From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Hogan <james.hogan@mips•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Alexandre Belloni <alexandre.belloni@bootlin•com>,
Paul Burton <paul.burton@mips•com>
Subject: linux-next: manual merge of the mips-fixes tree with Linus' tree
Date: Mon, 24 Dec 2018 09:07:40 +1100 [thread overview]
Message-ID: <20181224090740.3ebbd60c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1271 bytes --]
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/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2018-12-23 22:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20181224090740.3ebbd60c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alexandre.belloni@bootlin$(echo .)com \
--cc=james.hogan@mips$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paul.burton@mips$(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