From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Ralf Baechle <ralf@linux-mips•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Joe Perches" <joe@perches•com>,
"Rafał Miłecki" <zajec5@gmail•com>
Subject: linux-next: manual merge of the akpm-current tree with the mips tree
Date: Wed, 3 Jun 2015 19:33:46 +1000 [thread overview]
Message-ID: <20150603193346.01a9989d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1866 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
MAINTAINERS between commit d4b6c2755ce1 ("MAINTAINERS: Add Broadcom
BCM47xx entry") from the tree and commit b93598277db2 ("MAINTAINERS:
remove section BROADCOM BCM33XX MIPS ARCHITECTURE") from the
akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc MAINTAINERS
index 5f620640c34d,6de7364e67a4..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2211,22 -2153,6 +2211,14 @@@ T: git git://git.kernel.org/pub/scm/lin
S: Maintained
N: bcm2835
- BROADCOM BCM33XX MIPS ARCHITECTURE
- M: Kevin Cernekee <cernekee@gmail•com>
- L: linux-mips@linux-mips•org
- S: Maintained
- F: arch/mips/bcm3384/*
- F: arch/mips/include/asm/mach-bcm3384/*
- F: arch/mips/kernel/*bmips*
-
+BROADCOM BCM47XX MIPS ARCHITECTURE
+M: Hauke Mehrtens <hauke@hauke-m•de>
+M: Rafał Miłecki <zajec5@gmail•com>
+L: linux-mips@linux-mips•org
+S: Maintained
+F: arch/mips/bcm47xx/*
+F: arch/mips/include/asm/mach-bcm47xx/*
+
BROADCOM BCM5301X ARM ARCHITECTURE
M: Hauke Mehrtens <hauke@hauke-m•de>
L: linux-arm-kernel@lists•infradead.org
@@@ -2322,14 -2247,8 +2314,14 @@@ M: Ray Jui <rjui@broadcom•com
L: bcm-kernel-feedback-list@broadcom•com
S: Supported
F: drivers/gpio/gpio-bcm-kona.c
- F: Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
+ F: Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
+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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-06-03 9:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-03 9:33 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-02-15 5:03 linux-next: manual merge of the akpm-current tree with the mips tree Stephen Rothwell
2018-08-22 2:02 Stephen Rothwell
2019-05-03 8:59 Stephen Rothwell
2020-05-28 9:29 Stephen Rothwell
2020-05-29 21:15 ` Andrew Morton
2020-05-29 22:55 ` 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=20150603193346.01a9989d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=joe@perches$(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