Skip to contentSkip to conversation

rtlwifi commit contains a patch reject file

linux-next Paul Gortmaker 4 participants 4 messages Apr 20, 2019 – Apr 23, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

I'm kind of surprised sfr doesn't have a bot to complain when it sees a foo.c.rej or foo.c.orig in a commit...

Paul.
---

$ git show --stat ddab2eee794
commit ddab2eee7949f94b8ecdc5c84ae238826142d35d
Author: Larry Finger <[email protected]>
Date:   Thu Apr 4 13:29:31 2019 -0500

rtlwifi: Convert the wake_match variable to local

In five of the drivers, the contents of bits 29-31 of one of the RX descriptors is used to set bits in a variable that is used to save the wakeup condition for output in a debugging statement. The resulting variable is not used anywhere else even though it is stored in a struct and could be available in other routines. This variable is changed to be local.

 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c     | 15 ++++++++-------
 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej | 10 ++++++++++
 drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c     | 13 +++++++------
 drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c     | 14 +++++++-------
 drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c     | 14 +++++++-------
 drivers/net/wireless/realtek/rtlwifi/wifi.h              |  1 -
 6 files changed, 39 insertions(+), 28 deletions(-)

---

$ git describe --contains ddab2eee794
next-20190415~86^2~1
$ git show next-20190415~86
commit e4aee692121581ee2b29812f0db701769ef3f571
Merge: 61405eeb69ab bdfc4027de15
Author: Stephen Rothwell <[email protected]>
Date:   Mon Apr 15 12:08:21 2019 +1000

Merge remote-tracking branch 'wireless-drivers-next/master'

#1 lore raw

Hi Paul,

Quoted 3 lines · On Sat, 20 Apr 2019 11:50:09 -0400 Paul Gortmaker…

I'm kind of surprised sfr doesn't have a bot to complain when it sees a foo.c.rej or foo.c.orig in a commit...

You mean like this:

Commit

ddab2eee7949 ("rtlwifi: Convert the wake_match variable to local")

added this unexpected file:

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej

I have added that test to my commit checks now. Thanks for the suggestion. So far it only checks for .rej and .orig files - any others?

Signature · 2 lines
Cheers,
Stephen Rothwell
#3 lore raw
In reply to Paul Gortmaker
Quoted 20 lines · Paul Gortmaker

I'm kind of surprised sfr doesn't have a bot to complain when it sees a foo.c.rej or foo.c.orig in a commit...

Paul.
---

$ git show --stat ddab2eee794
commit ddab2eee7949f94b8ecdc5c84ae238826142d35d
Author: Larry Finger <[email protected]>
Date:   Thu Apr 4 13:29:31 2019 -0500

rtlwifi: Convert the wake_match variable to local

In five of the drivers, the contents of bits 29-31 of one of the RX descriptors is used to set bits in a variable that is used to save the wakeup condition for output in a debugging statement. The resulting variable is not used anywhere else even though it is stored in a struct and could be available in other routines. This variable is changed to be local.

Quoted 5 lines
 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c     | 15 ++++++++-------
 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej | 10 ++++++++++

Thanks for the report, the issue was fixed by this:

b5250c9c14c1 rtlwifi: rtl8188ee: Remove extraneous file

Signature · 1 line
Kalle Valo
#2 lore raw
In reply to Stephen Rothwell
Quoted 3 lines · Stephen Rothwell

I have added that test to my commit checks now. Thanks for the suggestion. So far it only checks for .rej and .orig files - any others?

Maybe consider the things listed in the .gitignore file? Those are quite difficult to add (git add -f) but I think I've seen it happen before, perhaps through different trees etc.

In fact, *.orig is listed in .gitignore, I wonder why *.rej isn't? Maybe so it stands out more in "git status"?

johannes