linux-kernel - linux-next: manual merge of the samsung-krzk-fixes tree with the arm-soc-fixes 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: <20201029095635.3c3996a3@canb.auug.org.au>
Date:   Thu, 29 Oct 2020 09:56:35 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Krzysztof Kozlowski <krzk@...nel.org>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     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 samsung-krzk-fixes tree with the
 arm-soc-fixes tree

Hi all,

Today's linux-next merge of the samsung-krzk-fixes tree got a conflict in:

  MAINTAINERS

between commit:

  421f2597bf42 ("MAINTAINERS: Move Kukjin Kim to credits")

from the arm-soc-fixes tree and commit:

  215f06d7efc2 ("MAINTAINERS: move Kyungmin Park to credits")

from the samsung-krzk-fixes 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 9bff94560b42,40b4a582b4cc..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2374,7 -2374,8 +2374,7 @@@ F:	drivers/i2c/busses/i2c-rk3x.
  F:	sound/soc/rockchip/
  N:	rockchip
  
- ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
+ ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
 -M:	Kukjin Kim <kgene@...nel.org>
  M:	Krzysztof Kozlowski <krzk@...nel.org>
  L:	linux-arm-kernel@...ts.infradead.org (moderated for non-subscribers)
  L:	linux-samsung-soc@...r.kernel.org

Content of type "application/pgp-signature" skipped