From: Neil Brown <neilb@suse.de>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the md-current tree with Linus' tree
Date: Tue, 15 Dec 2009 14:05:02 +1100 [thread overview]
Message-ID: <20091215140502.5edd6678@notabene.brown> (raw)
In-Reply-To: <200912141127.27019.arnd@arndb.de>
On Mon, 14 Dec 2009 11:27:26 +0100
Arnd Bergmann <arnd@arndb.de> wrote:
> Neil, still have a tree where I track patches to fs/compat_ioctl.c
> that have not yet been merged. If you just keep the half in your
> own files and drop the ones in fs/compat_ioctl.c, I'll submit that
> next time. You can also adapt the patch again to the new contents
> and remove the four above to save me that work.
>
> I didn't want to remove them from fs/compat_ioctl.c before they
> got added to md.c, in order to keep bisection correct.
>
> Arnd
I had already rebased that patch on the lasted from Linus and asked him to
pull again.
He how seems to have done that, so md should be up-to-date in -linus,
including the compat_ioctl stuff.
If you would like to double check that it matches what you expect, that would
be great.
Thanks,
NeilBrown
next prev parent reply other threads:[~2009-12-15 3:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-13 23:24 linux-next: manual merge of the md-current tree with Linus' tree Stephen Rothwell
2009-12-14 10:27 ` Arnd Bergmann
2009-12-15 3:05 ` Neil Brown [this message]
2009-12-15 9:57 ` Arnd Bergmann
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=20091215140502.5edd6678@notabene.brown \
--to=neilb@suse.de \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--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).