* linux-next: manual merge of the kernel-doc tree
@ 2008-10-14 7:11 Stephen Rothwell
2008-10-14 17:43 ` Randy Dunlap
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2008-10-14 7:11 UTC (permalink / raw)
To: Randy Dunlap; +Cc: linux-next, Kiyoshi Ueda
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the kernel-doc tree
2008-10-14 7:11 linux-next: manual merge of the kernel-doc tree Stephen Rothwell
@ 2008-10-14 17:43 ` Randy Dunlap
0 siblings, 0 replies; 2+ messages in thread
From: Randy Dunlap @ 2008-10-14 17:43 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Kiyoshi Ueda
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-10-14 17:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-14 7:11 linux-next: manual merge of the kernel-doc tree Stephen Rothwell
2008-10-14 17:43 ` Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).