From: Stephen Rothwell on
Hi Frédéric,

Today's linux-next merge of the bkl-ioctl tree got a conflict in
drivers/isdn/divert/divert_procfs.c between commit
64ef834551d7696f54553d7608eba80a5a800e77 ("procfs: Push down the bkl from
ioctl") from the bkl-procfs tree and commit
5cc2443e44f810a21d1228ac9bf60b41536e5b9c ("isdn: Push down BKL into ioctl
functions") from the bkl-ioctl tree.

I used the version from the blk-procfs tree.
Stephen Rothwell sfr(a)