Skip to content

Commit

Permalink
kernel: bump 5.15 to 5.15.55
Browse files Browse the repository at this point in the history
All patches automatically rebased.

Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200

Signed-off-by: John Audia <therealgraysky@proton.me>
  • Loading branch information
graysky2 authored and hauke committed Jul 31, 2022
1 parent e4af991 commit ce014b1
Show file tree
Hide file tree
Showing 19 changed files with 47 additions and 185 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.15
@@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .54
LINUX_KERNEL_HASH-5.15.54 = 594f548bb0a73e9c08deef838836c984666709687257a624c5ccaf9ae056ce4d
LINUX_VERSION-5.15 = .55
LINUX_KERNEL_HASH-5.15.55 = 1ef6bd508b6c3af3bef2d5b337e4477254dba284c79e329aa38f9763ae3bfdcc
4 changes: 0 additions & 4 deletions target/linux/generic/hack-5.15/205-kconfig-exit.patch
Expand Up @@ -7,8 +7,6 @@ Subject: [PATCH] scripts/Kconfig: Kconfig exit
scripts/kconfig/conf.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 5d84b44a2a2a..d279d95aac92 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -435,6 +435,8 @@ static int conf_sym(struct menu *menu)
Expand All @@ -20,5 +18,3 @@ index 5d84b44a2a2a..d279d95aac92 100644
newval = oldval;
break;
case '?':
--

4 changes: 2 additions & 2 deletions target/linux/generic/hack-5.15/221-module_exports.patch
Expand Up @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
"__kstrtabns_" #sym ": \n" \
--- a/include/asm-generic/export.h
+++ b/include/asm-generic/export.h
@@ -26,6 +26,12 @@ struct kernel_symbol {
@@ -26,6 +26,12 @@
#endif
.endm

Expand All @@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/*
* note on .section use: we specify progbits since usage of the "M" (SHF_MERGE)
* section flag requires it. Use '%progbits' instead of '@progbits' since the
@@ -42,7 +42,7 @@ struct kernel_symbol {
@@ -39,7 +45,7 @@
__ksymtab_\name:
__put \val, __kstrtab_\name
.previous
Expand Down
4 changes: 0 additions & 4 deletions target/linux/generic/hack-5.15/249-udp-tunnel-selection.patch
Expand Up @@ -7,8 +7,6 @@ Subject: [PATCH] net/ipv4: add udp tunnel tristate string
net/ipv4/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 87983e70f03f..426b44d39277 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -315,7 +315,7 @@ config NET_IPVTI
Expand All @@ -20,5 +18,3 @@ index 87983e70f03f..426b44d39277 100644
select NET_IP_TUNNEL
default n

--

6 changes: 0 additions & 6 deletions target/linux/generic/hack-5.15/253-ksmbd-config.patch
Expand Up @@ -8,8 +8,6 @@ Subject: [PATCH] Kconfig: add tristate for OID and ASNI string
lib/Kconfig | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/init/Kconfig b/init/Kconfig
index 5a2514bbb11d..32ba9490a6e4 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -2384,7 +2384,7 @@ config PADATA
Expand All @@ -21,8 +19,6 @@ index 5a2514bbb11d..32ba9490a6e4 100644
help
Build a simple ASN.1 grammar compiler that produces a bytecode output
that can be interpreted by the ASN.1 stream decoder and used to
diff --git a/lib/Kconfig b/lib/Kconfig
index d6c6cfd1fac9..6595c53abd3c 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -614,7 +614,7 @@ config LIBFDT
Expand All @@ -34,5 +30,3 @@ index d6c6cfd1fac9..6595c53abd3c 100644
help
Enable fast lookup object identifier registry.

--

4 changes: 0 additions & 4 deletions target/linux/generic/hack-5.15/261-lib-arc4-unhide.patch
Expand Up @@ -11,8 +11,6 @@ from backports.
lib/crypto/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
index 5056663c2aff..8a4d4e5bcd7a 100644
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
@@ -6,7 +6,7 @@ config CRYPTO_LIB_AES
Expand All @@ -24,5 +22,3 @@ index 5056663c2aff..8a4d4e5bcd7a 100644

config CRYPTO_ARCH_HAVE_LIB_BLAKE2S
bool
--

46 changes: 11 additions & 35 deletions target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch
Expand Up @@ -17,11 +17,9 @@ Subject: [PATCH] kernel: add block fit partition parser
include/linux/msdos_partition.h | 1 +
11 files changed, 57 insertions(+)

diff --git a/block/blk.h b/block/blk.h
index aab72194d226..ed23a4fac950 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -354,6 +354,8 @@ void blk_free_ext_minor(unsigned int minor);
@@ -354,6 +354,8 @@ void blk_free_ext_minor(unsigned int min
#define ADDPART_FLAG_NONE 0
#define ADDPART_FLAG_RAID 1
#define ADDPART_FLAG_WHOLEDISK 2
Expand All @@ -30,8 +28,6 @@ index aab72194d226..ed23a4fac950 100644
int bdev_add_partition(struct gendisk *disk, int partno, sector_t start,
sector_t length);
int bdev_del_partition(struct gendisk *disk, int partno);
diff --git a/block/partitions/Kconfig b/block/partitions/Kconfig
index 278593b8e4e9..d4cd2f36ea95 100644
--- a/block/partitions/Kconfig
+++ b/block/partitions/Kconfig
@@ -101,6 +101,13 @@ config ATARI_PARTITION
Expand All @@ -48,8 +44,6 @@ index 278593b8e4e9..d4cd2f36ea95 100644
config IBM_PARTITION
bool "IBM disk label and partition support"
depends on PARTITION_ADVANCED && S390
diff --git a/block/partitions/Makefile b/block/partitions/Makefile
index a7f05cdb02a8..d319eb1deba9 100644
--- a/block/partitions/Makefile
+++ b/block/partitions/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_ACORN_PARTITION) += acorn.o
Expand All @@ -60,26 +54,22 @@ index a7f05cdb02a8..d319eb1deba9 100644
obj-$(CONFIG_CMDLINE_PARTITION) += cmdline.o
obj-$(CONFIG_MAC_PARTITION) += mac.o
obj-$(CONFIG_LDM_PARTITION) += ldm.o
diff --git a/block/partitions/check.h b/block/partitions/check.h
index d5b28e309d64..1b2fd18b2480 100644
--- a/block/partitions/check.h
+++ b/block/partitions/check.h
@@ -58,6 +58,7 @@ int amiga_partition(struct parsed_partitions *state);
@@ -58,6 +58,7 @@ int amiga_partition(struct parsed_partit
int atari_partition(struct parsed_partitions *state);
int cmdline_partition(struct parsed_partitions *state);
int efi_partition(struct parsed_partitions *state);
+int fit_partition(struct parsed_partitions *state);
int ibm_partition(struct parsed_partitions *);
int karma_partition(struct parsed_partitions *state);
int ldm_partition(struct parsed_partitions *state);
@@ -68,3 +69,5 @@ int sgi_partition(struct parsed_partitions *state);
@@ -68,3 +69,5 @@ int sgi_partition(struct parsed_partitio
int sun_partition(struct parsed_partitions *state);
int sysv68_partition(struct parsed_partitions *state);
int ultrix_partition(struct parsed_partitions *state);
+
+int parse_fit_partitions(struct parsed_partitions *state, u64 start_sector, u64 nr_sectors, int *slot, int add_remain);
diff --git a/block/partitions/core.c b/block/partitions/core.c
index b9e9af84f518..176f7fe79c56 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -12,6 +12,10 @@
Expand All @@ -93,7 +83,7 @@ index b9e9af84f518..176f7fe79c56 100644
#include "check.h"

static int (*check_part[])(struct parsed_partitions *) = {
@@ -48,6 +52,9 @@ static int (*check_part[])(struct parsed_partitions *) = {
@@ -48,6 +52,9 @@ static int (*check_part[])(struct parsed
#ifdef CONFIG_EFI_PARTITION
efi_partition, /* this must come before msdos */
#endif
Expand All @@ -103,7 +93,7 @@ index b9e9af84f518..176f7fe79c56 100644
#ifdef CONFIG_SGI_PARTITION
sgi_partition,
#endif
@@ -408,6 +415,11 @@ static struct block_device *add_partition(struct gendisk *disk, int partno,
@@ -408,6 +415,11 @@ static struct block_device *add_partitio
goto out_del;
}

Expand All @@ -115,7 +105,7 @@ index b9e9af84f518..176f7fe79c56 100644
/* everything is up and running, commence */
err = xa_insert(&disk->part_tbl, partno, bdev, GFP_KERNEL);
if (err)
@@ -598,6 +610,11 @@ static bool blk_add_partition(struct gendisk *disk,
@@ -598,6 +610,11 @@ static bool blk_add_partition(struct gen
(state->parts[p].flags & ADDPART_FLAG_RAID))
md_autodetect_dev(part->bd_dev);

Expand All @@ -127,11 +117,9 @@ index b9e9af84f518..176f7fe79c56 100644
return true;
}

diff --git a/block/partitions/efi.c b/block/partitions/efi.c
index 7ca5c4c374d4..9ecd2b3d5674 100644
--- a/block/partitions/efi.c
+++ b/block/partitions/efi.c
@@ -716,6 +716,9 @@ int efi_partition(struct parsed_partitions *state)
@@ -716,6 +716,9 @@ int efi_partition(struct parsed_partitio
gpt_entry *ptes = NULL;
u32 i;
unsigned ssz = queue_logical_block_size(state->disk->queue) / 512;
Expand All @@ -141,7 +129,7 @@ index 7ca5c4c374d4..9ecd2b3d5674 100644

if (!find_valid_gpt(state, &gpt, &ptes) || !gpt || !ptes) {
kfree(gpt);
@@ -749,6 +752,11 @@ int efi_partition(struct parsed_partitions *state)
@@ -749,6 +752,11 @@ int efi_partition(struct parsed_partitio
ARRAY_SIZE(ptes[i].partition_name));
utf16_le_to_7bit(ptes[i].partition_name, label_max, info->volname);
state->parts[i + 1].has_info = true;
Expand All @@ -153,8 +141,6 @@ index 7ca5c4c374d4..9ecd2b3d5674 100644
}
kfree(ptes);
kfree(gpt);
diff --git a/block/partitions/efi.h b/block/partitions/efi.h
index 8cc2b88d0aa8..b5807e35bafc 100644
--- a/block/partitions/efi.h
+++ b/block/partitions/efi.h
@@ -52,6 +52,9 @@
Expand All @@ -167,11 +153,9 @@ index 8cc2b88d0aa8..b5807e35bafc 100644

typedef struct _gpt_header {
__le64 signature;
diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c
index b5d5c229cc3b..ff7e74911359 100644
--- a/block/partitions/msdos.c
+++ b/block/partitions/msdos.c
@@ -564,6 +564,15 @@ static void parse_minix(struct parsed_partitions *state,
@@ -564,6 +564,15 @@ static void parse_minix(struct parsed_pa
#endif /* CONFIG_MINIX_SUBPARTITION */
}

Expand All @@ -195,11 +179,9 @@ index b5d5c229cc3b..ff7e74911359 100644
{0, NULL},
};

diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 65470d1b8fc8..5dd9b54d6555 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -345,6 +345,8 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
@@ -345,6 +345,8 @@ int add_mtd_blktrans_dev(struct mtd_blkt
gd->first_minor = (new->devnum) << tr->part_bits;
gd->minors = 1 << tr->part_bits;
gd->fops = &mtd_block_ops;
Expand All @@ -208,11 +190,9 @@ index 65470d1b8fc8..5dd9b54d6555 100644

if (tr->part_bits)
if (new->devnum < 26)
diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index 57b984dd73b4..5982070e470b 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -428,6 +428,9 @@ int ubiblock_create(struct ubi_volume_info *vi)
@@ -428,6 +428,9 @@ int ubiblock_create(struct ubi_volume_in
goto out_cleanup_disk;
}
gd->private_data = dev;
Expand All @@ -222,8 +202,6 @@ index 57b984dd73b4..5982070e470b 100644
sprintf(gd->disk_name, "ubiblock%d_%d", dev->ubi_num, dev->vol_id);
set_capacity(gd, disk_capacity);
dev->gd = gd;
diff --git a/include/linux/msdos_partition.h b/include/linux/msdos_partition.h
index 2cb82db2a43c..c15b6c759aca 100644
--- a/include/linux/msdos_partition.h
+++ b/include/linux/msdos_partition.h
@@ -31,6 +31,7 @@ enum msdos_sys_ind {
Expand All @@ -234,5 +212,3 @@ index 2cb82db2a43c..c15b6c759aca 100644
SOLARIS_X86_PARTITION = 0x82, /* also Linux swap partitions */
NEW_SOLARIS_X86_PARTITION = 0xbf,

--

6 changes: 0 additions & 6 deletions target/linux/generic/hack-5.15/430-mtk-bmt-support.patch
Expand Up @@ -8,8 +8,6 @@ Subject: [PATCH] mtd/nand: add MediaTek NAND bad block managment table
drivers/mtd/nand/Makefile | 1 +
2 files changed, 5 insertions(+)

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index b40455234cbd..72ef18c59cee 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -46,6 +46,10 @@ config MTD_NAND_ECC_SW_BCH
Expand All @@ -23,8 +21,6 @@ index b40455234cbd..72ef18c59cee 100644
endmenu

endmenu
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 1c0b46960eb1..b9d97626bb47 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -2,6 +2,7 @@
Expand All @@ -35,5 +31,3 @@ index 1c0b46960eb1..b9d97626bb47 100644

obj-y += onenand/
obj-y += raw/
--

0 comments on commit ce014b1

Please sign in to comment.