* linux-next: manual merge of the bkl-ioctl tree with the fixes tree
@ 2010-04-29 5:50 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2010-04-29 5:50 UTC (permalink / raw)
To: "Frédéric Weisbecker"
Cc: linux-next, linux-kernel, Arnd Bergmann
[-- 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-04-30 17:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-29 5:50 linux-next: manual merge of the bkl-ioctl tree with the fixes tree Stephen Rothwell
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®