| Message ID | 20241120113015.294cf1d2@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | linux-next: manual merge of the ceph tree with the net tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc MAINTAINERS index 54fc0c1232b8,3771691fa978..000000000000 --- a/MAINTAINERS
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.