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

* https://github.com/coolsnowwolf/lede:
  ipq807x: disable br-nf after qca-nss-ecm start (coolsnowwolf#10488)
  x86: fix Bintel's ZHITAI Ti Plus 5000 fw bug
  rockchip: 5.15: add missing kernel config
  generic: 5.15: add missing PAGE_POOL_STATS config
  kernel: add CONFIG_NVMEM_U_BOOT_ENV symbol to configs

target/linux/generic/config-5.10

@@ -4175,6 +4175,7 @@ CONFIG_NMI_LOG_BUF_SHIFT=13
 # CONFIG_NVMEM_IMX_OCOTP is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SYSFS is not set
+# CONFIG_NVMEM_U_BOOT_ENV is not set
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
 # CONFIG_NVME_TCP is not set

target/linux/generic/config-5.15

@@ -4385,6 +4385,7 @@ CONFIG_NR_LRU_GENS=7
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_RMEM is not set
 # CONFIG_NVMEM_SYSFS is not set
+# CONFIG_NVMEM_U_BOOT_ENV is not set
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
 # CONFIG_NVME_TCP is not set
@@ -4434,6 +4435,7 @@ CONFIG_PACKET=y
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
+# CONFIG_PAGE_POOL_STATS is not set
 # CONFIG_PAGE_REPORTING is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 # CONFIG_PAGE_SIZE_32KB is not set
@@ -5644,6 +5646,7 @@ CONFIG_SERIAL_EARLYCON=y
 # CONFIG_SG_POOL is not set
 # CONFIG_SG_SPLIT is not set
 CONFIG_SHMEM=y
+# CONFIG_SHORTCUT_FE is not set
 # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
 # CONFIG_SH_ETH is not set
 # CONFIG_SH_TIMER_CMT is not set

target/linux/ipq807x/base-files/etc/sysctl.d/99-bridge-nf-call.conf

@@ -0,0 +1,6 @@
+# disable bridge netfilter module
+
+net.bridge.bridge-nf-call-arptables=0
+net.bridge.bridge-nf-call-iptables=0
+net.bridge.bridge-nf-call-ip6tables=0
+

target/linux/rockchip/armv8/config-5.15

@@ -70,10 +70,14 @@ CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
 CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_RK3328_DMC_DEVFREQ=y
 # CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+# CONFIG_ARM_SCMI_CPUFREQ is not set
+CONFIG_ARM_SCMI_POWER_DOMAIN=y
 CONFIG_ARM_SCMI_PROTOCOL=y
 CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_ARM_SCPI_POWER_DOMAIN=y
 CONFIG_ARM_SCPI_PROTOCOL=y
+CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
+CONFIG_ARM_SCMI_TRANSPORT_SMC=y
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
@@ -536,6 +540,7 @@ CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_ARM_SCMI is not set
 # CONFIG_REGULATOR_DA9121 is not set
 CONFIG_REGULATOR_FAN53555=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -546,6 +551,7 @@ CONFIG_REGULATOR_RK808=y
 # CONFIG_REGULATOR_RTQ6752 is not set
 CONFIG_RELOCATABLE=y
 CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_SCMI=y
 CONFIG_RFS_ACCEL=y
 CONFIG_ROCKCHIP_EFUSE=y
 CONFIG_ROCKCHIP_GRF=y
@@ -577,6 +583,7 @@ CONFIG_SCSI_SAS_LIBSAS=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 # CONFIG_SENSORS_AHT10 is not set
 # CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set
+# CONFIG_SENSORS_ARM_SCMI is not set
 CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_LTC2992 is not set
 # CONFIG_SENSORS_MAX127 is not set

target/linux/x86/patches-5.15/999-fix-nvme_ms_ids-bug.patch

@@ -0,0 +1,27 @@
+From 2bef3874236ab96d517dd2525aa8260507de24d3 Mon Sep 17 00:00:00 2001
+From: kingtous <[email protected]>
+Date: Fri, 8 Apr 2022 10:34:46 +0800
+Subject: [PATCH] fix: nvme_update_ns_info method should be called even if
+ nvme_ms_ids_equal return false
+
+I've encountered the suspend issue which causes NVMe SSD cannot be detected after reboot from Linux or wake from suspend. I've tried almost all popular Linux distributions like Ubuntu, Debian, Arch, Manjaro. None of them works with my NVMe SSD.
+I changed a brand new SSD but it doesn't work either. Originally, if nvme_ns_ids_equal method returns false, the nvme ns info will not try to update and namespace suddenly be removed. This is the issue I've found causing my laptop SSD not detected after suspend or reboot from Linux. After removing 'goto out_free_id', the suspend issue has gone, everything works.
+When nvme namespaced ids are not equal, we should also try to update namespace info, not just skip it.
+
+Signed-off-by: kingtous <[email protected]>
+---
+ drivers/nvme/host/core.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
+index efb85c6d8e2d5d..89c6a9598558a2 100644
+--- a/drivers/nvme/host/core.c
++++ b/drivers/nvme/host/core.c
+@@ -4056,7 +4056,6 @@ static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_ids *ids)
+ 	if (!nvme_ns_ids_equal(&ns->head->ids, ids)) {
+ 		dev_err(ns->ctrl->device,
+ 			"identifiers changed for nsid %d\n", ns->head->ns_id);
+-		goto out_free_id;
+ 	}
+
+ 	ret = nvme_update_ns_info(ns, id);