linux-kernel - Re: [PATCH] hid-asus: add ROG Ally X prod ID to quirk list

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: <nycvar.YFH.7.76.2408060815230.12664@cbobk.fhfr.pm>
Date: Tue, 6 Aug 2024 08:17:15 +0200 (CEST)
From: Jiri Kosina <jikos@...nel.org>
To: Luke Jones <luke@...nes.dev>
cc: Benjamin Tissoires <bentiss@...nel.org>, linux-input@...r.kernel.org, 
    linux-kernel@...r.kernel.org
Subject: Re: [PATCH] hid-asus: add ROG Ally X prod ID to quirk list

On Tue, 6 Aug 2024, Luke Jones wrote:

> > I've applied the patch, but got a conflict here, because I don't see 
> > USB_DEVICE_ID_ASUSTEK_ROG_AZOTH_KEYBOARD in my tree, nor in Linus' tree.
> > What tree was this patch generated against?
> 
> Apologies. I have a large tree of work for various asus devices. What 
> you see should have been dropped but it looks like a git-rebase didn't 
> go well.
> 
> Do you need me to regenerate it?

No worries, I've fixed the conflict by hand, I was just wondering where 
this is coming from.

Thanks,

-- 
Jiri Kosina
SUSE Labs