linux-kernel - linux-next: manual merge of the spi-fixes 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>] [day] [month] [year] [list]

Message-ID: <20211026092601.7e16a5c7@canb.auug.org.au>
Date:   Tue, 26 Oct 2021 09:26:01 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mark Brown <broonie@...nel.org>
Cc:     Arnd Bergmann <arnd@...db.de>,
        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 spi-fixes tree with Linus' tree

Hi all,

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

  drivers/spi/spi-tegra20-slink.c

between commit:

  ac8a6eba2a11 ("spi: Fix tegra20 build with CONFIG_PM=n once again")

from Linus' tree and commit:

  6b6c496a88e7 ("spi: tegra20: fix build with CONFIG_PM_SLEEP=n")

from the spi-fixes tree.

I fixed it up (I just used the former) 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