Re: linux-next: manual merge of the drivers-x86 tree with the hid tree

[Jiri Kosina]

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