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

* https://github.com/coolsnowwolf/lede:
  qualcommax: sync ipq50xx with upstream
  kernel: r8168: update to v8.055.00
  kernel: bump 6.x to latest HEAD
  OpenWrt v24.10.0: adjust config defaults
  kernel: add option to disable legacy cgroup v1

config/Config-kernel.in

@@ -979,6 +979,21 @@ if KERNEL_CGROUPS
 		  going to shrink due to deprecation process. New deployments with v1
 		  controller are highly discouraged.
 
+	config KERNEL_MEMCG_V1
+		bool "Legacy cgroup v1 memory controller"
+		default n
+		depends on KERNEL_MEMCG
+		help
+		  Legacy cgroup v1 memory controller which has been deprecated by
+		  cgroup v2 implementation. The v1 is there for legacy applications
+		  which haven't migrated to the new cgroup v2 interface yet. If you
+		  do not have any such application then you are completely fine leaving
+		  this option disabled.
+
+		  Please note that feature set of the legacy memory controller is likely
+		  going to shrink due to deprecation process. New deployments with v1
+		  controller are highly discouraged.
+
 	config KERNEL_CGROUP_PERF
 		bool "Enable perf_event per-cpu per-container group (cgroup) monitoring"
 		select KERNEL_PERF_EVENTS

package/kernel/r8168/patches/100-linux-6.9-support.patch

@@ -16,13 +16,11 @@ change to ethtool_keee from ethtool_eee
  src/r8168_n.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 44 insertions(+)
 
-diff --git a/src/r8168_n.c b/src/r8168_n.c
-index ad63f42..3d67641 100755
 --- a/src/r8168_n.c
 +++ b/src/r8168_n.c
-@@ -7941,7 +7941,11 @@ rtl8168_device_lpi_t_to_ethtool_lpi_t(struct rtl8168_private *tp , u32 lpi_timer
+@@ -8103,7 +8103,11 @@ out:
  }
-
+ #else
  static int
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
 +rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata)
@@ -32,7 +30,7 @@ index ad63f42..3d67641 100755
  {
          struct rtl8168_private *tp = netdev_priv(net);
          struct ethtool_eee *eee = &tp->eee;
-@@ -7975,9 +7979,15 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
+@@ -8137,9 +8141,15 @@ rtl_ethtool_get_eee(struct net_device *n
 
          edata->eee_enabled = !!val;
          edata->eee_active = !!(supported & adv & lp);
@@ -48,7 +46,7 @@ index ad63f42..3d67641 100755
          edata->tx_lpi_enabled = edata->eee_enabled;
          edata->tx_lpi_timer = tx_lpi_timer;
 
-@@ -7985,11 +7995,19 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
+@@ -8147,11 +8157,19 @@ rtl_ethtool_get_eee(struct net_device *n
  }
 
  static int
@@ -68,7 +66,7 @@ index ad63f42..3d67641 100755
          int rc = 0;
 
          if (!rtl8168_support_eee(tp))
-@@ -8013,6 +8031,18 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
+@@ -8175,6 +8193,18 @@ rtl_ethtool_set_eee(struct net_device *n
          }
 
          advertising = tp->advertising;
@@ -87,7 +85,7 @@ index ad63f42..3d67641 100755
          if (!edata->advertised) {
                  edata->advertised = advertising & eee->supported;
          } else if (edata->advertised & ~advertising) {
-@@ -8021,15 +8051,29 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
+@@ -8183,15 +8213,29 @@ rtl_ethtool_set_eee(struct net_device *n
                  rc = -EINVAL;
                  goto out;
          }

package/kernel/r8168/patches/300-r8168-add-LED-configuration-from-OF.patch

@@ -8,7 +8,7 @@
  #include <linux/if_vlan.h>
  #include <linux/crc32.h>
  #include <linux/interrupt.h>
-@@ -26098,6 +26099,18 @@ rtl8168_setup_mqs_reg(struct rtl8168_pri
+@@ -26180,6 +26181,18 @@ rtl8168_setup_mqs_reg(struct rtl8168_pri
  }
 
  static void
@@ -27,7 +27,7 @@
  rtl8168_init_software_variable(struct net_device *dev)
  {
          struct rtl8168_private *tp = netdev_priv(dev);
-@@ -26792,6 +26805,7 @@ err1:
+@@ -26896,6 +26909,7 @@ err1:
          if (tp->InitRxDescType == RX_DESC_RING_TYPE_2)
                  tp->RxDescLength = RX_DESC_LEN_TYPE_2;
 

target/linux/qualcommax/Makefile

@@ -9,6 +9,7 @@ CPU_TYPE:=cortex-a53
 SUBTARGETS:=ipq50xx ipq60xx ipq807x
 
 KERNEL_PATCHVER:=6.1
+KERNEL_TESTING_PATCHVER:=6.6
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \

target/linux/qualcommax/config-6.6

@@ -65,8 +65,6 @@ CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
 CONFIG_CAVIUM_TX2_ERRATUM_219=y
 CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
 CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
-CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_COMMON_CLK=y
 CONFIG_COMMON_CLK_QCOM=y
@@ -93,6 +91,7 @@ CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_CPU_MITIGATIONS=y
 CONFIG_CPU_PM=y
 CONFIG_CPU_RMAP=y
 CONFIG_CPU_THERMAL=y
@@ -151,8 +150,6 @@ CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FWNODE_MDIO=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
-CONFIG_GCC11_NO_ARRAY_BOUNDS=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_ARCH_TOPOLOGY=y
@@ -201,8 +198,10 @@ CONFIG_I2C_QUP=y
 CONFIG_IIO=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_IPQ5018_PHY is not set
 CONFIG_IPQ_APSS_6018=y
 CONFIG_IPQ_APSS_PLL=y
+# CONFIG_IPQ_CMN_PLL is not set
 # CONFIG_IPQ_GCC_4019 is not set
 # CONFIG_IPQ_GCC_5018 is not set
 # CONFIG_IPQ_GCC_5332 is not set
@@ -280,6 +279,7 @@ CONFIG_NR_CPUS=4
 CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
 CONFIG_NVMEM=y
 CONFIG_NVMEM_LAYOUTS=y
+CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y
 CONFIG_NVMEM_QCOM_QFPROM=y
 # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
 CONFIG_NVMEM_SYSFS=y
@@ -336,6 +336,7 @@ CONFIG_PHY_QCOM_QMP_USB=y
 CONFIG_PHY_QCOM_QUSB2=y
 # CONFIG_PHY_QCOM_SGMII_ETH is not set
 # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set
+# CONFIG_PHY_QCOM_UNIPHY_PCIE_28LP is not set
 # CONFIG_PHY_QCOM_USB_HS_28NM is not set
 # CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set
 # CONFIG_PHY_QCOM_USB_SS is not set
@@ -409,6 +410,7 @@ CONFIG_QCOM_NET_PHYLIB=y
 CONFIG_QCOM_PIL_INFO=y
 # CONFIG_QCOM_Q6V5_ADSP is not set
 CONFIG_QCOM_Q6V5_COMMON=y
+# CONFIG_QCOM_Q6V5_MPD is not set
 # CONFIG_QCOM_Q6V5_MSS is not set
 # CONFIG_QCOM_Q6V5_PAS is not set
 CONFIG_QCOM_Q6V5_WCSS=y
@@ -447,7 +449,6 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_CPR3 is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-# CONFIG_REGULATOR_QCOM_REFGEN is not set
 # CONFIG_REGULATOR_VQMMC_IPQ4019 is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=y
@@ -540,6 +541,7 @@ CONFIG_SPARSE_IRQ=y
 CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
+# CONFIG_SPI_QPIC_SNAND is not set
 CONFIG_SPI_QUP=y
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
 CONFIG_SWIOTLB=y