Messages in this thread | | | Date | Tue, 27 Apr 2010 14:48:04 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the bkl-ioctl tree with the staging-next tree |
| |
Hi Frédéric,
Today's linux-next merge of the bkl-ioctl tree got a conflict in drivers/staging/poch/poch.c between commit ba7d84da197c348efa2b2984a848e0fbccd4b9b0 ("Staging: Remove staging/poch") from the staging-next tree and commit 1dd97d3d546aa14db7efa5366b21d1336b91379e ("Rename 'struct file_operations' 'ioctl' fn pointer to 'bkl_ioctl'") from the bkl-ioctl tree.
The former just removed the file, so I did as well. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |