summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-10-17 09:46:17 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-10-17 09:49:33 -0700
commit8bf2afaffdfb0ef2638c115b224b3d69f2bd9906 (patch)
tree7f718693bbda97f9dc125348ea0c8788fea5cd09
parent4eea1586d9fdb8680b2e9f49787ea5ebd79405c6 (diff)
downloadkernel-8bf2afaffdfb0ef2638c115b224b3d69f2bd9906.tar.gz
kernel-8bf2afaffdfb0ef2638c115b224b3d69f2bd9906.tar.xz
kernel-8bf2afaffdfb0ef2638c115b224b3d69f2bd9906.zip
Linux v4.9-rc1
-rw-r--r--config-generic2
-rw-r--r--crash-driver.patch29
-rw-r--r--kbuild-AFTER_LINK.patch8
-rw-r--r--kernel.spec7
-rw-r--r--sources2
5 files changed, 25 insertions, 23 deletions
diff --git a/config-generic b/config-generic
index 350ccb76b..d65cf0765 100644
--- a/config-generic
+++ b/config-generic
@@ -3312,6 +3312,7 @@ CONFIG_RTC_DRV_CMOS=y
CONFIG_RTC_DRV_ABX80X=m
CONFIG_RTC_DRV_DS1307=m
CONFIG_RTC_DRV_DS1307_HWMON=y
+CONFIG_RTC_DRV_DS1307_CENTURY=y
CONFIG_RTC_DRV_DS1511=m
CONFIG_RTC_DRV_DS1553=m
CONFIG_RTC_DRV_DS1685_FAMILY=m
@@ -5595,6 +5596,7 @@ CONFIG_KS0108_PORT=0x378
CONFIG_KS0108_DELAY=2
CONFIG_CFAG12864B=y
CONFIG_CFAG12864B_RATE=20
+# CONFIG_IMG_ASCII_LCD is not set
# CONFIG_PHANTOM is not set
diff --git a/crash-driver.patch b/crash-driver.patch
index 2b05554b7..3bfd8ee99 100644
--- a/crash-driver.patch
+++ b/crash-driver.patch
@@ -1,4 +1,4 @@
-From 3fbd61fbbbfa7ae15cd3f3e2ff7a97e106be2b43 Mon Sep 17 00:00:00 2001
+From 973e23bf27b0b2e5021321357fc570cccea3104c Mon Sep 17 00:00:00 2001
From: Dave Anderson <anderson@redhat.com>
Date: Tue, 26 Nov 2013 12:42:46 -0500
Subject: [PATCH] crash-driver
@@ -149,19 +149,16 @@ index 0000000..404bcb9
+
+#endif /* _ASM_IA64_CRASH_H */
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
-index 0967310..e888878 100644
+index d111248..b14b4c6 100644
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
-@@ -84,6 +84,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
- #include <asm/unwind.h>
- EXPORT_SYMBOL(unw_init_running);
-
+@@ -9,3 +9,6 @@
+ EXPORT_SYMBOL(min_low_pfn); /* defined by bootmem.c, but not exported by generic code */
+ EXPORT_SYMBOL(max_low_pfn); /* defined by bootmem.c, but not exported by generic code */
+ #endif
++
+#include <linux/efi.h>
+EXPORT_SYMBOL_GPL(efi_mem_type);
-+
- #if defined(CONFIG_IA64_ESI) || defined(CONFIG_IA64_ESI_MODULE)
- extern void esi_call_phys (void);
- EXPORT_SYMBOL_GPL(esi_call_phys);
diff --git a/arch/powerpc/include/asm/crash-driver.h b/arch/powerpc/include/asm/crash-driver.h
new file mode 100644
index 0000000..50092d9
@@ -270,7 +267,7 @@ index 0000000..fd4736e
+
+#endif /* _X86_CRASH_H */
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index fdb8f3e..7dd3a49 100644
+index dcc0973..99b99d5 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -4,6 +4,9 @@
@@ -284,10 +281,10 @@ index fdb8f3e..7dd3a49 100644
config DEVMEM
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index 55d16bf..a40ace9 100644
+index 6e6c244..29cc9c8 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
-@@ -61,3 +61,5 @@ js-rtc-y = rtc.o
+@@ -60,3 +60,5 @@ js-rtc-y = rtc.o
obj-$(CONFIG_TILE_SROM) += tile-srom.o
obj-$(CONFIG_XILLYBUS) += xillybus/
obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o
@@ -506,9 +503,9 @@ index 0000000..25ab986
+
+#endif /* __CRASH_H__ */
--
-2.9.2
+2.7.4
-From 7523c19e1d22fbabeaeae9520c16a78202c0eefe Mon Sep 17 00:00:00 2001
+From 23d8bd48303acda2d3a95a3e1a662784a4fa9fcd Mon Sep 17 00:00:00 2001
From: Fedora Kernel Team <kernel-team@fedoraproject.org>
Date: Tue, 20 Sep 2016 19:39:46 +0200
Subject: [PATCH] Update of crash driver to handle CONFIG_HARDENED_USERCOPY and
@@ -601,5 +598,5 @@ index 085378a..0258bf8 100644
static struct miscdevice crash_dev = {
--
-2.9.3
+2.7.4
diff --git a/kbuild-AFTER_LINK.patch b/kbuild-AFTER_LINK.patch
index 74dac7bc8..ab738c62b 100644
--- a/kbuild-AFTER_LINK.patch
+++ b/kbuild-AFTER_LINK.patch
@@ -1,4 +1,4 @@
-From 22e118d8d8dd13cda14973e28e198ec76c6a9a3b Mon Sep 17 00:00:00 2001
+From 649d991ca7737dd227f2a1ca4f30247daf6a7b4b Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Mon, 6 Oct 2008 23:03:03 -0700
Subject: [PATCH] kbuild: AFTER_LINK
@@ -107,11 +107,11 @@ index d540966..eeb47b6 100644
VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \
$(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
-index 4f727eb..7f73bee 100755
+index f742c65..526eee4 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
-@@ -65,6 +65,10 @@ vmlinux_link()
- -lutil -lrt -lpthread ${1}
+@@ -111,6 +111,10 @@ vmlinux_link()
+ -lutil -lrt -lpthread
rm -f linux
fi
+ if [ -n "${AFTER_LINK}" ]; then
diff --git a/kernel.spec b/kernel.spec
index 064b63294..a6f125201 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,9 +67,9 @@ 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 0
+%global rcrev 1
# The git snapshot level
-%define gitrev 9
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2142,6 +2142,9 @@ fi
#
#
%changelog
+* Mon Oct 17 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc1.git0.1
+- Linux v4.8-rc1
+
* Mon Oct 17 2016 Laura Abbott <labbott@redhat.com>
- Disable debugging options.
diff --git a/sources b/sources
index 5d654976f..44eb9410a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
c1af0afbd3df35c1ccdc7a5118cd2d07 linux-4.8.tar.xz
0dad03f586e835d538d3e0d2cbdb9a28 perf-man-4.8.tar.gz
-e1029b94d3c299991f7103373ee1f090 patch-4.8-git9.xz
+57c8efbc183617e94a8367d03f752b4d patch-4.9-rc1.xz