Re: linux-next: manual merge of the staging tree with the vfs tree

Greg KH
2017-11-09T08:33:56Z

On Thu, Nov 09, 2017 at 03:01:26PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/pi433/pi433_if.c
>
> between commit:
>
> f81f0b5c9a30 ("pi433: sanitize ioctl")
>
> from the vfs tree and commit:
>
> 69af5d92da20 ("Staging: pi433: Fix the position of brace after if")
>
> from the staging tree.
>
> I fixed it up (I just used the vfs tree version (for the conflicting bits)
> as suggested by Al) and can carry the fix as necessary.

Sounds like the correct fix, thanks.

greg k-h