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

Stephen Rothwell
2017-11-09T04:01:29Z

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. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.

--
Cheers,
Stephen Rothwell