linux-kernel - Re: linux-next: manual merge of the mfd tree with the input 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: <20250730091729.1154b5ee@canb.auug.org.au>
Date: Wed, 30 Jul 2025 09:17:29 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Lee Jones <lee@...nel.org>, Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>, Linux Kernel
 Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Nuno Sá <nuno.sa@...log.com>
Subject: Re: linux-next: manual merge of the mfd tree with the input tree

Hi all,

On Thu, 3 Jul 2025 14:01:55 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   drivers/input/keyboard/adp5589-keys.c
> 
> between commit:
> 
>   43a8440f3969 ("Input: adp5589 - use new GPIO line value setter callbacks")
> 
> from the input tree and commit:
> 
>   3bdbd0858df6 ("Input: adp5589: remove the driver")
> 
> from the mfd tree.
> 
> I fixed it up (I just removed the file) 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 input tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped