netdev - linux-next: manual merge of the execve tree with the net-next 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]

Date: Mon, 18 Dec 2023 16:17:04 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Kees Cook <keescook@...omium.org>, David Miller <davem@...emloft.net>,
 Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>
Cc: Networking <netdev@...r.kernel.org>, Alexey Dobriyan
 <adobriyan@...il.com>, FUJITA Tomonori <fujita.tomonori@...il.com>, Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Trevor Gross <tmgross@...ch.edu>
Subject: linux-next: manual merge of the execve tree with the net-next tree

Hi all,

Today's linux-next merge of the execve tree got a conflict in:

  MAINTAINERS

between commit:

  cbaa28f970a1 ("MAINTAINERS: add Rust PHY abstractions for ETHERNET PHY LIBRARY")

from the net-next tree and commit:

  0a8a952a75f2 ("ELF, MAINTAINERS: specifically mention ELF")

from the execve 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 1f53b4c593dd,08278b9ede48..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7919,15 -7797,7 +7919,15 @@@ F:	include/uapi/linux/mdio.
  F:	include/uapi/linux/mii.h
  F:	net/core/of_net.c
  
 +ETHERNET PHY LIBRARY [RUST]
 +M:	FUJITA Tomonori <fujita.tomonori@...il.com>
 +R:	Trevor Gross <tmgross@...ch.edu>
 +L:	netdev@...r.kernel.org
 +L:	rust-for-linux@...r.kernel.org
 +S:	Maintained
 +F:	rust/kernel/net/phy.rs
 +
- EXEC & BINFMT API
+ EXEC & BINFMT API, ELF
  R:	Eric Biederman <ebiederm@...ssion.com>
  R:	Kees Cook <keescook@...omium.org>
  L:	linux-mm@...ck.org

Content of type "application/pgp-signature" skipped