LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Larry Finger <Larry.Finger@lwfinger.net>
Cc: "Fabio M. De Francesco" <fmdefrancesco@gmail.com>,
	Phillip Potter <phil@philpotter.co.uk>,
	Martin Kaiser <martin@kaiser.cx>,
	Michael Straube <straube.linux@gmail.com>,
	Fabio Aiuto <fabioaiuto83@gmail.com>,
	linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/3] staging: r8188eu: Remove all 5GHz network types
Date: Thu, 12 Aug 2021 10:29:04 +0200	[thread overview]
Message-ID: <YRTb0PaPY8BpQ4JO@kroah.com> (raw)
In-Reply-To: <13cdcd41-20f6-3b8e-0515-5066b1fdb49c@lwfinger.net>

On Wed, Aug 11, 2021 at 09:09:49PM -0500, Larry Finger wrote:
> On 8/11/21 7:25 PM, Fabio M. De Francesco wrote:
> > Remove all 5Ghz network types. r8188eu works on
> > 802.11bgn standards and on 2.4Ghz band.
> > 
> > Signed-off-by: Fabio M. De Francesco<fmdefrancesco@gmail.com>
> > ---
> >   drivers/staging/r8188eu/core/rtw_ap.c         | 13 ++---------
> >   drivers/staging/r8188eu/core/rtw_ieee80211.c  | 19 +++------------
> >   drivers/staging/r8188eu/core/rtw_ioctl_set.c  |  2 +-
> >   drivers/staging/r8188eu/core/rtw_mlme.c       | 10 --------
> >   drivers/staging/r8188eu/core/rtw_p2p.c        |  2 +-
> >   drivers/staging/r8188eu/core/rtw_wlan_util.c  | 15 ++----------
> >   drivers/staging/r8188eu/hal/odm.c             |  1 -
> >   drivers/staging/r8188eu/include/ieee80211.h   | 23 ++-----------------
> >   drivers/staging/r8188eu/include/wifi.h        |  2 +-
> >   drivers/staging/r8188eu/include/wlan_bssdef.h |  2 +-
> >   10 files changed, 13 insertions(+), 76 deletions(-)
> 
> Fabio,
> 
> This patch is fine, but it does conflict with my series fixing the smatch
> warnings. Whichever set Greg takes first will apply cleanly, but the second
> will fail. This problem is due to many people working at the same time.
> 
> Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

I worked it out and took both series, git is good at handling merge
issues like this :)

thanks,

greg k-h

  reply	other threads:[~2021-08-12  8:29 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-12  0:25 [PATCH 0/3] staging: r8188eu: Remove 5GHz band related code Fabio M. De Francesco
2021-08-12  0:25 ` [PATCH 1/3] staging: r8188eu: Remove all 5GHz network types Fabio M. De Francesco
2021-08-12  2:09   ` Larry Finger
2021-08-12  8:29     ` Greg Kroah-Hartman [this message]
2021-08-12 12:52     ` Fabio M. De Francesco
2021-08-12  0:25 ` [PATCH 2/3] staging: r8188eu: Remove code related to unsupported channels Fabio M. De Francesco
2021-08-12  2:11   ` Larry Finger
2021-08-12  0:25 ` [PATCH 3/3] staging: r8188eu: Remove no more necessary definitions and code Fabio M. De Francesco
2021-08-12  2:15   ` Larry Finger

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=YRTb0PaPY8BpQ4JO@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=Larry.Finger@lwfinger.net \
    --cc=fabioaiuto83@gmail.com \
    --cc=fmdefrancesco@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=martin@kaiser.cx \
    --cc=phil@philpotter.co.uk \
    --cc=straube.linux@gmail.com \
    --subject='Re: [PATCH 1/3] staging: r8188eu: Remove all 5GHz network types' \
    /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

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).