linux-next: manual merge of the staging tree with the v4l-dvb tree
Hi all,
Today's linux-next merge of the staging tree got a conflict in:
MAINTAINERS
between commit:
ba47652ba655 ("media: meye: remove this deprecated driver")
from the v4l-dvb tree and commit:
eec8ccab1b57 ("most: add maintainer entry")
from the staging tree.
I fixed it up (see below) 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.
Signature · 31 lines
Cheers, Stephen Rothwell diff --cc MAINTAINERS index ccbc53c08734,12a35773db78..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -14090,6 -14149,23 +14090,16 @@@ F: drivers/regulator/mpq7920. F: drivers/regulator/mpq7920.h F: include/linux/mfd/mp2629.h + MOST(R) TECHNOLOGY DRIVER + M: Parthiban Veerasooran <[email protected]> + M: Christian Gromm <[email protected]> + S: Maintained + F: Documentation/ABI/testing/configfs-most + F: Documentation/ABI/testing/sysfs-bus-most + F: drivers/most/ + F: drivers/staging/most/ + F: include/linux/most.h + -MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER -S: Orphan -W: http://popies.net/meye/ -F: Documentation/userspace-api/media/drivers/meye* -F: drivers/staging/media/deprecated/meye/ -F: include/uapi/linux/meye.h - MOTORCOMM PHY DRIVER M: Peter Geis <[email protected]> M: Frank <[email protected]>
Quoted 14 lines · Stephen Rothwell
Hi all,
Today's linux-next merge of the staging tree got a conflict in:
MAINTAINERSbetween commit:
ba47652ba655("media: meye: remove this deprecated driver")from the v4l-dvb tree and commit:
eec8ccab1b57("most: add maintainer entry")
Quoted 8 lines
from the staging tree.
I fixed it up (see below) 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.
Fix up looks good, thanks!
greg k-h