| 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
| ||
|
Message-ID: <20230530092000.256732c7@canb.auug.org.au>
Date: Tue, 30 May 2023 09:20:00 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Florian Fainelli <f.fainelli@...il.com>
Cc: Florian Fainelli <florian.fainelli@...adcom.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the broadcom tree with Linus' tree
Hi all,
Today's linux-next merge of the broadcom tree got a conflict in:
MAINTAINERS
between commit:
80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")
from Linus' tree and commit:
31345a0f5901 ("MAINTAINERS: Replace my email address")
from the broadcom 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 062962cb35aa,040ffd682131..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3910,8 -3913,36 +3910,8 @@@ F: drivers/net/dsa/bcm_sf2
F: include/linux/dsa/brcm.h
F: include/linux/platform_data/b53.h
-BROADCOM BCMBCA ARM ARCHITECTURE
-M: William Zhang <william.zhang@...adcom.com>
-M: Anand Gore <anand.gore@...adcom.com>
-M: Kursad Oney <kursad.oney@...adcom.com>
-M: Florian Fainelli <florian.fainelli@...adcom.com>
-M: Rafał Miłecki <rafal@...ecki.pl>
-R: Broadcom internal kernel review list <bcm-kernel-feedback-list@...adcom.com>
-L: linux-arm-kernel@...ts.infradead.org (moderated for non-subscribers)
-S: Maintained
-T: git https://github.com/broadcom/stblinux.git
-F: Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
-F: arch/arm64/boot/dts/broadcom/bcmbca/*
-N: bcmbca
-N: bcm[9]?47622
-N: bcm[9]?4912
-N: bcm[9]?63138
-N: bcm[9]?63146
-N: bcm[9]?63148
-N: bcm[9]?63158
-N: bcm[9]?63178
-N: bcm[9]?6756
-N: bcm[9]?6813
-N: bcm[9]?6846
-N: bcm[9]?6855
-N: bcm[9]?6856
-N: bcm[9]?6858
-N: bcm[9]?6878
-
BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
- M: Florian Fainelli <f.fainelli@...il.com>
+ M: Florian Fainelli <florian.fainelli@...adcom.com>
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@...adcom.com>
L: linux-rpi-kernel@...ts.infradead.org (moderated for non-subscribers)
L: linux-arm-kernel@...ts.infradead.org (moderated for non-subscribers)
@@@ -4007,34 -4039,6 +4008,34 @@@ N: brcmst
N: bcm7038
N: bcm7120
+BROADCOM BCMBCA ARM ARCHITECTURE
+M: William Zhang <william.zhang@...adcom.com>
+M: Anand Gore <anand.gore@...adcom.com>
+M: Kursad Oney <kursad.oney@...adcom.com>
- M: Florian Fainelli <f.fainelli@...il.com>
++M: Florian Fainelli <florian.fainelli@...adcom.com>
+M: Rafał Miłecki <rafal@...ecki.pl>
+R: Broadcom internal kernel review list <bcm-kernel-feedback-list@...adcom.com>
+L: linux-arm-kernel@...ts.infradead.org (moderated for non-subscribers)
+S: Maintained
+T: git https://github.com/broadcom/stblinux.git
+F: Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
+F: arch/arm64/boot/dts/broadcom/bcmbca/*
+N: bcmbca
+N: bcm[9]?47622
+N: bcm[9]?4912
+N: bcm[9]?63138
+N: bcm[9]?63146
+N: bcm[9]?63148
+N: bcm[9]?63158
+N: bcm[9]?63178
+N: bcm[9]?6756
+N: bcm[9]?6813
+N: bcm[9]?6846
+N: bcm[9]?6855
+N: bcm[9]?6856
+N: bcm[9]?6858
+N: bcm[9]?6878
+
BROADCOM BDC DRIVER
M: Justin Chen <justinpopo6@...il.com>
M: Al Cooper <alcooperx@...il.com>
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists