From: Jiri Kosina <jikos@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Arnd Bergmann <arnd@arndb.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: unexpected file in commit in hid tree
Date: Thu, 11 Nov 2021 22:46:49 +0100 (CET) [thread overview]
Message-ID: <nycvar.YFH.7.76.2111112246160.12554@cbobk.fhfr.pm> (raw)
In-Reply-To: <20211112081721.45529b69@canb.auug.org.au>
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
prev parent reply other threads:[~2021-11-11 21:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-11 21:17 linux-next: unexpected file in commit in hid tree Stephen Rothwell
2021-11-11 21:46 ` Jiri Kosina [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.YFH.7.76.2111112246160.12554@cbobk.fhfr.pm \
--to=jikos@kernel.org \
--cc=arnd@arndb.de \
--cc=benjamin.tissoires@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).