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

* https://github.com/coolsnowwolf/lede:
  rockchip: 5.18: diable ntfs option (coolsnowwolf#9875)
  kernel: add kmod-nvme package
  wolfssl: make shared again
  kernel: bump 5.10 to 5.10.134 (coolsnowwolf#9868)

Author: zesming

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .133
-LINUX_KERNEL_HASH-5.10.133 = 3b5c4c7d5bca720c11f1024c9aa00ac04397b6c7de37fd4170444077c723280e
+LINUX_VERSION-5.10 = .134
+LINUX_KERNEL_HASH-5.10.134 = ec3513acdf033dd8f8ac2545cd1bb826b0669e151185e5f70408a5c9fe273269

package/kernel/linux/modules/block.mk

@@ -508,6 +508,29 @@ endef
 $(eval $(call KernelPackage,nbd))
 
 
+define KernelPackage/nvme
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=NVM Express block device
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:= \
+	CONFIG_NVME_CORE \
+	CONFIG_BLK_DEV_NVME \
+	CONFIG_NVME_MULTIPATH=n \
+	CONFIG_NVME_HWMON=n
+  FILES:= \
+	$(LINUX_DIR)/drivers/nvme/host/nvme-core.ko \
+	$(LINUX_DIR)/drivers/nvme/host/nvme.ko
+  AUTOLOAD:=$(call AutoLoad,30,nvme-core nvme)
+endef
+
+define KernelPackage/nvme/description
+ Kernel module for NVM Express solid state drives directly
+ connected to the PCI or PCI Express bus.
+endef
+
+$(eval $(call KernelPackage,nvme))
+
+
 define KernelPackage/scsi-core
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=SCSI device support

package/libs/wolfssl/Config.in

@@ -72,7 +72,6 @@ config WOLFSSL_ASM_CAPABLE
 
 choice
 	prompt "Hardware Acceleration"
-	default WOLFSSL_HAS_CPU_CRYPTO if WOLFSSL_ASM_CAPABLE && !TARGET_armvirt
 	default WOLFSSL_HAS_NO_HW
 
 	config WOLFSSL_HAS_NO_HW

package/libs/wolfssl/Makefile

@@ -61,7 +61,6 @@ endef
 define Package/libwolfssl
 $(call Package/libwolfssl/Default)
   TITLE:=wolfSSL library
-  PKGFLAGS:=nonshared
   MENU:=1
   PROVIDES:=libcyassl
   DEPENDS:=+WOLFSSL_HAS_DEVCRYPTO:kmod-cryptodev +WOLFSSL_HAS_AFALG:kmod-crypto-user

target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch

@@ -706,7 +706,7 @@
  EXPORT_SYMBOL(xfrm_parse_spi);
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -4087,14 +4087,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4092,14 +4092,16 @@ static bool tcp_parse_aligned_timestamp(
  {
  	const __be32 *ptr = (const __be32 *)(th + 1);
 

target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch

@@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	int irq;
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -4988,7 +4988,7 @@ int stmmac_dvr_probe(struct device *devi
+@@ -4987,7 +4987,7 @@ int stmmac_dvr_probe(struct device *devi
  	priv->wol_irq = res->wol_irq;
  	priv->lpi_irq = res->lpi_irq;
 

target/linux/ramips/patches-5.10/804-staging-mt7621-pinctrl-use-ngpios-not-num-gpios.patch

@@ -1,6 +1,6 @@
 --- a/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
 +++ b/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
-@@ -354,7 +354,7 @@ static int rt2880_pinmux_probe(struct pl
+@@ -356,7 +356,7 @@ static int rt2880_pinmux_probe(struct pl
  		if (!of_device_is_available(np))
  			continue;
 

target/linux/rockchip/armv8/config-5.18

@@ -985,8 +985,6 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_NPCM7XX_KCS_IPMI_BMC is not set
 # CONFIG_NPCM7XX_TIMER is not set
 # CONFIG_NSPIRE_TIMER is not set
-CONFIG_NTFS_FS=y
-CONFIG_NTFS_RW=y
 CONFIG_NVMEM=y
 # CONFIG_NVMEM_BRCM_NVRAM is not set
 # CONFIG_NVMEM_IMX_IIM is not set