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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
