From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Subject: Re: linux-next: manual merge of the kernel-doc tree
Date: Tue, 14 Oct 2008 10:43:23 -0700 [thread overview]
Message-ID: <48F4DA3B.2090003@oracle.com> (raw)
In-Reply-To: <20081014181114.c069b145.sfr@canb.auug.org.au>
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
prev parent reply other threads:[~2008-10-14 17:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-14 7:11 linux-next: manual merge of the kernel-doc tree Stephen Rothwell
2008-10-14 17:43 ` Randy Dunlap [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48F4DA3B.2090003@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=k-ueda@ct.jp.nec.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).