Subject: linux-next: manual merge of the bkl-ioctl tree with my fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 27 Apr 2010 15:06:29 +1000

Hi Frédéric,

Today's linux-next merge of the bkl-ioctl tree got a aconflics in
drivers/block/pktcdvd.c between commit
30d32c9015af1fa56795c5ba8d7d6635d6bef8bf ("pktcdvd: improve BKL and
compat_ioctl.c usage") from my fixes tree and commit
1dd97d3d546aa14db7efa5366b21d1336b91379e ("Rename 'struct
file_operations' 'ioctl' fn pointer to 'bkl_ioctl'") from the bkl-ioctl
tree.

I used the version from my fixes tree for today.

Arnd, are you going to submit this change to Linus sometime soon, or
should I drop it?
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/