Re: linux-next: manual merge of the gpio-sim tree with the gpio-brgl-fixes tree

[Stephen Rothwell]

Hi all,

On Tue, 16 Nov 2021 10:39:24 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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

Attachment: pgpSX7ZT0UX3M.pgp
Description: OpenPGP digital signature