Skip to content

Commit

Permalink
Update standard patch set to v6.12
Browse files Browse the repository at this point in the history
  • Loading branch information
johnny-mnemonic committed Nov 18, 2024
1 parent 6e449e4 commit bc31537
Show file tree
Hide file tree
Showing 37 changed files with 44 additions and 44 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c7205c6a7ce8c78e12a36067aee5451c6e9c7981 Mon Sep 17 00:00:00 2001
From d0ec29de90eabac28d71255c725f3e2900837611 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/37] Revert "Documentation: Drop or replace remaining
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 1666576acc0e..1281bfbdea69 100644
index d401577b5a6a..de242302bf8a 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 79192a3024bf..ddac27d1da41 100644
index 68a8faff2543..e028bf75e596 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,4 +1,4 @@
From 07431302e425c07bbf16e5c9a9d7a8a3c3532b96 Mon Sep 17 00:00:00 2001
From fbc5af3c692747c2d93d23ebe39e6df0e62f35fe 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/37] Revert "lib/raid6: Drop IA64 support"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1b0ae419f8c1349a757eb2981e34d8030a204633 Mon Sep 17 00:00:00 2001
From ca47142c5444f3d090a46445bf69aa992d88c83e 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/37] Revert "Documentation: Drop IA64 from feature
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 98841eeeefb0e578639cbef29c7ae259e82ef9e5 Mon Sep 17 00:00:00 2001
From 76d36ecedf3c1018557f2a681e7f1f3dbf7768fd 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/37] Revert "kernel: Drop IA64 support from sig_fault
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1d2a136324f85db22c54a4ec5b57efd597cada82 Mon Sep 17 00:00:00 2001
From ce1cbc0323f4dfb7531f01fb753a73b9a3b577b8 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/37] Revert "arch: Remove Itanium (IA-64) architecture"
Expand Down Expand Up @@ -3010,7 +3010,7 @@ index a21dbf261be7..157b2139a4a1 100644
This option sets ``possible_cpus`` bits in ``cpu_possible_mask``.

diff --git a/MAINTAINERS b/MAINTAINERS
index 21fdaa19229a..a7cf480a2052 100644
index b878ddc99f94..5f9b398c58a8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10787,6 +10787,12 @@ F: drivers/i3c/
Expand Down Expand Up @@ -68070,10 +68070,10 @@ index 22f43721d031..3c1e782e9abd 100644
#endif
}
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 719e0ed1e976..61d0afb8c363 100644
index a1c353a62c56..466696333a03 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -8755,9 +8755,9 @@ void normalize_rt_tasks(void)
@@ -8758,9 +8758,9 @@ void normalize_rt_tasks(void)

#endif /* CONFIG_MAGIC_SYSRQ */

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

Expand Down
2 changes: 1 addition & 1 deletion patches/standard/0006-ia64-Use-generic-lock-bitops.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b6c42d697ccb78554a5de0f28115f486a43852e9 Mon Sep 17 00:00:00 2001
From 47d27c06eed11960267ffae9aa521e052853462d 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/37] ia64: Use generic lock bitops
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3e0631c838b28e5e4d2951f6aa6d8ef6b014d012 Mon Sep 17 00:00:00 2001
From 78efdda7358db934cc1eaabd42126042dba52668 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/37] ia64: Remove unused syscall_lookup_dcookie
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1c784ebb651f964e3ad61c96736b99f9dbf14aa5 Mon Sep 17 00:00:00 2001
From 8ea0829b6df9dafae96978ada001e322f0ecc90f 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/37] ia64: Correct parse_crashkernel argument count
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From dcaa9a06eb03c7fdc578c4540597b79735d52846 Mon Sep 17 00:00:00 2001
From 3bcf9bc926ada34dbb6c3b587eb0e1e8bd50b28d 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/37] ia64: Reserve map_shadow_stack() syscall number
Expand Down
2 changes: 1 addition & 1 deletion patches/standard/0010-ia64-Add-futex_wake-syscall.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1a23a1586b26aaa4cbb2563bc8bc8dc909d89dc0 Mon Sep 17 00:00:00 2001
From 2db39d7e1cd352cc7702aabd88c20892e7c85cd1 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/37] ia64: Add futex_wake() syscall
Expand Down
2 changes: 1 addition & 1 deletion patches/standard/0011-ia64-Add-futex_wait-syscall.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 972cd7967f7d5bacc67cc4c52ef0fe6d2bc0e389 Mon Sep 17 00:00:00 2001
From 0f6b6a1c35df8e589b9818971414d7e58274b750 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/37] ia64: Add futex_wait() syscall
Expand Down
2 changes: 1 addition & 1 deletion patches/standard/0012-ia64-Add-futex_requeue-syscall.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 0f4716ef9b524bf0305da055b1477afcaf03cb14 Mon Sep 17 00:00:00 2001
From 5a68172e9d8806c2f237a1ab37db4c55c2bffc40 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/37] ia64: Add futex_requeue() syscall
Expand Down
2 changes: 1 addition & 1 deletion patches/standard/0013-ia64-Remove-sentinel-element.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 727fa4d87b283fdfc252d7d69fbe1c20ea20dcb7 Mon Sep 17 00:00:00 2001
From ebbacaa6e074c14e5692b78683f8dffc83aa061e 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/37] ia64: Remove sentinel element
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 69aa4a69dce073209e492e0f86858b7ad14b7be6 Mon Sep 17 00:00:00 2001
From 86d4b029a952df5636bface1f9f4ad65086a53c6 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/37] Revert "linux/export: clean up the IA-64 KSYM_FUNC
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 70552e8f6868463420357de9b0e31fa01043a83d Mon Sep 17 00:00:00 2001
From ee8e839bcb7796caa417370501bf81ebe3a8abda 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/37] ia64: set nid of all reserved memblocks to 0 at setup
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a8256db7a10b88399fca501f994315031ef6241d Mon Sep 17 00:00:00 2001
From 862d5215729db81da5ef240e1489533fe6c40a7d 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/37] ia64: rename MAX_ORDER to MAX_PAGE_ORDER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d1f0a812cfcda745c07dd78f11e7236fd178a60f Mon Sep 17 00:00:00 2001
From b7da0fb2d3294c7229293ea4b31bb7a0c2b7d15c 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/37] Revert "mm: remove unnecessary ia64 code and comment"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d9256199efd0255daef410ae50032d8f8701c727 Mon Sep 17 00:00:00 2001
From df8d2df5649aee604140053ef65aefa144acdfb0 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Fri, 12 Jan 2024 18:54:34 +0100
Subject: [PATCH 18/37] Revert "arch: remove ARCH_THREAD_STACK_ALLOCATOR"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ca2aa2fa81edceb46f6fb2fb52d616348e56fd19 Mon Sep 17 00:00:00 2001
From 2516337e1d456555964db8f2ea96b87d7e62fbbb Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Thu, 11 Jan 2024 16:45:16 +0100
Subject: [PATCH 19/37] Revert "arch: remove ARCH_TASK_STRUCT_ALLOCATOR"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8bba13237ba1ae8a91ddfb1ea4f33b8302b59342 Mon Sep 17 00:00:00 2001
From 4c086a23b0532eeabaabf9afa6a1222a3bedf256 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Fri, 12 Jan 2024 19:11:18 +0100
Subject: [PATCH 20/37] Revert "arch: remove ARCH_TASK_STRUCT_ON_STACK"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 408f98908d8388238e507aa0301a051a601211b2 Mon Sep 17 00:00:00 2001
From 077cfe651cca9b13aadb42bf6b2122cf8da61cca Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Fri, 19 Jan 2024 20:18:07 +0100
Subject: [PATCH 21/37] Revert "tty: deprecate tty_write_message()"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 071af658649a19c36aa15a6b6bfd442c3114c74c Mon Sep 17 00:00:00 2001
From 9a782310ce39db5ecf05a599861d9fc0bd3adec9 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Sun, 24 Mar 2024 19:43:52 +0100
Subject: [PATCH 22/37] Revert "mmap: remove the IA64-specific vma expansion
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4c19fe7fd42cbb0d9ec1fb41b4451c532c3f426d Mon Sep 17 00:00:00 2001
From 5a8f5c4ac0e3441e1468a55efb537e2724633c41 Mon Sep 17 00:00:00 2001
From: Tomas Glozar <tglozar@gmail.com>
Date: Sun, 24 Mar 2024 20:20:36 +0100
Subject: [PATCH 23/37] Revert "hpet: remove hpets::hp_clocksource"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 70b9d84c464ba428c7c2f170595047a86999e5ea Mon Sep 17 00:00:00 2001
From 2154b82f030871e79865000412499f10662d60d6 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Sun, 2 Jun 2024 10:02:39 +0200
Subject: [PATCH 24/37] ia64: replay "change alloc_pages name in dma_map_ops
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 67ed0d13301dd8c3905a38595e167006d4f2c140 Mon Sep 17 00:00:00 2001
From d69af7e209c74ef025f0f6413d274c38370beb59 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Sun, 2 Jun 2024 13:28:12 +0200
Subject: [PATCH 25/37] ia64: handle "NUMA: early use of cpu_to_node() returns
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f097e6cacc8bc15fee5e1ef104c993729eb8b2b2 Mon Sep 17 00:00:00 2001
From c5fe12bfe80d9d2da4ff587a1cb105f36f9aac6a Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Sun, 2 Jun 2024 10:03:49 +0200
Subject: [PATCH 26/37] Revert "mm: remove guard around pgd_offset_k() macro"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From df55e5d5effdf520634629c83122c2fa387be41b Mon Sep 17 00:00:00 2001
From 4d20ead20da5e2ec8d702f6784779a097478582e Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Sun, 2 Jun 2024 10:05:31 +0200
Subject: [PATCH 27/37] Revert "ACPI/NUMA: Squash
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fadcee096f8d889883945e4a8093144e05e8ca0b Mon Sep 17 00:00:00 2001
From a0409ccb31dd0dca7fc41290d5cf6d5028ed1b98 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Sun, 2 Jun 2024 10:10:34 +0200
Subject: [PATCH 28/37] Revert "ACPI/NUMA: Remove architecture dependent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8a1a621cf6d0c62987cdebcd6902f093e0bdde47 Mon Sep 17 00:00:00 2001
From 6ff7edf19f1861514d4d6958077400f04339c1d3 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Thu, 18 Jul 2024 20:48:20 +0200
Subject: [PATCH 29/37] ia64: replay "sched/vtime: Do not include <asm/vtime.h>
Expand Down
2 changes: 1 addition & 1 deletion patches/standard/0030-ia64-fix-Python-string-escapes.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 886fc991cf47d432d54a0d29529184f23661f159 Mon Sep 17 00:00:00 2001
From 66d87474c58ba0b6f52d6ef7b33909d7184e443f Mon Sep 17 00:00:00 2001
From: Benjamin Gray <bgray@linux.ibm.com>
Date: Tue, 12 Sep 2023 16:07:55 +1000
Subject: [PATCH 30/37] ia64: fix Python string escapes
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ad80f0fd59042a5de7bf1fedeea7a26a6b256c30 Mon Sep 17 00:00:00 2001
From c6f5749105f91fa3cf99557939b5daece99846dd Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Thu, 19 Sep 2024 22:50:12 +0200
Subject: [PATCH 31/37] ia64: replay "dma-mapping: clearly mark DMA ops as
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d04e0bc0fcb56497474b40c5f29a07685c448475 Mon Sep 17 00:00:00 2001
From dae19098164a8deb9c67c186a24ef35819af48d3 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Fri, 27 Sep 2024 14:29:04 +0200
Subject: [PATCH 32/37] Partially revert "x86: remove PG_uncached"
Expand Down Expand Up @@ -123,7 +123,7 @@ index 6f9c3dceff32..84abc858ca3d 100644
#define IF_HAVE_PG_HWPOISON(_name) ,{1UL << PG_##_name, __stringify(_name)}
#else
diff --git a/tools/mm/page-types.c b/tools/mm/page-types.c
index 6eb17cc1a06c..fa57be7c3f20 100644
index bcac7ebfb51f..f01b4d998d8b 100644
--- a/tools/mm/page-types.c
+++ b/tools/mm/page-types.c
@@ -77,7 +77,7 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f55d4cd7eb6e9dab2da10cda15cc1953a254babe Mon Sep 17 00:00:00 2001
From a4781311a2df44ab5b26edcc6dffd5c515af2e04 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Fri, 27 Sep 2024 14:33:54 +0200
Subject: [PATCH 33/37] Replay "mm: make arch_get_unmapped_area() take vm_flags
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 451d23e0b23ab59516e004044ccac20b2b936faa Mon Sep 17 00:00:00 2001
From c933bc269bcbbd3a64409bb8ddd5be64a37376af Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Fri, 27 Sep 2024 14:54:38 +0200
Subject: [PATCH 34/37] Revert "efi: Remove unused declaration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e83d981751c9f19771ed7403e1bd053e08c6204b Mon Sep 17 00:00:00 2001
From ea880e685f1914fc4ba09bb29d8df19c3961bdbc Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Fri, 4 Oct 2024 20:50:34 +0200
Subject: [PATCH 35/37] ia64: replay "move asm/unaligned.h to
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From cd9576bbe610d9b5021d12bdb1268274c886cb74 Mon Sep 17 00:00:00 2001
From 1402ed0185e659156b085f22b6a41c4a27fc48b1 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Sat, 5 Oct 2024 13:16:09 +0200
Subject: [PATCH 36/37] ia64: For now silence warning due to redefinition of
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 820146ad4c28853df785ffecc45b01fcc27ff05e Mon Sep 17 00:00:00 2001
From c13f5a34d3af58afdc82d53f564d2f1957d823b0 Mon Sep 17 00:00:00 2001
From: Johnny Mnemonic <jm@machine-hall.org>
Date: Mon, 21 Oct 2024 11:51:37 +0200
Subject: [PATCH 37/37] ia64: Workaround -Wmissing-prototypes warnings
Expand Down

0 comments on commit bc31537

Please sign in to comment.