* [linux-next] rtlwifi commit contains a patch reject file
@ 2019-04-20 15:50 ` Paul Gortmaker
0 siblings, 0 replies; 8+ messages in thread
From: Paul Gortmaker @ 2019-04-20 15:50 UTC (permalink / raw)
To: Larry Finger
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA
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 <Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
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.
Signed-off-by: Larry Finger <Larry.Finger-tQ5ms3gMjBLk1uMJSBkQmQ@public.gmane.org>
Signed-off-by: Kalle Valo <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
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 <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Date: Mon Apr 15 12:08:21 2019 +1000
Merge remote-tracking branch 'wireless-drivers-next/master'
^ permalink raw reply [flat|nested] 8+ messages in thread* [linux-next] rtlwifi commit contains a patch reject file
@ 2019-04-20 15:50 ` Paul Gortmaker
0 siblings, 0 replies; 8+ messages in thread
From: Paul Gortmaker @ 2019-04-20 15:50 UTC (permalink / raw)
To: Larry Finger; +Cc: linux-next, netdev, linux-wireless
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 <Larry.Finger@lwfinger.net>
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.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
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 <sfr@canb.auug.org.au>
Date: Mon Apr 15 12:08:21 2019 +1000
Merge remote-tracking branch 'wireless-drivers-next/master'
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [linux-next] rtlwifi commit contains a patch reject file
2019-04-20 15:50 ` Paul Gortmaker
@ 2019-04-22 2:59 ` Stephen Rothwell
-1 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2019-04-22 2:59 UTC (permalink / raw)
To: Paul Gortmaker
Cc: Larry Finger, linux-next, netdev, linux-wireless, Kalle Valo
[-- Attachment #1: Type: text/plain, Size: 596 bytes --]
Hi Paul,
On Sat, 20 Apr 2019 11:50:09 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> 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?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [linux-next] rtlwifi commit contains a patch reject file
@ 2019-04-22 2:59 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2019-04-22 2:59 UTC (permalink / raw)
To: Paul Gortmaker
Cc: Larry Finger, linux-next, netdev, linux-wireless, Kalle Valo
[-- Attachment #1: Type: text/plain, Size: 596 bytes --]
Hi Paul,
On Sat, 20 Apr 2019 11:50:09 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> 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?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread[parent not found: <20190422125926.15862fdd-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>]
* Re: [linux-next] rtlwifi commit contains a patch reject file
2019-04-22 2:59 ` Stephen Rothwell
@ 2019-04-23 10:15 ` Johannes Berg
-1 siblings, 0 replies; 8+ messages in thread
From: Johannes Berg @ 2019-04-23 10:15 UTC (permalink / raw)
To: Stephen Rothwell, Paul Gortmaker
Cc: Larry Finger, linux-next-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA, Kalle Valo
On Mon, 2019-04-22 at 12:59 +1000, Stephen Rothwell wrote:
> 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [linux-next] rtlwifi commit contains a patch reject file
@ 2019-04-23 10:15 ` Johannes Berg
0 siblings, 0 replies; 8+ messages in thread
From: Johannes Berg @ 2019-04-23 10:15 UTC (permalink / raw)
To: Stephen Rothwell, Paul Gortmaker
Cc: Larry Finger, linux-next, netdev, linux-wireless, Kalle Valo
On Mon, 2019-04-22 at 12:59 +1000, Stephen Rothwell wrote:
> 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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [linux-next] rtlwifi commit contains a patch reject file
2019-04-20 15:50 ` Paul Gortmaker
@ 2019-04-23 5:41 ` Kalle Valo
-1 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2019-04-23 5:41 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: Larry Finger, linux-next, netdev, linux-wireless
Paul Gortmaker <paul.gortmaker@windriver.com> writes:
> 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 <Larry.Finger@lwfinger.net>
> 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.
>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
>
> 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
--
Kalle Valo
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [linux-next] rtlwifi commit contains a patch reject file
@ 2019-04-23 5:41 ` Kalle Valo
0 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2019-04-23 5:41 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: Larry Finger, linux-next, netdev, linux-wireless
Paul Gortmaker <paul.gortmaker@windriver.com> writes:
> 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 <Larry.Finger@lwfinger.net>
> 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.
>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
>
> 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
--
Kalle Valo
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-04-23 10:15 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-20 15:50 [linux-next] rtlwifi commit contains a patch reject file Paul Gortmaker
2019-04-20 15:50 ` Paul Gortmaker
2019-04-22 2:59 ` Stephen Rothwell
2019-04-22 2:59 ` Stephen Rothwell
[not found] ` <20190422125926.15862fdd-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2019-04-23 10:15 ` Johannes Berg
2019-04-23 10:15 ` Johannes Berg
2019-04-23 5:41 ` Kalle Valo
2019-04-23 5:41 ` Kalle Valo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.