Subject: Re: linux-next: manual merge of the input tree with the arm-soc tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 22 Feb 2023 09:10:26 +1100

Hi all,

On Thu, 12 Jan 2023 10:39:28 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the input tree got a conflict in:
> 
>   drivers/input/touchscreen/ucb1400_ts.c
> 
> between commit:
> 
>   481ac55a74c9 ("mfd: remove ucb1400 support")
> 
> from the arm-soc tree and commit:
> 
>   2cfa7c9c55d8 ("Input: ucb1400_ts - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()")
> 
> from the input tree.
> 
> I fixed it up (I 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-current tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell