| Message ID | 1489634291-30028-2-git-send-email-matthew@giassa.net (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
On Wed, Mar 15, 2017 at 08:18:08PM -0700, Matthew Giassa wrote: > Removing mixed spaces/hard-tabs used to create a "column alignment" of > macro names and macro values. > > Signed-off-by: Matthew Giassa <matthew@giassa.net> > --- > drivers/staging/ks7010/ks_wlan_ioctl.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) This patch does not apply to my tree at all. Are you sure you are working against the staging-next branch? Please rebase and resend. thanks, greg k-h
On Fri, Mar 17, 2017 at 03:22:57PM +0900, Greg KH wrote: > On Wed, Mar 15, 2017 at 08:18:08PM -0700, Matthew Giassa wrote: > > Removing mixed spaces/hard-tabs used to create a "column alignment" of > > macro names and macro values. > > > > Signed-off-by: Matthew Giassa <matthew@giassa.net> > > --- > > drivers/staging/ks7010/ks_wlan_ioctl.h | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > This patch does not apply to my tree at all. Are you sure you are > working against the staging-next branch? Please rebase and resend. Same thing for all of the patches in this series. greg k-h
diff --git a/drivers/staging/ks7010/ks_wlan_ioctl.h b/drivers/staging/ks7010/ks_wlan_ioctl.h index 8e62b10..d811680 100644 --- a/drivers/staging/ks7010/ks_wlan_ioctl.h +++ b/drivers/staging/ks7010/ks_wlan_ioctl.h @@ -20,8 +20,8 @@ /* SIOCIWFIRSTPRIV + 2 */ #define KS_WLAN_GET_FIRM_VERSION SIOCIWFIRSTPRIV + 3 #ifdef WPS -#define KS_WLAN_SET_WPS_ENABLE SIOCIWFIRSTPRIV + 4 -#define KS_WLAN_GET_WPS_ENABLE SIOCIWFIRSTPRIV + 5 +#define KS_WLAN_SET_WPS_ENABLE SIOCIWFIRSTPRIV + 4 +#define KS_WLAN_GET_WPS_ENABLE SIOCIWFIRSTPRIV + 5 #define KS_WLAN_SET_WPS_PROBE_REQ SIOCIWFIRSTPRIV + 6 #endif #define KS_WLAN_GET_EEPROM_CKSUM SIOCIWFIRSTPRIV + 7
Removing mixed spaces/hard-tabs used to create a "column alignment" of macro names and macro values. Signed-off-by: Matthew Giassa <matthew@giassa.net> --- drivers/staging/ks7010/ks_wlan_ioctl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)