Larry Finger <[email protected]> writes: > On 4/16/19 9:55 PM, Kalle Valo wrote: >> Larry Finger <[email protected]> writes: >> >>> Somehow file drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej was >>> incorporated into the sources. Obviously, it can be removed. >>> >>> Signed-off-by: Larry Finger <[email protected]> >>> Reported-by: Andrew Morton <[email protected]> >>> Cc: Andrew Morton <[email protected]> >>> --- >>> Andrew, >>> >>> Thanks. >>> >>> Larry >>> --- >>> drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej | 10 ---------- >>> 1 file changed, 10 deletions(-) >>> delete mode 100644 >>> drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej >>> >>> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej >>> b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej >>> deleted file mode 100644 >>> index aa03d4605d8c..000000000000 >>> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej >>> +++ /dev/null >> >> What tree is this? On wireless-drivers I can't find this file: >> >> $ ls drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej >> /bin/ls: cannot access >> 'drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej': No such >> file or directory >> $ >> >> Actually I cannot find any .rej files: >> >> $ find -name '*.rej' >> $ >> > > It is in wireless-drivers-next. This extraneous file was added in > commit 05f1be9594d5 ("rtlwifi: Convert the wake_match variable to > local").
Ah, now I see it. But I think the commit adding was: ddab2eee7949 rtlwifi: Convert the wake_match variable to local I'll queue this for w-d-next. -- Kalle Valo
