summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Add-option-to-automatically-enforce-module-signature.patch4
-rw-r--r--Add-secure_modules-call.patch4
-rw-r--r--Add-sysrq-option-to-disable-secure-boot-mode.patch2
-rw-r--r--config-arm-generic2
-rw-r--r--config-arm643
-rw-r--r--config-armv7-generic3
-rw-r--r--config-generic3
-rw-r--r--kernel.spec5
-rw-r--r--sources2
9 files changed, 21 insertions, 7 deletions
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch
index cc8914d2c..bfb12e0a7 100644
--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ b/Add-option-to-automatically-enforce-module-signature.patch
@@ -163,10 +163,10 @@ index cdc46a791b9d..0c1edd33a42c 100644
extern int modules_disabled; /* for sysctl */
diff --git a/kernel/module.c b/kernel/module.c
-index 63bdba31cebc..5000dd2cdd18 100644
+index f43cbdd52546..feb6736fec91 100644
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -3912,6 +3912,13 @@ void module_layout(struct module *mod,
+@@ -3913,6 +3913,13 @@ void module_layout(struct module *mod,
EXPORT_SYMBOL(module_layout);
#endif
diff --git a/Add-secure_modules-call.patch b/Add-secure_modules-call.patch
index 9a6cc9fbc..4124964ce 100644
--- a/Add-secure_modules-call.patch
+++ b/Add-secure_modules-call.patch
@@ -41,10 +41,10 @@ index c883b86ea964..cdc46a791b9d 100644
#ifdef CONFIG_SYSFS
diff --git a/kernel/module.c b/kernel/module.c
-index 650b038ae520..63bdba31cebc 100644
+index 42a1d2afb217..f43cbdd52546 100644
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -3911,3 +3911,13 @@ void module_layout(struct module *mod,
+@@ -3912,3 +3912,13 @@ void module_layout(struct module *mod,
}
EXPORT_SYMBOL(module_layout);
#endif
diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch
index 811406bf4..d7244f99a 100644
--- a/Add-sysrq-option-to-disable-secure-boot-mode.patch
+++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch
@@ -228,7 +228,7 @@ index 4121345498e0..0ff3cef5df96 100644
return 0;
diff --git a/kernel/module.c b/kernel/module.c
-index 5000dd2cdd18..0a2005132472 100644
+index feb6736fec91..5ea645737f23 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -107,9 +107,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
diff --git a/config-arm-generic b/config-arm-generic
index 37823e355..11c934a5b 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -259,6 +259,8 @@ CONFIG_CMA_AREAS=7
# CONFIG_ARM_PTDUMP is not set
+# CONFIG_ARM_CCI400_PMU is not set
+
# CONFIG_PATA_PLATFORM is not set
# CONFIG_USB_ULPI is not set
# CONFIG_KEYBOARD_OMAP4 is not set
diff --git a/config-arm64 b/config-arm64
index 52417b654..bd040513b 100644
--- a/config-arm64
+++ b/config-arm64
@@ -14,6 +14,9 @@ CONFIG_ARCH_SEATTLE=y
# CONFIG_ARCH_FSL_LS2085A is not set
# CONFIG_ARCH_MEDIATEK is not set
# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_SPRD is not set
+# CONFIG_ARCH_ZYNQMP is not set
# Erratum
CONFIG_ARM64_ERRATUM_826319=y
diff --git a/config-armv7-generic b/config-armv7-generic
index 98812599d..90c79ca74 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -71,6 +71,8 @@ CONFIG_ARCH_VIRT=y
# CONFIG_ARCH_VEXPRESS_SPC is not set
# CONFIG_ARCH_WM8850 is not set
# CONFIG_ARCH_DIGICOLOR is not set
+# CONFIG_ARCH_ALPINE is not set
+# CONFIG_ARCH_AT91 is not set
# errata
# v5/v6
@@ -397,6 +399,7 @@ CONFIG_ARCH_MVEBU=y
CONFIG_MACH_ARMADA_370=y
CONFIG_MACH_ARMADA_375=y
CONFIG_MACH_ARMADA_38X=y
+CONFIG_MACH_ARMADA_39X=y
CONFIG_MACH_ARMADA_XP=y
CONFIG_MACH_DOVE=y
diff --git a/config-generic b/config-generic
index d14208325..9ec015755 100644
--- a/config-generic
+++ b/config-generic
@@ -266,6 +266,7 @@ CONFIG_MTD=m
# CONFIG_SM_FTL is not set
# CONFIG_MTD_OOPS is not set
# CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_PARTITIONED_MASTER is not set
#
# RAM/ROM/Flash chip drivers
@@ -390,6 +391,7 @@ CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_PCI_LEGACY=y
CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
CONFIG_VIRTIO_MMIO=m
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
CONFIG_VIRTIO_NET=m
@@ -2931,6 +2933,7 @@ CONFIG_WM831X_WATCHDOG=m
# CONFIG_MEN_A21_WDT is not set
# CONFIG_GPIO_WATCHDOG is not set
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_TIMERIOMEM=m
diff --git a/kernel.spec b/kernel.spec
index 189c7614b..d6969aa19 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 12
+%define gitrev 13
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2187,6 +2187,9 @@ fi
#
#
%changelog
+* Thu Apr 23 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git13.1
+- Linux v4.0-10710-g27cf3a16b253
+
* Wed Apr 22 2015 Peter Robinson <pbrobinson@fedoraproject.org>
- Update AMD xgbe a0 aarch64 driver for 4.1
diff --git a/sources b/sources
index 0760a6cca..9d0e58890 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
a86916bd12798220da9eb4a1eec3616d linux-4.0.tar.xz
d125eecce68ab6fb5f1f23523c2c04b8 perf-man-4.0.tar.gz
-b89c27d11d3559808c330db556de20d4 patch-4.0-git12.xz
+059384b90e76b8c6691069e31ebbc401 patch-4.0-git13.xz