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

[Jiri Kosina]

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