Stephen Rothwell wrote:
> Hi Randy,
>
> Today's linux-next merge of the kernel-doc tree got a conflict in
> block/blk-core.c between commit d00e29fd99dd63d1c51917604e35dee824ed567f
> ("block: remove end_{queued|dequeued}_request()") from Linus' tree and
> commit bcbfb613cdca2d5c4c3f67ed428d7464abe7fb2f ("kerndoc-block-add")
> from the kernel-doc tree.
>
> The former removed what the latter was modifying, so I just removed the
> code.
Hi Stephen,
Fixed & updated. Better luck tomorrow.
Thanks,
~Randy
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
