LinuxLists.cc - linux-next: unexpected file in commit in hid tree

2021-11-11 21:17:28

Subject: linux-next: unexpected file in commit in hid tree

Hi all,

Commit

b763dc3f17a2 ("HID: intel-ish-hid: fix module device-id handling")

added this unexpected file:

include/linux/mod_devicetable.h.rej

--
Cheers,
Stephen Rothwell

Attachments:

(No filename) (488.00 B)
OpenPGP digital signature

2021-11-11 21:46:59

by Jiri Kosina

[permalink] [raw]

Subject: Re: linux-next: unexpected file in commit in hid tree

On Fri, 12 Nov 2021, Stephen Rothwell wrote:

> Hi all,
>
> Commit
>
> b763dc3f17a2 ("HID: intel-ish-hid: fix module device-id handling")
>
> added this unexpected file:
>
> include/linux/mod_devicetable.h.rej

Bah, I have absolutely no idea how it ended up there, I must have
fat-fingerd git add badly when resolving the conflict.

Thanks for the report, fixed version now pushed out.

--
Jiri Kosina
SUSE Labs