From: Tree Davies <tdavies@darkphysics.net>
To: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Cc: gregkh@linuxfoundation.org, dan.carpenter@linaro.org,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] staging: rtl8192e: Rename variable bCurrentHTSupport
Date: Sat, 15 Jul 2023 13:14:59 -0700 [thread overview]
Message-ID: <ZLL+Q0tcW5S8Xjmj@basil> (raw)
In-Reply-To: <6dee04ae-4129-cd7c-0d31-70d29b86c8ff@gmail.com>
On Thu, Jul 06, 2023 at 10:48:56PM +0200, Philipp Hortmann wrote:
> On 7/6/23 03:59, Tree Davies wrote:
> > This patch renames variable bCurrentHTSupport to bcurrent_ht_support
> > to fix checkpatch warning Avoid CamelCase.
> >
> > Signed-off-by: Tree Davies<tdavies@darkphysics.net>
> > ---
> > drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
> > drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +-
> > drivers/staging/rtl8192e/rtl819x_BAProc.c | 12 ++++++------
> > drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
> > drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ++++++++--------
> > drivers/staging/rtl8192e/rtllib_softmac.c | 16 ++++++++--------
> > drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +-
> > drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
> > 8 files changed, 30 insertions(+), 30 deletions(-)
>
>
> Hi Tree,
>
> when I try to apply your patch on the top of all the other patches I get the
> following error message:
>
> kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git apply -v
> ~/Downloads/20230706-\[PATCH\]\ staging_\ rtl8192e_\ Rename\ variable\
> bCurrentHTSupport-10002.txt
> Checking patch drivers/staging/rtl8192e/rtl8192e/rtl_core.c...
> Checking patch drivers/staging/rtl8192e/rtl8192e/rtl_wx.c...
> Checking patch drivers/staging/rtl8192e/rtl819x_BAProc.c...
> Checking patch drivers/staging/rtl8192e/rtl819x_HT.h...
> Checking patch drivers/staging/rtl8192e/rtl819x_HTProc.c...
> Checking patch drivers/staging/rtl8192e/rtllib_softmac.c...
> error: while searching for:
> crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
> encrypt = ieee->host_encrypt && crypt && crypt->ops &&
> ((strcmp(crypt->ops->name, "R-WEP") == 0 || wpa_ie_len));
> if (ieee->ht_info->bCurrentHTSupport) {
> tmp_ht_cap_buf = (u8 *)&(ieee->ht_info->SelfHTCap);
> tmp_ht_cap_len = sizeof(ieee->ht_info->SelfHTCap);
> tmp_ht_info_buf = (u8 *)&(ieee->ht_info->SelfHTInfo);
>
> error: patch failed: drivers/staging/rtl8192e/rtllib_softmac.c:816
> error: drivers/staging/rtl8192e/rtllib_softmac.c: patch does not apply
> Checking patch drivers/staging/rtl8192e/rtllib_softmac_wx.c...
> Checking patch drivers/staging/rtl8192e/rtllib_tx.c...
>
>
> My be the previous send patches are not taken then your chance is better
> that this one will fit. Will see what happens.
>
>
> You need to put your patches into a patch series.
> This reduces email traffic as the reviewer can just send one email and does
> not need to send four.
>
> A possible command for a patch series is looking like this:
> git format-patch -o ~/Documents/kernel/patches/ --cover-letter -n
> --thread=shallow --to="Greg Kroah-Hartman <gregkh@linuxfoundation.org>,linux-staging@lists.linux.dev,linux-kernel@vger.kernel.org"
> 4bbbd60d84e15fdb7bffde98a687ed168a4dfbbd^..HEAD
>
> Use the git commit id of your first patch.
>
> Bye Philipp
>
>
Philipp,
I think I understand what I did wrong. Each of these original patches were
created/based from the same commit hash. So it makes sense that only the
first one applied would apply cleanly and the others would fail.
My apologies,
Tree
next prev parent reply other threads:[~2023-07-15 20:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-06 1:59 [PATCH] staging: rtl8192e: Rename variable bCurrentHTSupport Tree Davies
2023-07-06 20:48 ` Philipp Hortmann
2023-07-07 2:56 ` Tree Davies
2023-07-15 20:14 ` Tree Davies [this message]
2023-07-18 19:56 ` Philipp Hortmann
2023-07-19 3:32 ` Tree Davies
2023-07-20 19:34 ` Greg KH
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=ZLL+Q0tcW5S8Xjmj@basil \
--to=tdavies@darkphysics.net \
--cc=dan.carpenter@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=philipp.g.hortmann@gmail.com \
/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).