linux-kernel - linux-next: manual merge of the realtek tree with Linus' 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>] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 13 Apr 2020 08:50:34 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andreas Färber <afaerber@...e.de>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linus Torvalds <torvalds@...ux-foundation.org>,
        Joe Perches <joe@...ches.com>
Subject: linux-next: manual merge of the realtek tree with Linus' tree

Hi all,

Today's linux-next merge of the realtek tree got a conflict in:

  MAINTAINERS

between commit:

  3b50142d8528 ("MAINTAINERS: sort field names for all entries")

from Linus' tree and commit:

  d6656fa4c621 ("ARM: Prepare Realtek RTD1195")

from the realtek 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 6851ef7cf1bd,1b15d2dd2535..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2269,8 -2203,10 +2269,9 @@@ M:	Andreas Färber <afaerber@...e.de
  L:	linux-arm-kernel@...ts.infradead.org (moderated for non-subscribers)
  L:	linux-realtek-soc@...ts.infradead.org (moderated for non-subscribers)
  S:	Maintained
 -F:	arch/arm/boot/dts/rtd*
 +F:	Documentation/devicetree/bindings/arm/realtek.yaml
+ F:	arch/arm/mach-realtek/
  F:	arch/arm64/boot/dts/realtek/
 -F:	Documentation/devicetree/bindings/arm/realtek.yaml
  
  ARM/RENESAS ARM64 ARCHITECTURE
  M:	Geert Uytterhoeven <geert+renesas@...der.be>

Content of type "application/pgp-signature" skipped