linux-kernel - linux-next: manual merge of the input tree with Linus' 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240820112358.665c5532@canb.auug.org.au>
Date: Tue, 20 Aug 2024 11:23:58 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the input tree with Linus' tree

Hi all,

Today's linux-next merge of the input tree got a conflict in:

  drivers/input/touchscreen/cyttsp4_core.c

between commit:

  cb04e8b1d2f2 ("minmax: don't use max() in situations that want a C constant expression")

from Linus' tree and commit:

  25162a4f64f8 ("Input: cyttsp4 - remove driver")

from the input tree.

I fixed it up (the latter removed the file, so I did that) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped