Re: [PATCHv6 1/3] staging: wlan-ng: move logical continuations at the end of line

[Maksymilian Piechota <maksymilianpiechota@gmail.com>]

On Tue, Feb 14, 2017 at 09:16:31AM -0800, Greg Kroah-Hartman wrote:
> On Mon, Feb 13, 2017 at 09:25:49AM -0500, Maksymilian Piechota wrote:
> > move logical continuations at the end of line
> > 
> > Signed-off-by: Maksymilian Piechota <maksymilianpiechota@gmail.com>
> > ---
> >  drivers/staging/wlan-ng/prism2mgmt.c | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
> > index 16fb2d3..64a9ebc 100644
> > --- a/drivers/staging/wlan-ng/prism2mgmt.c
> > +++ b/drivers/staging/wlan-ng/prism2mgmt.c
> > @@ -1308,9 +1308,8 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
> >  			hw->sniffhdr = 0;
> >  			wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
> >  		} else
> > -		    if ((msg->wlanheader.status ==
> > -			 P80211ENUM_msgitem_status_data_ok)
> > -			&& (msg->wlanheader.data == P80211ENUM_truth_true)) {
> > +		    if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) && 
> > +			(msg->wlanheader.data == P80211ENUM_truth_true)) {
> >  			hw->sniffhdr = 1;
> >  			wlandev->netdev->type = ARPHRD_IEEE80211_PRISM;
> >  		} else {
> 
> This patch has checkpatch.pl errors.  Please always use checkpatch so
> you don't get emails from grumpy maintainers telling you to fix the
> checkpatch errors :)
> 
> Please fix up and resend the whole series.
> 
> thanks,
> 
> greg k-h

of course it has. Few patches ago I've sent all changes in one patch so
there was no errors. Then You asked me to break up every change to particular
commits, so there are checkpatch errors between them. PATCH 3/3 solves
all errors.

So how should I commit this changes, finally? I feel bit lost.