* linux-next: Tree for Oct 7
@ 2013-10-07 15:18 Thierry Reding
2013-10-07 15:18 ` linux-next: build failure after merge of the mips tree Thierry Reding
` (3 more replies)
0 siblings, 4 replies; 19+ messages in thread
From: Thierry Reding @ 2013-10-07 15:18 UTC (permalink / raw)
To: linux-next, linux-kernel; +Cc: Mark Brown
Hi all,
I've uploaded today's linux-next tree to the master branch of the
repository below:
git://gitorious.org/thierryreding/linux-next.git
A next-20131007 tag is also provided for convenience.
No new conflicts today. i386, x86_64 and ARM default configurations did
build fine. There were some build failures unrelated to the merge, most
of which I fixed and added as patches on top of the final merge.
Thierry
^ permalink raw reply [flat|nested] 19+ messages in thread* linux-next: build failure after merge of the mips tree 2013-10-07 15:18 linux-next: Tree for Oct 7 Thierry Reding @ 2013-10-07 15:18 ` Thierry Reding 2013-10-07 15:18 ` linux-next: manual merge of the drm-intel tree Thierry Reding ` (2 subsequent siblings) 3 siblings, 0 replies; 19+ messages in thread From: Thierry Reding @ 2013-10-07 15:18 UTC (permalink / raw) To: Greg Ungerer, Ralf Baechle, Ashok Kumar Cc: linux-next, linux-kernel, linux-mips Today's linux-next merge fails to build on various default configuration builds. This seems to be caused by the following commit: 5395d97 MIPS: Fix start of free memory when using initrd Looking at the patchwork URLs in that commit message, Greg's original patch seems to have been fine, but Ashok's patch uses the initrd_end symbol outside of the section protected by an CONFIG_BLK_DEV_INITRD #ifdef and therefore causes to fail during linking. I've reverted the patch in today's linux-next tree. Thierry ^ permalink raw reply [flat|nested] 19+ messages in thread
* linux-next: manual merge of the drm-intel tree 2013-10-07 15:18 linux-next: Tree for Oct 7 Thierry Reding 2013-10-07 15:18 ` linux-next: build failure after merge of the mips tree Thierry Reding @ 2013-10-07 15:18 ` Thierry Reding 2013-10-07 15:18 ` linux-next: manual merge of the random tree Thierry Reding 2013-10-07 15:18 ` linux-next: manual merge of the wireless-next tree Thierry Reding 3 siblings, 0 replies; 19+ messages in thread From: Thierry Reding @ 2013-10-07 15:18 UTC (permalink / raw) To: Daniel Vetter, Ben Widawsky, Rodrigo Vivi; +Cc: linux-next, linux-kernel Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_dp.c caused by commits 0cc4b69 (drm/i915: Mask LPSP to get PSR working even with Power Well in use by audio.) and 18b5992 (drm/i915: Calculate PSR register offsets from base + gen). I fixed it up (see below). Please verify that the resolution looks correct. Thanks, Thierry --- diff --cc drivers/gpu/drm/i915/intel_dp.c index bc6579e,c4c280c..f349931 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@@ -1549,8 -1558,8 +1558,8 @@@ static void intel_edp_psr_setup(struct intel_edp_psr_write_vsc(intel_dp, &psr_vsc); /* Avoid continuous PSR exit by masking memup and hpd */ - I915_WRITE(EDP_PSR_DEBUG_CTL, EDP_PSR_DEBUG_MASK_MEMUP | + I915_WRITE(EDP_PSR_DEBUG_CTL(dev), EDP_PSR_DEBUG_MASK_MEMUP | - EDP_PSR_DEBUG_MASK_HPD); + EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP); intel_dp->psr_setup_done = true; } ^ permalink raw reply [flat|nested] 19+ messages in thread
* linux-next: manual merge of the random tree 2013-10-07 15:18 linux-next: Tree for Oct 7 Thierry Reding 2013-10-07 15:18 ` linux-next: build failure after merge of the mips tree Thierry Reding 2013-10-07 15:18 ` linux-next: manual merge of the drm-intel tree Thierry Reding @ 2013-10-07 15:18 ` Thierry Reding 2013-10-07 15:18 ` linux-next: manual merge of the wireless-next tree Thierry Reding 3 siblings, 0 replies; 19+ messages in thread From: Thierry Reding @ 2013-10-07 15:18 UTC (permalink / raw) Cc: linux-next, linux-kernel Today's linux-next merge of the random tree got a conflict in: drivers/char/random.c caused by commits 5573604 (random: push extra entropy to the output pools) and 0244ad0 (Remove GENERIC_HARDIRQ config option). I fixed it up (see below). Please verify that the resolution looks correct. Thanks, Thierry --- diff --cc drivers/char/random.c index 7737b5b,f126bd2..7cfc146 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@@ -255,8 -255,12 +255,9 @@@ #include <linux/fips.h> #include <linux/ptrace.h> #include <linux/kmemcheck.h> +#include <linux/irq.h> + #include <linux/workqueue.h> -#ifdef CONFIG_GENERIC_HARDIRQS -# include <linux/irq.h> -#endif - #include <asm/processor.h> #include <asm/uaccess.h> #include <asm/irq.h> ^ permalink raw reply [flat|nested] 19+ messages in thread
* linux-next: manual merge of the wireless-next tree 2013-10-07 15:18 linux-next: Tree for Oct 7 Thierry Reding ` (2 preceding siblings ...) 2013-10-07 15:18 ` linux-next: manual merge of the random tree Thierry Reding @ 2013-10-07 15:18 ` Thierry Reding 2013-10-07 15:48 ` Larry Finger 3 siblings, 1 reply; 19+ messages in thread From: Thierry Reding @ 2013-10-07 15:18 UTC (permalink / raw) To: John W. Linville, Arend van Spriel, Joe Perches, Larry Finger Cc: linux-next, linux-kernel Today's linux-next merge of the wireless-next tree got conflicts in: drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h drivers/net/wireless/rtlwifi/rtl8188ee/phy.h drivers/net/wireless/rtlwifi/rtl8192ce/phy.h drivers/net/wireless/rtlwifi/rtl8192de/phy.h drivers/net/wireless/rtlwifi/rtl8723ae/phy.h caused by commits 05f3820 (brcmfmac: rework rx path bus interface) and 9bd91f3 (brcm80211: Remove extern from function prototypes) as well as commits d41200a (rtlwifi: rtl8188ee: Convert driver to use new rtl_phy_scan_operation_backup() routine), 3764eb7 (rtlwifi: rtl8192ce: Convert driver to use new rtl_phy_scan_operation_backup() routine), 6483033 (rtlwifi: rtl8192ce: Convert driver to use new rtl_phy_scan_operation_backup() routine), 3fc0165 (rtlwifi: rtl8723ae: Convert driver to use new rtl_phy_scan_operation_backup() routine) and a958df5 (rtlwifi: Remove extern from function prototypes). I fixed them up (see below). Please verify that the resolution looks correct. Thanks, Thierry --- diff --cc drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h index 7f1340d,200ee9b..a6eb09e --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h @@@ -132,34 -132,34 +132,34 @@@ struct pktq *brcmf_bus_gettxq(struct br * interface functions from common layer */ -extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, - struct sk_buff *pkt, int prec); +bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, struct sk_buff *pkt, + int prec); /* Receive frame for delivery to OS. Callee disposes of rxp. */ - void brcmf_rx_frames(struct device *dev, struct sk_buff_head *rxlist); -extern void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp); ++void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp); /* Indication from bus module regarding presence/insertion of dongle. */ -extern int brcmf_attach(uint bus_hdrlen, struct device *dev); +int brcmf_attach(uint bus_hdrlen, struct device *dev); /* Indication from bus module regarding removal/absence of dongle */ -extern void brcmf_detach(struct device *dev); +void brcmf_detach(struct device *dev); /* Indication from bus module that dongle should be reset */ -extern void brcmf_dev_reset(struct device *dev); +void brcmf_dev_reset(struct device *dev); /* Indication from bus module to change flow-control state */ -extern void brcmf_txflowblock(struct device *dev, bool state); +void brcmf_txflowblock(struct device *dev, bool state); /* Notify the bus has transferred the tx packet to firmware */ -extern void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, - bool success); +void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success); -extern int brcmf_bus_start(struct device *dev); +int brcmf_bus_start(struct device *dev); #ifdef CONFIG_BRCMFMAC_SDIO -extern void brcmf_sdio_exit(void); -extern void brcmf_sdio_init(void); +void brcmf_sdio_exit(void); +void brcmf_sdio_init(void); +void brcmf_sdio_register(void); #endif #ifdef CONFIG_BRCMFMAC_USB -extern void brcmf_usb_exit(void); -extern void brcmf_usb_init(void); +void brcmf_usb_exit(void); +void brcmf_usb_register(void); #endif #endif /* _BRCMF_BUS_H_ */ diff --cc drivers/net/wireless/rtlwifi/rtl8188ee/phy.h index 71ddf4f,d4545f0..8e1f1be --- a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h @@@ -200,26 -200,29 +200,25 @@@ enum _ANT_DIV_TYPE CGCS_RX_SW_ANTDIV = 0x05, }; -extern u32 rtl88e_phy_query_bb_reg(struct ieee80211_hw *hw, - u32 regaddr, u32 bitmask); -extern void rtl88e_phy_set_bb_reg(struct ieee80211_hw *hw, - u32 regaddr, u32 bitmask, u32 data); -extern u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw, - enum radio_path rfpath, u32 regaddr, - u32 bitmask); -extern void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw, - enum radio_path rfpath, u32 regaddr, - u32 bitmask, u32 data); -extern bool rtl88e_phy_mac_config(struct ieee80211_hw *hw); -extern bool rtl88e_phy_bb_config(struct ieee80211_hw *hw); -extern bool rtl88e_phy_rf_config(struct ieee80211_hw *hw); -extern void rtl88e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); -extern void rtl88e_phy_get_txpower_level(struct ieee80211_hw *hw, - long *powerlevel); -extern void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); -extern void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw); -extern void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw, - enum nl80211_channel_type ch_type); -extern void rtl88e_phy_sw_chnl_callback(struct ieee80211_hw *hw); -extern u8 rtl88e_phy_sw_chnl(struct ieee80211_hw *hw); -extern void rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery); +u32 rtl88e_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask); +void rtl88e_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask, + u32 data); +u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath, + u32 regaddr, u32 bitmask); +void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath, + u32 regaddr, u32 bitmask, u32 data); +bool rtl88e_phy_mac_config(struct ieee80211_hw *hw); +bool rtl88e_phy_bb_config(struct ieee80211_hw *hw); +bool rtl88e_phy_rf_config(struct ieee80211_hw *hw); +void rtl88e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); +void rtl88e_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel); +void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); - void rtl88e_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation); +void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw); +void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw, + enum nl80211_channel_type ch_type); +void rtl88e_phy_sw_chnl_callback(struct ieee80211_hw *hw); +u8 rtl88e_phy_sw_chnl(struct ieee80211_hw *hw); +void rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery); void rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw); void rtl88e_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain); bool rtl88e_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, diff --cc drivers/net/wireless/rtlwifi/rtl8192ce/phy.h index f8973e5,aeb268b..ff32b5b --- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h @@@ -199,14 -200,15 +197,13 @@@ bool rtl92c_phy_mac_config(struct ieee8 bool rtl92ce_phy_bb_config(struct ieee80211_hw *hw); bool rtl92c_phy_rf_config(struct ieee80211_hw *hw); bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw, - enum radio_path rfpath); + enum radio_path rfpath); void rtl92c_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); -void rtl92c_phy_get_txpower_level(struct ieee80211_hw *hw, - long *powerlevel); +void rtl92c_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel); void rtl92c_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); -bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw, - long power_indbm); +bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw, long power_indbm); - void rtl92c_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation); void rtl92c_phy_set_bw_mode(struct ieee80211_hw *hw, - enum nl80211_channel_type ch_type); + enum nl80211_channel_type ch_type); void rtl92c_phy_sw_chnl_callback(struct ieee80211_hw *hw); u8 rtl92c_phy_sw_chnl(struct ieee80211_hw *hw); void rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery); @@@ -217,10 -220,10 +214,9 @@@ void _rtl92ce_phy_lc_calibrate(struct i void rtl92c_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain); bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, enum radio_path rfpath); -bool rtl8192_phy_check_is_legal_rfpath(struct ieee80211_hw *hw, - u32 rfpath); +bool rtl8192_phy_check_is_legal_rfpath(struct ieee80211_hw *hw, u32 rfpath); - bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype); bool rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw, - enum rf_pwrstate rfpwr_state); + enum rf_pwrstate rfpwr_state); void rtl92ce_phy_set_rf_on(struct ieee80211_hw *hw); bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype); void rtl92c_phy_set_io(struct ieee80211_hw *hw); diff --cc drivers/net/wireless/rtlwifi/rtl8192de/phy.h index 0f993f4,bef3040..33df0d1c --- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.h +++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.h @@@ -127,24 -125,26 +125,23 @@@ static inline void rtl92d_release_cckan *flag); } -extern u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, - u32 regaddr, u32 bitmask); -extern void rtl92d_phy_set_bb_reg(struct ieee80211_hw *hw, - u32 regaddr, u32 bitmask, u32 data); -extern u32 rtl92d_phy_query_rf_reg(struct ieee80211_hw *hw, - enum radio_path rfpath, u32 regaddr, - u32 bitmask); -extern void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, - enum radio_path rfpath, u32 regaddr, - u32 bitmask, u32 data); -extern bool rtl92d_phy_mac_config(struct ieee80211_hw *hw); -extern bool rtl92d_phy_bb_config(struct ieee80211_hw *hw); -extern bool rtl92d_phy_rf_config(struct ieee80211_hw *hw); -extern bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw, - enum radio_path rfpath); -extern void rtl92d_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); -extern void rtl92d_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); -extern void rtl92d_phy_set_bw_mode(struct ieee80211_hw *hw, - enum nl80211_channel_type ch_type); -extern u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw); +u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask); +void rtl92d_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask, + u32 data); +u32 rtl92d_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath, + u32 regaddr, u32 bitmask); +void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath, + u32 regaddr, u32 bitmask, u32 data); +bool rtl92d_phy_mac_config(struct ieee80211_hw *hw); +bool rtl92d_phy_bb_config(struct ieee80211_hw *hw); +bool rtl92d_phy_rf_config(struct ieee80211_hw *hw); +bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw, + enum radio_path rfpath); +void rtl92d_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); +void rtl92d_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); - void rtl92d_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation); +void rtl92d_phy_set_bw_mode(struct ieee80211_hw *hw, + enum nl80211_channel_type ch_type); +u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw); bool rtl92d_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, enum rf_content content, enum radio_path rfpath); diff --cc drivers/net/wireless/rtlwifi/rtl8723ae/phy.h index bbb950d,3d8f9e3..c3adc72 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/phy.h +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/phy.h @@@ -183,33 -183,34 +183,32 @@@ struct tx_power_struct u32 mcs_original_offset[4][16]; }; -extern u32 rtl8723ae_phy_query_bb_reg(struct ieee80211_hw *hw, - u32 regaddr, u32 bitmask); -extern void rtl8723ae_phy_set_bb_reg(struct ieee80211_hw *hw, - u32 regaddr, u32 bitmask, u32 data); -extern u32 rtl8723ae_phy_query_rf_reg(struct ieee80211_hw *hw, - enum radio_path rfpath, u32 regaddr, - u32 bitmask); -extern void rtl8723ae_phy_set_rf_reg(struct ieee80211_hw *hw, - enum radio_path rfpath, u32 regaddr, - u32 bitmask, u32 data); -extern bool rtl8723ae_phy_mac_config(struct ieee80211_hw *hw); -extern bool rtl8723ae_phy_bb_config(struct ieee80211_hw *hw); -extern bool rtl8723ae_phy_rf_config(struct ieee80211_hw *hw); -extern bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw, - enum radio_path rfpath); -extern void rtl8723ae_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); -extern void rtl8723ae_phy_get_txpower_level(struct ieee80211_hw *hw, - long *powerlevel); -extern void rtl8723ae_phy_set_txpower_level(struct ieee80211_hw *hw, - u8 channel); -extern bool rtl8723ae_phy_update_txpower_dbm(struct ieee80211_hw *hw, - long power_indbm); -extern void rtl8723ae_phy_set_bw_mode_callback(struct ieee80211_hw *hw); -extern void rtl8723ae_phy_set_bw_mode(struct ieee80211_hw *hw, - enum nl80211_channel_type ch_type); -extern void rtl8723ae_phy_sw_chnl_callback(struct ieee80211_hw *hw); -extern u8 rtl8723ae_phy_sw_chnl(struct ieee80211_hw *hw); -extern void rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery); +u32 rtl8723ae_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, + u32 bitmask); +void rtl8723ae_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask, + u32 data); +u32 rtl8723ae_phy_query_rf_reg(struct ieee80211_hw *hw, + enum radio_path rfpath, u32 regaddr, + u32 bitmask); +void rtl8723ae_phy_set_rf_reg(struct ieee80211_hw *hw, + enum radio_path rfpath, u32 regaddr, u32 bitmask, + u32 data); +bool rtl8723ae_phy_mac_config(struct ieee80211_hw *hw); +bool rtl8723ae_phy_bb_config(struct ieee80211_hw *hw); +bool rtl8723ae_phy_rf_config(struct ieee80211_hw *hw); +bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw, + enum radio_path rfpath); +void rtl8723ae_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); +void rtl8723ae_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel); +void rtl8723ae_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); +bool rtl8723ae_phy_update_txpower_dbm(struct ieee80211_hw *hw, + long power_indbm); - void rtl8723ae_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation); +void rtl8723ae_phy_set_bw_mode_callback(struct ieee80211_hw *hw); +void rtl8723ae_phy_set_bw_mode(struct ieee80211_hw *hw, + enum nl80211_channel_type ch_type); +void rtl8723ae_phy_sw_chnl_callback(struct ieee80211_hw *hw); +u8 rtl8723ae_phy_sw_chnl(struct ieee80211_hw *hw); +void rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery); void rtl8723ae_phy_lc_calibrate(struct ieee80211_hw *hw); void rtl8723ae_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain); bool rtl8723ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: manual merge of the wireless-next tree 2013-10-07 15:18 ` linux-next: manual merge of the wireless-next tree Thierry Reding @ 2013-10-07 15:48 ` Larry Finger 2013-10-07 15:56 ` Joe Perches 0 siblings, 1 reply; 19+ messages in thread From: Larry Finger @ 2013-10-07 15:48 UTC (permalink / raw) To: Thierry Reding, John W. Linville, Arend van Spriel, Joe Perches Cc: linux-next, linux-kernel On 10/07/2013 10:18 AM, Thierry Reding wrote: > Today's linux-next merge of the wireless-next tree got conflicts in: > > drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h > drivers/net/wireless/rtlwifi/rtl8188ee/phy.h > drivers/net/wireless/rtlwifi/rtl8192ce/phy.h > drivers/net/wireless/rtlwifi/rtl8192de/phy.h > drivers/net/wireless/rtlwifi/rtl8723ae/phy.h > > caused by commits 05f3820 (brcmfmac: rework rx path bus interface) and > 9bd91f3 (brcm80211: Remove extern from function prototypes) as well as > commits d41200a (rtlwifi: rtl8188ee: Convert driver to use new > rtl_phy_scan_operation_backup() routine), 3764eb7 (rtlwifi: rtl8192ce: > Convert driver to use new rtl_phy_scan_operation_backup() routine), > 6483033 (rtlwifi: rtl8192ce: Convert driver to use new > rtl_phy_scan_operation_backup() routine), 3fc0165 (rtlwifi: rtl8723ae: > Convert driver to use new rtl_phy_scan_operation_backup() routine) and > a958df5 (rtlwifi: Remove extern from function prototypes). > > I fixed them up (see below). Please verify that the resolution looks > correct. > > Thanks, > Thierry > --- > diff --cc drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h > index 7f1340d,200ee9b..a6eb09e > --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h > +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h > @@@ -132,34 -132,34 +132,34 @@@ struct pktq *brcmf_bus_gettxq(struct br > * interface functions from common layer > */ > > -extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, > - struct sk_buff *pkt, int prec); > +bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, struct sk_buff *pkt, > + int prec); > > /* Receive frame for delivery to OS. Callee disposes of rxp. */ > - void brcmf_rx_frames(struct device *dev, struct sk_buff_head *rxlist); > -extern void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp); > ++void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp); > > /* Indication from bus module regarding presence/insertion of dongle. */ > -extern int brcmf_attach(uint bus_hdrlen, struct device *dev); > +int brcmf_attach(uint bus_hdrlen, struct device *dev); > /* Indication from bus module regarding removal/absence of dongle */ > -extern void brcmf_detach(struct device *dev); > +void brcmf_detach(struct device *dev); > /* Indication from bus module that dongle should be reset */ > -extern void brcmf_dev_reset(struct device *dev); > +void brcmf_dev_reset(struct device *dev); > /* Indication from bus module to change flow-control state */ > -extern void brcmf_txflowblock(struct device *dev, bool state); > +void brcmf_txflowblock(struct device *dev, bool state); > > /* Notify the bus has transferred the tx packet to firmware */ > -extern void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, > - bool success); > +void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success); > > -extern int brcmf_bus_start(struct device *dev); > +int brcmf_bus_start(struct device *dev); > > #ifdef CONFIG_BRCMFMAC_SDIO > -extern void brcmf_sdio_exit(void); > -extern void brcmf_sdio_init(void); > +void brcmf_sdio_exit(void); > +void brcmf_sdio_init(void); > +void brcmf_sdio_register(void); > #endif > #ifdef CONFIG_BRCMFMAC_USB > -extern void brcmf_usb_exit(void); > -extern void brcmf_usb_init(void); > +void brcmf_usb_exit(void); > +void brcmf_usb_register(void); > #endif > > #endif /* _BRCMF_BUS_H_ */ > diff --cc drivers/net/wireless/rtlwifi/rtl8188ee/phy.h > index 71ddf4f,d4545f0..8e1f1be > --- a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h > +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.h > @@@ -200,26 -200,29 +200,25 @@@ enum _ANT_DIV_TYPE > CGCS_RX_SW_ANTDIV = 0x05, > }; > > -extern u32 rtl88e_phy_query_bb_reg(struct ieee80211_hw *hw, > - u32 regaddr, u32 bitmask); > -extern void rtl88e_phy_set_bb_reg(struct ieee80211_hw *hw, > - u32 regaddr, u32 bitmask, u32 data); > -extern u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw, > - enum radio_path rfpath, u32 regaddr, > - u32 bitmask); > -extern void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw, > - enum radio_path rfpath, u32 regaddr, > - u32 bitmask, u32 data); > -extern bool rtl88e_phy_mac_config(struct ieee80211_hw *hw); > -extern bool rtl88e_phy_bb_config(struct ieee80211_hw *hw); > -extern bool rtl88e_phy_rf_config(struct ieee80211_hw *hw); > -extern void rtl88e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); > -extern void rtl88e_phy_get_txpower_level(struct ieee80211_hw *hw, > - long *powerlevel); > -extern void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); > -extern void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw); > -extern void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw, > - enum nl80211_channel_type ch_type); > -extern void rtl88e_phy_sw_chnl_callback(struct ieee80211_hw *hw); > -extern u8 rtl88e_phy_sw_chnl(struct ieee80211_hw *hw); > -extern void rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery); > +u32 rtl88e_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask); > +void rtl88e_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask, > + u32 data); > +u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath, > + u32 regaddr, u32 bitmask); > +void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath, > + u32 regaddr, u32 bitmask, u32 data); > +bool rtl88e_phy_mac_config(struct ieee80211_hw *hw); > +bool rtl88e_phy_bb_config(struct ieee80211_hw *hw); > +bool rtl88e_phy_rf_config(struct ieee80211_hw *hw); > +void rtl88e_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); > +void rtl88e_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel); > +void rtl88e_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); > - void rtl88e_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation); > +void rtl88e_phy_set_bw_mode_callback(struct ieee80211_hw *hw); > +void rtl88e_phy_set_bw_mode(struct ieee80211_hw *hw, > + enum nl80211_channel_type ch_type); > +void rtl88e_phy_sw_chnl_callback(struct ieee80211_hw *hw); > +u8 rtl88e_phy_sw_chnl(struct ieee80211_hw *hw); > +void rtl88e_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery); > void rtl88e_phy_lc_calibrate(struct ieee80211_hw *hw); > void rtl88e_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain); > bool rtl88e_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, > diff --cc drivers/net/wireless/rtlwifi/rtl8192ce/phy.h > index f8973e5,aeb268b..ff32b5b > --- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h > +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.h > @@@ -199,14 -200,15 +197,13 @@@ bool rtl92c_phy_mac_config(struct ieee8 > bool rtl92ce_phy_bb_config(struct ieee80211_hw *hw); > bool rtl92c_phy_rf_config(struct ieee80211_hw *hw); > bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw, > - enum radio_path rfpath); > + enum radio_path rfpath); > void rtl92c_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); > -void rtl92c_phy_get_txpower_level(struct ieee80211_hw *hw, > - long *powerlevel); > +void rtl92c_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel); > void rtl92c_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); > -bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw, > - long power_indbm); > +bool rtl92c_phy_update_txpower_dbm(struct ieee80211_hw *hw, long power_indbm); > - void rtl92c_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation); > void rtl92c_phy_set_bw_mode(struct ieee80211_hw *hw, > - enum nl80211_channel_type ch_type); > + enum nl80211_channel_type ch_type); > void rtl92c_phy_sw_chnl_callback(struct ieee80211_hw *hw); > u8 rtl92c_phy_sw_chnl(struct ieee80211_hw *hw); > void rtl92c_phy_iq_calibrate(struct ieee80211_hw *hw, bool b_recovery); > @@@ -217,10 -220,10 +214,9 @@@ void _rtl92ce_phy_lc_calibrate(struct i > void rtl92c_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain); > bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, > enum radio_path rfpath); > -bool rtl8192_phy_check_is_legal_rfpath(struct ieee80211_hw *hw, > - u32 rfpath); > +bool rtl8192_phy_check_is_legal_rfpath(struct ieee80211_hw *hw, u32 rfpath); > - bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype); > bool rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw, > - enum rf_pwrstate rfpwr_state); > + enum rf_pwrstate rfpwr_state); > void rtl92ce_phy_set_rf_on(struct ieee80211_hw *hw); > bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype); > void rtl92c_phy_set_io(struct ieee80211_hw *hw); > diff --cc drivers/net/wireless/rtlwifi/rtl8192de/phy.h > index 0f993f4,bef3040..33df0d1c > --- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.h > +++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.h > @@@ -127,24 -125,26 +125,23 @@@ static inline void rtl92d_release_cckan > *flag); > } > > -extern u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, > - u32 regaddr, u32 bitmask); > -extern void rtl92d_phy_set_bb_reg(struct ieee80211_hw *hw, > - u32 regaddr, u32 bitmask, u32 data); > -extern u32 rtl92d_phy_query_rf_reg(struct ieee80211_hw *hw, > - enum radio_path rfpath, u32 regaddr, > - u32 bitmask); > -extern void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, > - enum radio_path rfpath, u32 regaddr, > - u32 bitmask, u32 data); > -extern bool rtl92d_phy_mac_config(struct ieee80211_hw *hw); > -extern bool rtl92d_phy_bb_config(struct ieee80211_hw *hw); > -extern bool rtl92d_phy_rf_config(struct ieee80211_hw *hw); > -extern bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw, > - enum radio_path rfpath); > -extern void rtl92d_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); > -extern void rtl92d_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); > -extern void rtl92d_phy_set_bw_mode(struct ieee80211_hw *hw, > - enum nl80211_channel_type ch_type); > -extern u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw); > +u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask); > +void rtl92d_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask, > + u32 data); > +u32 rtl92d_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath, > + u32 regaddr, u32 bitmask); > +void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath, > + u32 regaddr, u32 bitmask, u32 data); > +bool rtl92d_phy_mac_config(struct ieee80211_hw *hw); > +bool rtl92d_phy_bb_config(struct ieee80211_hw *hw); > +bool rtl92d_phy_rf_config(struct ieee80211_hw *hw); > +bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw, > + enum radio_path rfpath); > +void rtl92d_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); > +void rtl92d_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); > - void rtl92d_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation); > +void rtl92d_phy_set_bw_mode(struct ieee80211_hw *hw, > + enum nl80211_channel_type ch_type); > +u8 rtl92d_phy_sw_chnl(struct ieee80211_hw *hw); > bool rtl92d_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, > enum rf_content content, > enum radio_path rfpath); > diff --cc drivers/net/wireless/rtlwifi/rtl8723ae/phy.h > index bbb950d,3d8f9e3..c3adc72 > --- a/drivers/net/wireless/rtlwifi/rtl8723ae/phy.h > +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/phy.h > @@@ -183,33 -183,34 +183,32 @@@ struct tx_power_struct > u32 mcs_original_offset[4][16]; > }; > > -extern u32 rtl8723ae_phy_query_bb_reg(struct ieee80211_hw *hw, > - u32 regaddr, u32 bitmask); > -extern void rtl8723ae_phy_set_bb_reg(struct ieee80211_hw *hw, > - u32 regaddr, u32 bitmask, u32 data); > -extern u32 rtl8723ae_phy_query_rf_reg(struct ieee80211_hw *hw, > - enum radio_path rfpath, u32 regaddr, > - u32 bitmask); > -extern void rtl8723ae_phy_set_rf_reg(struct ieee80211_hw *hw, > - enum radio_path rfpath, u32 regaddr, > - u32 bitmask, u32 data); > -extern bool rtl8723ae_phy_mac_config(struct ieee80211_hw *hw); > -extern bool rtl8723ae_phy_bb_config(struct ieee80211_hw *hw); > -extern bool rtl8723ae_phy_rf_config(struct ieee80211_hw *hw); > -extern bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw, > - enum radio_path rfpath); > -extern void rtl8723ae_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); > -extern void rtl8723ae_phy_get_txpower_level(struct ieee80211_hw *hw, > - long *powerlevel); > -extern void rtl8723ae_phy_set_txpower_level(struct ieee80211_hw *hw, > - u8 channel); > -extern bool rtl8723ae_phy_update_txpower_dbm(struct ieee80211_hw *hw, > - long power_indbm); > -extern void rtl8723ae_phy_set_bw_mode_callback(struct ieee80211_hw *hw); > -extern void rtl8723ae_phy_set_bw_mode(struct ieee80211_hw *hw, > - enum nl80211_channel_type ch_type); > -extern void rtl8723ae_phy_sw_chnl_callback(struct ieee80211_hw *hw); > -extern u8 rtl8723ae_phy_sw_chnl(struct ieee80211_hw *hw); > -extern void rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery); > +u32 rtl8723ae_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, > + u32 bitmask); > +void rtl8723ae_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask, > + u32 data); > +u32 rtl8723ae_phy_query_rf_reg(struct ieee80211_hw *hw, > + enum radio_path rfpath, u32 regaddr, > + u32 bitmask); > +void rtl8723ae_phy_set_rf_reg(struct ieee80211_hw *hw, > + enum radio_path rfpath, u32 regaddr, u32 bitmask, > + u32 data); > +bool rtl8723ae_phy_mac_config(struct ieee80211_hw *hw); > +bool rtl8723ae_phy_bb_config(struct ieee80211_hw *hw); > +bool rtl8723ae_phy_rf_config(struct ieee80211_hw *hw); > +bool rtl92c_phy_config_rf_with_feaderfile(struct ieee80211_hw *hw, > + enum radio_path rfpath); > +void rtl8723ae_phy_get_hw_reg_originalvalue(struct ieee80211_hw *hw); > +void rtl8723ae_phy_get_txpower_level(struct ieee80211_hw *hw, long *powerlevel); > +void rtl8723ae_phy_set_txpower_level(struct ieee80211_hw *hw, u8 channel); > +bool rtl8723ae_phy_update_txpower_dbm(struct ieee80211_hw *hw, > + long power_indbm); > - void rtl8723ae_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation); > +void rtl8723ae_phy_set_bw_mode_callback(struct ieee80211_hw *hw); > +void rtl8723ae_phy_set_bw_mode(struct ieee80211_hw *hw, > + enum nl80211_channel_type ch_type); > +void rtl8723ae_phy_sw_chnl_callback(struct ieee80211_hw *hw); > +u8 rtl8723ae_phy_sw_chnl(struct ieee80211_hw *hw); > +void rtl8723ae_phy_iq_calibrate(struct ieee80211_hw *hw, bool recovery); > void rtl8723ae_phy_lc_calibrate(struct ieee80211_hw *hw); > void rtl8723ae_phy_set_rfpath_switch(struct ieee80211_hw *hw, bool bmain); > bool rtl8723ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, Yes, the patches for rtlwifi problems are correct. All of these problems would have been avoided if changes to wireless drivers were sent to the wireless tree rather than direct submission to net-next!!!! Larry ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: manual merge of the wireless-next tree 2013-10-07 15:48 ` Larry Finger @ 2013-10-07 15:56 ` Joe Perches 2013-10-07 16:09 ` Larry Finger 0 siblings, 1 reply; 19+ messages in thread From: Joe Perches @ 2013-10-07 15:56 UTC (permalink / raw) To: Larry Finger Cc: Thierry Reding, John W. Linville, Arend van Spriel, linux-next, linux-kernel On Mon, 2013-10-07 at 10:48 -0500, Larry Finger wrote: > On 10/07/2013 10:18 AM, Thierry Reding wrote: > > Today's linux-next merge of the wireless-next tree got conflicts in: > > > > drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h > > drivers/net/wireless/rtlwifi/rtl8188ee/phy.h > > drivers/net/wireless/rtlwifi/rtl8192ce/phy.h > > drivers/net/wireless/rtlwifi/rtl8192de/phy.h > > drivers/net/wireless/rtlwifi/rtl8723ae/phy.h [] > Yes, the patches for rtlwifi problems are correct. All of these problems would > have been avoided if changes to wireless drivers were sent to the wireless tree > rather than direct submission to net-next!!!! They were and you acked it. https://lkml.org/lkml/2013/9/25/589 Who picks it up first and applies it is not in my domain. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: manual merge of the wireless-next tree 2013-10-07 15:56 ` Joe Perches @ 2013-10-07 16:09 ` Larry Finger 2013-10-07 16:17 ` Joe Perches 0 siblings, 1 reply; 19+ messages in thread From: Larry Finger @ 2013-10-07 16:09 UTC (permalink / raw) To: Joe Perches Cc: Thierry Reding, John W. Linville, Arend van Spriel, linux-next, linux-kernel On 10/07/2013 10:56 AM, Joe Perches wrote: > On Mon, 2013-10-07 at 10:48 -0500, Larry Finger wrote: >> On 10/07/2013 10:18 AM, Thierry Reding wrote: >>> Today's linux-next merge of the wireless-next tree got conflicts in: >>> >>> drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h >>> drivers/net/wireless/rtlwifi/rtl8188ee/phy.h >>> drivers/net/wireless/rtlwifi/rtl8192ce/phy.h >>> drivers/net/wireless/rtlwifi/rtl8192de/phy.h >>> drivers/net/wireless/rtlwifi/rtl8723ae/phy.h > [] >> Yes, the patches for rtlwifi problems are correct. All of these problems would >> have been avoided if changes to wireless drivers were sent to the wireless tree >> rather than direct submission to net-next!!!! > > They were and you acked it. > https://lkml.org/lkml/2013/9/25/589 > > Who picks it up first and applies it is > not in my domain. Fair enough. I should have asked DaveM to let John apply those changes. Larry ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: manual merge of the wireless-next tree 2013-10-07 16:09 ` Larry Finger @ 2013-10-07 16:17 ` Joe Perches 2013-10-07 17:16 ` Larry Finger 0 siblings, 1 reply; 19+ messages in thread From: Joe Perches @ 2013-10-07 16:17 UTC (permalink / raw) To: Larry Finger Cc: Thierry Reding, John W. Linville, Arend van Spriel, linux-next, linux-kernel On Mon, 2013-10-07 at 11:09 -0500, Larry Finger wrote: > On 10/07/2013 10:56 AM, Joe Perches wrote: > > On Mon, 2013-10-07 at 10:48 -0500, Larry Finger wrote: > >> On 10/07/2013 10:18 AM, Thierry Reding wrote: > >>> Today's linux-next merge of the wireless-next tree got conflicts in: > >>> > >>> drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h > >>> drivers/net/wireless/rtlwifi/rtl8188ee/phy.h > >>> drivers/net/wireless/rtlwifi/rtl8192ce/phy.h > >>> drivers/net/wireless/rtlwifi/rtl8192de/phy.h > >>> drivers/net/wireless/rtlwifi/rtl8723ae/phy.h > > [] > >> Yes, the patches for rtlwifi problems are correct. All of these problems would > >> have been avoided if changes to wireless drivers were sent to the wireless tree > >> rather than direct submission to net-next!!!! > > > > They were and you acked it. > > https://lkml.org/lkml/2013/9/25/589 > > > > Who picks it up first and applies it is > > not in my domain. > > Fair enough. I should have asked DaveM to let John apply those changes. Or maybe John could merge changes from net-next into wireless-next a bit more often. ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: manual merge of the wireless-next tree 2013-10-07 16:17 ` Joe Perches @ 2013-10-07 17:16 ` Larry Finger 0 siblings, 0 replies; 19+ messages in thread From: Larry Finger @ 2013-10-07 17:16 UTC (permalink / raw) To: Joe Perches Cc: Thierry Reding, John W. Linville, Arend van Spriel, linux-next, linux-kernel On 10/07/2013 11:17 AM, Joe Perches wrote: > > Or maybe John could merge changes from net-next > into wireless-next a bit more often. I'm not sure that John pulls from net-next. My understanding of the work flow is wireless-next => net-next => linux-next => mainline => wireless-next... Larry ^ permalink raw reply [flat|nested] 19+ messages in thread
* linux-next: build failure after merge of the mips tree
@ 2023-03-27 5:12 Stephen Rothwell
2023-03-27 8:41 ` Thomas Bogendoerfer
0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2023-03-27 5:12 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: Rob Herring, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
Hi all,
After merging the mips tree, today's linux-next build (mips
cavium_octeon_defconfig) failed like this:
arch/mips/cavium-octeon/octeon-irq.c:2893:35: error: assignment to ‘u64’ {aka ‘long long unsigned int’} from ‘void *’ makes integer from pointer without a cast [-Werror=int-conversion]
(reported here: https://linux.kernelci.org/build/id/6420fc4409ffd05fb69c951a/logs/)
Caused by commit
ed6a0b6e9fd7 ("MIPS: octeon: Use of_address_to_resource()")
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: linux-next: build failure after merge of the mips tree 2023-03-27 5:12 linux-next: build failure after merge of the mips tree Stephen Rothwell @ 2023-03-27 8:41 ` Thomas Bogendoerfer 0 siblings, 0 replies; 19+ messages in thread From: Thomas Bogendoerfer @ 2023-03-27 8:41 UTC (permalink / raw) To: Stephen Rothwell Cc: Rob Herring, Linux Kernel Mailing List, Linux Next Mailing List On Mon, Mar 27, 2023 at 04:12:17PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the mips tree, today's linux-next build (mips > cavium_octeon_defconfig) failed like this: > > arch/mips/cavium-octeon/octeon-irq.c:2893:35: error: assignment to ‘u64’ {aka ‘long long unsigned int’} from ‘void *’ makes integer from pointer without a cast [-Werror=int-conversion] > > (reported here: https://linux.kernelci.org/build/id/6420fc4409ffd05fb69c951a/logs/) > > Caused by commit > > ed6a0b6e9fd7 ("MIPS: octeon: Use of_address_to_resource()") I've added below patch to fix the problem. Thomas. commit 101f26c72825c5dba1dfe826e4202a9a04b435c6 Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Date: Mon Mar 27 10:35:22 2023 +0200 MIPS: octeon: Fix compile error Commit ed6a0b6e9fd7 ("MIPS: octeon: Use of_address_to_resource()") lost a cast, which causes a compile error. Fixes: ed6a0b6e9fd7 ("MIPS: octeon: Use of_address_to_resource()") Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c index 064e2409377a..8425a6b38aa2 100644 --- a/arch/mips/cavium-octeon/octeon-irq.c +++ b/arch/mips/cavium-octeon/octeon-irq.c @@ -2890,7 +2890,7 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node, if (WARN_ON(ret)) return ret; - ciu3_info->ciu3_addr = base_addr = phys_to_virt(res.start); + ciu3_info->ciu3_addr = base_addr = (u64)phys_to_virt(res.start); ciu3_info->node = node; consts.u64 = cvmx_read_csr(base_addr + CIU3_CONST); -- Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ] ^ permalink raw reply related [flat|nested] 19+ messages in thread
* linux-next: build failure after merge of the mips tree
@ 2020-04-20 10:07 Stephen Rothwell
2020-04-20 11:33 ` Thomas Bogendoerfer
0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2020-04-20 10:07 UTC (permalink / raw)
To: Ralf Baechle, James Hogan
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
kernelci.org bot, Christoph Hellwig, Thomas Bogendoerfer
[-- Attachment #1: Type: text/plain, Size: 408 bytes --]
Hi all,
After merging the mips tree, today's linux-next build (mips gpr_defconfig)
failed like this:
arch/mips/alchemy/common/setup.c:99:9: error: implicit declaration of function ‘remap_pfn_range’; did you mean ‘io_remap_pfn_range’? [-Werror=implicit-function-declaration]
Caused by commit
d399157283fb ("MIPS: cleanup fixup_bigphys_addr handling")
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: linux-next: build failure after merge of the mips tree 2020-04-20 10:07 Stephen Rothwell @ 2020-04-20 11:33 ` Thomas Bogendoerfer 0 siblings, 0 replies; 19+ messages in thread From: Thomas Bogendoerfer @ 2020-04-20 11:33 UTC (permalink / raw) To: Stephen Rothwell Cc: Ralf Baechle, James Hogan, Linux Next Mailing List, Linux Kernel Mailing List, kernelci.org bot, Christoph Hellwig On Mon, Apr 20, 2020 at 08:07:44PM +1000, Stephen Rothwell wrote: > After merging the mips tree, today's linux-next build (mips gpr_defconfig) > failed like this: > > arch/mips/alchemy/common/setup.c:99:9: error: implicit declaration of function ‘remap_pfn_range’; did you mean ‘io_remap_pfn_range’? [-Werror=implicit-function-declaration] > > Caused by commit > > d399157283fb ("MIPS: cleanup fixup_bigphys_addr handling") I've pushed a fix to mips-next branch. Thomas. -- Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ] ^ permalink raw reply [flat|nested] 19+ messages in thread
* linux-next: build failure after merge of the mips tree
@ 2013-02-17 23:43 Stephen Rothwell
2013-02-17 23:59 ` Hauke Mehrtens
2013-02-20 0:29 ` Stephen Rothwell
0 siblings, 2 replies; 19+ messages in thread
From: Stephen Rothwell @ 2013-02-17 23:43 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-next, linux-kernel, Hauke Mehrtens, John Crispin
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
Hi Ralf,
After merging the mips tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/ssb/driver_gpio.c: In function 'ssb_gpio_chipco_to_irq':
drivers/ssb/driver_gpio.c:82:3: error: implicit declaration of function 'ssb_mips_irq' [-Werror=implicit-function-declaration]
Caused by commit d630dd4ef20f ("ssb: add gpio_to_irq again").
I have used the mips tree from next-20130215 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: linux-next: build failure after merge of the mips tree 2013-02-17 23:43 Stephen Rothwell @ 2013-02-17 23:59 ` Hauke Mehrtens 2013-02-20 0:29 ` Stephen Rothwell 1 sibling, 0 replies; 19+ messages in thread From: Hauke Mehrtens @ 2013-02-17 23:59 UTC (permalink / raw) To: Stephen Rothwell; +Cc: Ralf Baechle, linux-next, linux-kernel, John Crispin -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 02/18/2013 12:43 AM, Stephen Rothwell wrote: > Hi Ralf, > > After merging the mips tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/ssb/driver_gpio.c: In function 'ssb_gpio_chipco_to_irq': > drivers/ssb/driver_gpio.c:82:3: error: implicit declaration of > function 'ssb_mips_irq' [-Werror=implicit-function-declaration] > > Caused by commit d630dd4ef20f ("ssb: add gpio_to_irq again"). > > I have used the mips tree from next-20130215 for today. > Hi Ralf and blogic, Could you drop this patch [0] and this one [1]. I saw that they are not any more in blogic tree. Hauke [0]: https://patchwork.linux-mips.org/patch/4719/ [1]: https://patchwork.linux-mips.org/patch/4720/ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBAgAGBQJRIW7SAAoJEIZ0px9YPRMySfMQAII6ZFgh+dDS/gEhxCmZ5EJZ dmz5AjafHmmqAKuw5j5erKvRzocxaxwLscvEjv6WXD/dGD7DoUkixSkoHD0G5ptE gba3OL8qqBQGzuqhUsfKCnYS3b7UGYC95G9qS03jcikm46Rl3ufpEnOswkIwyssw Qd0yVqvsmXDaTz6LljwSYGT6BxLo63QmoaxH64yCXwYtOh+vGanif8U+QZcg61Hm jL1CRlbzjJg5VrtTOak9SVsRFRp4TOvJe7TI5P/Nm20mkt6q+1sWcoOXa1egG0k7 68Y2hTzlERTK6LCpmHRZcQxXPbMl/KP03+mgtqcN5xQtkGq4NfcnfG0HIANo9fpf BlnCX//gDaLRVcwlQnAShVYRcLd+tjb6l+2ObYLShJVFPdD5YJ3sTiySKW7xVW04 iFlzxDWKYA2NILHldHHa+MX7r86IBPLrZhG+IqgdjLcw4zQZiGn2heVSQipzmPGm eBWqJuSUtVYNrEFVd/+CcqHo5jvmqmybh7+DLi6fVBvNb1vh9ApmltVuD37T00CB d3bOF5VEFQR+zoNloxriI84SCZPRu/in8f/Bqy9x+iGnkgW+FxnJnDi4kEaerNB7 jjZow64JwE5f/pYHle/ffLUvsCRLV7GpvJ33n4OxFQyVMYHrPEdbF2r+YkytA5zJ KzZDEk6WfzVItcPcjSTg =EwXd -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: linux-next: build failure after merge of the mips tree 2013-02-17 23:43 Stephen Rothwell 2013-02-17 23:59 ` Hauke Mehrtens @ 2013-02-20 0:29 ` Stephen Rothwell 1 sibling, 0 replies; 19+ messages in thread From: Stephen Rothwell @ 2013-02-20 0:29 UTC (permalink / raw) To: Ralf Baechle; +Cc: linux-next, linux-kernel, Hauke Mehrtens, John Crispin [-- Attachment #1: Type: text/plain, Size: 646 bytes --] Hi Ralf, On Mon, 18 Feb 2013 10:43:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > After merging the mips tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/ssb/driver_gpio.c: In function 'ssb_gpio_chipco_to_irq': > drivers/ssb/driver_gpio.c:82:3: error: implicit declaration of function 'ssb_mips_irq' [-Werror=implicit-function-declaration] > > Caused by commit d630dd4ef20f ("ssb: add gpio_to_irq again"). > > I have used the mips tree from next-20130215 for today. I am still getting this build problem. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* linux-next: build failure after merge of the mips tree @ 2011-11-10 1:22 Stephen Rothwell 0 siblings, 0 replies; 19+ messages in thread From: Stephen Rothwell @ 2011-11-10 1:22 UTC (permalink / raw) To: Ralf Baechle; +Cc: linux-next, linux-kernel, Manuel Lauss [-- Attachment #1: Type: text/plain, Size: 1127 bytes --] Hi Ralf, After merging the mips tree, today's linux-next build (x86_64 allmodconfig) failed like this: warning: (SND_SOC_DB1200) selects SND_SOC_AU1XPSC which has unmet direct dependencies (SOUND && !M68K && !UML && SND && SND_SOC && MIPS_ALCHEMY) warning: (SND_SOC_DB1200) selects SND_SOC_AU1XPSC which has unmet direct dependencies (SOUND && !M68K && !UML && SND && SND_SOC && MIPS_ALCHEMY) sound/soc/au1x/psc-ac97.c:26:36: fatal error: asm/mach-au1x00/au1000.h: No such file or directory compilation terminated. sound/soc/au1x/db1200.c:16:36: fatal error: asm/mach-au1x00/au1000.h: No such file or directory compilation terminated. sound/soc/au1x/psc-i2s.c:24:36: fatal error: asm/mach-au1x00/au1000.h: No such file or directory compilation terminated. sound/soc/au1x/dbdma2.c:27:36: fatal error: asm/mach-au1x00/au1000.h: No such file or directory [I left the Kconfig lines there just in case they are relevant] Probably caused by some Kconfig dependency/select change. I have used the mips tree form next-20111109 for today. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 19+ messages in thread
* linux-next: build failure after merge of the mips tree
@ 2010-07-27 1:14 Stephen Rothwell
0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2010-07-27 1:14 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-next, linux-kernel, Lars-Peter Clausen
[-- Attachment #1: Type: text/plain, Size: 900 bytes --]
Hi Ralf,
After merging the xtensa tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/video/jz4740_fb.c:29:39: error: asm/mach-jz4740/jz4740_fb.h: No such file or directory
drivers/video/jz4740_fb.c:30:34: error: asm/mach-jz4740/gpio.h: No such file or directory
drivers/video/jz4740_fb.c:149: error: array type has incomplete element type
drivers/video/jz4740_fb.c:150: error: implicit declaration of function 'JZ_GPIO_BULK_PIN'
drivers/video/jz4740_fb.c:150: error: 'LCD_PCLK' undeclared here (not in a function)
... and on and on ...
Caused by commit e457478bc296ea3f2ae51ca7c165a59621c1655d ("FBDEV:
JZ4740: Add framebuffer driver"). Presumably this driver will only build
on MIPS?
I have used the mips tree from next-20100726 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in threadend of thread, other threads:[~2023-03-27 9:31 UTC | newest] Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-10-07 15:18 linux-next: Tree for Oct 7 Thierry Reding 2013-10-07 15:18 ` linux-next: build failure after merge of the mips tree Thierry Reding 2013-10-07 15:18 ` linux-next: manual merge of the drm-intel tree Thierry Reding 2013-10-07 15:18 ` linux-next: manual merge of the random tree Thierry Reding 2013-10-07 15:18 ` linux-next: manual merge of the wireless-next tree Thierry Reding 2013-10-07 15:48 ` Larry Finger 2013-10-07 15:56 ` Joe Perches 2013-10-07 16:09 ` Larry Finger 2013-10-07 16:17 ` Joe Perches 2013-10-07 17:16 ` Larry Finger -- strict thread matches above, loose matches on Subject: below -- 2023-03-27 5:12 linux-next: build failure after merge of the mips tree Stephen Rothwell 2023-03-27 8:41 ` Thomas Bogendoerfer 2020-04-20 10:07 Stephen Rothwell 2020-04-20 11:33 ` Thomas Bogendoerfer 2013-02-17 23:43 Stephen Rothwell 2013-02-17 23:59 ` Hauke Mehrtens 2013-02-20 0:29 ` Stephen Rothwell 2011-11-10 1:22 Stephen Rothwell 2010-07-27 1:14 Stephen Rothwell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).