From: Michael Ellerman <mpe@ellerman•id.au>
To: Brian Norris <computersforpeace@gmail•com>,
Ralf Baechle <ralf@linux-mips•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Rafał Miłecki" <zajec5@gmail•com>
Subject: linux-next: manual merge of the l2-mtd tree with the mips tree
Date: Fri, 12 Jun 2015 20:50:20 +1000 [thread overview]
Message-ID: <1434106220.20648.1.camel@ellerman.id.au> (raw)
Hi Brian,
Today's linux-next merge of the l2-mtd tree got a conflict in MAINTAINERS
between commit 68c2d21d0126 "MIPS: BCM47xx: Move NVRAM driver to the
drivers/firmware/" from the mips tree and commit 02787daadbda "MAINTAINERS: add
entry for new brcmnand/ directory" from the l2-mtd tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc MAINTAINERS
index 85dc5bd76c38,ad9f36875372..d848473e184f
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2320,12 -2257,12 +2320,18 @@@ S: Supporte
F: drivers/gpio/gpio-bcm-kona.c
F: Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
+BROADCOM NVRAM DRIVER
+M: Rafał Miłecki <zajec5@gmail•com>
+L: linux-mips@linux-mips•org
+S: Maintained
+F: drivers/firmware/broadcom/*
+
+ BROADCOM STB NAND FLASH DRIVER
+ M: Brian Norris <computersforpeace@gmail•com>
+ L: linux-mtd@lists•infradead.org
+ S: Maintained
+ F: drivers/mtd/nand/brcmnand/
+
BROADCOM SPECIFIC AMBA DRIVER (BCMA)
M: Rafał Miłecki <zajec5@gmail•com>
L: linux-wireless@vger•kernel.org
cheers
next reply other threads:[~2015-06-12 10:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-12 10:50 Michael Ellerman [this message]
2015-06-12 10:57 ` linux-next: manual merge of the l2-mtd tree with the mips tree Michael Ellerman
-- strict thread matches above, loose matches on Subject: below --
2015-06-12 3:27 Michael Ellerman
2011-07-29 3:49 Stephen Rothwell
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=1434106220.20648.1.camel@ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=computersforpeace@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
--cc=zajec5@gmail$(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