Home » Mailing list archives » linux-kernel » 2010 » April » 27

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

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Stephen Rothwell
Subject: linux-next: manual merge of the bkl-ioctl tree with my fixes tree
Date: Monday, April 26, 2010 - 10:06 pm

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                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
linux-next: manual merge of the bkl-ioctl tree with my fix ..., Stephen Rothwell, (Mon Apr 26, 10:06 pm)
Re: linux-next: manual merge of the bkl-ioctl tree with my ..., Arnd Bergmann, (Tue Apr 27, 2:02 am)
Re: linux-next: manual merge of the bkl-ioctl tree with my ..., Stephen Rothwell, (Tue Apr 27, 11:22 pm)
[PATCH] pktcdvd: improve BKL and compat_ioctl.c usage, Arnd Bergmann, (Wed Apr 28, 5:36 am)