linux-kernel - linux-next: manual merge of the akpm-current tree with the mips tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20150603193346.01a9989d@canb.auug.org.au>
Date:	Wed, 3 Jun 2015 19:33:46 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Ralf Baechle <ralf@...ux-mips.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Joe Perches <joe@...ches.com>,
	Rafał Miłecki <zajec5@...il.com>
Subject: linux-next: manual merge of the akpm-current tree with the mips
 tree

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@...b.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@...il.com>
- L:	linux-mips@...ux-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@...ke-m.de>
 +M:	Rafał Miłecki <zajec5@...il.com>
 +L:	linux-mips@...ux-mips.org
 +S:	Maintained
 +F:	arch/mips/bcm47xx/*
 +F:	arch/mips/include/asm/mach-bcm47xx/*
 +
  BROADCOM BCM5301X ARM ARCHITECTURE
  M:	Hauke Mehrtens <hauke@...ke-m.de>
  L:	linux-arm-kernel@...ts.infradead.org
@@@ -2322,14 -2247,8 +2314,14 @@@ M:	Ray Jui <rjui@...adcom.com
  L:	bcm-kernel-feedback-list@...adcom.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@...il.com>
 +L:	linux-mtd@...ts.infradead.org
 +S:	Maintained
 +F:	drivers/mtd/nand/brcmnand/
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:	Rafał Miłecki <zajec5@...il.com>
  L:	linux-wireless@...r.kernel.org

Content of type "application/pgp-signature" skipped