kernel: bump 5.4 to 5.4.274 (coolsnowwolf#12096)

467815891a · Apr 29, 2024 · 61cab55 · 61cab55
1 parent 03d0bbd
commit 61cab55
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 25 deletions.
diff --git a/include/kernel-5.4 b/include/kernel-5.4
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .273
-LINUX_KERNEL_HASH-5.4.273 = 8ba0cfd3faa7222542b30791def49f426d7b50a07217366ead655a5687534743
+LINUX_VERSION-5.4 = .274
+LINUX_KERNEL_HASH-5.4.274 = eac7b421a43cd46a3dbebf7c85d075faa7e164d80d215d31fcd35544b6f79ed4
diff --git a/...eneric/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/...eneric/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
@@ -1000,7 +1000,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		u32 mahr = ravb_read(ndev, MAHR);
  		u32 malr = ravb_read(ndev, MALR);
 
-@@ -2165,7 +2167,7 @@ static int ravb_probe(struct platform_de
+@@ -2168,7 +2170,7 @@ static int ravb_probe(struct platform_de
  	priv->msg_enable = RAVB_DEF_MSG_ENABLE;
 
  	/* Read and set MAC address */

diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
@@ -959,14 +959,14 @@ CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_586 is not set
 # CONFIG_CRYPTO_AES_ARM is not set
-# CONFIG_CRYPTO_AES_ARM_BS is not set
-# CONFIG_CRYPTO_AES_ARM64_BS is not set
-# CONFIG_CRYPTO_AES_ARM_CE is not set
 # CONFIG_CRYPTO_AES_ARM64 is not set
+# CONFIG_CRYPTO_AES_ARM64_BS is not set
 # CONFIG_CRYPTO_AES_ARM64_CE is not set
 # CONFIG_CRYPTO_AES_ARM64_CE_BLK is not set
 # CONFIG_CRYPTO_AES_ARM64_CE_CCM is not set
 # CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
+# CONFIG_CRYPTO_AES_ARM_BS is not set
+# CONFIG_CRYPTO_AES_ARM_CE is not set
 # CONFIG_CRYPTO_AES_NI_INTEL is not set
 # CONFIG_CRYPTO_AES_TI is not set
 CONFIG_CRYPTO_ALGAPI=y
@@ -996,8 +996,8 @@ CONFIG_CRYPTO_BLKCIPHER2=y
 # CONFIG_CRYPTO_CRC32C_INTEL is not set
 # CONFIG_CRYPTO_CRC32_ARM_CE is not set
 # CONFIG_CRYPTO_CRCT10DIF is not set
-# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
 # CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
+# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_CTR is not set
 # CONFIG_CRYPTO_CTS is not set
@@ -1054,8 +1054,8 @@ CONFIG_CRYPTO_BLKCIPHER2=y
 # CONFIG_CRYPTO_GCM is not set
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_GHASH_ARM_CE is not set
 # CONFIG_CRYPTO_GHASH_ARM64_CE is not set
+# CONFIG_CRYPTO_GHASH_ARM_CE is not set
 # CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
 # CONFIG_CRYPTO_HASH is not set
 # CONFIG_CRYPTO_HMAC is not set
@@ -1116,8 +1116,8 @@ CONFIG_CRYPTO_PCRYPT=y
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA256_ARM is not set
 # CONFIG_CRYPTO_SHA256_ARM64 is not set
-# CONFIG_CRYPTO_SHA2_ARM_CE is not set
 # CONFIG_CRYPTO_SHA2_ARM64_CE is not set
+# CONFIG_CRYPTO_SHA2_ARM_CE is not set
 # CONFIG_CRYPTO_SHA3 is not set
 # CONFIG_CRYPTO_SHA3_ARM64 is not set
 # CONFIG_CRYPTO_SHA512 is not set
@@ -2241,7 +2241,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_INA2XX_ADC is not set
 # CONFIG_INDIRECT_PIO is not set
 CONFIG_INET=y
-CONFIG_INET_TABLE_PERTURB_ORDER=16
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
 # CONFIG_INET6_IPCOMP is not set
@@ -2256,6 +2255,7 @@ CONFIG_INET_TABLE_PERTURB_ORDER=16
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_LRO is not set
+CONFIG_INET_TABLE_PERTURB_ORDER=16
 # CONFIG_INET_TCP_DIAG is not set
 # CONFIG_INET_TUNNEL is not set
 # CONFIG_INET_UDP_DIAG is not set

diff --git a/target/linux/generic/hack-5.4/550-loop-Report-EOPNOTSUPP-properly.patch b/target/linux/generic/hack-5.4/550-loop-Report-EOPNOTSUPP-properly.patch
@@ -18,7 +18,7 @@ Reviewed-by: Bart Van Assche <bvanassche@acm.org>
 
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
-@@ -462,7 +462,7 @@ static void lo_complete_rq(struct reques
+@@ -468,7 +468,7 @@ static void lo_complete_rq(struct reques
  	if (!cmd->use_aio || cmd->ret < 0 || cmd->ret == blk_rq_bytes(rq) ||
  	    req_op(rq) != REQ_OP_READ) {
  		if (cmd->ret < 0)
@@ -27,7 +27,7 @@ Reviewed-by: Bart Van Assche <bvanassche@acm.org>
  		goto end_io;
  	}
 
-@@ -1978,7 +1978,10 @@ static void loop_handle_cmd(struct loop_
+@@ -2001,7 +2001,10 @@ static void loop_handle_cmd(struct loop_
   failed:
  	/* complete non-aio request */
  	if (!cmd->use_aio || ret) {

diff --git a/target/linux/generic/hack-5.4/995-usb-serial-option-add-ec200a.patch b/target/linux/generic/hack-5.4/995-usb-serial-option-add-ec200a.patch
@@ -8,7 +8,7 @@
  #define QUECTEL_PRODUCT_RM500K			0x7001
 
  #define CMOTECH_VENDOR_ID			0x16d8
-@@ -1246,6 +1247,7 @@ static const struct usb_device_id option
+@@ -1251,6 +1252,7 @@ static const struct usb_device_id option
  	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200U, 0xff, 0, 0) },
  	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
  	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },

diff --git a/target/linux/generic/pending-5.4/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-5.4/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
 
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -6947,7 +6947,7 @@ static void __ref alloc_node_mem_map(str
+@@ -6949,7 +6949,7 @@ static void __ref alloc_node_mem_map(str
  		mem_map = NODE_DATA(0)->node_mem_map;
  #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
  		if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

diff --git a/.../linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/.../linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
@@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 +MODULE_ALIAS("nf-flow-table-hw");
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -6006,6 +6006,13 @@ static int nf_tables_flowtable_parse_hoo
+@@ -6041,6 +6041,13 @@ static int nf_tables_flowtable_parse_hoo
  	if (err < 0)
  		return err;
 
@@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  	ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
  	if (!ops)
  		return -ENOMEM;
-@@ -6150,10 +6157,19 @@ static int nf_tables_newflowtable(struct
+@@ -6190,10 +6197,19 @@ static int nf_tables_newflowtable(struct
  	}
 
  	flowtable->data.type = type;
@@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  	err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
  					     flowtable);
  	if (err < 0)
-@@ -6279,7 +6295,8 @@ static int nf_tables_fill_flowtable_info
+@@ -6319,7 +6335,8 @@ static int nf_tables_fill_flowtable_info
  	    nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
  	    nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
  	    nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),

diff --git a/.../linux/rockchip/patches-5.4/004-arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch b/.../linux/rockchip/patches-5.4/004-arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch
@@ -26,15 +26,15 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
 
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -857,6 +857,7 @@
+@@ -866,6 +866,7 @@
  		resets = <&cru SRST_GMAC2IO_A>;
  		reset-names = "stmmaceth";
  		rockchip,grf = <&grf>;
 +		snps,txpbl = <0x4>;
  		status = "disabled";
  	};
 
-@@ -878,6 +879,7 @@
+@@ -887,6 +888,7 @@
  		reset-names = "stmmaceth", "mac-phy";
  		phy-mode = "rmii";
  		phy-handle = <&phy>;

diff --git a/...inux/rockchip/patches-5.4/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch b/...inux/rockchip/patches-5.4/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch
@@ -26,7 +26,7 @@ use-case. You've been warned.
 
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -955,6 +955,33 @@
+@@ -964,6 +964,33 @@
  		status = "disabled";
  	};
 

diff --git a/target/linux/rockchip/patches-5.4/209-arm64-dts-rk3328-add-usb3phy-nodes-for-rk3328.patch b/target/linux/rockchip/patches-5.4/209-arm64-dts-rk3328-add-usb3phy-nodes-for-rk3328.patch
@@ -38,7 +38,7 @@
  };
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -822,6 +822,47 @@
+@@ -831,6 +831,47 @@
  		};
  	};
 

diff --git a/...linux/rockchip/patches-5.4/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch b/...linux/rockchip/patches-5.4/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch
@@ -31,7 +31,7 @@ Signed-off-by: wevsty <ty@wevs.org>
  		reg = <0x0 0xff100000 0x0 0x1000>;
 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-@@ -1882,6 +1882,16 @@
+@@ -1890,6 +1890,16 @@
  		};
  	};
 

diff --git a/target/linux/rockchip/patches-5.4/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch b/target/linux/rockchip/patches-5.4/806-arm64-dts-rockchip-rk3328-add-dfi-node.patch
@@ -11,7 +11,7 @@ Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
 
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -1034,6 +1034,13 @@
+@@ -1043,6 +1043,13 @@
  		};
  	};
 

diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4
@@ -80,8 +80,8 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
 # CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
+CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_CYRIX_32=y
@@ -179,8 +179,8 @@ CONFIG_GENERIC_VDSO_32=y
 # CONFIG_GEOS is not set
 CONFIG_GLOB=y
 # CONFIG_HABANA_AI is not set
-# CONFIG_HANGCHECK_TIMER is not set
 # CONFIG_HALTPOLL_CPUIDLE is not set
+# CONFIG_HANGCHECK_TIMER is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y