Skip to content

Commit

Permalink
Update standard patch set to v6.12-rc7
Browse files Browse the repository at this point in the history
  • Loading branch information
johnny-mnemonic committed Nov 12, 2024
1 parent 460b5e5 commit 598ebb9
Show file tree
Hide file tree
Showing 37 changed files with 762 additions and 114 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 21b5af7318b01d9d28a15170661a1ec4ab3a4d19 Mon Sep 17 00:00:00 2001
From c7205c6a7ce8c78e12a36067aee5451c6e9c7981 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Fri, 27 Oct 2023 13:11:28 +0200
Subject: [PATCH 01/36] Revert "Documentation: Drop or replace remaining
Subject: [PATCH 01/37] Revert "Documentation: Drop or replace remaining
mentions of IA64"

This reverts commit 944834901adc94b3a44d1dd153eb739a937e52d2.
Expand Down Expand Up @@ -181,7 +181,7 @@ index 0f714fc945ac..63a4c5deb156 100644
=====

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 1518343bbe22..a5d363aa958e 100644
index 1666576acc0e..1281bfbdea69 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1496,7 +1496,7 @@
Expand Down Expand Up @@ -425,7 +425,7 @@ index b2ac3c743a3a..ce3f39d9b3cb 100644
sparc - 在这一点上,IRQ是开着的(?),把local_irq_save改为_disable。
- 待办事项: 需要第二个CPU来禁用抢占 (参考 #1)
diff --git a/Makefile b/Makefile
index c5493c0c0ca1..e71d19745161 100644
index 79192a3024bf..ddac27d1da41 100644
--- a/Makefile
+++ b/Makefile
@@ -366,7 +366,7 @@ include $(srctree)/scripts/subarch.include
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8ecb61597bce22eb2a0958e041c35e170ccf63e0 Mon Sep 17 00:00:00 2001
From 07431302e425c07bbf16e5c9a9d7a8a3c3532b96 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Fri, 27 Oct 2023 13:11:38 +0200
Subject: [PATCH 02/36] Revert "lib/raid6: Drop IA64 support"
Subject: [PATCH 02/37] Revert "lib/raid6: Drop IA64 support"

This reverts commit b089ea3cc30de85ea7e20aa66500feb4082dfbf7.
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d49da3d13fd2f32ee720a020ae56ef3320641856 Mon Sep 17 00:00:00 2001
From 1b0ae419f8c1349a757eb2981e34d8030a204633 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Fri, 27 Oct 2023 13:11:48 +0200
Subject: [PATCH 03/36] Revert "Documentation: Drop IA64 from feature
Subject: [PATCH 03/37] Revert "Documentation: Drop IA64 from feature
descriptions"

This reverts commit af1f459233d4edeef634f559539e7f4b64cb1d25.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 409027d7e4c6712406107b410ae12cf0478cf978 Mon Sep 17 00:00:00 2001
From 98841eeeefb0e578639cbef29c7ae259e82ef9e5 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Fri, 27 Oct 2023 13:11:55 +0200
Subject: [PATCH 04/36] Revert "kernel: Drop IA64 support from sig_fault
Subject: [PATCH 04/37] Revert "kernel: Drop IA64 support from sig_fault
handlers"

This reverts commit f5e836884d8e55b416dfad55c29481ec1b65c1f0.
Expand Down Expand Up @@ -57,10 +57,10 @@ index b7bc545ec3b2..0f52d0ac47c5 100644
#define __ADDR_BND_PKEY_PAD (__alignof__(void *) < sizeof(short) ? \
sizeof(short) : __alignof__(void *))
diff --git a/kernel/signal.c b/kernel/signal.c
index 4344860ffcac..108bb58d3d34 100644
index cbabb2d05e0a..632f5bcedbc3 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1716,8 +1716,9 @@ void force_sigsegv(int sig)
@@ -1717,8 +1717,9 @@ void force_sigsegv(int sig)
force_sig(SIGSEGV);
}

Expand All @@ -72,7 +72,7 @@ index 4344860ffcac..108bb58d3d34 100644
{
struct kernel_siginfo info;

@@ -1726,15 +1727,24 @@ int force_sig_fault_to_task(int sig, int code, void __user *addr,
@@ -1727,15 +1728,24 @@ int force_sig_fault_to_task(int sig, int code, void __user *addr,
info.si_errno = 0;
info.si_code = code;
info.si_addr = addr;
Expand Down Expand Up @@ -100,7 +100,7 @@ index 4344860ffcac..108bb58d3d34 100644
{
struct kernel_siginfo info;

@@ -1743,6 +1753,11 @@ int send_sig_fault(int sig, int code, void __user *addr, struct task_struct *t)
@@ -1744,6 +1754,11 @@ int send_sig_fault(int sig, int code, void __user *addr, struct task_struct *t)
info.si_errno = 0;
info.si_code = code;
info.si_addr = addr;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 7ca267d96849ff3b08d27295944d624ee2dea056 Mon Sep 17 00:00:00 2001
From 1d2a136324f85db22c54a4ec5b57efd597cada82 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Fri, 27 Oct 2023 13:13:25 +0200
Subject: [PATCH 05/36] Revert "arch: Remove Itanium (IA-64) architecture"
Subject: [PATCH 05/37] Revert "arch: Remove Itanium (IA-64) architecture"

This reverts commit cf8e8658100d4eae80ce9b21f7a81cb024dd5057.
---
Expand Down Expand Up @@ -3010,10 +3010,10 @@ index a21dbf261be7..157b2139a4a1 100644
This option sets ``possible_cpus`` bits in ``cpu_possible_mask``.

diff --git a/MAINTAINERS b/MAINTAINERS
index a097afd76ded..99334f11eb83 100644
index 21fdaa19229a..a7cf480a2052 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10814,6 +10814,12 @@ F: drivers/i3c/
@@ -10787,6 +10787,12 @@ F: drivers/i3c/
F: include/dt-bindings/i3c/
F: include/linux/i3c/

Expand All @@ -3026,7 +3026,7 @@ index a097afd76ded..99334f11eb83 100644
IBM Operation Panel Input Driver
M: Eddie James <eajames@linux.ibm.com>
L: linux-input@vger.kernel.org
@@ -17624,6 +17630,11 @@ S: Maintained
@@ -17575,6 +17581,11 @@ S: Maintained
F: drivers/leds/leds-pca9532.c
F: include/linux/leds-pca9532.h

Expand Down Expand Up @@ -67508,7 +67508,7 @@ index 695316a83b01..1d75d5e540bc 100644
/* Extract the status field from a kernel handle */
#define GET_MSEG_HANDLE_STATUS(h) (((*(unsigned long *)(h)) >> 16) & 3)
diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c
index 0f5b09e290c8..4eb4b9455139 100644
index 3036c15f3689..d2b2e39783d0 100644
--- a/drivers/misc/sgi-gru/grumain.c
+++ b/drivers/misc/sgi-gru/grumain.c
@@ -41,12 +41,16 @@ struct device *grudev = &gru_device;
Expand Down Expand Up @@ -67878,7 +67878,7 @@ index 804355da46f5..c6a8a2dc49c7 100644
defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\
(defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_ARCH_RPC))
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index ea36c6956bf3..ed3b16f3ffad 100644
index de035071fedb..013865fdcecc 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -435,7 +435,7 @@ config FB_VESA
Expand All @@ -67904,7 +67904,7 @@ index 684b9fe84fff..85716e58487b 100644
depends on I2C || I2C=n
depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT
diff --git a/fs/Kconfig b/fs/Kconfig
index 949895cff872..de83fbc2d48d 100644
index aae170fc2795..542c2de4fa0f 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -257,7 +257,7 @@ config ARCH_SUPPORTS_HUGETLBFS
Expand Down Expand Up @@ -68004,7 +68004,7 @@ index e28d88066033..c0295bef3771 100644
* We play games with efi_enabled so that the compiler will, if
* possible, remove EFI-related code altogether.
diff --git a/include/linux/mm.h b/include/linux/mm.h
index ecf63d2b0582..508a168683c7 100644
index 61fff5d34ed5..b38792ad77ba 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -375,6 +375,8 @@ extern unsigned int kobjsize(const void *objp);
Expand Down Expand Up @@ -68057,10 +68057,10 @@ index d293d52a3e00..53cea7e55288 100644
}

diff --git a/kernel/fork.c b/kernel/fork.c
index 89ceb4a68af2..a0d4ecca688c 100644
index 22f43721d031..3c1e782e9abd 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -3017,7 +3017,7 @@ static inline bool clone3_stack_valid(struct kernel_clone_args *kargs)
@@ -3019,7 +3019,7 @@ static inline bool clone3_stack_valid(struct kernel_clone_args *kargs)
if (!access_ok((void __user *)kargs->stack, kargs->stack_size))
return false;

Expand All @@ -68070,10 +68070,10 @@ index 89ceb4a68af2..a0d4ecca688c 100644
#endif
}
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 43e453ab7e20..d001af5e33fd 100644
index 719e0ed1e976..61d0afb8c363 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -8733,9 +8733,9 @@ void normalize_rt_tasks(void)
@@ -8755,9 +8755,9 @@ void normalize_rt_tasks(void)

#endif /* CONFIG_MAGIC_SYSRQ */

Expand All @@ -68085,7 +68085,7 @@ index 43e453ab7e20..d001af5e33fd 100644
*
* They can only be called when the whole system has been
* stopped - every CPU needs to be quiescent, and no scheduling
@@ -8757,7 +8757,30 @@ struct task_struct *curr_task(int cpu)
@@ -8779,7 +8779,30 @@ struct task_struct *curr_task(int cpu)
return cpu_curr(cpu);
}

Expand Down Expand Up @@ -68138,7 +68138,7 @@ index 79e6cb1d5c48..c6afa709254f 100644
{
.procname = "max_lock_depth",
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 7315f643817a..86cce2fb358b 100644
index 7312ae7c3cc5..0e7c4b0664d6 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -781,7 +781,7 @@ config SHRINKER_DEBUG
Expand Down Expand Up @@ -68181,10 +68181,10 @@ index 20aa459bfb3e..8968e2b8a12e 100644
bool "ARM BCJ filter decoder" if EXPERT
default y
diff --git a/mm/mmap.c b/mm/mmap.c
index dd4b35a25aeb..3ea457da9aa1 100644
index 79d541f1502b..88bf7d8b5c54 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1034,9 +1034,9 @@ static int acct_stack_growth(struct vm_area_struct *vma,
@@ -1035,9 +1035,9 @@ static int acct_stack_growth(struct vm_area_struct *vma,
return 0;
}

Expand All @@ -68196,7 +68196,7 @@ index dd4b35a25aeb..3ea457da9aa1 100644
* vma is the last one with address > vma->vm_end. Have to extend vma.
*/
static int expand_upwards(struct vm_area_struct *vma, unsigned long address)
@@ -1132,7 +1132,7 @@ static int expand_upwards(struct vm_area_struct *vma, unsigned long address)
@@ -1133,7 +1133,7 @@ static int expand_upwards(struct vm_area_struct *vma, unsigned long address)
validate_mm(mm);
return error;
}
Expand Down
4 changes: 2 additions & 2 deletions patches/standard/0006-ia64-Use-generic-lock-bitops.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1b9b2bd5c679facced893bb86d743518a73298ff Mon Sep 17 00:00:00 2001
From b6c42d697ccb78554a5de0f28115f486a43852e9 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Tue, 31 Oct 2023 19:49:13 +0100
Subject: [PATCH 06/36] ia64: Use generic lock bitops
Subject: [PATCH 06/37] ia64: Use generic lock bitops

ia64 is missing the function xor_unlock_is_negative_byte. Resolve this
by including asm-generic/bitops/lock.h and removing clear_bit_unlock
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0272d7967139c102817877ad44e55798e0f562f5 Mon Sep 17 00:00:00 2001
From 3e0631c838b28e5e4d2951f6aa6d8ef6b014d012 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Tue, 31 Oct 2023 19:51:09 +0100
Subject: [PATCH 07/36] ia64: Remove unused syscall_lookup_dcookie
Subject: [PATCH 07/37] ia64: Remove unused syscall_lookup_dcookie

lookup_dcookie was removed on other architectures after ia64 was
dropped.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d0b7cbdd83c5e04c8d9232bacba7d05424ea9aa0 Mon Sep 17 00:00:00 2001
From 1c784ebb651f964e3ad61c96736b99f9dbf14aa5 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Tue, 31 Oct 2023 19:49:39 +0100
Subject: [PATCH 08/36] ia64: Correct parse_crashkernel argument count
Subject: [PATCH 08/37] ia64: Correct parse_crashkernel argument count

New function has two more parameters crash_size and crash_base;
fix build by passing NULL to them.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From f7754b1c472c72c09ae20b4b6a8dd4ed5b25678e Mon Sep 17 00:00:00 2001
From dcaa9a06eb03c7fdc578c4540597b79735d52846 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Thu, 9 Nov 2023 17:18:24 +0100
Subject: [PATCH 09/36] ia64: Reserve map_shadow_stack() syscall number
Subject: [PATCH 09/37] ia64: Reserve map_shadow_stack() syscall number

map_shadow_stack was introducted after ia64 was removed from
the kernel hence it was not added to ia64 syscall table.
Expand Down
4 changes: 2 additions & 2 deletions patches/standard/0010-ia64-Add-futex_wake-syscall.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e9e3910d979b6f91dcf253bac72637d11df79b0d Mon Sep 17 00:00:00 2001
From 1a23a1586b26aaa4cbb2563bc8bc8dc909d89dc0 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Thu, 9 Nov 2023 17:24:02 +0100
Subject: [PATCH 10/36] ia64: Add futex_wake() syscall
Subject: [PATCH 10/37] ia64: Add futex_wake() syscall

futex_wake() was added after ia64 was removed from the kernel.

Expand Down
4 changes: 2 additions & 2 deletions patches/standard/0011-ia64-Add-futex_wait-syscall.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 467a464332e15eee26e54953f6d7d17a94324cc6 Mon Sep 17 00:00:00 2001
From 972cd7967f7d5bacc67cc4c52ef0fe6d2bc0e389 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Thu, 9 Nov 2023 17:31:05 +0100
Subject: [PATCH 11/36] ia64: Add futex_wait() syscall
Subject: [PATCH 11/37] ia64: Add futex_wait() syscall

futex_wait() was added after ia64 was removed from the kernel.

Expand Down
4 changes: 2 additions & 2 deletions patches/standard/0012-ia64-Add-futex_requeue-syscall.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 05a9a64329a84ecac50e66fb28dc352bded72ff9 Mon Sep 17 00:00:00 2001
From 0f4716ef9b524bf0305da055b1477afcaf03cb14 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Thu, 9 Nov 2023 17:32:42 +0100
Subject: [PATCH 12/36] ia64: Add futex_requeue() syscall
Subject: [PATCH 12/37] ia64: Add futex_requeue() syscall

futex_requeue() was added after ia64 was removed from the kernel.

Expand Down
4 changes: 2 additions & 2 deletions patches/standard/0013-ia64-Remove-sentinel-element.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From bba6cd5e4dd316a09d7432e5a2376553ae485e99 Mon Sep 17 00:00:00 2001
From 727fa4d87b283fdfc252d7d69fbe1c20ea20dcb7 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Mon, 13 Nov 2023 22:54:43 +0100
Subject: [PATCH 13/36] ia64: Remove sentinel element
Subject: [PATCH 13/37] ia64: Remove sentinel element

See 426ee5196d1821d70192923e70c0f8347faade47.
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 5f886604f34ff0fd119d3b81fcdc2a53dca76579 Mon Sep 17 00:00:00 2001
From 69aa4a69dce073209e492e0f86858b7ad14b7be6 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Mon, 20 Nov 2023 17:08:57 +0100
Subject: [PATCH 14/36] Revert "linux/export: clean up the IA-64 KSYM_FUNC
Subject: [PATCH 14/37] Revert "linux/export: clean up the IA-64 KSYM_FUNC
macro"

This reverts commit 9e0be3f50c0e8517d0238b62409c20bcb8cd8785.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 37336209a5f0eba7f844bc8e0c9b2d278f1f136e Mon Sep 17 00:00:00 2001
From 70552e8f6868463420357de9b0e31fa01043a83d Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Tue, 21 Nov 2023 16:40:42 +0100
Subject: [PATCH 15/36] ia64: set nid of all reserved memblocks to 0 at setup
Subject: [PATCH 15/37] ia64: set nid of all reserved memblocks to 0 at setup

Kernel panic was reported on HP Integrity rx6600 servers after commit
61167ad5fecde ("mm: pass nid to reserve_bootmem_region()"):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 3ef506eda8bbcbe2c1e0607044bf63ecffa76722 Mon Sep 17 00:00:00 2001
From a8256db7a10b88399fca501f994315031ef6241d Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Thu, 11 Jan 2024 13:37:09 +0100
Subject: [PATCH 16/36] ia64: rename MAX_ORDER to MAX_PAGE_ORDER
Subject: [PATCH 16/37] ia64: rename MAX_ORDER to MAX_PAGE_ORDER

MAX_ORDER was renamed to MAX_PAGE_ORDER in commit 5e0a760b44417
("mm, treewide: rename MAX_ORDER to MAX_PAGE_ORDER"). Rename it also
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8c8e6738f666b79c9da5be59946145579231afb2 Mon Sep 17 00:00:00 2001
From d1f0a812cfcda745c07dd78f11e7236fd178a60f Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Thu, 11 Jan 2024 14:21:54 +0100
Subject: [PATCH 17/36] Revert "mm: remove unnecessary ia64 code and comment"
Subject: [PATCH 17/37] Revert "mm: remove unnecessary ia64 code and comment"

This reverts commit e99fb98d478a0480d50e334df21bef12fb74e17f.
---
Expand All @@ -12,7 +12,7 @@ This reverts commit e99fb98d478a0480d50e334df21bef12fb74e17f.
4 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/mm/Kconfig b/mm/Kconfig
index 4c9f5ea13271..fe1c4ebbcb77 100644
index 33fa51d608dc..13862edde680 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -749,7 +749,7 @@ config DEFAULT_MMAP_MIN_ADDR
Expand All @@ -25,7 +25,7 @@ index 4c9f5ea13271..fe1c4ebbcb77 100644
On arm and other archs it should not be higher than 32768.
Programs which use vm86 functionality or have some need to map
diff --git a/mm/memory.c b/mm/memory.c
index 2366578015ad..619285fe1e20 100644
index bdf77a3ec47b..86cf4e6cd963 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -125,7 +125,9 @@ static __always_inline bool vmf_orig_pte_uffd_wp(struct vm_fault *vmf)
Expand Down
Loading

0 comments on commit 598ebb9

Please sign in to comment.