Re: [GIT PULL] platform-drivers-x86 for v7.0-1

[Antheas Kapenekakis]

On Sat, 14 Feb 2026 at 00:52, Linus Torvalds
<torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Fri, 13 Feb 2026 at 11:00, Ilpo Järvinen
> <ilpo.jarvinen@xxxxxxxxxxxxxxx> wrote:
> >
> > There's a known conflict with HID/asus changes that came through
> > the hid tree:
>
> Bah. I looked at that conflict, and I just couldn't stand doing the
> straightforward but stupid resolution.
>
> > Antheas Kapenekakis (11):
> >       HID: asus: add support for the asus-wmi brightness handler
>
> This was basically doing very similar things right next to commit
> f631011e36b8 ("HID: hid-asus: Implement fn lock for Asus ProArt P16")
> that came in through the HID tree
>
> So since that asus-wmi brightness handler added a switch statement for
> KEY_xyz event, I moved that KEY_FN_ESC from the QUIRK_HID_FN_LOCK
> logic into the same case statement.
>
> Maybe I screwed something up, but I just couldn't deal with having
> that if-statement next to the switch statement.
>
> So my merge isn't the trivial obvious one, and somebody should check me.
>
> Same goes for the added HID_USAGE_PAGE_VENDOR. The driver had alredy
> been changed to use HID_UP_ASUSVENDOR which is that same value in
> <linux/hid.h>.
>
> So I removed the duplicate HID_USAGE_PAGE_VENDOR entirely in favor of
> just consistently using that HID_UP_ASUSVENDOR thing.
>
> Connor / Antheas - please check your respective changes still work
> after I went nuts on it all.

Hi,
I reviewed the merge and it looks good to me. I tested it and
backlight control works properly.

Good catch on HID_UP_ASUSVENDOR, I missed it.

Tobias can comment on QUIRK_HID_FN_LOCK, I do not have an affected device.

Antheas

>            Linus
>