linux-kernel - Re: linux-next: manual merge of the drivers-x86 tree with the hid 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <5q8qo934-17p0-7q87-37n4-691rr34q7n5p@xreary.bet>
Date: Wed, 28 Jan 2026 18:20:26 +0100 (CET)
From: Jiri Kosina <jikos@...nel.org>
To: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
cc: Mark Brown <broonie@...nel.org>, Benjamin Tissoires <bentiss@...nel.org>, 
    Hans de Goede <hansg@...nel.org>, Mark Gross <markgross@...nel.org>, 
    Antheas Kapenekakis <lkml@...heas.dev>, 
    Connor Belli <connorbelli2003@...il.com>, 
    Ionut Nechita <ionut_n2001@...oo.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 drivers-x86 tree with the hid
 tree

On Wed, 28 Jan 2026, Ilpo Järvinen wrote:

> I moved this asus kbd series into a separate branch and merged that into 
> my for-next branch. I could create an IB PR for that branch if HID 
> maintainers so prefer, though admittedly the conflict doesn't look 
> particularly complex.

Yeah, the conflict is trivial, and Linus likes to see conflicts between 
trees himself.

The one of us who sends pull request to Linus should just point it out in 
pull request.

Thanks,

-- 
Jiri Kosina
SUSE Labs