* linux-next: manual merge of the ceph tree with the net tree
@ 2024-11-20 0:30 Stephen Rothwell
2024-11-21 23:58 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2024-11-20 0:30 UTC (permalink / raw)
To: Jeff Layton, Ilya Dryomov, David Miller, Jakub Kicinski,
Paolo Abeni
Cc: Networking, Linux Kernel Mailing List, Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the ceph tree with the net tree
2024-11-20 0:30 linux-next: manual merge of the ceph tree with the net tree Stephen Rothwell
@ 2024-11-21 23:58 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2024-11-21 23:58 UTC (permalink / raw)
To: Jeff Layton, Ilya Dryomov
Cc: David Miller, Jakub Kicinski, Paolo Abeni, Networking,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]
Hi all,
On Wed, 20 Nov 2024 11:30:15 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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.
>
> 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/
This is now a conflict between the ceph tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-11-21 23:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-20 0:30 linux-next: manual merge of the ceph tree with the net tree Stephen Rothwell
2024-11-21 23:58 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox