diff --git a/ARM-tegra-usb-no-reset.patch b/ARM-tegra-usb-no-reset.patch index c356aec66..ac4ae8981 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 aeb50bb6ba9c..5859e12dd498 100644 +index eaffb0248de1..b9884d87b012 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5021,6 +5021,13 @@ static void hub_event(struct work_struct *work) +@@ -5009,6 +5009,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 5b02e4ed0..7ba12b477 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 5e28e2be3a41..aca51ef7f0db 100644 +index 33ce9a344e38..f2d464b05bb9 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1665,6 +1665,16 @@ config EFI_MIXED +@@ -1677,6 +1677,16 @@ config EFI_MIXED If unsure, say N. diff --git a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch index e7601d7af..ea09ad26b 100644 --- a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch +++ b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch @@ -59,7 +59,7 @@ index b15036b1890c..0fbc68ed4ce9 100644 ifdef CONFIG_DEBUG_INFO ifdef CONFIG_DEBUG_INFO_SPLIT diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug -index a2ca213c71ca..032c4d549c49 100644 +index e5ea3ab856bf..c10f3879e212 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 10c47251b..31f418d62 100644 --- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch +++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch @@ -62,10 +62,10 @@ index ac49b6e83436..5cdb1c323f62 100644 prompt "Which hash algorithm should modules be signed with?" depends on MODULE_SIG diff --git a/kernel/Makefile b/kernel/Makefile -index a59481a3fa6c..04b4ba9e0c9d 100644 +index 616994f0a76f..43b9d7ba757f 100644 --- a/kernel/Makefile +++ b/kernel/Makefile -@@ -45,6 +45,7 @@ obj-$(CONFIG_UID16) += uid16.o +@@ -46,6 +46,7 @@ obj-$(CONFIG_UID16) += uid16.o obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_MODULE_SIG) += module_signing.o @@ -73,7 +73,7 @@ index a59481a3fa6c..04b4ba9e0c9d 100644 obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o obj-$(CONFIG_KEXEC) += kexec.o -@@ -98,6 +99,8 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o +@@ -99,6 +100,8 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o $(obj)/configs.o: $(obj)/config_data.h diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch index 69971a3ae..c513e0631 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 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index 176d4fe4f076..bd374bd2490b 100644 +index 512a35929f94..466b7e9758d0 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -3793,7 +3793,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -3808,7 +3808,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. @@ -28,7 +28,7 @@ index 176d4fe4f076..bd374bd2490b 100644 virtio_mmio.device= [VMMIO] Memory mapped virtio (platform) device. diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c -index 032db459370f..5b9c0bae4503 100644 +index 88a4f99dd2a7..570920c08a51 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot"); diff --git a/ath9k-rx-dma-stop-check.patch b/ath9k-rx-dma-stop-check.patch index 7613691bb..d63e2c4c8 100644 --- a/ath9k-rx-dma-stop-check.patch +++ b/ath9k-rx-dma-stop-check.patch @@ -7,7 +7,7 @@ Subject: [PATCH] ath9k: rx dma stop check 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c -index 3e58bfa0c1fd..406eea47256e 100644 +index bba85d1a6cd1..ebbee8f17130 100644 --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c @@ -693,7 +693,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset) diff --git a/config-armv7 b/config-armv7 index 2d4c50887..a9e116ac7 100644 --- a/config-armv7 +++ b/config-armv7 @@ -289,6 +289,7 @@ CONFIG_TI_DAVINCI_EMAC=m CONFIG_TI_DAVINCI_MDIO=m CONFIG_TI_CPSW=m CONFIG_TI_CPSW_PHY_SEL=y +CONFIG_TI_CPSW_ALE=m CONFIG_TI_CPTS=y # Builtin needed for BBone White CONFIG_REGULATOR_TPS65217=y diff --git a/config-armv7-generic b/config-armv7-generic index 5be7d4be6..24b3fe5be 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -372,6 +372,7 @@ CONFIG_AD525X_DPOT_I2C=m CONFIG_AD525X_DPOT_SPI=m CONFIG_TEGRA_SOCTHERM=m CONFIG_TEGRA_MC=y +CONFIG_ARM_TEGRA_DEVFREQ=m # Jetson TK1 CONFIG_PINCTRL_AS3722=y diff --git a/config-generic b/config-generic index 2caa0f0b8..db819b288 100644 --- a/config-generic +++ b/config-generic @@ -1212,6 +1212,8 @@ CONFIG_NET_ACT_POLICE=m CONFIG_NET_ACT_SIMP=m CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m CONFIG_DCB=y CONFIG_DNS_RESOLVER=m @@ -1420,6 +1422,7 @@ CONFIG_IXGBEVF=m CONFIG_IXGBE=m CONFIG_IXGBE_DCA=y CONFIG_IXGBE_DCB=y +CONFIG_IXGBE_VXLAN=y CONFIG_IXGBE_HWMON=y CONFIG_I40E=m CONFIG_I40E_VXLAN=y @@ -1534,6 +1537,7 @@ CONFIG_TEHUTI=m CONFIG_NET_VENDOR_TI=y CONFIG_TLAN=m +# CONFIG_TI_CPSW_ALE is not set CONFIG_NET_VENDOR_VIA=y CONFIG_VIA_RHINE=m @@ -1839,6 +1843,7 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_USB=m CONFIG_IEEE802154=m +CONFIG_IEEE802154_SOCKET=m CONFIG_IEEE802154_6LOWPAN=m CONFIG_IEEE802154_DRIVERS=m CONFIG_IEEE802154_FAKELB=m @@ -1963,6 +1968,7 @@ CONFIG_BT=m CONFIG_BT_BREDR=y CONFIG_BT_LE=y CONFIG_BT_6LOWPAN=m +# CONFIG_BT_SELFTEST is not set CONFIG_BT_SCO=y CONFIG_BT_CMTP=m CONFIG_BT_RFCOMM=m @@ -3676,6 +3682,7 @@ CONFIG_HID_MULTITOUCH=m CONFIG_HID_NTRIG=y CONFIG_HID_PLANTRONICS=m CONFIG_HID_PRIMAX=m +CONFIG_HID_BETOP_FF=m CONFIG_HID_PRODIKEYS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_GYRATION=m @@ -5222,6 +5229,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_KTHREAD_PRIO=0 CONFIG_SPARSE_RCU_POINTER=y +# CONFIG_LIVEPATCH is not set + CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 @@ -5380,6 +5389,7 @@ CONFIG_POWERCAP=y # CONFIG_HMC_DRV is not set # CONFIG_PM_DEVFREQ is not set +# CONFIG_PM_DEVFREQ_EVENT is not set # CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND is not set # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set # CONFIG_DEVFREQ_GOV_POWERSAVE is not set diff --git a/config-x86-generic b/config-x86-generic index 248b11d64..2c8b0a9c0 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -490,6 +490,9 @@ CONFIG_NFC_MICROREAD_MEI=m # CONFIG_X86_GOLDFISH is not set CONFIG_X86_INTEL_LPSS=y + +# CONFIG_X86_AMD_PLATFORM_DEVICE is not set + CONFIG_IOSF_MBI=m # CONFIG_IOSF_MBI_DEBUG is not set CONFIG_PWM_LPSS=m 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 9b42b4d6f..f0112cb68 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 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index aca51ef7f0db..0705833ee3a0 100644 +index f2d464b05bb9..cff33bf8db16 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1666,7 +1666,8 @@ config EFI_MIXED +@@ -1678,7 +1678,8 @@ config EFI_MIXED If unsure, say N. config EFI_SECURE_BOOT_SIG_ENFORCE diff --git a/kernel.spec b/kernel.spec index 1cd19c025..3e1078013 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 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2215,6 +2215,9 @@ fi # ||----w | # || || %changelog +* Wed Feb 11 2015 Josh Boyer - 3.20.0-0.rc0.git2.1 +- Linux v3.19-2595-gc5ce28df0e7c + * Wed Feb 11 2015 Josh Boyer - 3.20.0-0.rc0.git1.1 - Linux v3.19-463-g3e8c04eb1174 - Reenable debugging options. diff --git a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch index d521c804d..6223a172b 100644 --- a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch +++ b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch @@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett 1 file changed, 8 insertions(+) diff --git a/kernel/kexec.c b/kernel/kexec.c -index 9a8a01abbaed..9a0ecbf14545 100644 +index c85277639b34..2126bc321505 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -36,6 +36,7 @@ diff --git a/sources b/sources index 20ab7ff2f..a113e2339 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ d3fc8316d4d4d04b65cbc2d70799e763 linux-3.19.tar.xz 15d8d2f97ce056488451a5bfb2944603 perf-man-3.19.tar.gz -0b259984faf27cba30f6c69eb815a406 patch-3.19-git1.xz +d785b3a4a0356ea34b82f9d5e033935d patch-3.19-git2.xz