Messages in this thread | | | Date | Thu, 29 Apr 2010 15:49:54 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree |
| |
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. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |