Hi all, Today's linux-next merge of the v4l-dvb-next tree got conflicts in: MAINTAINERS between commit: e0be11a833e8 ("MAINTAINERS: add networking entries for Willem") from Linus' tree and commit: 3673237b62a8 ("media: zr364xx: remove deprecated driver") from the v4l-dvb-next 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. -- Cheers, Stephen Rothwell diff --cc MAINTAINERS index 56c7cb44a42a,ba5254cd1002..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -21582,23 -21710,6 +21565,13 @@@ S: Orpha W: http://linux-lc100020.sourceforge.net F: drivers/net/wireless/zydas/zd1201.* - USB ZR364XX DRIVER - M: Antoine Jacquet <royale@xxxxxxxxxx> - L: linux-usb@xxxxxxxxxxxxxxx - L: linux-media@xxxxxxxxxxxxxxx - S: Maintained - W: http://royale.zerezo.com/zr364xx/ - T: git git://linuxtv.org/media_tree.git - F: Documentation/admin-guide/media/zr364xx* - F: drivers/staging/media/deprecated/zr364xx/ - +USER DATAGRAM PROTOCOL (UDP) +M: Willem de Bruijn <willemdebruijn.kernel@xxxxxxxxx> +S: Maintained +F: include/linux/udp.h +F: net/ipv4/udp.c +F: net/ipv6/udp.c + USER-MODE LINUX (UML) M: Richard Weinberger <richard@xxxxxx> M: Anton Ivanov <anton.ivanov@xxxxxxxxxxxxxxxxxx>
Attachment:
pgpuqlo16K1uf.pgp
Description: OpenPGP digital signature