Date:   Thu, 11 Nov 2021 22:46:49 +0100 (CET)
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
In-Reply-To: <20211112081721.45529b69@canb.auug.org.au>
Message-ID: <nycvar.YFH.7.76.2111112246160.12554@cbobk.fhfr.pm>
References: <20211112081721.45529b69@canb.auug.org.au>
User-Agent: Alpine 2.21 (LSU 202 2017-01-01)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Precedence: bulk

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