]>
 
 
www.infradead.org Git - users/jedix/linux-maple.git/log 
 
 
 
 
 
 
Ajay Singh [Fri, 20 Jul 2018 12:01:36 +0000  (17:31 +0530)] 
 
staging: wilc1000: rename variable from 'gpio' to 'gpio_irq' 
 
Rename from 'gpio' to 'gpio_irq', so its inlcude the information about 
the purpose of GPIO. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Fri, 20 Jul 2018 12:01:35 +0000  (17:31 +0530)] 
 
staging: wilc1000: remove gpio parameter from wilc_netdev_init() 
 
Instead of passing the gpio as parameter to wilc_netdev_init() now 
setting its value after finishing wilc_netdev_init() call. Avoided 
passing of extra parameter to wilc_netdev_init(). 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Colin Ian King [Fri, 20 Jul 2018 18:32:29 +0000  (19:32 +0100)] 
 
staging: rtl8712: remove redundant pointer 'nic' 
 
Pointer 'nic' is being assigned but is never used hence it is 
redundant and can be removed. 
 
Cleans up clang warning: 
warning: variable 'nic' set but not used [-Wunused-but-set-variable] 
 
Signed-off-by: Colin Ian King <colin.king@canonical.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:19 +0000  (04:15  +0530)] 
 
staging: wilc1000: move variable assignment along with its declaration 
 
Cleanup patch to club the variable assignment along with the variable 
declaration especially for private data. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:18 +0000  (04:15  +0530)] 
 
staging: wilc1000: remove unnecessary 'NULL' check from cfg80211_ops callbacks 
 
Cleanup patch to remove the unnecessary 'NULL' check used in 'cfg80211_ops' 
callback functions. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:17 +0000  (04:15  +0530)] 
 
staging: wilc1000: use 'int' inplace of 's32' date type 
 
Cleanup patch to use 'int' instead of 's32' to have the same data type 
based on its usage. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:16 +0000  (04:15  +0530)] 
 
staging: wilc1000: avoid setting default value for variable at declaration 
 
Cleanup patch to avoid setting default value for local variables and 
also clubbed similar variables together. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:15 +0000  (04:15  +0530)] 
 
staging: wilc1000: avoid forward declaration of host_int_parse_join_bss_param() 
 
Reorder the functions position in host interface to avoid forward 
declaration of host_int_parse_join_bss_param(). 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:14 +0000  (04:15  +0530)] 
 
staging: wilc1000: avoid host_int_get_assoc_res_info() forward declaration 
 
Reorder the function position in host interface to avoid forward 
declaration of host_int_get_assoc_res_info(). 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:13 +0000  (04:15  +0530)] 
 
staging: wilc1000: avoid forward declaration for handle_scan_done() 
 
Reorder the function position in host interface to avoid forward 
declaration of handle_scan_done(). 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:12 +0000  (04:15  +0530)] 
 
staging: wilc1000: remove unnecessary type used for wid id 
 
Cleanup patch to remove unnecessary typecast used while assigning the 
WID ID. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:11 +0000  (04:15  +0530)] 
 
staging: wilc1000: use single space before opening brances '{' 
 
Cleanup patch to use single space instead of multiple space before the 
'{'. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:10 +0000  (04:15  +0530)] 
 
staging: wilc1000: remove unnecessary blank line between variable declaration 
 
Cleanup patch to remove the unnecessary blank line between variables 
declaration inside the function. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:09 +0000  (04:15  +0530)] 
 
staging: wilc1000: use lowercase for 'IFC_UP' struct element name 
 
Cleanup patch to use lowercase for structure element name to follow 
linux coding style. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:08 +0000  (04:15  +0530)] 
 
staging: wilc1000: remove the mutliple #define used for same macro 
 
Moved the same #define in common header file instead of having their 
declartion in different files. 
 
Below macros are moved to header file: 
TCP_ACK_FILTER_LINK_SPEED_THRESH 
DEFAULT_LINK_SPEED 
GET_PKT_OFFSET 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:07 +0000  (04:15  +0530)] 
 
staging: wilc1000: removed unused element from wilc_cfg_frame struct 
 
Cleanup up patch to remove the unused structure elements in 
'wilc_cfg_frame' struct. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:06 +0000  (04:15  +0530)] 
 
staging: wilc1000: remove unnecessary elements from 'wilc_priv' struct 
 
Remove unused elements from 'wilc_priv' structure. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:05 +0000  (04:15  +0530)] 
 
staging: wilc1000: remove unused elements in 'wilc' struct 
 
Cleanup patch to remove unused elements from 'wilc' struct. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:04 +0000  (04:15  +0530)] 
 
staging: wilc1000: rename enum AUTHTYPE to use lowercase 
 
Cleanup patch to rename enum AUTHTYPE to lowercase. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:03 +0000  (04:15  +0530)] 
 
staging: wilc1000: rename enum SITESURVEY to use lowercase 
 
Cleanup patch to have enum in lowercase as per linux coding style. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:02 +0000  (04:15  +0530)] 
 
staging: wilc1000: rename enum CURRENT_TXRATE to use lowercase 
 
Cleanup patch to rename enums in lowercase to follow linux coding style. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:01 +0000  (04:15  +0530)] 
 
staging: wilc1000: rename goto to avoid leading '_' in label name 
 
Cleanup patch to avoid use of leading '_' in goto label name. Also used 
proper string for lable names. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:45:00 +0000  (04:15  +0530)] 
 
staging: wilc1000: remove extra enums defined for ieee80211_eid 
 
Cleanup patch to make use of existing enum 'ieee80211_eid' instead of 
adding new enum in WILC for element ID's. 
 
The below mapping is same to remove extra enum in WILC. 
 
SUPP_RATES_IE   	-> WLAN_EID_SUPP_RATES 
EXT_SUPP_RATES_IE	-> WLAN_EID_EXT_SUPP_RATES 
HT_CAPABILITY_IE	-> WLAN_EID_HT_CAPABILITY 
RSN_IE			-> WLAN_EID_RSN 
WPA_IE			-> WLAN_EID_VENDOR_SPECIFIC 
WMM_IE			-> WLAN_EID_VENDOR_SPECIFIC 
P2P_IE			-> WLAN_EID_VENDOR_SPECIFIC 
 
Also remove enum 'info_element_id' as its same as 'ieee80211_eid', below 
the mapping of elements of enums which are used. 
 
ITIM -> WLAN_EID_TIM 
IDSPARMS -> WLAN_EID_DS_PARAMS 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:44:59 +0000  (04:14  +0530)] 
 
staging: wilc1000: remove extra enum defined for data rates 
 
Cleanup patch to remove extra enum defined to handle data rates. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:44:58 +0000  (04:14  +0530)] 
 
staging: wilc1000: remove enum connect_status instead use ieee80211_statuscode 
 
Cleanup patch to remove the use of enum 'connect_status' and instead use 
predefined 'ieee80211_statuscode' for error code values. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ajay Singh [Wed, 18 Jul 2018 22:44:57 +0000  (04:14  +0530)] 
 
staging: wilc1000: remove unused enum declaration 
 
Cleanup patch to remove unused enums. 
 
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>  
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Fri, 20 Jul 2018 20:21:34 +0000  (21:21 +0100)] 
 
staging:rtl8192u: Remove typedef and rename DOT11D_STATE - Style 
 
Remove typedef from enumerated type DOT11D_STATE to clear checkpatch issue 
with declaring new types. 
 
Rename the enumertion from DOT11D_STATE to dot11d_state. 
 
These changes are coding style changes which should not effect runtime 
execution of code. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Fri, 20 Jul 2018 20:21:33 +0000  (21:21 +0100)] 
 
staging:rtl8192u: Rename variable MaxTxPowerInDbm - Style 
 
Rename the variable MaxTxPowerInDbm to max_tx_pwr_dbm. This change clears a 
checkpatch issue with CamelCase naming. This coding style change should not 
impact runtime execution. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Fri, 20 Jul 2018 20:21:32 +0000  (21:21 +0100)] 
 
staging:rtl8192u: Rename variable NumChnls - Style 
 
Rename the member variable NumChnls to num_channels. This change clears the 
checkpatch issue with CamelCase naming. The change should not impact runtime 
execution. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Fri, 20 Jul 2018 20:21:31 +0000  (21:21 +0100)] 
 
staging:rtl8192u: Rename structure member FirstChnl - Style 
 
Rename structure member FirstChnl to first_channel. This coding style change 
clears a checkpatch issue with CamelCase naming. This change should not impact 
the runtime code execution. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Fri, 20 Jul 2018 20:21:30 +0000  (21:21 +0100)] 
 
staging:rtl8192u: Remove typedef from structure - Style 
 
Remove the typedef directive from struct _CHNL_TXPOWER_TRIPLE. This is a 
coding style change which clears a checkpatch issue with declaring new types. 
There should be no impact on runtime execution. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Fri, 20 Jul 2018 20:21:29 +0000  (21:21 +0100)] 
 
staging:rtl8192u: Remove multiple blank lines - Style 
 
Remove multiple blank lines which cause checkpatch issues. These are purely 
coding style changes which should not impact execution. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Mon, 16 Jul 2018 19:04:52 +0000  (20:04 +0100)] 
 
staging:rtl8192u: Rename TClass > t_class - Style 
 
Rename the struct TS_COMMON_INFO member variable from TClass to t_class. This 
change clears the checkpatch issue with CamelCase Variable names. There should 
be no impact on runtime execution. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Mon, 16 Jul 2018 19:04:51 +0000  (20:04 +0100)] 
 
staging:rtl8192u: Rename TSpec > t_spec - Style 
 
Rename the TS_COMMON_INFO structure's member TSpec to t_spec. This change 
clears the checkpatch issue with CamelCase naming of variables. There should 
be no impact on runtime execution. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Mon, 16 Jul 2018 19:04:50 +0000  (20:04 +0100)] 
 
staging:rtl8192u: Rename Addr > addr - Style 
 
Rename the TX_COMMON_INFO structure's member Addr to addr. This change 
clears the checkpatch issue with CamelCase naming. This is a coding style 
change only and should not impact runtime execution. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Mon, 16 Jul 2018 19:04:49 +0000  (20:04 +0100)] 
 
staging:rtl8192u: Rename InactTimer > inact_timer - Style 
 
Rename the struct TS_COMMON_INFO member InactTimer to inact_timer. 
This change clears the checkpatch issue with CamelCase naming. The change 
should not have any impact on runtime execution. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Mon, 16 Jul 2018 19:04:48 +0000  (20:04 +0100)] 
 
staging:rtl8192u: rename SetupTimer > setup_timer - Style 
 
Rename the struct TS_COMMON_INFO member SetupTimer to setup_timer. This 
clears the checkpatch issue with CamelCase variable names. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Mon, 16 Jul 2018 19:04:47 +0000  (20:04 +0100)] 
 
staging:rtl8192u: Rename List > list - Coding style 
 
In struct TS_COMMON_INFO rename the member List to list. This clears the 
checkpatch issue concerning CamelCase naming of variables. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Mon, 16 Jul 2018 19:04:46 +0000  (20:04 +0100)] 
 
staging:rtl8192u: remove typedef of struct TS_COMMON_INFO - Style 
 
To clear a checkpatch issue removed the typedef of the structure 
TS_COMMON_INFO. 
 
This change removes the previous declaration, which defined two types, both 
TS_COMMON_INFO and a pointer type PTS_COMMON_INFO: 
 
typedef struct _TS_COMMON_INFO { 
	... 
} TS_COMMON_INFO, *PTS_COMMON_INFO; 
 
The pointer type has been completely removed from the code, as: 
"(so-called Hungarian notation) is brain damaged" according to the coding 
standard. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
John Whitmore [Mon, 16 Jul 2018 19:04:45 +0000  (20:04 +0100)] 
 
staging:rtl8192u: remove typedef of enumeration TR_SELECT - Style 
 
To clear a checkpatch issue removed the typedef of the enumeration TR_SELECT 
this should not impact runtime code as it's only a coding style change. 
 
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ali Aminian [Fri, 20 Jul 2018 04:02:04 +0000  (08:32 +0430)] 
 
staging: rts5208: xd.c fixed a brace coding style issue 
 
Fixing a coding style issue 
 
Signed-off-by: Ali Aminian <aminian.opensource@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Michael Straube [Mon, 16 Jul 2018 15:04:49 +0000  (17:04 +0200)] 
 
staging: rtl8188eu: remove blank lines 
 
Remove unrequired blank lines as reported by checkpatch. 
 
Signed-off-by: Michael Straube <straube.linux@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Michael Straube [Mon, 16 Jul 2018 14:23:03 +0000  (16:23 +0200)] 
 
staging: rtl8188eu: use is_multicast_ether_addr 
 
Use is_multicast_ether_addr instead of IS_MCAST. 
By definition the broadcast address is also a multicast address, 
so checking for !multicast in the conditional is sufficient. 
 
Signed-off-by: Michael Straube <straube.linux@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Michael Straube [Mon, 16 Jul 2018 14:23:02 +0000  (16:23 +0200)] 
 
staging: rtl8188eu: remove MacAddr_isBcst macro 
 
Use is_broadcast_ether_addr instead of the MacAddr_isBcst macro. 
The macro is not used anywhere else, so remove it. 
 
Signed-off-by: Michael Straube <straube.linux@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:20 +0000  (20:49 -0700)] 
 
staging: gasket: common ioctls add __user annotations 
 
Add __user annotation to gasket common ioctl pointer arguments for 
sparse checking. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:19 +0000  (20:49 -0700)] 
 
staging: gasket: common ioctl dispatcher add __user annotations 
 
Add __user annotation to gasket core common ioctl pointer arguments for 
sparse checking. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:18 +0000  (20:49 -0700)] 
 
staging: gasket: apex ioctl add __user annotations 
 
Add __user annotation to ioctl pointer argument, for sparse checking. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:17 +0000  (20:49 -0700)] 
 
staging: gasket: top ioctl handler add __user annotations 
 
Add __user annotation to gasket_core top-level ioctl handling pointer 
arguments, for sparse checking. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:16 +0000  (20:49 -0700)] 
 
staging: gasket: always allow root open for write 
 
Always allow root to open device for writing. 
 
Drop special-casing of ioctl permissions for root vs. owner. 
 
Convert to bool types as appropriate. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:15 +0000  (20:49 -0700)] 
 
staging: gasket: fix multi-line comment syntax in gasket_core.h 
 
Use consistent kernel-style multi-line comment syntax. 
 
Reported-by: Guenter Roeck <groeck@chromium.org>  
Signed-off-by: Simon Que <sque@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:14 +0000  (20:49 -0700)] 
 
staging: gasket: remove extra parens in gasket_write_mappable_regions 
 
Remove unneeded parentheses around subexpressions. 
 
Reported-by: Guenter Roeck <groeck@chromium.org>  
Signed-off-by: Simon Que <sque@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:13 +0000  (20:49 -0700)] 
 
staging: gasket: gasket_mmap use PAGE_MASK 
 
gasket_mmap use PAGE_MASK, instead of performing math on PAGE_SIZE, for 
simplicity and clarity. 
 
Reported-by: Guenter Roeck <groeck@chromium.org>  
Signed-off-by: Simon Que <sque@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:12 +0000  (20:49 -0700)] 
 
staging: gasket: remove unnecessary parens in page table code 
 
gasket_alloc_coherent_memory() extra parentheses in statement. 
 
Reported-by: Guenter Roeck <groeck@chromium.org>  
Signed-off-by: Simon Que <sque@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:11 +0000  (20:49 -0700)] 
 
staging: gasket: fix comment syntax in apex.h 
 
Use kernel-style multi-line comment syntax. 
 
Reported-by: Guenter Roeck <groeck@chromium.org>  
Signed-off-by: Simon Que <sque@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:10 +0000  (20:49 -0700)] 
 
staging: gasket: remove else clause after return in if clause 
 
Else after return is unnecessary and may cause static code checkers to 
complain. 
 
Reported-by: Guenter Roeck <groeck@chromium.org>  
Signed-off-by: Simon Que <sque@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:09 +0000  (20:49 -0700)] 
 
staging: gasket: gasket page table functions use bool return type 
 
Convert from int to bool return type for gasket page table functions 
that return values used as booleans. 
 
Reported-by: Guenter Roeck <groeck@chromium.org>  
Signed-off-by: Simon Que <sque@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:08 +0000  (20:49 -0700)] 
 
staging: gasket: apex_clock_gating simplify logic, reduce indentation 
 
Collapse together two checks and return immediately, avoid conditional 
indentation for most of function code. 
 
Reported-by: Guenter Roeck <groeck@chromium.org>  
Signed-off-by: Simon Que <sque@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:07 +0000  (20:49 -0700)] 
 
staging: gasket: gasket_mmap return error instead of valid BAR index 
 
When offset to be mapped matches both a BAR region and a coherent mapped 
region return an error as intended, not the BAR index. 
 
Signed-off-by: Simon Que <sque@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:06 +0000  (20:49 -0700)] 
 
staging: gasket: don't treat no device reset callback as an error 
 
It is not an error for a device to not have a reset callback registered. 
 
Signed-off-by: Simon Que <sque@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:05 +0000  (20:49 -0700)] 
 
staging: gasket: remove unnecessary code in coherent allocator 
 
Remove extraneous statement in gasket_config_coherent_allocator() 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:04 +0000  (20:49 -0700)] 
 
staging: gasket: fix class create bug handling 
 
class_create() never returns NULL, and this driver should never return 
PTR_ERR(NULL) anyway. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Reviewed-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:03 +0000  (20:49 -0700)] 
 
staging: gasket: remove code for no physical device 
 
gasket_enable_dev code for enabling a gasket device with no physical PCI 
device registered shouldn't be necessary. 
 
Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:02 +0000  (20:49 -0700)] 
 
staging: gasket: gasket_enable_dev remove unnecessary variable 
 
Remove unnecessary variable, pass constant param instead. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Fri, 20 Jul 2018 03:49:01 +0000  (20:49 -0700)] 
 
staging: gasket: allow compile for ARM64 in Kconfig 
 
The gasket and apex drivers are also to be used on ARM64 architectures. 
 
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:55 +0000  (13:56 -0700)] 
 
staging: gasket: drop gasket_cdev_get_info, use container_of 
 
Remove gasket_cdev_get_info(), use container_of() directly instead, 
drop unnecessary NULL checks. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:54 +0000  (13:56 -0700)] 
 
staging: gasket: bail out of reset sequence on device callback error 
 
If device reset callback returns an error, error out at the gasket 
level. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:53 +0000  (13:56 -0700)] 
 
staging: gasket: gasket_wait_with_reschedule use 32 bits of retry count 
 
Don't need a 64-bit retry counter. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:52 +0000  (13:56 -0700)] 
 
staging: gasket: gasket_wait_with_reschedule simplify logic 
 
gasket_wait_with_reschedule() is a little more clear if we just return 
directly when the waited-for condition is hit.  This also allows the 
following condition check to be removed and identation of the 
conditionally-executed code to be reduced. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:51 +0000  (13:56 -0700)] 
 
staging: gasket: gasket_wait_with_reschedule use msleep 
 
Replace schedule_timeout() call with msleep() for simplicity. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:50 +0000  (13:56 -0700)] 
 
staging: gasket: fix gasket_wait_with_reschedule timeout return code 
 
Return -ETIMEDOUT, not -EINVAL, on timeout, including callers. 
 
Reported-by: Dmitry Torokhov <dtor@chromium.org>  
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:49 +0000  (13:56 -0700)] 
 
staging: gasket: convert gasket_mmap_has_permissions to bool return 
 
gasket_mmap_has_permissions() should return a boolean value. 
 
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:48 +0000  (13:56 -0700)] 
 
staging: gasket: Remove stale pointers on error allocating attr array 
 
If gasket_sysfs_create_mapping() hits errors allocating the attribute 
array, remove stale pointers to device info from the mapping object. 
 
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:47 +0000  (13:56 -0700)] 
 
staging: gasket: Return EBUSY on mapping create when already in use 
 
gasket_sysfs_create_mapping() return EBUSY if sysfs mapping already in 
use, as a more appropriate error code than the current return of EINVAL, 
which would indicate invalid parameters. 
 
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:46 +0000  (13:56 -0700)] 
 
staging: gasket: hold mutex on gasket driver unregistration 
 
Take the global mutex on driver unregistration updates for proper 
ordering of updates and consistent access procedures. 
 
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:45 +0000  (13:56 -0700)] 
 
staging: gasket: remove driver registration on class creation failure 
 
If class_create() fails, remove the gasket driver from the global 
registration table. 
 
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:44 +0000  (13:56 -0700)] 
 
staging: gasket: whitespace fix in gasket_page_table_init 
 
Tab replaced with space. 
 
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:43 +0000  (13:56 -0700)] 
 
staging: gasket: fix typo in gasket_core.h comments 
 
Grammar fixup in gasket_core.h comments describing struct 
gasket_interrupt_desc. 
 
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Todd Poynor [Tue, 17 Jul 2018 20:56:42 +0000  (13:56 -0700)] 
 
staging: gasket: fix typo in apex_enter_reset 
 
Fix typo in log message. 
 
Signed-off-by: Zhongze Hu <frankhu@chromium.org>  
Signed-off-by: Todd Poynor <toddpoynor@google.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Tobias Lindskog [Fri, 6 Jul 2018 21:44:16 +0000  (14:44 -0700)] 
 
staging: android: ashmem: Shrink directly through shmem_fallocate 
 
When ashmem_shrink is called from direct reclaim on a user thread, a 
call to do_fallocate will check for permissions against the security 
policy of that user thread.  It can thus fail by chance if called on a 
thread that isn't permitted to modify the relevant ashmem areas. 
 
Because we know that we have a shmem file underneath, call the shmem 
implementation of fallocate directly instead of going through the 
user-space interface for fallocate. 
 
Signed-off-by: Tobias Lindskog <tobias.lindskog@sonymobile.com>  
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>  
Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Matthias Wolf [Mon, 16 Jul 2018 09:30:00 +0000  (11:30 +0200)] 
 
staging: fbtft: Fix line continuation 
 
Fix checkpatch warning: avoid unnecessary line continuation 
to allow grepping of whole error message. 
 
Signed-off-by: Matthias Wolf <der_wolf_@web.de>  
Signed-off-by: Felix Siegel <felix.siegel@stud.uni-hannover.de>  
Signed-off-by: Tim Cofala <cofala@stud.uni-hannover.de>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Matthias Wolf [Mon, 16 Jul 2018 09:29:59 +0000  (11:29 +0200)] 
 
staging: fbtft: Fix line over 80 characters 
 
Fix checkpatch line over 80 characters where it seemed appropriate 
 
Signed-off-by: Matthias Wolf <der_wolf_@web.de>  
Signed-off-by: Felix Siegel <felix.siegel@stud.uni-hannover.de>  
Signed-off-by: Tim Cofala <cofala@stud.uni-hannover.de>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Nishad Kamdar [Sat, 14 Jul 2018 15:44:58 +0000  (21:14 +0530)] 
 
staging: comedi: comedi_fops: Shift assignment operator '=' to previous line 
 
Shift '=' assignment operator to the end of previous 
line to conform to preferred kernel style line wrapping. 
Issue reported by checkpatch CHECK. 
 
Signed-off-by: Nishad Kamdar <nishadkamdar@gmail.com>  
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Michael Straube [Sat, 14 Jul 2018 12:52:41 +0000  (14:52 +0200)] 
 
staging: rtl8188eu: remove redundant header file 
 
Both functions declared in rtl8188e_led.h are also declared in 
rtw_led.h which is included from drv_types.h. Remove rtl8188e_led.h 
and it's includes. 
 
Signed-off-by: Michael Straube <straube.linux@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Michael Straube [Sat, 14 Jul 2018 12:52:40 +0000  (14:52 +0200)] 
 
staging: rtl8188eu: add spaces around '+' 
 
Add spaces around '+' to follow kernel coding style. 
 
Signed-off-by: Michael Straube <straube.linux@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Michael Straube [Sat, 14 Jul 2018 12:52:39 +0000  (14:52 +0200)] 
 
staging: rtl8188eu: rename variable 
 
Rename variable to avoid CamelCase. 
tmpV16 -> tmpv16 
 
Signed-off-by: Michael Straube <straube.linux@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Michael Straube [Sat, 14 Jul 2018 12:52:38 +0000  (14:52 +0200)] 
 
staging: rtl8188eu: rename function parameters 
 
Rename function parameters to avoid CamelCase. 
bWrite -> write 
PwrState -> pwrstate 
 
Signed-off-by: Michael Straube <straube.linux@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Michael Straube [Sat, 14 Jul 2018 12:52:37 +0000  (14:52 +0200)] 
 
staging: rtl8188eu: rename Efuse_PowerSwitch 
 
Rename function to avoid CamelCase. 
Efuse_PowerSwitch -> efuse_power_switch 
 
Signed-off-by: Michael Straube <straube.linux@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Michael Straube [Sat, 14 Jul 2018 12:52:36 +0000  (14:52 +0200)] 
 
staging: rtl8188eu: do not line break function definition 
 
Do not line break function definition of Efuse_PowerSwitch(). 
 
Signed-off-by: Michael Straube <straube.linux@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Oliver Hübers [Fri, 13 Jul 2018 13:41:06 +0000  (15:41 +0200)] 
 
staging: mt7621: Add SPDX license identifier 
 
Signed-off-by: Oliver Hübers <oliver.huebers@web.de>  
Signed-off-by: Vanessa Borgmann <nessa.x@web.de>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Michael Straube [Fri, 13 Jul 2018 18:05:08 +0000  (20:05 +0200)] 
 
staging: rtl8188eu: remove is_{multicast,broadcast}_mac_addr 
 
Remove custom is_multicast_mac_addr() and is_broadcast_mac_addr(). 
Use is_multicast_ether_addr() instead. 
 
By definition the broadcast address is also a multicast address. 
is_multicast_ether_addr() returns true for broadcast addresses. 
Hence checking for multicast in the conditional is sufficient. 
 
Signed-off-by: Michael Straube <straube.linux@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Oliver Hübers [Fri, 13 Jul 2018 13:41:03 +0000  (15:41 +0200)] 
 
staging: mt7621-pci: Include preferred headers 
 
This fixes the following checkpatch warnings: 
Use #include <linux/pci.h> instead of <asm/pci.h> 
Use #include <linux/io.h> instead of <asm/io.h> 
 
Signed-off-by: Oliver Hübers <oliver.huebers@web.de>  
Signed-off-by: Vanessa Borgmann <nessa.x@web.de>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Cristian Kubis [Sat, 14 Jul 2018 22:25:41 +0000  (00:25  +0200)] 
 
staging: olpc_dcon: add missing identifier names 
 
Add missing function argument identifier names as suggested by 
checkpatch.pl. 
 
Signed-off-by: Cristian Kubis <cristian.kubis@tsunix.de>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Cristian Kubis [Sat, 14 Jul 2018 22:25:40 +0000  (00:25  +0200)] 
 
staging: olpc_dcon: prefer 'help' in KConfig 
 
Fix for a style warning reported by checkpatch.pl in KConfig 
suggesting to use 'help' instead of '---help---'. 
 
Signed-off-by: Cristian Kubis <cristian.kubis@tsunix.de>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ivan Safonov [Sat, 14 Jul 2018 17:54:10 +0000  (20:54 +0300)] 
 
staging:r8188eu: Use lib80211 to encrypt (CCMP) tx frames 
 
Put data to skb, decrypt with lib80211_crypt_ccmp, and place back to tx buffer. 
 
Signed-off-by: Ivan Safonov <insafonov@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Ivan Safonov [Sat, 14 Jul 2018 17:54:09 +0000  (20:54 +0300)] 
 
staging:r8188eu: Use lib80211 to encrypt (TKIP) tx frames 
 
Put data to skb, decrypt with lib80211_crypt_tkip, and place back to tx buffer. 
 
MIC calculation will be replaced later. 
 
Signed-off-by: Ivan Safonov <insafonov@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Greg Kroah-Hartman [Mon, 16 Jul 2018 07:06:57 +0000  (09:06 +0200)] 
 
Merge 4.18-rc5 into staging-next 
 
We need the staging fixes in here as well. 
 
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Linus Torvalds [Sun, 15 Jul 2018 19:49:31 +0000  (12:49 -0700)] 
 
Linux 4.18-rc5 
 
Linus Torvalds [Sun, 15 Jul 2018 16:49:21 +0000  (09:49 -0700)] 
 
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 
 
Pull ARM SoC fixes from Olof Johansson: 
 
 - A fix for OMAP5 and DRA7 to make the branch predictor hardening 
   settings take proper effect on secondary cores 
 
 - Disable USB OTG on am3517 since current driver isn't working 
 
 - Fix thermal sensor register settings on Armada 38x 
 
 - Fix suspend/resume IRQs on pxa3xx 
 
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: 
  ARM: dts: am3517.dtsi:  Disable reference to OMAP3 OTG controller 
  ARM: DRA7/OMAP5: Enable ACTLR[0] (Enable invalidates of BTB) for secondary cores 
  ARM: pxa: irq: fix handling of ICMR registers in suspend/resume 
  ARM: dts: armada-38x: use the new thermal binding 
 
Linus Torvalds [Sat, 14 Jul 2018 23:15:19 +0000  (16:15 -0700)] 
 
Merge tag 'rtc-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux 
 
Pull RTC fixes from Alexandre Belloni: 
 "Two fixes for 4.18: 
 
   - an important core fix for RTCs using the core offsetting only one 
     driver is affected 
 
   - a fix for the error path of mrst" 
 
* tag 'rtc-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: 
  rtc: fix alarm read and set offset 
  rtc: mrst: fix error code in probe() 
 
Olof Johansson [Sat, 14 Jul 2018 22:14:02 +0000  (15:14 -0700)] 
 
Merge tag 'omap-for-v4.18/fixes-rc4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes 
 
Two omap fixes for v4.18-rc cycle 
 
Turns out the recent patches for ARM branch predictor hardening are 
not working on omap5 and dra7 as planned because the secondary CPU 
is parked to the bootrom code. We can't configure it in the bootloader. 
So we must enable invalidates of BTB for omap5 and dra7 secondary 
core in the kernel. 
 
And there's a fix for reserved register access for am3517. The 
usb otg module on am3517 is not the same as for other omap3. 
 
* tag 'omap-for-v4.18/fixes-rc4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: 
  ARM: dts: am3517.dtsi:  Disable reference to OMAP3 OTG controller 
  ARM: DRA7/OMAP5: Enable ACTLR[0] (Enable invalidates of BTB) for secondary cores 
 
Signed-off-by: Olof Johansson <olof@lixom.net>