Re: [PATCH 1/3] staging: r8188eu: Remove all 5GHz network types

[Fabio M. De Francesco]

On Thursday, August 12, 2021 4:09:49 AM CEST 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@xxxxxxxxx>
> > ---
> > 
> >   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.
> 
Hi Larry,

The Wizard of Git :-) (Greg, of course) has been able to work this problem out 
and took both series, as you probably already know.

Just kidding... However, you may be interested to know that, most of the 
times, the above-mentioned conflict can be worked out by using the 3-way merge 
option of git-am (https://en.wikipedia.org/wiki/Merge_(version_control)#Three-way_merge). I suppose that he used that option to resolve the conflict (am I 
missing something?).

> Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>

Thanks for looking at my patches and acking them.

Fabio
> 
> Larry