diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-16 10:01:09 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-16 10:01:09 -0500 |
commit | f1193f2c7556c2f1a74c3b6f16320a6d899806d9 (patch) | |
tree | 6a6107b0e900f3eb78cf61ba8ceeda44a6307ba3 | |
parent | 87b2a17d8cd45e1bb04d49c89ae7af476bcd917c (diff) | |
download | kernel-f1193f2c7556c2f1a74c3b6f16320a6d899806d9.tar.gz kernel-f1193f2c7556c2f1a74c3b6f16320a6d899806d9.tar.xz kernel-f1193f2c7556c2f1a74c3b6f16320a6d899806d9.zip |
Linux v3.19-6676-g1fa185ebcbce
22 files changed, 73 insertions, 49 deletions
diff --git a/ARM-tegra-usb-no-reset.patch b/ARM-tegra-usb-no-reset.patch index ac4ae8981..7c6357876 100644 --- a/ARM-tegra-usb-no-reset.patch +++ b/ARM-tegra-usb-no-reset.patch @@ -9,10 +9,10 @@ Patch for disconnect issues with storage attached to a 1 file changed, 7 insertions(+) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index eaffb0248de1..b9884d87b012 100644 +index d7c3d5a35946..a1121fc01e8c 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5009,6 +5009,13 @@ static void hub_event(struct work_struct *work) +@@ -5006,6 +5006,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch index 7ba12b477..06a92a99d 100644 --- a/Add-option-to-automatically-enforce-module-signature.patch +++ b/Add-option-to-automatically-enforce-module-signature.patch @@ -33,10 +33,10 @@ index 199f453cb4de..ec38acf00b40 100644 290/040 ALL edd_mbr_sig_buffer EDD MBR signatures 2D0/A00 ALL e820_map E820 memory map table diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 33ce9a344e38..f2d464b05bb9 100644 +index eb1cf898ed3c..a2a0a1636287 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1677,6 +1677,16 @@ config EFI_MIXED +@@ -1678,6 +1678,16 @@ config EFI_MIXED If unsure, say N. @@ -54,7 +54,7 @@ index 33ce9a344e38..f2d464b05bb9 100644 def_bool y prompt "Enable seccomp to safely compute untrusted bytecode" diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c -index 92b9a5f2aed6..2192da755e34 100644 +index ef17683484e9..105e7360d747 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -12,6 +12,7 @@ @@ -63,9 +63,9 @@ index 92b9a5f2aed6..2192da755e34 100644 #include <asm/desc.h> +#include <asm/bootparam_utils.h> - #undef memcpy /* Use memcpy from misc.c */ - -@@ -828,6 +829,37 @@ out: + #include "../string.h" + #include "eboot.h" +@@ -827,6 +828,37 @@ out: return status; } @@ -103,7 +103,7 @@ index 92b9a5f2aed6..2192da755e34 100644 /* * See if we have Graphics Output Protocol */ -@@ -1407,6 +1439,10 @@ struct boot_params *efi_main(struct efi_config *c, +@@ -1406,6 +1438,10 @@ struct boot_params *efi_main(struct efi_config *c, else setup_boot_services32(efi_early); @@ -129,10 +129,10 @@ index 225b0988043a..90dbfb73e11f 100644 * The sentinel is set to a nonzero value (0xff) in header.S. * diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index c4648adadd7d..90de17f70b16 100644 +index 27d200929864..ac83259928e6 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1150,6 +1150,12 @@ void __init setup_arch(char **cmdline_p) +@@ -1151,6 +1151,12 @@ void __init setup_arch(char **cmdline_p) io_delay_init(); @@ -146,7 +146,7 @@ index c4648adadd7d..90de17f70b16 100644 * Parse the ACPI tables for possible boot-time SMP configuration. */ diff --git a/include/linux/module.h b/include/linux/module.h -index d4b96d6c926a..c47f75720dbd 100644 +index 0c86ec9e10ed..b02dfaacc76c 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add); @@ -163,10 +163,10 @@ index d4b96d6c926a..c47f75720dbd 100644 extern int modules_disabled; /* for sysctl */ diff --git a/kernel/module.c b/kernel/module.c -index 98c3d7955a51..6244f24abe27 100644 +index c641bc22d10b..ad861480c8e4 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -3896,6 +3896,13 @@ void module_layout(struct module *mod, +@@ -3887,6 +3887,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 84ff314ac..76b8e693e 100644 --- a/Add-secure_modules-call.patch +++ b/Add-secure_modules-call.patch @@ -16,7 +16,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com> 2 files changed, 17 insertions(+) diff --git a/include/linux/module.h b/include/linux/module.h -index b653d7c0a05a..d4b96d6c926a 100644 +index 42999fe2dbd0..0c86ec9e10ed 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -502,6 +502,8 @@ int unregister_module_notifier(struct notifier_block *nb); @@ -41,10 +41,10 @@ index b653d7c0a05a..d4b96d6c926a 100644 #ifdef CONFIG_SYSFS diff --git a/kernel/module.c b/kernel/module.c -index d856e96a3cce..98c3d7955a51 100644 +index 8426ad48362c..c641bc22d10b 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -3895,3 +3895,13 @@ void module_layout(struct module *mod, +@@ -3886,3 +3886,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 2585d7dd1..f94b2f117 100644 --- a/Add-sysrq-option-to-disable-secure-boot-mode.patch +++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch @@ -15,7 +15,7 @@ Upstream-status: Fedora mustard 7 files changed, 65 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index c5a7fe1c197c..f476de69248d 100644 +index f96581df9c45..495b30ab31d6 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -70,6 +70,11 @@ @@ -30,7 +30,7 @@ index c5a7fe1c197c..f476de69248d 100644 #include <video/edid.h> #include <asm/mtrr.h> -@@ -1275,6 +1280,37 @@ void __init i386_reserve_resources(void) +@@ -1278,6 +1283,37 @@ void __init i386_reserve_resources(void) #endif /* CONFIG_X86_32 */ @@ -228,10 +228,10 @@ index 7b40c5f07dce..8a60477b96e1 100644 return 0; diff --git a/kernel/module.c b/kernel/module.c -index 6244f24abe27..b77554170d76 100644 +index ad861480c8e4..7f4745c58671 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 */ +@@ -108,9 +108,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ #ifdef CONFIG_MODULE_SIG #ifdef CONFIG_MODULE_SIG_FORCE diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch index 6b7b932d2..e4de4be56 100644 --- a/KEYS-Add-a-system-blacklist-keyring.patch +++ b/KEYS-Add-a-system-blacklist-keyring.patch @@ -29,10 +29,10 @@ index 72665eb80692..2c7b80d31366 100644 + #endif /* _KEYS_SYSTEM_KEYRING_H */ diff --git a/init/Kconfig b/init/Kconfig -index 1354ac09b516..ac49b6e83436 100644 +index 058e3671fa11..ee83b7c6856c 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1750,6 +1750,15 @@ config SYSTEM_TRUSTED_KEYRING +@@ -1734,6 +1734,15 @@ config SYSTEM_TRUSTED_KEYRING Keys in this keyring are used by module signature checking. diff --git a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch index c97ae3e2a..b1d8730f2 100644 --- a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch +++ b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch @@ -43,7 +43,7 @@ Signed-off-by: Josh Stone <jistone@redhat.com> 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 5fa2e3035509..f2ffff2addbb 100644 +index 33cb15efd257..1eafc166bffd 100644 --- a/Makefile +++ b/Makefile @@ -706,7 +706,11 @@ KBUILD_CFLAGS += -fomit-frame-pointer @@ -59,7 +59,7 @@ index 5fa2e3035509..f2ffff2addbb 100644 ifdef CONFIG_DEBUG_INFO ifdef CONFIG_DEBUG_INFO_SPLIT diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug -index 79a9bb67aeaf..7a97851042f8 100644 +index ecb3516f6546..f9fd2dbc72c4 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -165,7 +165,23 @@ config DEBUG_INFO_DWARF4 diff --git a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch index 1ab1cd485..05a3cd875 100644 --- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch +++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch @@ -42,10 +42,10 @@ index 706b16fa6de8..470e8dfcb517 100644 efi_guid_t guid; u64 table; diff --git a/init/Kconfig b/init/Kconfig -index ac49b6e83436..5cdb1c323f62 100644 +index ee83b7c6856c..3b9ecb2d12af 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1904,6 +1904,15 @@ config MODULE_SIG_ALL +@@ -1888,6 +1888,15 @@ config MODULE_SIG_ALL comment "Do not forget to sign required modules with scripts/sign-file" depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL diff --git a/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch b/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch index 08417c18d..0727adee8 100644 --- a/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch +++ b/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch @@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com> 1 file changed, 6 insertions(+) diff --git a/drivers/char/mem.c b/drivers/char/mem.c -index bd117a1019f7..b59b3eb6674e 100644 +index efe38c1bc234..16b8af1188e1 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -167,6 +167,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf, @@ -26,7 +26,7 @@ index bd117a1019f7..b59b3eb6674e 100644 if (!valid_phys_addr_range(p, count)) return -EFAULT; -@@ -516,6 +519,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf, +@@ -513,6 +516,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf, char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ int err = 0; diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch index c210ed94b..27f5276eb 100644 --- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch +++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch @@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index a89e32637570..78f2a8704bb1 100644 +index bfcb1a62a7b4..a1d62e9ed29b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -3810,7 +3810,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -3822,7 +3822,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. the allocated input device; If set to 0, video driver will only send out the event without touching backlight brightness level. diff --git a/config-armv7 b/config-armv7 index 677da0579..3792e70c8 100644 --- a/config-armv7 +++ b/config-armv7 @@ -63,6 +63,7 @@ CONFIG_USB_EHCI_HCD_ORION=m CONFIG_MMC_SDHCI_PXAV3=m CONFIG_MVPP2=m CONFIG_COMMON_CLK_SI5351=m +CONFIG_RTC_DRV_ARMADA38X=m # CONFIG_CACHE_FEROCEON_L2 is not set # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set @@ -367,6 +368,7 @@ CONFIG_MFD_SPMI_PMIC=m CONFIG_SPMI=m CONFIG_SPMI_MSM_PMIC_ARB=m CONFIG_QCOM_SPMI_IADC=m +CONFIG_QCOM_SPMI_VADC=m # i.MX # CONFIG_MXC_DEBUG_BOARD is not set diff --git a/config-armv7-generic b/config-armv7-generic index d8ae0dad1..3b62d1ed0 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -335,6 +335,7 @@ CONFIG_SND_SOC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP_I2S=m CONFIG_ROCKCHIP_THERMAL=m CONFIG_DRM_ROCKCHIP=m +CONFIG_PHY_ROCKCHIP_USB=m # Tegra CONFIG_ARCH_TEGRA_114_SOC=y @@ -437,6 +438,7 @@ CONFIG_USB_CONFIGFS_SERIAL=y # CONFIG_USB_CONFIGFS_F_UAC2 is not set # CONFIG_USB_CONFIGFS_F_MIDI is not set # CONFIG_USB_CONFIGFS_F_HID is not set +# CONFIG_USB_CONFIGFS_F_UVC is not set # CONFIG_MUSB_PIO_ONLY is not set # CONFIG_USB_GADGET_DEBUG is not set diff --git a/config-generic b/config-generic index 63aa4715a..f368aebb6 100644 --- a/config-generic +++ b/config-generic @@ -74,6 +74,7 @@ CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_SLUB_STATS is not set # CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_KASAN is not set # CONFIG_AD525X_DPOT is not set @@ -2409,6 +2410,7 @@ CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 # CONFIG_SERIAL_RP2 is not set # CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set # CONFIG_SERIAL_ST_ASC is not set # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_MAX3100 is not set @@ -2671,6 +2673,7 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m CONFIG_HID_SENSOR_IIO_COMMON=m CONFIG_HID_SENSOR_IIO_TRIGGER=m # CONFIG_IIO_SYSFS_TRIGGER is not set +# CONFIG_IIO_SSP_SENSORHUB is not set # CONFIG_AD5446 is not set # CONFIG_AD5380 is not set # CONFIG_AD5064 is not set @@ -2683,6 +2686,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m # CONFIG_ITG3200 is not set # CONFIG_APDS9300 is not set # CONFIG_CM32181 is not set +# CONFIG_CM3232 is not set # CONFIG_CM36651 is not set # CONFIG_GP2AP020A00F is not set # CONFIG_TSL2583 is not set @@ -2695,6 +2699,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m # CONFIG_TI_ADC128S052 is not set # CONFIG_VIPERBOARD_ADC is not set # CONFIG_VF610_ADC is not set +# CONFIG_CC10001_ADC is not set # CONFIG_INV_MPU6050_IIO is not set CONFIG_IIO_ST_GYRO_3AXIS=m CONFIG_IIO_ST_MAGN_3AXIS=m @@ -2715,6 +2720,8 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m # CONFIG_IIO_ST_PRESS is not set # CONFIG_KXSD9 is not set # CONFIG_MMA8452 is not set +# CONFIG_MMA9551 is not set +# CONFIG_MMA9553 is not set # CONFIG_AD7266 is not set # CONFIG_AD7298 is not set # CONFIG_AD7476 is not set @@ -2741,6 +2748,7 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m # CONFIG_ADIS16130 is not set # CONFIG_ADIS16136 is not set # CONFIG_ADIS16260 is not set +# CONFIG_KMX61 is not set # CONFIG_ADXRS450 is not set # CONFIG_BMG160 is not set # CONFIG_ADIS16400 is not set @@ -2751,8 +2759,10 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m # CONFIG_SI7005 is not set # CONFIG_SI7020 is not set # CONFIG_AS3935 is not set +# CONFIG_SX9500 is not set CONFIG_KXCJK1013=m # CONFIG_ISL29125 is not set +# CONFIG_JSA1212 is not set # CONFIG_TCS3414 is not set # CONFIG_AK09911 is not set # CONFIG_T5403 is not set @@ -2971,6 +2981,7 @@ CONFIG_RTC_DRV_PCF85063=m # CONFIG_RTC_DRV_MOXART is not set # CONFIG_RTC_DRV_ISL12057 is not set # CONFIG_RTC_DRV_XGENE is not set +# CONFIG_RTC_DRV_ABB5ZES3 is not set CONFIG_R3964=m # CONFIG_APPLICOM is not set @@ -3611,6 +3622,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y # CONFIG_USB_EHCI_MV is not set # CONFIG_USB_EHCI_HCD_PLATFORM is not set # CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760 is not set # CONFIG_USB_ISP1760_HCD is not set CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m @@ -4535,6 +4547,7 @@ CONFIG_CRYPTO=y CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_USER_API_HASH=y CONFIG_CRYPTO_USER_API_SKCIPHER=y +CONFIG_CRYPTO_USER_API_RNG=y CONFIG_CRYPTO_MANAGER=y # Note, CONFIG_CRYPTO_MANAGER_DISABLE_TESTS needs to be unset, or FIPS will be disabled. # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set @@ -4893,6 +4906,7 @@ CONFIG_MIGRATION=y CONFIG_BOUNCE=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS_FLASH=m # CONFIG_LEDS_LOCOMO is not set # CONFIG_LEDS_NET48XX is not set # CONFIG_LEDS_PCA9532 is not set @@ -5060,6 +5074,7 @@ CONFIG_LIRC_SIR=m # CONFIG_SAMPLES is not set +CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set CONFIG_NOZOMI=m @@ -5208,6 +5223,8 @@ CONFIG_USBIP_HOST=m # CONFIG_VIDEO_SAA7191 is not set # CONFIG_DVB_MN88472 is not set # CONFIG_DVB_MN88473 is not set +# CONFIG_FB_SM7XX is not set +# CONFIG_FB_TFT is not set # END OF STAGING # diff --git a/crash-driver.patch b/crash-driver.patch index c9a99b8e2..9c35b0169 100644 --- a/crash-driver.patch +++ b/crash-driver.patch @@ -269,7 +269,7 @@ index 000000000000..fd4736ec99f5 + +#endif /* _X86_CRASH_H */ diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig -index efefd12a0f7b..6a318132b7ee 100644 +index a4af8221751e..193f1a7c2ce5 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -4,6 +4,9 @@ @@ -281,7 +281,7 @@ index efefd12a0f7b..6a318132b7ee 100644 + source "drivers/tty/Kconfig" - config DEVKMEM + config DEVMEM diff --git a/drivers/char/Makefile b/drivers/char/Makefile index d06cde26031b..0832636fd9bc 100644 --- a/drivers/char/Makefile diff --git a/criu-no-expert.patch b/criu-no-expert.patch index b6e46e203..800b2e133 100644 --- a/criu-no-expert.patch +++ b/criu-no-expert.patch @@ -9,7 +9,7 @@ Upstream-status: Fedora mustard 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/Kconfig b/init/Kconfig -index 5cdb1c323f62..a1c34718643d 100644 +index 3b9ecb2d12af..e2e09df716d1 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1135,7 +1135,7 @@ config DEBUG_BLK_CGROUP diff --git a/efi-Add-EFI_SECURE_BOOT-bit.patch b/efi-Add-EFI_SECURE_BOOT-bit.patch index e8e221940..da6a9a092 100644 --- a/efi-Add-EFI_SECURE_BOOT-bit.patch +++ b/efi-Add-EFI_SECURE_BOOT-bit.patch @@ -12,10 +12,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> 2 files changed, 3 insertions(+) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 90de17f70b16..c5a7fe1c197c 100644 +index ac83259928e6..f96581df9c45 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1152,7 +1152,9 @@ void __init setup_arch(char **cmdline_p) +@@ -1153,7 +1153,9 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE if (boot_params.secure_boot) { diff --git a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch index 2238eeda3..3133d6658 100644 --- a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch +++ b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch @@ -14,10 +14,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c -index 2192da755e34..4b03911a502d 100644 +index 105e7360d747..83fc4e9888ee 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c -@@ -831,8 +831,9 @@ out: +@@ -830,8 +830,9 @@ out: static int get_secure_boot(void) { @@ -28,7 +28,7 @@ index 2192da755e34..4b03911a502d 100644 efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID; efi_status_t status; -@@ -856,6 +857,23 @@ static int get_secure_boot(void) +@@ -855,6 +856,23 @@ static int get_secure_boot(void) if (setup == 1) return 0; diff --git a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch index f0112cb68..5db62eed9 100644 --- a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch +++ b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch @@ -11,10 +11,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index f2d464b05bb9..cff33bf8db16 100644 +index a2a0a1636287..5b5c9e803d19 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1678,7 +1678,8 @@ config EFI_MIXED +@@ -1679,7 +1679,8 @@ config EFI_MIXED If unsure, say N. config EFI_SECURE_BOOT_SIG_ENFORCE diff --git a/input-kill-stupid-messages.patch b/input-kill-stupid-messages.patch index fe01d3a75..ccf42cdf7 100644 --- a/input-kill-stupid-messages.patch +++ b/input-kill-stupid-messages.patch @@ -9,7 +9,7 @@ Upstream-status: Fedora mustard 1 file changed, 4 insertions(+) diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c -index e27a25892db4..9ab0a86cc03d 100644 +index 387c51f4b4e4..04a1c7d47aba 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c @@ -436,11 +436,15 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data, diff --git a/kbuild-AFTER_LINK.patch b/kbuild-AFTER_LINK.patch index 333a4949f..f91a19eac 100644 --- a/kbuild-AFTER_LINK.patch +++ b/kbuild-AFTER_LINK.patch @@ -90,10 +90,10 @@ index 2a8ddfd12a5b..452ca53561fe 100644 cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $< diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile -index 09297c8e1fcd..d5a03d9d2ef2 100644 +index 7b9be9822724..c4c5d4ae3dad 100644 --- a/arch/x86/vdso/Makefile +++ b/arch/x86/vdso/Makefile -@@ -171,8 +171,9 @@ $(vdso32-images:%=$(obj)/%.dbg): $(obj)/vdso32-%.so.dbg: FORCE \ +@@ -172,8 +172,9 @@ $(vdso32-images:%=$(obj)/%.dbg): $(obj)/vdso32-%.so.dbg: FORCE \ quiet_cmd_vdso = VDSO $@ cmd_vdso = $(CC) -nostdlib -o $@ \ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ diff --git a/kernel.spec b/kernel.spec index ea1671330..5917403c1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2209,6 +2209,9 @@ fi # ||----w | # || || %changelog +* Mon Feb 16 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git6.1 +- Linux v3.19-6676-g1fa185ebcbce + * Fri Feb 13 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git5.1 - Linux v3.19-5015-gc7d7b9867155 @@ -1,3 +1,3 @@ d3fc8316d4d4d04b65cbc2d70799e763 linux-3.19.tar.xz 15d8d2f97ce056488451a5bfb2944603 perf-man-3.19.tar.gz -b0fbaaa54036f35db20f1d6cfae2aab9 patch-3.19-git5.xz +f028d95f1e88d6fdaf13b581bd879467 patch-3.19-git6.xz diff --git a/x86-Lock-down-IO-port-access-when-module-security-is.patch b/x86-Lock-down-IO-port-access-when-module-security-is.patch index 52cb956dc..0c6498190 100644 --- a/x86-Lock-down-IO-port-access-when-module-security-is.patch +++ b/x86-Lock-down-IO-port-access-when-module-security-is.patch @@ -44,7 +44,7 @@ index 4ddaf66ea35f..00b440307419 100644 } regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); diff --git a/drivers/char/mem.c b/drivers/char/mem.c -index 9a6b63783a94..bd117a1019f7 100644 +index 297110c12635..efe38c1bc234 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -27,6 +27,7 @@ @@ -53,9 +53,9 @@ index 9a6b63783a94..bd117a1019f7 100644 #include <linux/aio.h> +#include <linux/module.h> - #include <asm/uaccess.h> + #include <linux/uaccess.h> -@@ -582,6 +583,9 @@ static ssize_t write_port(struct file *file, const char __user *buf, +@@ -577,6 +578,9 @@ static ssize_t write_port(struct file *file, const char __user *buf, unsigned long i = *ppos; const char __user *tmp = buf; |