From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jeff Layton <jlayton@kernel•org>,
Ilya Dryomov <idryomov@gmail•com>,
David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>
Cc: Networking <netdev@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the ceph tree with the net tree
Date: Wed, 20 Nov 2024 11:30:15 +1100 [thread overview]
Message-ID: <20241120113015.294cf1d2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1056 bytes --]
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/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-11-20 0:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-20 0:30 Stephen Rothwell [this message]
2024-11-21 23:58 ` linux-next: manual merge of the ceph tree with the net tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241120113015.294cf1d2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=idryomov@gmail$(echo .)com \
--cc=jlayton@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox