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

Message-ID: <20230222091026.4b440e8e@canb.auug.org.au>
Date:   Wed, 22 Feb 2023 09:10:26 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc:     Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        Jonathan Cameron <Jonathan.Cameron@...wei.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 input tree with the arm-soc
 tree

Hi all,

On Thu, 12 Jan 2023 10:39:28 +1100 Stephen Rothwell <sfr@...b.auug.org.au> 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

Content of type "application/pgp-signature" skipped