Skip to content

Commit

Permalink
Update standard patch set to v6.13-pre-rc-w-ia64-1
Browse files Browse the repository at this point in the history
from
https://github.com/johnny-mnemonic/linux-ia64/tree/v6.13-pre-rc-w-ia64-1

Also drop extra patch now in standard patch set.
  • Loading branch information
johnny-mnemonic committed Nov 21, 2024
1 parent eea17fd commit fd2a806
Show file tree
Hide file tree
Showing 38 changed files with 147 additions and 147 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d0ec29de90eabac28d71255c725f3e2900837611 Mon Sep 17 00:00:00 2001
From 4dc1e037b29662958c28236402177917b65b06aa 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
Subject: [PATCH 01/38] Revert "Documentation: Drop or replace remaining
mentions of IA64"

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

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index d401577b5a6a..de242302bf8a 100644
index 2e66fef83468..fac4db0968c5 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1496,7 +1496,7 @@
@@ -1503,7 +1503,7 @@
See comment before function elanfreq_setup() in
arch/x86/kernel/cpu/cpufreq/elanfreq.c.

Expand All @@ -193,7 +193,7 @@ index d401577b5a6a..de242302bf8a 100644
Specifies physical address of start of kernel core
image elf header and optionally the size. Generally
kexec loader will pass this option to capture kernel.
@@ -1559,6 +1559,12 @@
@@ -1566,6 +1566,12 @@
floppy= [HW]
See Documentation/admin-guide/blockdev/floppy.rst.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From fbc5af3c692747c2d93d23ebe39e6df0e62f35fe Mon Sep 17 00:00:00 2001
From 5a828609ae27d46d3697299d19bf8b0eb7e205e9 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"
Subject: [PATCH 02/38] 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 ca47142c5444f3d090a46445bf69aa992d88c83e Mon Sep 17 00:00:00 2001
From 0e8e4a345da3ceb83acc8d20c97d1d37fadebe34 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
Subject: [PATCH 03/38] 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 76d36ecedf3c1018557f2a681e7f1f3dbf7768fd Mon Sep 17 00:00:00 2001
From 577057e374f48ecfe5b76e84c273bada3c71b4ef 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
Subject: [PATCH 04/38] Revert "kernel: Drop IA64 support from sig_fault
handlers"

This reverts commit f5e836884d8e55b416dfad55c29481ec1b65c1f0.
Expand All @@ -12,10 +12,10 @@ This reverts commit f5e836884d8e55b416dfad55c29481ec1b65c1f0.
3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h
index c8ed09ac29ac..4a8da681f4af 100644
index d5d03d919df8..062e6465d7cd 100644
--- a/include/linux/sched/signal.h
+++ b/include/linux/sched/signal.h
@@ -303,11 +303,20 @@ static inline void kernel_signal_stop(void)
@@ -304,11 +304,20 @@ static inline void kernel_signal_stop(void)

schedule();
}
Expand All @@ -41,7 +41,7 @@ index c8ed09ac29ac..4a8da681f4af 100644
int force_sig_mceerr(int code, void __user *, short);
int send_sig_mceerr(int code, void __user *, short, struct task_struct *);
diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h
index b7bc545ec3b2..0f52d0ac47c5 100644
index 5a1ca43b5fc6..013f2c5ccae6 100644
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@ -68,6 +68,11 @@ union __sifields {
Expand All @@ -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 cbabb2d05e0a..632f5bcedbc3 100644
index 98b65cb35830..7979ed929b90 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1717,8 +1717,9 @@ void force_sigsegv(int sig)
@@ -1685,8 +1685,9 @@ void force_sigsegv(int sig)
force_sig(SIGSEGV);
}

Expand All @@ -72,7 +72,7 @@ index cbabb2d05e0a..632f5bcedbc3 100644
{
struct kernel_siginfo info;

@@ -1727,15 +1728,24 @@ int force_sig_fault_to_task(int sig, int code, void __user *addr,
@@ -1695,15 +1696,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 cbabb2d05e0a..632f5bcedbc3 100644
{
struct kernel_siginfo info;

@@ -1744,6 +1754,11 @@ int send_sig_fault(int sig, int code, void __user *addr, struct task_struct *t)
@@ -1712,6 +1722,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
Loading

0 comments on commit fd2a806

Please sign in to comment.