From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Frédéric Weisbecker" <fweisbec@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Linus Torvalds" <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the bkl-ioctl tree with my fixes tree
Date: Tue, 27 Apr 2010 11:02:35 +0200 [thread overview]
Message-ID: <201004271102.35904.arnd@arndb.de> (raw)
In-Reply-To: <20100427150629.cb526876.sfr@canb.auug.org.au>
On Tuesday 27 April 2010, Stephen Rothwell wrote:
> Today's linux-next merge of the bkl-ioctl tree got a aconflics in
> drivers/block/pktcdvd.c between commit
> 30d32c9015af1fa56795c5ba8d7d6635d6bef8bf ("pktcdvd: improve BKL and
> compat_ioctl.c usage") from my fixes tree and commit
> 1dd97d3d546aa14db7efa5366b21d1336b91379e ("Rename 'struct
> file_operations' 'ioctl' fn pointer to 'bkl_ioctl'") from the bkl-ioctl
> tree.
>
> I used the version from my fixes tree for today.
>
> Arnd, are you going to submit this change to Linus sometime soon, or
> should I drop it?
It's not clear yet how we do it. Ideally "pktcdvd: improve BKL and
compat_ioctl.c usage" should find its way into -rc1 in some way, but
we need to reshuffle the BKL removal trees to make that go in nicely.
Where is your fixes tree? Maybe Frederic can take all BKL related
patches from that into one of his trees.
Arnd
next prev parent reply other threads:[~2010-04-27 9:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-27 5:06 linux-next: manual merge of the bkl-ioctl tree with my fixes tree Stephen Rothwell
2010-04-27 9:02 ` Arnd Bergmann [this message]
2010-04-28 6:22 ` Stephen Rothwell
2010-04-28 12:36 ` [PATCH] pktcdvd: improve BKL and compat_ioctl.c usage 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=201004271102.35904.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/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