linux-kernel - Re: linux-next: manual merge of the gpio-sim 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20211217171136.613b02d3@canb.auug.org.au>
Date:   Fri, 17 Dec 2021 17:11:36 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Bartosz Golaszewski <brgl@...ev.pl>
Cc:     Kent Gibson <warthog618@...il.com>,
        Li Zhijian <lizhijian@...fujitsu.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the gpio-sim tree with the
 gpio-brgl-fixes tree

Hi all,

On Tue, 16 Nov 2021 10:39:24 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the gpio-sim tree got a conflict in:
> 
>   tools/testing/selftests/gpio/Makefile
> 
> between commits:
> 
>   92a59d7f381d ("selftests: gpio: fix gpio compiling error")
>   4f4d0af7b2d9 ("selftests: gpio: restore CFLAGS options")
> 
> from the gpio-brgl-fixes tree and commits:
> 
>   79d93060a28e ("selftests: gpio: provide a helper for reading chip info")
>   60283bc9fceb ("selftests: gpio: add a helper for reading GPIO line names")
> 
> from the gpio-sim 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.

This is now a conflict between the gpio-brgl tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped