]>
 
 
www.infradead.org Git - users/hch/misc.git/log 
 
 
 
 
 
 
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:59 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename SetRFPowerState 
 
Use naming schema found in other rtlwifi devices. 
Rename SetRFPowerState to rtl92e_set_rf_power_state. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:58 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_SetBWMode 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_SetBWMode to rtl92e_set_bw_mode. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:57 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_setBBreg 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_setBBreg to rtl92e_set_bb_reg. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:56 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_QueryBBReg 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_QueryBBReg to rtl92e_get_bb_reg. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:55 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_phy_SwChnl 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_phy_SwChnl to rtl92e_set_channel. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:54 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_phy_setTxPower 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_phy_setTxPower to rtl92e_set_tx_power. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:53 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_phy_SetRFReg 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_phy_SetRFReg to rtl92e_set_rf_reg. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:52 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_phy_RFConfig 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_phy_RFConfig to rtl92e_config_phy. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:51 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_phy_QueryRFReg 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_phy_QueryRFReg to rtl92e_get_rf_reg. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:50 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_phy_getTxPower 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_phy_getTxPower to rtl92e_get_tx_power. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:49 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_phy_ConfigRFWithHeaderFile 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_phy_ConfigRFWithHeaderFile to rtl92e_config_rf_path. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:48 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_phy_configmac 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_phy_configmac to rtl92e_config_mac. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:47 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_phy_CheckIsLegalRFPath 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_phy_CheckIsLegalRFPath to rtl92e_is_legal_rf_path. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:46 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_phy_checkBBAndRF 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_phy_checkBBAndRF to rtl92e_check_bb_and_rf. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:45 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_BBConfig 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_BBConfig to rtl92e_config_bb. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:44 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename PHY_SetRtl8192eRfOff 
 
Use naming schema found in other rtlwifi devices. 
Rename PHY_SetRtl8192eRfOff to rtl92e_set_rf_off. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:43 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename PHY_ScanOperationBackup8192 
 
Use naming schema found in other rtlwifi devices. 
Rename PHY_ScanOperationBackup8192 to rtl92e_scan_op_backup. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:42 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename InitialGain819xPci 
 
Use naming schema found in other rtlwifi devices. 
Rename InitialGain819xPci to rtl92e_init_gain. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:41 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename firmware_init_param 
 
Use naming schema found in other rtlwifi devices. 
Rename firmware_init_param to rtl92e_init_fw_param. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:40 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_update_ratr_table 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_update_ratr_table to rtl92e_update_ratr_table. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:39 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_tx_fill_desc 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_tx_fill_desc to rtl92e_fill_tx_desc. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:38 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_tx_fill_cmd_desc 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_tx_fill_cmd_desc to rtl92e_fill_tx_cmd_desc. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:37 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_rx_query_status_desc 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_rx_query_status_desc to rtl92e_get_rx_stats. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:36 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_link_change 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_link_change to rtl92e_link_change. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:35 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_interrupt_recognized 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_interrupt_recognized to rtl92e_ack_irq. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:34 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_InitializeVariables 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_InitializeVariables to rtl92e_init_variables. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:33 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_HalTxCheckStuck 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_HalTxCheckStuck to rtl92e_is_tx_stuck. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:32 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_halt_adapter 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_halt_adapter to rtl92e_stop_adapter. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:31 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_HalRxCheckStuck 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_HalRxCheckStuck to rtl92e_is_rx_stuck. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:30 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_GetNmodeSupportBySecCfg 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_GetNmodeSupportBySecCfg to rtl92e_get_nmode_support_by_sec. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:29 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_GetHalfNmodeSupportByAPs 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_GetHalfNmodeSupportByAPs to rtl92e_is_halfn_supported_by_ap. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:28 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_get_eeprom_size 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_get_eeprom_size to rtl92e_get_eeprom_size. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:27 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192e_start_beacon 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192e_start_beacon to rtl92e_start_beacon. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:26 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192e_SetHwReg 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192e_SetHwReg to rtl92e_set_reg. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:25 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_enable_tx 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_enable_tx to rtl92e_enable_tx. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:24 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_enable_rx 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_enable_rx to rtl92e_enable_rx. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:23 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_EnableInterrupt 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_EnableInterrupt to rtl92e_enable_irq. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:22 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_DisableInterrupt 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_DisableInterrupt to rtl92e_disable_irq. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:21 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_ClearInterrupt 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_ClearInterrupt to rtl92e_clear_irq. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:20 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_AllowAllDestAddr 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_AllowAllDestAddr to rtl92e_set_monitor_mode. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:19 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename rtl8192_adapter_start 
 
Use naming schema found in other rtlwifi devices. 
Rename rtl8192_adapter_start to rtl92e_start_adapter. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:18 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename cmpk_message_handle_tx 
 
Use naming schema found in other rtlwifi devices. 
Rename cmpk_message_handle_tx to rtl92e_send_cmd_pkt. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:17 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename PHY_SetRF8256OFDMTxPower 
 
Use naming schema found in other rtlwifi devices. 
Rename PHY_SetRF8256OFDMTxPower to rtl92e_set_ofdm_tx_power. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:16 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename PHY_SetRF8256CCKTxPower 
 
Use naming schema found in other rtlwifi devices. 
Rename PHY_SetRF8256CCKTxPower to rtl92e_set_cck_tx_power. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:15 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename PHY_SetRF8256Bandwidth 
 
Use naming schema found in other rtlwifi devices. 
Rename PHY_SetRF8256Bandwidth to rtl92e_set_bandwidth. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Mateusz Kulikowski [Sun, 19 Jul 2015 17:27:14 +0000  (19:27 +0200)] 
 
staging: rtl8192e: Rename PHY_RF8256_Config 
 
Use naming schema found in other rtlwifi devices. 
Rename PHY_RF8256_Config to rtl92e_config_rf. 
 
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:48 +0000  (09:55 -0400)] 
 
staging: unisys: remove bogus error checking 
 
The netdev we're testing for can't be removed, because its never 
unregistered, so don't bother checking for it 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:47 +0000  (09:55 -0400)] 
 
staging: unisys: remove visornic_ioctl 
 
All it does is return no supported.  Removing the function entirely 
accomplishes the same thing 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:46 +0000  (09:55 -0400)] 
 
staging: unisys: Remove trans_start 
 
dev_trans_start does this for us now 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:45 +0000  (09:55 -0400)] 
 
staging: unisys: Fix improper use of NETDEV_TX_BUSY 
 
Using NETDEV_TX_BUSY is tricky.  Its meant for situations where the error 
in question is transient and quickly resolved.  But the driver rarely is 
able to know that to a certainty.  And in the case of visornic, it just 
uses it without any care for that, in the hopes that it won't loose frames, 
even if the problem is that the skb is somehow malformed for the hardware. 
If we get one of those kinds of skbs, NETDEV_TX_BUSY will just cause us to 
spin, processing the same error over and over. 
 
Fix it by dropping the frame, stopping the queue where appropriate, and 
returning NETDEV_TX_OK 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:44 +0000  (09:55 -0400)] 
 
staging: unisys: Remove some extraneous start/stop queue operations 
 
If we put them in the enable and disable paths, we don't need them in 
several other places 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:43 +0000  (09:55 -0400)] 
 
staging: unisys: Change enable/disable to wait forever 
 
I don't see why the server should stop responding, or that we should just 
give up if it does.  Wait forever when enabling/disabling the visornic 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:42 +0000  (09:55 -0400)] 
 
staging: unisys: Make serverdown synchronous 
 
I don't see why serverdown should be async on a workqueue.  Just make it 
synchronous, and remove some code in the process 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:41 +0000  (09:55 -0400)] 
 
staging: unisys: simplify visornic_serverdown_complete 
 
Theres a lot of code duplication going on in visornic_serverdown_complete. 
We should just be able to send it through the dev_close path and have it 
do the right things. 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:40 +0000  (09:55 -0400)] 
 
staging: unisys: Guard against task leakage 
 
Its possible to overwrite the old task pointer in visornic_resume.  Add a 
check to guard against that and a warning if we find that its already 
running 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:39 +0000  (09:55 -0400)] 
 
staging: unisys: Clean up kthread usage 
 
Remove the has_stopped completion as theres already one available 
internally. 
 
Correct the while loops 
 
Remove the while loop in drain_queue as it already exists in the top level 
loop 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:38 +0000  (09:55 -0400)] 
 
staging: unisys: Linarize skbs 
 
If we can't fit an skb into a frag array, linaraize it so we don't have to 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:37 +0000  (09:55 -0400)] 
 
staging: unisys: BUG halt on error in I/O channel 
 
We precheck that we have enough space in an iochannel prior to writing to 
it when we send in a fragmented skb.  Given that there is no recovery from 
this condition that I can see, turn it into a BUG halt 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:36 +0000  (09:55 -0400)] 
 
staging: unisys: Check return code properly on visor_copy_fragsinfo_from_skb 
 
One call site for visor_copy_fragsinfo_from_skb was checking for an rc of 
-1, but thhe function doesn't return that, it returns -errno.  Correct it 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Neil Horman [Tue, 21 Jul 2015 13:55:35 +0000  (09:55 -0400)] 
 
staging: unisys: Remove num_visornic_open array 
 
As pointed out in a recent review, the num_visornic_open array didn't do 
anything useful, and it exposed a potential race in the visornic code that 
could arise while taking down a net interface while reading from the 
debugfs files. Fix that by removing the array entirely, and just iterating 
over all the registered netdevs in a given namespace, filtering on them 
having visornic ops (to identify which are ours), and having their queues 
not be stopped (identifying that they are up). This should prevent any oops 
conditions happening due to changing state in that array, and save us a 
bunch of code too. 
 
Signed-off-by: Neil Horman <nhorman@redhat.com>  
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>  
Acked-by: Neil Horman <nhorman@tuxdriver.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Steve Pennington [Wed, 22 Jul 2015 17:50:11 +0000  (12:50 -0500)] 
 
staging: rtl8723au: fix incorrect type in assignment warning 
 
Repaced calls to htons and memcpy with a single call to put_unaligned_be16 
to fix the following sparse warning: 
drivers/staging/rtl8723au/core/rtw_recv.c:1557:21: warning: incorrect type in assignment (different base types) 
drivers/staging/rtl8723au/core/rtw_recv.c:1557:21:    expected unsigned short [unsigned] [assigned] [usertype] len 
drivers/staging/rtl8723au/core/rtw_recv.c:1557:21:    got restricted __be16 [usertype] <noident> 
 
Signed-off-by: Steve Pennington <sgpenn@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Jon Medhurst (Tixy) [Fri, 17 Jul 2015 11:01:29 +0000  (12:01 +0100)] 
 
staging: ion: ion_cma_heap: Don't directly use dma_common_get_sgtable 
 
Use dma_get_sgtable rather than dma_common_get_sgtable so a device's 
dma_ops aren't bypassed. This is essential in situations where a device 
uses an IOMMU and the physical memory is not contiguous (as the common 
function assumes). 
 
Signed-off-by: Jon Medhurst <tixy@linaro.org>  
Reviewed-by: Robin Murphy <robin.murphy@arm.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Stuart Yoder [Thu, 16 Jul 2015 17:50:50 +0000  (12:50 -0500)] 
 
staging: fsl-mc: update TODO list 
 
update TODO list to provide more detail on remaining work 
 
Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Dan Carpenter [Sun, 19 Jul 2015 10:52:33 +0000  (13:52 +0300)] 
 
Staging: rtl8192e: pointer math bug in rtllib_rx_DELBA() 
 
The pointer math here was totally wrong so we were reading nonsense 
information from beyond the end of the buffer.  It could lead to an oops 
if that memory wasn't mapped. 
 
The "pReasonCode" pointer is assigned but never used so I deleted it. 
 
With-Fix-From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> 
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>  
Acked-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Tested-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Luis de Bethencourt [Mon, 20 Jul 2015 16:36:18 +0000  (18:36 +0200)] 
 
staging: rtl8192u: remove unneeded bool 
 
bool Reval is set to match the value of bHalfWirelessN24GMode just to 
this. The value can be returned directly. Removing uneeded bool. 
 
Signed-off-by: Luis de Bethencourt <luis@debethencourt.com>  
Suggested-by: Joe Perches <joe@perches.com>  
Suggested-by: Franks Klaver <fransklaver@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Luis de Bethencourt [Mon, 20 Jul 2015 16:35:42 +0000  (18:35 +0200)] 
 
staging: rtl8192u: remove bool comparisons 
 
Remove explicit true/false comparisons to bool variables. 
 
Signed-off-by: Luis de Bethencourt <luis@debethencourt.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Dan Carpenter [Sun, 19 Jul 2015 10:52:17 +0000  (13:52 +0300)] 
 
Staging: rtl8192u: pointer math bug in ieee80211_rx_DELBA() 
 
Smatch complains because "delba" is a pointer to struct 
rtl_80211_hdr_3addr so the "delba += sizeof(struct rtl_80211_hdr_3addr);" 
is clearly wrong.  We are reading nonsense data from beyond the end of 
the buffer and could oops if that memory isn't mapped. 
 
It turns out the next two statements are also wrong. We should delete 
the += sizeof() statement and "delba+2" should be "&delba->payload[2]". 
"pReasonCode" isn't used so I deleted that. 
 
With-Fix-From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> 
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Sudip Mukherjee [Tue, 21 Jul 2015 13:27:28 +0000  (18:57 +0530)] 
 
staging: rtl8188eu: remove multiple blank line 
 
Multiple blank lines should be avoided. 
 
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Sudip Mukherjee [Tue, 21 Jul 2015 13:27:27 +0000  (18:57 +0530)] 
 
staging: rtl8188eu: dont mix success and error path 
 
Success and error path was mixed. Separate them by directly returning 0 
from the success path. In the process remove the variable which became 
unused. 
 
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Sudip Mukherjee [Tue, 21 Jul 2015 13:27:26 +0000  (18:57 +0530)] 
 
staging: rtl8188eu: check for kzalloc failure 
 
Check for kzalloc failure and directly return from the error patch thus 
simplifying the success path. 
 
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>  
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Sudip Mukherjee [Tue, 21 Jul 2015 13:27:25 +0000  (18:57 +0530)] 
 
staging: rtl8188eu: remove label 
 
Directly return NULL instead of using another label and goto. 
 
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Sudip Mukherjee [Tue, 21 Jul 2015 13:27:24 +0000  (18:57 +0530)] 
 
staging: rtl8188eu: remove unused define 
 
_HCI_INTF_C_ was only defined here but not being used anywhere. 
 
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Antoine BLIN [Fri, 17 Jul 2015 13:04:34 +0000  (15:04 +0200)] 
 
staging: sm750fb: ddk750_power.c: Split lines over 80 characters. 
 
Fix up "line over 80 characters" warning found by the checkpatch.pl script. 
 
Signed-off-by: Antoine BLIN <antoine.blin@lip6.fr>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Aaron Ouellette [Fri, 17 Jul 2015 01:21:16 +0000  (21:21 -0400)] 
 
staging: sm750fb: removed extra parentheses 
 
fixed checkpatch.pl error: 
ERROR: return is not a function, parentheses are not needed 
 
Signed-off-by: Aaron Ouellette <aouellette2016@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Bernd Porr [Wed, 22 Jul 2015 17:46:39 +0000  (18:46 +0100)] 
 
staging/comedi/drivers/usbduxsigma.c: added support for ehci drivers 
 
urb->interval is deprecated and thus I've changed the driver 
that it now always assumes interval=1 which means every frame 
in USB 1.1 and every uframe in USB 2.0. However we still need 
to have different sampling rates which are still multiples 
of the interval which is now transmitted to the firmware. 
The firmware transmits either zero length packets or none every (u)frame. 
This is checked in the completion handler and any packet 
at zero length is discarded so that comedi again sees the data 
coming in at the interval specified. This also then gives the ADC 
the necessary time to convert. For example 16 channels require 
about 700us and in this period no packet could be transmitted. 
In this case this is padded up to 1ms so that we have then 7 zero 
length packets and one packet with the ADC data. 
 
Signed-off-by: Bernd Porr <mail@berndporr.me.uk>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Bernd Porr [Wed, 22 Jul 2015 17:45:55 +0000  (18:45 +0100)] 
 
staging/comedi/drivers/usbduxsigma.c: updated address details 
 
Changed my e-mail address to mail@berndporr.me.uk. The old one 
is no longer used. 
 
Signed-off-by: Bernd Porr <mail@berndporr.me.uk>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Chandra S Gorentla [Mon, 20 Jul 2015 11:23:15 +0000  (16:53 +0530)] 
 
staging: comedi: drivers: pcl816.c remove leading space 
 
Checkpatch.pl warning - suspect code indent for conditional statements - 
is corrected 
 
Signed-off-by: Chandra S Gorentla <csgorentla@gmail.com>  
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:47 +0000  (19:16 +0100)] 
 
staging: vt6655: desc.h remove dead strctures 
 
Remove these unsed structures. 
typedef struct tagSTxSyncDesc 
typedef struct tagSRrvTime_atim 
typedef struct tagSTxBufHead 
typedef struct tagSBEACONCtl 
typedef struct tagSSecretKey 
typedef struct tagSKeyEntry 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:46 +0000  (19:16 +0100)] 
 
staging: vt6655: s_cbFillTxBufHead replace STxBufHead 
 
vnt_tx_fifo_head has now replaced STxBufHead 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:45 +0000  (19:16 +0100)] 
 
staging: vt6655: always set 32 bit dma mask 
 
The device is limited to 32 bit address space. 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:44 +0000  (19:16 +0100)] 
 
staging: vt6655: fix tagTDES1 -> wReqCount type 
 
should be __le16 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:43 +0000  (19:16 +0100)] 
 
staging: vt6655: Fix wReqCount to __le16 
 
Should be __le16 and do and correct endian conversion. 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:42 +0000  (19:16 +0100)] 
 
staging: vt6655: fix tagSRxDesc -> next_desc type 
 
Should always be __le32 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:41 +0000  (19:16 +0100)] 
 
staging: vt6655: Fix tagSRxDesc -> buff_addr type 
 
Should always be __le32. 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:40 +0000  (19:16 +0100)] 
 
staging: vt6655: remove unused tagDEVICE_RD_INFO -> curr_desc 
 
variable is assigned a value that is never used. 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:39 +0000  (19:16 +0100)] 
 
staging: vt6655: fix tagSTxDesc -> next_desc type 
 
Should always be __le32 type 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:38 +0000  (19:16 +0100)] 
 
staging: vt6655: fix tagDEVICE_TD_INFO -> buff_addr type 
 
Should always be __le32 type 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:37 +0000  (19:16 +0100)] 
 
staging: vt6655: Remove unused tagDEVICE_TD_INFO curr_desc 
 
The variable is assigned a value that is never used. 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:36 +0000  (19:16 +0100)] 
 
staging: vt6655: remove unnecessary variable skb_dma 
 
skb_dma flips from 0 to the contents buf_dma. 
 
This is nolonger necessary so use buf_dma directly 
and remove skb_dma altogether. 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:35 +0000  (19:16 +0100)] 
 
staging: vt6655: dead code tx path remove dma_unmap_single 
 
When pTDInfo->skb_dma not equal to pTDInfo->buf_dma, pTDInfo->skb_dma 
equals zero. 
 
as mentioned in comment pre-allocated buf_dma can't be unmapped 
so remove dead code. 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:34 +0000  (19:16 +0100)] 
 
staging: vt6655: remove unused DBG_PORT80 and VIAWET_DEBUG 
 
VIAWET_DEBUG is never defined so DBG_PORT80 is empty and never used. 
 
Remove both macros. 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Malcolm Priestley [Wed, 22 Jul 2015 18:16:33 +0000  (19:16 +0100)] 
 
staging: vt6655: Remove ununsed macro ASSERT 
 
VIAWET_DEBUG is not defined so macro is empty. 
 
Remove the macro. 
 
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Cihangir Akturk [Wed, 22 Jul 2015 12:59:32 +0000  (15:59 +0300)] 
 
staging: lustre: obdclass: Make structure declerations static const 
 
obd_device_list_sops and obd_device_list_fops are not referenced 
outside of linux-module.c, and in the general use case 
struct file_operations and struct seq_operations should be a const 
object, so make them static and const. 
 
This patch fixes the following sparse warnings: 
WARNING: struct seq_operations should normally be const 
WARNING: struct file_operations should normally be const 
 
Signed-off-by: Cihangir Akturk <cakturk@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Cihangir Akturk [Tue, 21 Jul 2015 07:22:52 +0000  (10:22 +0300)] 
 
staging: lustre: ldlm: Make function static. 
 
target_send_reply_msg function is not referenced outside of ldlm_lib.c 
file, so make it static. 
 
Signed-off-by: Cihangir Akturk <cakturk@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Kolbeinn Karlsson [Sun, 19 Jul 2015 20:23:19 +0000  (16:23 -0400)] 
 
staging: lustre: make functions only used locally static 
 
Add a static modifier to two functions that have no 
separate declaration and are only used within the file they are 
defined in. This problem was reported by sparse. 
 
Signed-off-by: Kolbeinn Karlsson <kk752@cornell.edu>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Miguel Bernabeu Diaz [Thu, 16 Jul 2015 23:39:21 +0000  (01:39  +0200)] 
 
staging: lustre: Fix style error with decorator 
 
Fixed checkpatch.pl error: 
ERROR: "(foo*)" should be "(foo *)" 
 
Signed-off-by: Miguel Bernabeu Diaz <miguelbernadi@gmail.com>  
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Greg Kroah-Hartman [Mon, 20 Jul 2015 20:21:28 +0000  (13:21 -0700)] 
 
Merge 4.2-rc3 into staging-next 
 
We need the staging fixes in here as well. 
 
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>  
Linus Torvalds [Sun, 19 Jul 2015 21:45:02 +0000  (14:45 -0700)] 
 
Linux 4.2-rc3 
 
Linus Torvalds [Sun, 19 Jul 2015 21:18:00 +0000  (14:18 -0700)] 
 
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 
 
Pull SCSI fixes from James Bottomley: 
 "Two fairly simple fixes: one is a change that causes us to have a very 
  low queue depth leading to performance issues and the other is a null 
  deref occasionally in tapes thanks to use after put" 
 
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: 
  scsi: fix host max depth checking for the 'queue_depth' sysfs interface 
  st: null pointer dereference panic caused by use after kref_put by st_open 
 
Linus Torvalds [Sun, 19 Jul 2015 21:12:22 +0000  (14:12 -0700)] 
 
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 
 
Pull MIPS fixes from Ralf Baechle: 
 "Another round of MIPS fixes for 4.2. 
 
  Things are looking quite decent at this stage but the recent work on 
  the FPU support took its toll: 
 
   - fix an incorrect overly restrictive ifdef 
 
   - select O32 64-bit FP support for O32 binary compatibility 
 
   - remove workarounds for Sibyte SB1250 Pass1 parts.  There are rare 
     fixing the workarounds is not worth the effort. 
 
   - patch up an outdated and now incorrect comment" 
 
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: 
  MIPS: fpu.h: Allow 64-bit FPU on a 64-bit MIPS R6 CPU 
  MIPS: SB1: Remove support for Pass 1 parts. 
  MIPS: Require O32 FP64 support for MIPS64 with O32 compat 
  MIPS: asm-offset.c: Patch up various comments refering to the old filename.