Prev: linux-next: manual merge of the usb tree with the input tree
Next: linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree
From: Stephen Rothwell on 30 Apr 2010 13:40
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).
Stephen Rothwell sfr(a)canb.auug.org.au