Re: linux-next: manual merge of the bkl-ioctl tree with thestaging-next tree

[Greg KH]

On Tue, Apr 27, 2010 at 02:48:04PM +1000, Stephen Rothwell wrote:
> 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.

That's the correct fix :)

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/