summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2011-09-27 21:13:20 -0400
committerChuck Ebbert <cebbert@redhat.com>2011-09-27 21:13:20 -0400
commitc39b72eeb3e88d1d4dcc1a4188932568f07b3593 (patch)
treea19c4945adc9461e8a2b0adfe90274b8f12ae353
parent3c2fcd2b1914b94ede8dfc654ea834c9e735fa5f (diff)
downloadkernel-c39b72eeb3e88d1d4dcc1a4188932568f07b3593.tar.gz
kernel-c39b72eeb3e88d1d4dcc1a4188932568f07b3593.tar.xz
kernel-c39b72eeb3e88d1d4dcc1a4188932568f07b3593.zip
Linux 3.1-rc8
New option: CONFIG_ARM_ERRATA_764369 is not set Fix up utrace.patch to apply after commit f9d81f61c
-rw-r--r--config-arm-omap-generic1
-rw-r--r--config-arm-tegra3
-rw-r--r--kernel.spec9
-rw-r--r--sources2
-rw-r--r--utrace.patch14
5 files changed, 18 insertions, 11 deletions
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index 19ea52191..e396169b3 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -127,6 +127,7 @@ CONFIG_ARM_ERRATA_720789=y
# CONFIG_ARM_ERRATA_753970 is not set
# CONFIG_ARM_ERRATA_754322 is not set
# CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
CONFIG_ARM_GIC=y
# CONFIG_PCI_SYSCALL is not set
# CONFIG_PCCARD is not set
diff --git a/config-arm-tegra b/config-arm-tegra
index 91c176bcd..910b39f81 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -6,7 +6,6 @@ CONFIG_MACH_TRIMSLICE=y
CONFIG_MACH_WARIO=y
CONFIG_MACH_TEGRA_DT=y
CONFIG_TEGRA_DEBUG_UARTD=y
-CONFIG_ARM_ERRATA_742230=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_SMP=y
@@ -32,6 +31,7 @@ CONFIG_CACHE_L2X0=y
CONFIG_ARM_ERRATA_430973=y
# CONFIG_ARM_ERRATA_458693 is not set
# CONFIG_ARM_ERRATA_460075 is not set
+CONFIG_ARM_ERRATA_742230=y
# CONFIG_ARM_ERRATA_742231 is not set
CONFIG_PL310_ERRATA_588369=y
CONFIG_ARM_ERRATA_720789=y
@@ -41,6 +41,7 @@ CONFIG_ARM_ERRATA_720789=y
# CONFIG_ARM_ERRATA_753970 is not set
# CONFIG_ARM_ERRATA_754322 is not set
# CONFIG_ARM_ERRATA_754327 is not set
+# CONFIG_ARM_ERRATA_764369 is not set
CONFIG_SMP_ON_UP=y
CONFIG_LOCAL_TIMERS=y
# CONFIG_THUMB2_KERNEL is not set
diff --git a/kernel.spec b/kernel.spec
index fdf34c540..5c891f1e8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3
#
-%global baserelease 2
+%global baserelease 0
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -82,7 +82,7 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 7
+%define rcrev 8
# The git snapshot level
%define gitrev 0
# Set rpm version accordingly
@@ -2051,6 +2051,11 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Sep 27 2011 Chuck Ebbert <cebbert@redhat.com>
+- Linux 3.1-rc8
+- New option: CONFIG_ARM_ERRATA_764369 is not set
+- Fix up utrace.patch to apply after commit f9d81f61c
+
* Thu Sep 22 2011 Dave Jones <davej@redhat.com>
- Make CONFIG_XEN_PLATFORM_PCI=y (rhbz 740664)
diff --git a/sources b/sources
index 90baa3585..2194c37b8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2
-39d993cb8e337a037e9e703b82223cec patch-3.1-rc7.bz2
+aae4a0422f4be618fcdbf4bf9de67143 patch-3.1-rc8.bz2
diff --git a/utrace.patch b/utrace.patch
index fbf28ff62..576c737f3 100644
--- a/utrace.patch
+++ b/utrace.patch
@@ -5168,14 +5168,14 @@ index 4194664..1a50090 100644
unlock_task_sighand(child, &flags);
ret = 0;
@@ -760,7 +772,7 @@ int ptrace_request(struct task_struct *child, long request,
- * of this trap and now. Trigger re-trap immediately.
- */
- if (child->jobctl & JOBCTL_TRAP_NOTIFY)
-- signal_wake_up(child, true);
-+ ptrace_signal_wake_up(child, true);
-
+ * start of this trap and now. Trigger re-trap.
+ */
+ if (child->jobctl & JOBCTL_TRAP_NOTIFY)
+- signal_wake_up(child, true);
++ ptrace_signal_wake_up(child, true);
+ ret = 0;
+ }
unlock_task_sighand(child, &flags);
- ret = 0;
diff --git a/kernel/signal.c b/kernel/signal.c
index 3e8e0b1..0dc6abb 100644
--- a/kernel/signal.c