From: Frederic Weisbecker <fweisbec@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>
Subject: Re: linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree
Date: Thu, 29 Apr 2010 22:59:47 +0200 [thread overview]
Message-ID: <20100429205944.GC5392@nowhere> (raw)
In-Reply-To: <20100429154954.84966e61.sfr@canb.auug.org.au>
On Thu, Apr 29, 2010 at 03:49:54PM +1000, Stephen Rothwell wrote:
> Hi Frédéric,
>
> Today's linux-next merge of the bkl-ioctl tree got a conflict in
> drivers/char/i8k.c between commit
> 64ef834551d7696f54553d7608eba80a5a800e77 ("procfs: Push down the bkl from
> ioctl") from the bkl-procfs tree and commit
> 59ce88717d9d8af8cb14af3a0a505cafb692b482 ("drivers: Push down BKL into
> various drivers") from the bkl-ioctl tree.
>
> I used the version from the bkl-procfs tree for today.
>
> Can you guys please sort out these various bkl removal trees, please.
I'll do a test merge of my branches and solve the conflicts I can find.
Sorry about that.
next prev parent reply other threads:[~2010-04-30 19:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-29 5:49 linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree Stephen Rothwell
2010-04-29 20:59 ` Frederic Weisbecker [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-04-29 5:50 Stephen Rothwell
2010-04-27 5:06 Stephen Rothwell
2010-04-27 5:18 ` Frederic Weisbecker
2010-04-27 5:06 Stephen Rothwell
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=20100429205944.GC5392@nowhere \
--to=fweisbec@gmail.com \
--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).