[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  Update README.md
  luci-app-qbittorrent-simple: move to `luci` feeds (coolsnowwolf#10606)
  rockchip: fix radxa e25 adc-keys power button support
  mac80211: backports linux 6.1 support
  ksmbd: fixes build on kernel 6.1

Author: github-actions[bot]

README.md

@@ -134,6 +134,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 iKOOLCORE 硬酷R1 多网口小主机 - N5105/N6005 : Cube box, rest fun. 方寸之间，尽享乐趣
 
 (商品介绍页面 - 硬酷科技（支持花呗）)：
+[优惠券链接](https://taoquan.taobao.com/coupon/unify_apply.htm?sellerId=2208215115814&activityId=85fbaf791c4b45e9aaf5ec8e3d1cb2a9)
 [下单链接](https://item.taobao.com/item.htm?ft=t&id=682987219699)
 
 [![r1](doc/r1.jpg)](https://item.taobao.com/item.htm?ft=t&id=682025492099)

doc/r1.jpg

@@ -0,0 +1,14 @@
+--- a/smb1pdu.c
++++ b/smb1pdu.c
+@@ -5851,7 +5851,11 @@ static int smb_populate_readdir_entry(struct ksmbd_conn *conn, int info_level,
+  *
+  * Return:	0 on success, otherwise -EINVAL
+  */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
++static bool ksmbd_fill_dirent(struct dir_context *ctx, const char *name, int namlen,
++#else
+ static int ksmbd_fill_dirent(struct dir_context *ctx, const char *name, int namlen,
++#endif
+ 		loff_t offset, u64 ino, unsigned int d_type)
+ {
+ 	struct ksmbd_readdir_data *buf =

package/kernel/ksmbd/patches/010-fixes-build-on-6.1.patch

@@ -0,0 +1,27 @@
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -49,7 +49,11 @@
+ 
+ 	if (present_fcs_len)
+ 		__pskb_trim(skb, skb->len - present_fcs_len);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
+ 	__pskb_pull(skb, rtap_space);
++#else
++	pskb_pull(skb, rtap_space);
++#endif
+ 
+ 	hdr = (void *)skb->data;
+ 	fc = hdr->frame_control;
+@@ -74,8 +78,11 @@
+ 
+ 	memmove(skb->data + IEEE80211_HT_CTL_LEN, skb->data,
+ 		hdrlen - IEEE80211_HT_CTL_LEN);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
+ 	__pskb_pull(skb, IEEE80211_HT_CTL_LEN);
+-
++#else
++	pskb_pull(skb, IEEE80211_HT_CTL_LEN);
++#endif
+ 	return skb;
+ }
+ 

package/kernel/mac80211/patches/subsys/995-backport-pskb_pull.patch

@@ -0,0 +1,14 @@
+--- a/net/mac80211/rc80211_minstrel_ht.c
++++ b/net/mac80211/rc80211_minstrel_ht.c
+@@ -1867,7 +1867,11 @@
+ 
+ 	memset(sample_table, 0xff, sizeof(sample_table));
+ 	for (col = 0; col < SAMPLE_COLUMNS; col++) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
+ 		prandom_bytes(rnd, sizeof(rnd));
++#else
++		get_random_bytes(rnd, sizeof(rnd));
++#endif
+ 		for (i = 0; i < MCS_GROUP_RATES; i++) {
+ 			new_idx = (i + rnd[i]) % MCS_GROUP_RATES;
+ 			while (sample_table[col][new_idx] != 0xff)

package/kernel/mac80211/patches/subsys/996-use-prandom_u32_max.patch

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mt76
-PKG_RELEASE=5
+PKG_RELEASE=6
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=

package/kernel/mt76/Makefile

@@ -0,0 +1,33 @@
+--- a/mt7921/dma.c
+--- b/mt7921/dma.c
+@@ -283,10 +283,15 @@
+ 	if (ret < 0)
+ 		return ret;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)
+ 	netif_tx_napi_add(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
+ 			  mt7921_poll_tx, NAPI_POLL_WEIGHT);
+ 	napi_enable(&dev->mt76.tx_napi);
+-
++#else
++	netif_napi_add_tx_weight(&dev->mt76.tx_napi_dev, &dev->mt76.tx_napi,
++			  mt7921_poll_tx, NAPI_POLL_WEIGHT);
++	napi_enable(&dev->mt76.tx_napi);
++#endif
+ 	return mt7921_dma_enable(dev);
+ }
+ 
+--- a/dma.c
+--- b/dma.c
+@@ -895,7 +895,11 @@
+ 	dev->napi_dev.threaded = 1;
+ 
+ 	mt76_for_each_q_rx(dev, i) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
+ 		netif_napi_add(&dev->napi_dev, &dev->napi[i], poll, 64);
++#else
++		netif_napi_add_weight(&dev->napi_dev, &dev->napi[i], poll, 64);
++#endif
+ 		mt76_dma_rx_fill(dev, &dev->q_rx[i]);
+ 		napi_enable(&dev->napi[i]);
+ 	}

package/kernel/mt76/patches/091-fix-linux-6.1-build.patch

@@ -3,6 +3,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/input/input.h>
 #include "rk3568.dtsi"
 
 / {