linux-kernel - linux-next: manual merge of the gpio 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: <20181217191753.172ca200@canb.auug.org.au>
Date:   Mon, 17 Dec 2018 19:17:53 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Linus Walleij <linus.walleij@...aro.org>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Janusz Krzysztofik <jmkrzyszt@...il.com>,
        Tony Lindgren <tony@...mide.com>
Subject: linux-next: manual merge of the gpio tree with the arm-soc tree

Hi all,

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

  arch/arm/mach-omap1/board-ams-delta.c

between commit:

  19a2668a8ae3 ("ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED device")

from the arm-soc tree and commit:

  21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()")

from the gpio tree.

I fixed it up (the former removed the code updated by the latter, so
I used that) 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