* linux-next: unexpected file in commit in hid tree
@ 2021-11-11 21:17 Stephen Rothwell
2021-11-11 21:46 ` Jiri Kosina
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2021-11-11 21:17 UTC (permalink / raw)
To: Jiri Kosina, Benjamin Tissoires
Cc: Arnd Bergmann, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: unexpected file in commit in hid tree
2021-11-11 21:17 linux-next: unexpected file in commit in hid tree Stephen Rothwell
@ 2021-11-11 21:46 ` Jiri Kosina
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Kosina @ 2021-11-11 21:46 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Benjamin Tissoires, Arnd Bergmann, Linux Kernel Mailing List,
Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-11 21:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-11 21:17 linux-next: unexpected file in commit in hid tree Stephen Rothwell
2021-11-11 21:46 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).