mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "\"Frédéric Weisbecker\"" <fweisbec@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Arnd Bergmann <arnd@arndb.de>
Subject: linux-next: manual merge of the bkl-ioctl tree with the fixes tree
Date: Thu, 29 Apr 2010 15:50:04 +1000	[thread overview]
Message-ID: <20100429155004.26148af5.sfr@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 560 bytes --]

Hi Frédéric,

Today's linux-next merge of the bkl-ioctl tree got a conflict in
drivers/block/pktcdvd.c between commit
db02df06864ed90b08771914ed3d50daca7cd8d7 ("pktcdvd: improve BKL and
compat_ioctl.c usage") from the fixes tree and commit
59ce88717d9d8af8cb14af3a0a505cafb692b482 ("drivers: Push down BKL into
various drivers") from the bkl-ioctl tree.

I used the version from the fixes tree as that seems to be a superset
(including removing the [un]lock_kernel() calls).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

                 reply	other threads:[~2010-04-30 17:33 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20100429155004.26148af5.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.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

all inboxes | Powered by JetHome®