From 86a3e5e78981a6b2e8c4fe079b914855ea8b54b6 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 9 Nov 2015 09:56:21 -0800 Subject: [PATCH] Linux v4.3-9269-gce5c2d2 --- ...wl4030-Add-iio-properties-for-bci-su.patch | 37 ------------------- config-arm64 | 1 + config-armv7-generic | 3 ++ config-generic | 15 +++++++- config-x86-generic | 3 +- gitrev | 2 +- kernel.spec | 9 +++-- sources | 2 +- 8 files changed, 26 insertions(+), 46 deletions(-) delete mode 100644 Revert-ARM-dts-twl4030-Add-iio-properties-for-bci-su.patch diff --git a/Revert-ARM-dts-twl4030-Add-iio-properties-for-bci-su.patch b/Revert-ARM-dts-twl4030-Add-iio-properties-for-bci-su.patch deleted file mode 100644 index 9682813da..000000000 --- a/Revert-ARM-dts-twl4030-Add-iio-properties-for-bci-su.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ebcb3fbbf9ce01d641e5e0ea7d232a6cc225fb96 Mon Sep 17 00:00:00 2001 -From: Sebastian Reichel -Date: Fri, 6 Nov 2015 17:13:50 +0100 -Subject: [PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci - subnode" - -This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32, -which breaks the omap3 device tree build due to a wrong reference. - -I accidently queued this change via the power supply subsystem while -telling Marek at the same time, that it should go through Tony's tree. -Following that I did miss Stephen's messages about the build failure in -linux-next and since he switched to merging an older snapshot nobody -else noticed the problem in my tree. I didn't notice myself, since I -did not build any device tree files assuming none have changed by me. - -Signed-off-by: Sebastian Reichel ---- - arch/arm/boot/dts/twl4030.dtsi | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi -index 482b7aa..36ae916 100644 ---- a/arch/arm/boot/dts/twl4030.dtsi -+++ b/arch/arm/boot/dts/twl4030.dtsi -@@ -22,8 +22,6 @@ - charger: bci { - compatible = "ti,twl4030-bci"; - interrupts = <9>, <2>; -- io-channels = <&twl4030_madc 11>; -- io-channel-name = "vac"; - bci3v1-supply = <&vusb3v1>; - }; - --- -2.5.0 - diff --git a/config-arm64 b/config-arm64 index dcd46b90e..8aa288a63 100644 --- a/config-arm64 +++ b/config-arm64 @@ -152,6 +152,7 @@ CONFIG_AMD_XGBE_PHY=m CONFIG_POWER_RESET_HISI=y CONFIG_HISI_THERMAL=m CONFIG_STUB_CLK_HI6220=y +CONFIG_PCI_HISI=y # ThunderX # CONFIG_MDIO_OCTEON is not set diff --git a/config-armv7-generic b/config-armv7-generic index 888764be1..ea5b26e31 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -936,3 +936,6 @@ CONFIG_R8188EU=m # CONFIG_CRYPTO_DEV_UX500_DEBUG is not set # CONFIG_AB8500_DEBUG is not set # CONFIG_ARM_KERNMEM_PERMS is not set + +# Altera? +# CONFIG_PCIE_ALTERA is not set diff --git a/config-generic b/config-generic index fb50cef79..ea3185517 100644 --- a/config-generic +++ b/config-generic @@ -2347,6 +2347,7 @@ CONFIG_SERIO_ARC_PS2=m # CONFIG_SERIO_PARKBD is not set # CONFIG_SERIO_PCIPS2 is not set # CONFIG_SERIO_LIBPS2 is not set +# CONFIG_USERIO is not set # # Input Device Drivers @@ -2476,6 +2477,9 @@ CONFIG_TOUCHSCREEN_ZFORCE=m # CONFIG_TOUCHSCREEN_SX8654 is not set # CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set +# CONFIG_TOUCHSCREEN_FT6236 is not set +# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set + CONFIG_INPUT_MISC=y CONFIG_INPUT_E3X0_BUTTON=m @@ -3801,6 +3805,8 @@ CONFIG_SND_DICE=m CONFIG_SND_OXFW=m CONFIG_SND_FIREWORKS=m CONFIG_SND_BEBOB=m +CONFIG_SND_FIREWIRE_DIGI00X=m +CONFIG_SND_FIREWIRE_TASCAM=m # # Open Sound System @@ -3982,7 +3988,8 @@ CONFIG_HID_BELKIN=m CONFIG_HID_APPLEIR=m # CONFIG_HID_CP2112 is not set CONFIG_HID_LENOVO=m - +CONFIG_HID_CORSAIR=m +CONFIG_HID_GFRM=m # # USB Imaging devices @@ -4352,7 +4359,7 @@ CONFIG_MFD_VIPERBOARD=m # CONFIG_MFD_DA9062 is not set # CONFIG_EZX_PCAP is not set # CONFIG_INTEL_SOC_PMIC is not set - +# CONFIG_MFD_ATMEL_FLEXCOM is not set # # File systems @@ -5093,6 +5100,7 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_AK4554 is not set # CONFIG_SND_SOC_AK4642 is not set # CONFIG_SND_SOC_AK5386 is not set +# CONFIG_SND_SOC_AK4613 is not set # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L73 is not set # CONFIG_SND_SOC_CS4270 is not set @@ -5256,6 +5264,7 @@ CONFIG_FUNCTION_PROFILER=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_TRACE_ENUM_MAP_FILE is not set +# CONFIG_TRACING_EVENTS_GPIO is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set CONFIG_FUNCTION_TRACER=y @@ -5679,6 +5688,7 @@ CONFIG_PSTORE_RAM=m # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_STATIC_KEYS is not set +# CONFIG_TEST_PRINTF is not set # CONFIG_AVERAGE is not set # CONFIG_VMXNET3 is not set @@ -5704,6 +5714,7 @@ CONFIG_IOMMU_SUPPORT=y # CONFIG_MAILBOX is not set # CONFIG_ALTERA_MBOX is not set +# CONFIG_MAILBOX_TEST is not set # CONFIG_RESET_CONTROLLER is not set diff --git a/config-x86-generic b/config-x86-generic index 04ef6e1ef..ddc2946ce 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -545,9 +545,10 @@ CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m +CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_TAS571X is not set - +# CONFIG_SND_SUN4I_CODEC is not set # CONFIG_INTEL_POWERCLAMP is not set CONFIG_X86_PKG_TEMP_THERMAL=m diff --git a/gitrev b/gitrev index 694419ced..a8eab9573 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -d1e41ff11941784f469f17795a4d9425c2eb4b7a +ce5c2d2c256a4c8b523036537cd6be2d6af8f69d diff --git a/kernel.spec b/kernel.spec index 699afa0ce..f0cea264c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -40,7 +40,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 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 4 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -593,8 +593,6 @@ Patch510: 0001-iwlwifi-Add-new-PCI-IDs-for-the-8260-series.patch #CVE-2015-7990 rhbz 1276437 1276438 Patch511: RDS-fix-race-condition-when-sending-a-message-on-unb.patch -Patch512: Revert-ARM-dts-twl4030-Add-iio-properties-for-bci-su.patch - # END OF PATCH DEFINITIONS %endif @@ -2038,6 +2036,9 @@ fi # # %changelog +* Mon Nov 09 2015 Laura Abbott - 4.4.0-0.rc0.git5.1 +- Linux v4.3-9269-gce5c2d2 + * Sun Nov 8 2015 Peter Robinson - Minor ARMv7 updates diff --git a/sources b/sources index a77cac0e2..2fe6ade7c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 58b35794eee3b6d52ce7be39357801e7 linux-4.3.tar.xz 7c516c9528b9f9aac0136944b0200b7e perf-man-4.3.tar.gz -34456837ff3861686c03fe8abba0e012 patch-4.3-git4.xz +d406f8762448abbfff164af43a89080e patch-4.3-git5.xz