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

* https://github.com/coolsnowwolf/lede:
  linux-atm: add kernel 5.19 support
  r8168: add kernel 5.19 support
  r8152: add kernel 5.19 support
  r8125: add kernel 5.19 support
  x86: fix 5.19 modules.mk
  Update README.md
  x86: switch test kernel to 5.19
  Version update to R22.8.2
  Update README.md
  Update README.md
  linux: fix 5.19 patch build error
  libcap: update to 2.65
  libcap: update to 2.64
  mtools: update to 4.0.40

README.md

@@ -2,6 +2,11 @@
 
 如何编译自己需要的 OpenWrt 固件 [English](./README_EN.md)
 
+## 官方讨论群
+如有技术问题需要讨论或者交流，欢迎加入以下群：
+1. QQ 讨论群： Op固件技术研究群 ,号码 891659613 ，加群链接：[点击加入](https://jq.qq.com/?_wv=1027&k=XL8SK5aC "Op固件技术研究群")
+2. TG 讨论群： OP 编译官方大群 ，加群链接：[点击加入](https://t.me/JhKgAA6Hx1 "OP 编译官方大群")
+
 ## 注意
 
 1. **不要用 root 用户进行编译**
@@ -113,14 +118,12 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 1. 源代码中绝不含任何后门和可以监控或者劫持你的 HTTPS 的闭源软件， SSL 安全是互联网最后的壁垒。安全干净才是固件应该做到的；
 
-2. 如有技术问题需要讨论，欢迎加入 QQ 讨论群： OP 共享技术交流群 ,号码 297253733 ，加群链接: 点击链接加入群聊【 OP 共享技术交流群】：[点击加入](https://jq.qq.com/?_wv=1027&k=5yCRuXL "OP共享技术交流群")
-
-3. 想学习 OpenWrt 开发，但是摸不着门道？自学没毅力？基础太差？怕太难学不会？跟着佐大学 OpenWrt 开发入门培训班助你能学有所成
+2. 想学习 OpenWrt 开发，但是摸不着门道？自学没毅力？基础太差？怕太难学不会？跟着佐大学 OpenWrt 开发入门培训班助你能学有所成
 报名地址：[点击报名](http://forgotfun.org/2018/04/openwrt-training-2018.html "报名")
 
-4. QCA IPQ60xx 开源仓库地址：<https://github.com/coolsnowwolf/openwrt-gl-ax1800>
+3. QCA IPQ60xx 开源仓库地址：<https://github.com/coolsnowwolf/openwrt-gl-ax1800>
 
-5. 稳定版仓库地址：<https://github.com/coolsnowwolf/openwrt>
+4. 存档版本仓库地址：<https://github.com/coolsnowwolf/openwrt>
 
 ## 软路由介绍
 

package/lean/default-settings/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=default-settings
 PKG_VERSION:=2
-PKG_RELEASE:=28
+PKG_RELEASE:=29
 PKG_LICENSE:=GPLv3
 PKG_LICENSE_FILES:=LICENSE
 

package/lean/default-settings/files/zzz-default-settings

@@ -46,7 +46,7 @@ sed -i '/option disabled/d' /etc/config/wireless
 sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh
 
 sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
-echo "DISTRIB_REVISION='R22.7.7'" >> /etc/openwrt_release
+echo "DISTRIB_REVISION='R22.8.2'" >> /etc/openwrt_release
 sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
 echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release
 

package/lean/r8125/patches/020-5.19-support.patch

@@ -0,0 +1,18 @@
+--- a/src/r8125_n.c
++++ b/src/r8125_n.c
+@@ -116,6 +116,15 @@
+ #define FIRMWARE_8168FP_3   "rtl_nic/rtl8168fp-3.fw"
+ #define FIRMWARE_8168FP_4   "rtl_nic/rtl8168fp-4.fw"
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++static inline void netif_set_gso_max_size(struct net_device *dev,
++					  unsigned int size)
++{
++	/* dev->gso_max_size is read locklessly from sk_setup_caps() */
++	WRITE_ONCE(dev->gso_max_size, size);
++}
++#endif
++
+ /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
+    The RTL chips use a 64 element hash table based on the Ethernet CRC. */
+ static const int multicast_filter_limit = 32;

package/lean/r8152/patches/010-5.19-support.patch

@@ -0,0 +1,19 @@
+--- a/r8152.c
++++ b/r8152.c
+@@ -1026,6 +1026,16 @@
+ #define RTL_ADVERTISED_1000_FULL		BIT(5)
+ #define RTL_ADVERTISED_2500_FULL		BIT(6)
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++static inline void netif_set_gso_max_size(struct net_device *dev,
++					  unsigned int size)
++{
++	/* dev->gso_max_size is read locklessly from sk_setup_caps() */
++	WRITE_ONCE(dev->gso_max_size, size);
++}
++#endif
++
++
+ /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
+  * The RTL chips use a 64 element hash table based on the Ethernet CRC.
+  */

package/lean/r8168/patches/030-5.19-support.patch

@@ -0,0 +1,18 @@
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -116,6 +116,15 @@
+ #define FIRMWARE_8168FP_3   "rtl_nic/rtl8168fp-3.fw"
+ #define FIRMWARE_8168FP_4   "rtl_nic/rtl8168fp-4.fw"
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++static inline void netif_set_gso_max_size(struct net_device *dev,
++					  unsigned int size)
++{
++	/* dev->gso_max_size is read locklessly from sk_setup_caps() */
++	WRITE_ONCE(dev->gso_max_size, size);
++}
++#endif
++
+ /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
+    The RTL chips use a 64 element hash table based on the Ethernet CRC. */
+ static const int multicast_filter_limit = 32;

package/libs/libcap/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libcap
-PKG_VERSION:=2.63
+PKG_VERSION:=2.65
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/libs/security/linux-privs/libcap2
-PKG_HASH:=0c637b8f44fc7d8627787e9cf57f15ac06c1ddccb53e41feec5496be3466f77f
+PKG_HASH:=73e350020cc31fe15360879d19384ffa3395a825f065fcf6bda3a5cdf965bebd
 
 PKG_MAINTAINER:=Paul Wassi <[email protected]>
 PKG_LICENSE:=GPL-2.0-only

package/network/utils/linux-atm/patches/900-add_5.19_support.patch

@@ -0,0 +1,17 @@
+--- a/src/maint/Makefile.am
++++ b/src/maint/Makefile.am
+@@ -1,5 +1,5 @@
+ BOOTPGMS=atmaddr esi
+-SYSPGMS=atmloop atmtcp enitune zntune hediag # nstune
++SYSPGMS=atmloop atmtcp enitune hediag # nstune
+ USRPGMS=atmdiag atmdump sonetdiag saaldump
+
+ INCLUDES=-I$(srcdir)/../q2931 -I$(srcdir)/../saal -I.
+@@ -14,7 +14,6 @@ esi_SOURCES = esi.c
+ atmloop_SOURCES = atmloop.c
+ atmtcp_SOURCES = atmtcp.c
+ enitune_SOURCES = enitune.c
+-zntune_SOURCES = zntune.c
+ #nstune_SOURCES = nstune.c
+
+ atmdiag_SOURCES = atmdiag.c

target/linux/generic/hack-5.19/904-debloat_dma_buf.patch

@@ -0,0 +1,93 @@
+From e3692cb2fcd5ba1244512a0f43b8118f65f1c375 Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <[email protected]>
+Date: Sat, 8 Jul 2017 08:20:43 +0200
+Subject: debloat: dmabuf
+
+Signed-off-by: Felix Fietkau <[email protected]>
+---
+ drivers/base/Kconfig      |  2 +-
+ drivers/dma-buf/Makefile  | 10 +++++++---
+ drivers/dma-buf/dma-buf.c |  4 +++-
+ kernel/sched/core.c       |  1 +
+ 4 files changed, 12 insertions(+), 5 deletions(-)
+
+--- a/drivers/base/Kconfig
++++ b/drivers/base/Kconfig
+@@ -198,7 +198,7 @@ config SOC_BUS
+ source "drivers/base/regmap/Kconfig"
+
+ config DMA_SHARED_BUFFER
+-	bool
++	tristate
+ 	default n
+ 	select IRQ_WORK
+ 	help
+--- a/drivers/dma-buf/heaps/Makefile
++++ b/drivers/dma-buf/heaps/Makefile
+@@ -1,3 +1,3 @@
+ # SPDX-License-Identifier: GPL-2.0
+-obj-$(CONFIG_DMABUF_HEAPS_SYSTEM)	+= system_heap.o
+-obj-$(CONFIG_DMABUF_HEAPS_CMA)		+= cma_heap.o
++dma-buf-objs-$(CONFIG_DMABUF_HEAPS_SYSTEM)	+= system_heap.o
++dma-buf-objs-$(CONFIG_DMABUF_HEAPS_CMA)		+= cma_heap.o
+--- a/drivers/dma-buf/Makefile
++++ b/drivers/dma-buf/Makefile
+@@ -1,12 +1,14 @@
+ # SPDX-License-Identifier: GPL-2.0-only
+-obj-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \
++obj-$(CONFIG_DMA_SHARED_BUFFER) := dma-shared-buffer.o
++
++dma-buf-objs-y := dma-buf.o dma-fence.o dma-fence-array.o dma-fence-chain.o \
+ 	 dma-resv.o
+-obj-$(CONFIG_DMABUF_HEAPS)	+= dma-heap.o
+-obj-$(CONFIG_DMABUF_HEAPS)	+= heaps/
+-obj-$(CONFIG_SYNC_FILE)		+= sync_file.o
+-obj-$(CONFIG_SW_SYNC)		+= sw_sync.o sync_debug.o
+-obj-$(CONFIG_UDMABUF)		+= udmabuf.o
+-obj-$(CONFIG_DMABUF_SYSFS_STATS) += dma-buf-sysfs-stats.o
++dma-buf-objs-$(CONFIG_DMABUF_HEAPS)	+= dma-heap.o
++obj-$(CONFIG_DMABUF_HEAPS)		+= heaps/
++dma-buf-objs-$(CONFIG_SYNC_FILE)	+= sync_file.o
++dma-buf-objs-$(CONFIG_SW_SYNC)		+= sw_sync.o sync_debug.o
++dma-buf-objs-$(CONFIG_UDMABUF)		+= udmabuf.o
++dma-buf-objs-$(CONFIG_DMABUF_SYSFS_STATS) += udmabuf.o
+
+ dmabuf_selftests-y := \
+ 	selftest.o \
+@@ -15,4 +17,6 @@ dmabuf_selftests-y := \
+ 	st-dma-fence-unwrap.o \
+ 	st-dma-resv.o
+
+-obj-$(CONFIG_DMABUF_SELFTESTS)	+= dmabuf_selftests.o
++dma-buf-objs-$(CONFIG_DMABUF_SELFTESTS)	+= dmabuf_selftests.o
++
++dma-shared-buffer-objs :=  $(dma-buf-objs-y)
+--- a/drivers/dma-buf/dma-buf.c
++++ b/drivers/dma-buf/dma-buf.c
+@@ -1459,4 +1459,5 @@ static void __exit dma_buf_deinit(void)
+ 	kern_unmount(dma_buf_mnt);
+ 	dma_buf_uninit_sysfs_statistics();
+ }
+-__exitcall(dma_buf_deinit);
++module_exit(dma_buf_deinit);
++MODULE_LICENSE("GPL");
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -4287,6 +4287,7 @@ int wake_up_state(struct task_struct *p,
+ {
+ 	return try_to_wake_up(p, state, 0);
+ }
++EXPORT_SYMBOL_GPL(wake_up_state);
+
+ /*
+  * Perform scheduler related setup for a newly forked process p.
+--- a/fs/d_path.c
++++ b/fs/d_path.c
+@@ -314,6 +314,7 @@ char *dynamic_dname(struct dentry *dentr
+ 	buffer += buflen - sz;
+ 	return memcpy(buffer, temp, sz);
+ }
++EXPORT_SYMBOL_GPL(dynamic_dname);
+
+ char *simple_dname(struct dentry *dentry, char *buffer, int buflen)
+ {

target/linux/generic/hack-5.19/952-add-net-conntrack-events-support-multiple-registrant.patch

@@ -53,32 +53,31 @@ Signed-off-by: Zhi Chen <[email protected]>
 
  	e = nf_ct_ecache_find(ct);
  	if (e == NULL)
-@@ -128,10 +135,12 @@ nf_conntrack_event_report(enum ip_conntr
+@@ -117,20 +124,24 @@
  			  u32 portid, int report)
  {
  #ifdef CONFIG_NF_CONNTRACK_EVENTS
 +#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
- 	const struct net *net = nf_ct_net(ct);
-
- 	if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb))
- 		return 0;
+ 	if (nf_ct_ecache_exist(ct))
+ 		return nf_conntrack_eventmask_report(1 << event, ct, portid, report);
+ #endif
+ 	return 0;
 +#endif
+ }
 
- 	return nf_conntrack_eventmask_report(1 << event, ct, portid, report);
- #else
-@@ -143,10 +152,12 @@ static inline int
+ static inline int
  nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct)
  {
  #ifdef CONFIG_NF_CONNTRACK_EVENTS
 +#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
- 	const struct net *net = nf_ct_net(ct);
-
- 	if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb))
- 		return 0;
+ 	if (nf_ct_ecache_exist(ct))
+ 		return nf_conntrack_eventmask_report(1 << event, ct, 0, 0);
+ #endif
+ 	return 0;
 +#endif
+ }
 
- 	return nf_conntrack_eventmask_report(1 << event, ct, 0, 0);
- #else
+ #ifdef CONFIG_NF_CONNTRACK_EVENTS
 --- a/include/net/netns/conntrack.h
 +++ b/include/net/netns/conntrack.h
 @@ -112,6 +112,9 @@ struct netns_ct {

target/linux/x86/Makefile

@@ -11,7 +11,7 @@ FEATURES:=squashfs vdi vmdk vhdx pcmcia fpu boot-part rootfs-part
 SUBTARGETS:=64 generic legacy geode 
 
 KERNEL_PATCHVER:=5.15
-KERNEL_TESTING_PATCHVER:=5.18
+KERNEL_TESTING_PATCHVER:=5.19
 
 KERNELNAME:=bzImage
 

target/linux/x86/modules.mk

@@ -22,7 +22,7 @@ $(eval $(call KernelPackage,amazon-ena))
 define KernelPackage/amd-xgbe
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=AMD Ethernet on SoC support
-  DEPENDS:=@PCI_SUPPORT @TARGET_x86_64 +kmod-lib-crc32c +kmod-ptp +kmod-libphy +(LINUX_5_10||LINUX_5_15||LINUX_5_18):kmod-mdio-devres
+  DEPENDS:=@PCI_SUPPORT @TARGET_x86_64 +kmod-lib-crc32c +kmod-ptp +kmod-libphy +(LINUX_5_10||LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-mdio-devres
   KCONFIG:=CONFIG_AMD_XGBE
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/amd/xgbe/amd-xgbe.ko
   AUTOLOAD:=$(call AutoLoad,35,amd-xgbe)

tools/mtools/Makefile

@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtools
-PKG_VERSION:=4.0.37
+PKG_VERSION:=4.0.40
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=799b197e23e47b61259628810b27790efb7a1fe36037ef1da8a27b0ae4fa8342
+PKG_HASH:=a22fca42354011dd2293a7f51f228b46ebbd802e7740b0975912afecb79d5df4
 
 HOST_BUILD_PARALLEL:=1