Commit 0cad34fb authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Cross-merge networking fixes after downstream PR (net-6.16-rc6-2).

No conflicts.

Adjacent changes:

drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
  c701574c ("wifi: mt76: mt7925: fix invalid array index in ssid assignment during hw scan")
  b3a431fe ("wifi: mt76: mt7925: fix off by one in mt7925_mcu_hw_scan()")

drivers/net/wireless/mediatek/mt76/mt7996/mac.c
  62da647a ("wifi: mt76: mt7996: Add MLO support to mt7996_tx_check_aggr()")
  dc66a129 ("wifi: mt76: add a wrapper for wcid access with validation")

drivers/net/wireless/mediatek/mt76/mt7996/main.c
  3dd6f67c ("wifi: mt76: Move RCU section in mt7996_mcu_add_rate_ctrl()")
  8989d8e9 ("wifi: mt76: mt7996: Do not set wcid.sta to 1 in mt7996_mac_sta_event()")

net/mac80211/cfg.c
  58fcb1b4 ("wifi: mac80211: reject VHT opmode for unsupported channel widths")
  037dc18a ("wifi: mac80211: add support for storing station S1G capabilities")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a339dd69 c7979c39

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -27330,13 +27330,6 @@ S: Supported 
W:	http://www.marvell.com

F:	drivers/i2c/busses/i2c-xlp9xx.c









XRA1403 GPIO EXPANDER









M:	Nandor Han <nandor.han@ge.com>









L:	linux-gpio@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/gpio/gpio-xra1403.txt









F:	drivers/gpio/gpio-xra1403.c

















XTENSA XTFPGA PLATFORM SUPPORT









M:	Max Filippov <jcmvbkbc@gmail.com>









S:	Maintained

























drivers/base/power/main.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1236,8 +1236,8 @@ void dpm_complete(pm_message_t state)







 */









void dpm_resume_end(pm_message_t state)









{









	pm_restore_gfp_mask();









	dpm_resume(state);









	pm_restore_gfp_mask();









	dpm_complete(state);









}









EXPORT_SYMBOL_GPL(dpm_resume_end);
































drivers/gpio/gpiolib-of.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -708,7 +708,7 @@ struct gpio_desc *of_find_gpio(struct device_node *np, const char *con_id,







			       unsigned int idx, unsigned long *flags)









{









	char propname[32]; /* 32 is max size of property name */









	enum of_gpio_flags of_flags;









	enum of_gpio_flags of_flags = 0;









	const of_find_gpio_quirk *q;









	struct gpio_desc *desc;










































drivers/gpio/gpiolib.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -3297,14 +3297,15 @@ static int gpiod_get_raw_value_commit(const struct gpio_desc *desc)







static int gpio_chip_get_multiple(struct gpio_chip *gc,









				  unsigned long *mask, unsigned long *bits)









{









	int ret;









	









	lockdep_assert_held(&gc->gpiodev->srcu);



















	if (gc->get_multiple) {









		int ret;



















		ret = gc->get_multiple(gc, mask, bits);









		if (ret > 0)









			return -EBADE;









		return ret;









	}



















	if (gc->get) {
































drivers/net/can/m_can/m_can.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -665,7 +665,7 @@ static int m_can_handle_lost_msg(struct net_device *dev)







	struct can_frame *frame;









	u32 timestamp = 0;



















	netdev_err(dev, "msg lost in rxf0\n");









	netdev_dbg(dev, "msg lost in rxf0\n");



















	stats->rx_errors++;









	stats->rx_over_errors++;