linux-kernel - linux-next: manual merge of the ceph tree with the net 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241120113015.294cf1d2@canb.auug.org.au>
Date: Wed, 20 Nov 2024 11:30:15 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jeff Layton <jlayton@...nel.org>, Ilya Dryomov <idryomov@...il.com>,
 David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, Paolo
 Abeni <pabeni@...hat.com>
Cc: Networking <netdev@...r.kernel.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 ceph tree with the net tree

Hi all,

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

  MAINTAINERS

between commit:

  4262bacb748f ("MAINTAINERS: exclude can core, drivers and DT bindings from netdev ML")

from the net tree and commit:

  6779c9d59a07 ("MAINTAINERS: exclude net/ceph from networking")

from the ceph 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 54fc0c1232b8,3771691fa978..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -16235,7 -16179,7 +16236,8 @@@ X:	include/net/mac80211.
  X:	include/net/wext.h
  X:	net/9p/
  X:	net/bluetooth/
 +X:	net/can/
+ X:	net/ceph/
  X:	net/mac80211/
  X:	net/rfkill/
  X:	net/wireless/

Content of type "application/pgp-signature" skipped