linux-kernel - linux-next: manual merge of the davinci tree with the arm-soc 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]

Message-ID: <20230110094246.1497d12e@canb.auug.org.au>
Date:   Tue, 10 Jan 2023 09:42:46 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Bartosz Golaszewski <brgl@...ev.pl>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>
Cc:     ARM <linux-arm-kernel@...ts.infradead.org>,
        Bartosz Golaszewski <bartosz.golaszewski@...aro.org>,
        Jilin Yuan <yuanjilin@...rlc.com>,
        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 davinci tree with the arm-soc tree

Hi all,

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

  arch/arm/mach-davinci/board-dm365-evm.c

between commit:

  fef6ca600ba7 ("ARM: davinci: remove unused board support")

from the arm-soc tree and commit:

  84bde55c050b ("ARM: davinci: fix repeated words in comments")

from the davinci tree.

I fixed it up (I removed the file) 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

Content of type "application/pgp-signature" skipped