From: Dan Carpenter <dan.carpenter@oracle.com>
To: Pascal Terjan <pterjan@google.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
devel@driverdev.osuosl.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Subject: Re: [PATCH] staging: rtl8712: switch to common ieee80211 headers
Date: Tue, 2 Jun 2020 21:56:26 +0300 [thread overview]
Message-ID: <20200602185626.GJ30374@kadam> (raw)
In-Reply-To: <CAANdO=KBPh81Jaxhta8k3ipnwWbr5xdhTuRW6GNEZsTTpyMjXQ@mail.gmail.com>
On Tue, Jun 02, 2020 at 04:58:46PM +0100, Pascal Terjan wrote:
> On Tue, 2 Jun 2020 at 15:57, Larry Finger <Larry.Finger@lwfinger.net> wrote:
> >
> > On 6/1/20 3:24 PM, Pascal Terjan wrote:
> > > This patch switches to <linux/ieee80211.h> and <net/cfg80211.h> and
> > > deletes a lot of duplicate definitions plus many unused ones.
> > >
> > > Non obvious changes:
> > > - struct ieee80211_ht_cap is different enough that I preferred to keep
> > > (and rename) it for now.
> > > - mcs_rate in translate_scan was not read after being set, so I deleted
> > > that part rather than using the renamed struct
> > > - WLAN_CAPABILITY_BSS is replaced with WLAN_CAPABILITY_ESS which is the
> > > corresponding one with same value
> > >
> > > Signed-off-by: Pascal Terjan <pterjan@google.com>
> >
> > This patch does not apply to the staging repo, current mainline, or
> > wireless-drivers-next. Where did you intend it to go? Staging is the correct tree.
>
> It was against staging-testing as there is a (trivial) merge conflict
> in there with https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/commit/?h=staging-testing&id=2aaeaaff1ae21b2817256435c7fc0095eeda61ae
> which is also in staging-next
> What is the best practice in such case?
It has to apply against staging-next so that's fine.
>
> Thanks to kbuild test robot I found that it is failing to build there
> because I forgot to add a dependency on CFG80211 in Kconfig, so I will
> need to send a v2.
Yup.
regards,
dan carpenter
next prev parent reply other threads:[~2020-06-02 18:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-01 20:24 [PATCH] staging: rtl8712: switch to common ieee80211 headers Pascal Terjan
2020-06-02 14:57 ` Larry Finger
2020-06-02 15:58 ` Pascal Terjan
2020-06-02 18:56 ` Dan Carpenter [this message]
2020-06-09 19:48 ` [PATCH v2] " Pascal Terjan
2020-06-02 15:04 ` [PATCH] " kbuild test robot
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=20200602185626.GJ30374@kadam \
--to=dan.carpenter@oracle.com \
--cc=Larry.Finger@lwfinger.net \
--cc=devel@driverdev.osuosl.org \
--cc=florian.c.schilhabel@googlemail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pterjan@google.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