Messages in this thread | | | Date | Mon, 24 Dec 2018 09:07:40 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the mips-fixes tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the mips-fixes tree got a conflict in:
MAINTAINERS
between commit:
6584297b78b6 ("MAINTAINERS: Update linux-mips mailing list address")
from Linus' tree and commit:
9bd2f7eeaed1 ("MAINTAINERS: Add a maintainer for MSCC MIPS SoCs")
from the mips-fixes 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 f3a5c97e3419,50223cba6ddb..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -9912,8 -9801,9 +9912,9 @@@ F: drivers/dma/at_xdmac. MICROSEMI MIPS SOCS M: Alexandre Belloni <alexandre.belloni@bootlin.com> + M: Microchip Linux Driver Support <UNGLinuxDriver@microchip.com> -L: linux-mips@linux-mips.org +L: linux-mips@vger.kernel.org - S: Maintained + S: Supported F: arch/mips/generic/board-ocelot.c F: arch/mips/configs/generic/board-ocelot.config F: arch/mips/boot/dts/mscc/ [unhandled content-type:application/pgp-signature] | |