diff options
| -rw-r--r-- | config-arm64 | 4 | ||||
| -rw-r--r-- | config-armv7 | 1 | ||||
| -rw-r--r-- | config-armv7-generic | 1 | ||||
| -rw-r--r-- | config-generic | 6 | ||||
| -rw-r--r-- | disable-CONFIG_EXPERT-for-ZONE_DMA.patch | 43 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 10 | ||||
| -rw-r--r-- | sources | 2 |
8 files changed, 18 insertions, 51 deletions
diff --git a/config-arm64 b/config-arm64 index d76849426..9e68302ff 100644 --- a/config-arm64 +++ b/config-arm64 @@ -244,12 +244,14 @@ CONFIG_QCOM_COINCELL=m # CONFIG_PINCTRL_APQ8084 is not set # CONFIG_PINCTRL_MSM8660 is not set # CONFIG_PINCTRL_MSM8960 is not set +# CONFIG_PINCTRL_MDM9615 is not set # CONFIG_PINCTRL_MSM8X74 is not set # CONFIG_PINCTRL_QDF2XXX is not set # CONFIG_INPUT_PM8941_PWRKEY is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set # CONFIG_CHARGER_MANAGER is not set # CONFIG_SENSORS_LTC2978_REGULATOR is not set +# CONFIG_QCOM_Q6V5_PIL is not set # ThunderX # CONFIG_MDIO_OCTEON is not set @@ -261,6 +263,8 @@ CONFIG_DMI=y CONFIG_DMIID=y CONFIG_DMI_SYSFS=y +# CONFIG_MV_XOR_V2 is not set + CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SATA_AHCI_SEATTLE=m diff --git a/config-armv7 b/config-armv7 index 568f0f652..d3882566a 100644 --- a/config-armv7 +++ b/config-armv7 @@ -349,6 +349,7 @@ CONFIG_QCOM_SMSM=y CONFIG_QCOM_SMP2P=m CONFIG_PCIE_QCOM=y CONFIG_MTD_NAND_QCOM=m +# CONFIG_QCOM_Q6V5_PIL is not set # i.MX # CONFIG_MXC_DEBUG_BOARD is not set diff --git a/config-armv7-generic b/config-armv7-generic index 814036a66..443720a34 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -475,6 +475,7 @@ CONFIG_MFD_TPS65912_SPI=y # CONFIG_PINCTRL_APQ8084 is not set # CONFIG_PINCTRL_MSM8960 is not set # CONFIG_PINCTRL_MSM8660 is not set +# CONFIG_PINCTRL_MDM9615 is not set # CONFIG_PINCTRL_MSM8996 is not set # GPIO diff --git a/config-generic b/config-generic index 1ac079708..6bdf8e4f9 100644 --- a/config-generic +++ b/config-generic @@ -2558,7 +2558,7 @@ CONFIG_TOUCHSCREEN_W90X900=m # CONFIG_TOUCHSCREEN_BU21013 is not set CONFIG_TOUCHSCREEN_RM_TS=m CONFIG_TOUCHSCREEN_ST1232=m -CONFIG_TOUCHSCREEN_SURFACE3_SPI=m +# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_MAX11801 is not set CONFIG_TOUCHSCREEN_AUO_PIXCIR=m @@ -4122,6 +4122,7 @@ CONFIG_HID_GREENASIA=m CONFIG_HID_SMARTJOYPLUS=m CONFIG_HID_TOPSEED=m CONFIG_HID_THINGM=m +CONFIG_HID_LED=m CONFIG_HID_THRUSTMASTER=m CONFIG_HID_XINMO=m CONFIG_HID_ZEROPLUS=m @@ -4134,6 +4135,7 @@ CONFIG_HID_SENSOR_ALS=m # CONFIG_HID_SENSOR_PROX is not set CONFIG_HID_SENSOR_ACCEL_3D=m # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set +CONFIG_HID_ALPS=m CONFIG_HID_EMS_FF=m CONFIG_HID_ELECOM=m CONFIG_HID_ELO=m @@ -5475,6 +5477,8 @@ CONFIG_ASYNC_TX_DMA=y # CONFIG_HSU_DMA is not set # CONFIG_HSU_DMA_PCI is not set # CONFIG_XGENE_DMA is not set +# CONFIG_XILINX_DMA is not set +# CONFIG_XILINX_ZYNQMP_DMA is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_HIDMA is not set diff --git a/disable-CONFIG_EXPERT-for-ZONE_DMA.patch b/disable-CONFIG_EXPERT-for-ZONE_DMA.patch deleted file mode 100644 index 784cf2035..000000000 --- a/disable-CONFIG_EXPERT-for-ZONE_DMA.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 78bd7226c92c8309d1c6c1378f1224dcd591b49f Mon Sep 17 00:00:00 2001 -From: Fedora Kernel Team <kernel-team@fedoraproject.org> -Date: Fri, 22 Jan 2016 13:03:36 -0600 -Subject: [PATCH] Make ZONE_DMA not depend on CONFIG_EXPERT - -Disable the requirement on CONFIG_EXPERT for ZONE_DMA and ZONE_DEVICE so -that we can enable NVDIMM_PFN and ND_PFN - -Signed-off-by: Justin Forbes <jforbes@fedoraproject.org> ---- - arch/x86/Kconfig | 2 +- - mm/Kconfig | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 3c74b549ea9a..8a5b7b8cc425 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -318,7 +318,7 @@ source "kernel/Kconfig.freezer" - menu "Processor type and features" - - config ZONE_DMA -- bool "DMA memory allocation support" if EXPERT -+ bool "DMA memory allocation support" - default y - help - DMA memory allocation support allows devices with less than 32-bit -diff --git a/mm/Kconfig b/mm/Kconfig -index 05efa6a5199e..c1a01e50c293 100644 ---- a/mm/Kconfig -+++ b/mm/Kconfig -@@ -650,7 +650,7 @@ config IDLE_PAGE_TRACKING - See Documentation/vm/idle_page_tracking.txt for more details. - - config ZONE_DEVICE -- bool "Device memory (pmem, etc...) hotplug support" if EXPERT -+ bool "Device memory (pmem, etc...) hotplug support" - depends on MEMORY_HOTPLUG - depends on MEMORY_HOTREMOVE - depends on SPARSEMEM_VMEMMAP --- -2.5.0 - @@ -1 +1 @@ -194dc870a5890e855ecffb30f3b80ba7c88f96d6 +c624c86615fb8aa61fa76ed8c935446d06c80e77 diff --git a/kernel.spec b/kernel.spec index 53f3b37d4..9b0add9a9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 3 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -598,9 +598,6 @@ Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch Patch508: kexec-uefi-copy-secure_boot-flag-in-boot-params.patch -#Required for some persistent memory options -Patch641: disable-CONFIG_EXPERT-for-ZONE_DMA.patch - #CVE-2016-3134 rhbz 1317383 1317384 Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch @@ -2172,6 +2169,9 @@ fi # # %changelog +* Fri Jul 29 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc0.git3.1 +- Linux v4.7-6438-gc624c86 + * Fri Jul 29 2016 Bastien Nocera <bnocera@redhat.com> - Add touchscreen and pen driver for the Surface 3 - Add CrystalCove PWM support, for CherryTrail devices @@ -1,3 +1,3 @@ 5276563eb1f39a048e4a8a887408c031 linux-4.7.tar.xz fe259c02c75eec61d1aa4b1211f3c853 perf-man-4.7.tar.gz -891c3c1a3b649e9559bc67a50dcc75cd patch-4.7-git2.xz +6661b4dfc07bb1f534b89ad8a862543d patch-4.7-git3.xz |