linux-kernel - linux-next: manual merge of the v4l-dvb-next tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20230123100147.5d8aff75@canb.auug.org.au>
Date:   Mon, 23 Jan 2023 10:01:47 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mauro Carvalho Chehab <mchehab@...nel.org>
Cc:     Hans Verkuil <hverkuil-cisco@...all.nl>,
        Jakub Kicinski <kuba@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the v4l-dvb-next tree with Linus' tree

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@...ezo.com>
- L:	linux-usb@...r.kernel.org
- L:	linux-media@...r.kernel.org
- 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@...il.com>
 +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@....at>
  M:	Anton Ivanov <anton.ivanov@...bridgegreys.com>

Content of type "application/pgp-signature" skipped