Skip to content

Commit

Permalink
kernel: bump 5.4 to 5.14.224 (coolsnowwolf#10406)
Browse files Browse the repository at this point in the history
All patches automatically rebased.

Signed-off-by: Liu Linhui <[email protected]>
misaka36 authored Nov 11, 2022
1 parent 46e6f98 commit b48712a
Showing 7 changed files with 11 additions and 12 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.4
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .223
LINUX_KERNEL_HASH-5.4.223 = 9ef07f12df6887f196e2e21c197f26854859e6b586aa4bfdd4798f562a717eeb
LINUX_VERSION-5.4 = .224
LINUX_KERNEL_HASH-5.4.224 = 8b7df25b5560620eb2776d7b7c67569764b3916ff2f596767f72567b38d13d36
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ Signed-off-by: Martin K. Petersen <[email protected]>
kfree(sdev->inquiry);
kfree(sdev);

@@ -891,6 +900,8 @@ static struct bin_attribute dev_attr_vpd
@@ -899,6 +908,8 @@ static struct bin_attribute dev_attr_vpd

sdev_vpd_pg_attr(pg83);
sdev_vpd_pg_attr(pg80);
@@ -77,7 +77,7 @@ Signed-off-by: Martin K. Petersen <[email protected]>

static ssize_t show_inquiry(struct file *filep, struct kobject *kobj,
struct bin_attribute *bin_attr,
@@ -1223,12 +1234,18 @@ static umode_t scsi_sdev_bin_attr_is_vis
@@ -1231,12 +1242,18 @@ static umode_t scsi_sdev_bin_attr_is_vis
struct scsi_device *sdev = to_scsi_device(dev);


@@ -96,7 +96,7 @@ Signed-off-by: Martin K. Petersen <[email protected]>
return S_IRUGO;
}

@@ -1271,8 +1288,10 @@ static struct attribute *scsi_sdev_attrs
@@ -1279,8 +1296,10 @@ static struct attribute *scsi_sdev_attrs
};

static struct bin_attribute *scsi_sdev_bin_attrs[] = {
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@
{ "mx25u2033e", INFO(0xc22532, 0, 64 * 1024, 4, SECT_4K) },
{ "mx25u3235f", INFO(0xc22536, 0, 64 * 1024, 64,
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
@@ -5026,6 +5033,9 @@ int spi_nor_scan(struct spi_nor *nor, co
@@ -5027,6 +5034,9 @@ int spi_nor_scan(struct spi_nor *nor, co
if (info->flags & USE_CLSR)
nor->flags |= SNOR_F_USE_CLSR;

Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -2566,6 +2566,7 @@ static const struct flash_info spi_nor_ids[] = {
@@ -2566,6 +2566,7 @@ static const struct flash_info spi_nor_i
/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
{ "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+ { "XM25QH128C", INFO(0x204018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

/* XTX Technology (Shenzhen) Limited */
{ "xt25f128b", INFO(0x0B4018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

Original file line number Diff line number Diff line change
@@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
kfree(net->ipv6.ip6_blk_hole_entry);
#endif
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
@@ -6428,6 +6477,9 @@ void __init ip6_route_init_special_entri
@@ -6434,6 +6483,9 @@ void __init ip6_route_init_special_entri
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@
#endif
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2872,6 +2872,8 @@ static int tun_set_iff(struct net *net,
@@ -2873,6 +2873,8 @@ static int tun_set_iff(struct net *net,
~(NETIF_F_HW_VLAN_CTAG_TX |
NETIF_F_HW_VLAN_STAG_TX);

Original file line number Diff line number Diff line change
@@ -10,15 +10,15 @@ Signed-off-by: Abhimanyu Vishwakarma <[email protected]>

--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -4939,6 +4939,7 @@ int spi_nor_scan(struct spi_nor *nor, co
@@ -4940,6 +4940,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
struct spi_nor_flash_parameter *params = &nor->params;
+ const char __maybe_unused *of_mtd_name = NULL;
int ret;
int i;

@@ -5001,7 +5002,12 @@ int spi_nor_scan(struct spi_nor *nor, co
@@ -5002,7 +5003,12 @@ int spi_nor_scan(struct spi_nor *nor, co
/* Init flash parameters based on flash_info struct and SFDP */
spi_nor_init_params(nor);

0 comments on commit b48712a

Please sign in to comment.