Hi all,
On Wed, 20 Nov 2024 11:30:15 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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:
pgpBX4xYsXEtE.pgp
Description: OpenPGP digital signature
