Skip to content

Commit

Permalink
kernel: bump 5.15 to 5.15.125
Browse files Browse the repository at this point in the history
1. Add new symbols to generic config
2. Bump kernel
   Changelog: https://lore.kernel.org/stable/2023080818-groin-gradient-a031@gregkh/

   All patches automatically rebased.

Signed-off-by: John Audia <[email protected]>
  • Loading branch information
graysky2 authored and hauke committed Aug 9, 2023
1 parent 81c1172 commit daed332
Show file tree
Hide file tree
Showing 23 changed files with 35 additions and 33 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.15
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .124
LINUX_KERNEL_HASH-5.15.124 = 00036a0260ad012aa832a8698a4afcf23b2410091527738ce48ce3fcc23f22ed
LINUX_VERSION-5.15 = .125
LINUX_KERNEL_HASH-5.15.125 = 150f3846b76cd23a6135f49cef71372bade5a06e851cb4f8558df8b862d8fec7
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -571,6 +571,18 @@ config ARCH_VIRT
@@ -572,6 +572,18 @@ config ARCH_VIRT
select HAVE_ARM_ARCH_TIMER
select ARCH_SUPPORTS_BIG_ENDIAN

Expand Down
2 changes: 1 addition & 1 deletion target/linux/ath25/patches-5.15/107-ar5312_gpio.patch
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
+subsys_initcall(ar5312_gpio_init);
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -231,6 +231,7 @@ config ATH25
@@ -232,6 +232,7 @@ config ATH25
select CEVT_R4K
select CSRC_R4K
select DMA_NONCOHERENT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: John Crispin <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -257,6 +257,8 @@ config ATH79
@@ -258,6 +258,8 @@ config ATH79
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_MIPS16
select SYS_SUPPORTS_ZBOOT_UART_PROM
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -332,6 +332,9 @@ config BCM63XX
@@ -333,6 +333,9 @@ config BCM63XX
select SYNC_R4K
select DMA_NONCOHERENT
select IRQ_MIPS_CPU
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -275,25 +275,20 @@ config BMIPS_GENERIC
@@ -276,25 +276,20 @@ config BMIPS_GENERIC
select SYNC_R4K
select COMMON_CLK
select BCM6345_L1_IRQ
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -275,6 +275,7 @@ config BMIPS_GENERIC
@@ -276,6 +276,7 @@ config BMIPS_GENERIC
select SYNC_R4K
select COMMON_CLK
select BCM6345_L1_IRQ
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Signed-off-by: Andrew Morton <[email protected]>

--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -1295,6 +1295,14 @@ config ARCH_HAS_ELFCORE_COMPAT
@@ -1298,6 +1298,14 @@ config ARCH_HAS_ELFCORE_COMPAT
config ARCH_HAS_PARANOID_L1D_FLUSH
bool

Expand All @@ -90,7 +90,7 @@ Signed-off-by: Andrew Morton <[email protected]>
source "scripts/gcc-plugins/Kconfig"
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -84,6 +84,7 @@ config X86
@@ -85,6 +85,7 @@ config X86
select ARCH_HAS_PMEM_API if X86_64
select ARCH_HAS_PTE_DEVMAP if X86_64
select ARCH_HAS_PTE_SPECIAL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ Signed-off-by: Andrew Morton <[email protected]>
mmdrop(mm);
}

@@ -2622,6 +2624,13 @@ pid_t kernel_clone(struct kernel_clone_a
@@ -2617,6 +2619,13 @@ pid_t kernel_clone(struct kernel_clone_a
get_task_struct(p);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ Signed-off-by: Johan Almbladh <[email protected]>
L: [email protected]
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -57,7 +57,6 @@ config MIPS
@@ -58,7 +58,6 @@ config MIPS
select HAVE_ARCH_TRACEHOOK
select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES
select HAVE_ASM_MODVERSIONS
- select HAVE_CBPF_JIT if !64BIT && !CPU_MICROMIPS
select HAVE_CONTEXT_TRACKING
select HAVE_TIF_NOHZ
select HAVE_C_RECORDMCOUNT
@@ -65,7 +64,10 @@ config MIPS
@@ -66,7 +65,10 @@ config MIPS
select HAVE_DEBUG_STACKOVERFLOW
select HAVE_DMA_CONTIGUOUS
select HAVE_DYNAMIC_FTRACE
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.15/220-arm-gc_sections.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
---
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -117,6 +117,7 @@ config ARM
@@ -118,6 +118,7 @@ config ARM
select HAVE_UID16
select HAVE_VIRT_CPU_ACCOUNTING_GEN
select IRQ_FORCED_THREADING
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Acked-by: Rob Landley <[email protected]>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1101,9 +1101,6 @@ config FW_ARC
@@ -1102,9 +1102,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool

Expand All @@ -19,7 +19,7 @@ Acked-by: Rob Landley <[email protected]>
config CEVT_BCM1480
bool

@@ -3183,6 +3180,18 @@ choice
@@ -3184,6 +3181,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice

Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/pending-5.15/920-mangle_bootargs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
help
--- a/init/main.c
+++ b/init/main.c
@@ -616,6 +616,29 @@ static inline void setup_nr_cpu_ids(void
@@ -614,6 +614,29 @@ static inline void setup_nr_cpu_ids(void
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
#endif

Expand Down Expand Up @@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
/*
* We need to store the untouched command line for future reference.
* We also need to store the touched command line since the parameter
@@ -956,6 +979,7 @@ asmlinkage __visible void __init __no_sa
@@ -953,6 +976,7 @@ asmlinkage __visible void __init __no_sa
pr_notice("%s", linux_banner);
early_security_init();
setup_arch(&command_line);
Expand Down
2 changes: 1 addition & 1 deletion target/linux/lantiq/patches-5.15/0152-lantiq-VPE.patch
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: Stefan Koch <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2430,6 +2430,12 @@ config MIPS_VPE_LOADER
@@ -2431,6 +2431,12 @@ config MIPS_VPE_LOADER
Includes a loader for loading an elf relocatable object
onto another VPE and running it.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1729,6 +1729,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
@@ -1730,6 +1730,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN

endchoice

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <[email protected]>

--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1727,6 +1727,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
@@ -1728,6 +1728,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property.

Expand Down Expand Up @@ -247,7 +247,7 @@ Signed-off-by: Michael Gray <[email protected]>
}
--- a/init/main.c
+++ b/init/main.c
@@ -114,6 +114,10 @@
@@ -112,6 +112,10 @@

#include <kunit/test.h>

Expand All @@ -258,7 +258,7 @@ Signed-off-by: Michael Gray <[email protected]>
static int kernel_init(void *);

extern void init_IRQ(void);
@@ -991,6 +995,18 @@ asmlinkage __visible void __init __no_sa
@@ -988,6 +992,18 @@ asmlinkage __visible void __init __no_sa
page_alloc_init();

pr_notice("Kernel command line: %s\n", saved_command_line);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1181,6 +1181,10 @@ config MIPS_MSC
@@ -1182,6 +1182,10 @@ config MIPS_MSC
config SYNC_R4K
bool

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <[email protected]>

--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1727,6 +1727,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
@@ -1728,6 +1728,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property.

Expand Down Expand Up @@ -228,7 +228,7 @@ Signed-off-by: Adrian Panella <[email protected]>
}
--- a/init/main.c
+++ b/init/main.c
@@ -114,6 +114,10 @@
@@ -112,6 +112,10 @@

#include <kunit/test.h>

Expand All @@ -239,7 +239,7 @@ Signed-off-by: Adrian Panella <[email protected]>
static int kernel_init(void *);

extern void init_IRQ(void);
@@ -991,6 +995,18 @@ asmlinkage __visible void __init __no_sa
@@ -988,6 +992,18 @@ asmlinkage __visible void __init __no_sa
page_alloc_init();

pr_notice("Kernel command line: %s\n", saved_command_line);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: David Bauer <[email protected]>

--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -545,8 +545,28 @@ static int __init bootcmdline_scan_chose
@@ -547,8 +547,28 @@ static int __init bootcmdline_scan_chose

#endif /* CONFIG_OF_EARLY_FLATTREE */

Expand Down Expand Up @@ -46,7 +46,7 @@ Signed-off-by: David Bauer <[email protected]>
bool dt_bootargs = false;

/*
@@ -560,6 +580,14 @@ static void __init bootcmdline_init(void
@@ -562,6 +582,14 @@ static void __init bootcmdline_init(void
}

/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ Signed-off-by: John Crispin <[email protected]>

--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -687,7 +687,6 @@ static void __init arch_mem_init(char **
@@ -689,7 +689,6 @@ static void __init arch_mem_init(char **
mips_reserve_vmcore();

mips_parse_crashkernel();
- device_tree_init();

/*
* In order to reduce the possibility of kernel panic when failed to
@@ -804,6 +803,7 @@ void __init setup_arch(char **cmdline_p)
@@ -806,6 +805,7 @@ void __init setup_arch(char **cmdline_p)

cpu_cache_init();
paging_init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Submitted-by: Birger Koblitz <[email protected]>
platform-$(CONFIG_SGI_IP28) += sgi-ip22/
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1054,8 +1054,58 @@ config NLM_XLP_BOARD
@@ -1055,8 +1055,58 @@ config NLM_XLP_BOARD
This board is based on Netlogic XLP Processor.
Say Y here if you have a XLP based board.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Signed-off-by: Christian Lamparter <[email protected]>

--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -130,7 +130,7 @@ static int have_root __initdata;
@@ -131,7 +131,7 @@ static int have_root __initdata;
static int have_console __initdata;

/* Set in uml_mem_setup and modified in linux_main */
Expand Down
2 changes: 2 additions & 0 deletions target/linux/x86/config-5.15
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ CONFIG_CPU_SUP_INTEL=y
CONFIG_CPU_SUP_TRANSMETA_32=y
CONFIG_CPU_SUP_UMC_32=y
CONFIG_CPU_SUP_ZHAOXIN=y
CONFIG_CPU_SRSO=y
CONFIG_CPU_UNRET_ENTRY=y
CONFIG_CRASH_CORE=y
CONFIG_CRC16=y
Expand Down Expand Up @@ -116,6 +117,7 @@ CONFIG_FUSION=y
CONFIG_FUSION_MAX_SGE=128
CONFIG_FUSION_SPI=y
CONFIG_FW_LOADER_PAGED_BUF=y
# CONFIG_GDS_FORCE_MITIGATION is not set
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_CLOCKEVENTS=y
Expand Down

0 comments on commit daed332

Please sign in to comment.