linux-kernel - linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-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]

Date:   Wed, 20 Jan 2021 13:51:08 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Bartosz Golaszewski <brgl@...ev.pl>
Cc:     Bartosz Golaszewski <bgolaszewski@...libre.com>,
        Dmitry Osipenko <digetx@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Thierry Reding <treding@...dia.com>
Subject: linux-next: manual merge of the gpio-brgl tree with the
 gpio-brgl-fixes tree

Hi all,

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

  drivers/gpio/Kconfig

between commit:

  298d75c9b188 ("gpio: tegra: Add missing dependencies")

from the gpio-brgl-fixes tree and commit:

  355ef6bb005f ("gpio: tegra: Add dependency on GPIOLIB_IRQCHIP")

from the gpio-brgl tree.

I fixed it up (the former is just a superset of the latter) 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