summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2015-11-11 09:29:29 -0800
committerLaura Abbott <labbott@fedoraproject.org>2015-11-11 09:30:47 -0800
commit4edc7cd99aa0d7c322edb6ec17a26c33a51fab8d (patch)
tree734bd42ba5a5b1fabff68361e235bbc94609747d
parentc78c67f036a933ab5081ba89cde5b0601e2172cf (diff)
downloadkernel-4edc7cd99aa0d7c322edb6ec17a26c33a51fab8d.tar.gz
kernel-4edc7cd99aa0d7c322edb6ec17a26c33a51fab8d.tar.xz
kernel-4edc7cd99aa0d7c322edb6ec17a26c33a51fab8d.zip
Linux v4.3-11481-gc5a3788
- Actually drop CONFIG_DMADEVICES_VDEBUG
-rw-r--r--ARM-dts-Add-am335x-bonegreen.patch103
-rw-r--r--Makefile1
-rw-r--r--Makefile.release1
-rw-r--r--config-arm-generic4
-rw-r--r--config-arm643
-rw-r--r--config-armv7-generic5
-rw-r--r--config-generic7
-rw-r--r--config-nodebug2
-rw-r--r--config-x86-generic1
-rw-r--r--gitrev2
-rw-r--r--kernel.spec8
-rw-r--r--sources2
12 files changed, 26 insertions, 113 deletions
diff --git a/ARM-dts-Add-am335x-bonegreen.patch b/ARM-dts-Add-am335x-bonegreen.patch
deleted file mode 100644
index 35fb3e4ef..000000000
--- a/ARM-dts-Add-am335x-bonegreen.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From patchwork Fri Sep 25 15:10:31 2015
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: ARM: dts: Add am335x-bonegreen
-From: Robert Nelson <robertcnelson@gmail.com>
-X-Patchwork-Id: 7265851
-Message-Id: <1443193831-5693-1-git-send-email-robertcnelson@gmail.com>
-To: tony@atomide.com, devicetree@vger.kernel.org
-Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
- Robert Nelson <robertcnelson@gmail.com>, Jason Kridner <jkridner@gmail.com>
-Date: Fri, 25 Sep 2015 10:10:31 -0500
-
-SeeedStudio BeagleBone Green (BBG) is clone of the BeagleBone Black (BBB) minus
-the HDMI port and addition of two Grove connectors (i2c2 and usart2).
-
-This board can be identified by the 1A value after A335BNLT (BBB) in the at24 eeprom:
-1A: [aa 55 33 ee 41 33 33 35 42 4e 4c 54 1a 00 00 00 |.U3.A335BNLT....|]
-
-http://beagleboard.org/green
-http://www.seeedstudio.com/wiki/Beaglebone_green
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
-CC: Tony Lindgren <tony@atomide.com>
-CC: Jason Kridner <jkridner@gmail.com>
-
----
-arch/arm/boot/dts/Makefile | 1 +
- arch/arm/boot/dts/am335x-bonegreen.dts | 53 ++++++++++++++++++++++++++++++++++
- 2 files changed, 54 insertions(+)
- create mode 100644 arch/arm/boot/dts/am335x-bonegreen.dts
-
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 233159d..e45d771 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -446,6 +446,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \
- am335x-base0033.dtb \
- am335x-bone.dtb \
- am335x-boneblack.dtb \
-+ am335x-bonegreen.dtb \
- am335x-sl50.dtb \
- am335x-evm.dtb \
- am335x-evmsk.dtb \
-diff --git a/arch/arm/boot/dts/am335x-bonegreen.dts b/arch/arm/boot/dts/am335x-bonegreen.dts
-new file mode 100644
-index 0000000..0f65bda
---- /dev/null
-+++ b/arch/arm/boot/dts/am335x-bonegreen.dts
-@@ -0,0 +1,53 @@
-+/*
-+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+/dts-v1/;
-+
-+#include "am33xx.dtsi"
-+#include "am335x-bone-common.dtsi"
-+
-+/ {
-+ model = "TI AM335x BeagleBone Green";
-+ compatible = "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
-+};
-+
-+&ldo3_reg {
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-always-on;
-+};
-+
-+&mmc1 {
-+ vmmc-supply = <&vmmcsd_fixed>;
-+};
-+
-+&mmc2 {
-+ vmmc-supply = <&vmmcsd_fixed>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&emmc_pins>;
-+ bus-width = <8>;
-+ status = "okay";
-+};
-+
-+&am33xx_pinmux {
-+ uart2_pins: uart2_pins {
-+ pinctrl-single,pins = <
-+ 0x150 (PIN_INPUT | MUX_MODE1) /* spi0_sclk.uart2_rxd */
-+ 0x154 (PIN_OUTPUT | MUX_MODE1) /* spi0_d0.uart2_txd */
-+ >;
-+ };
-+};
-+
-+&uart2 {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&uart2_pins>;
-+ status = "okay";
-+};
-+
-+&rtc {
-+ system-power-controller;
-+};
diff --git a/Makefile b/Makefile
index 4f11a034b..9f97a1d06 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,6 @@ debug:
@perl -pi -e 's/# CONFIG_CARL9170_DEBUGFS is not set/CONFIG_CARL9170_DEBUGFS=y/' config-nodebug
@perl -pi -e 's/# CONFIG_IWLWIFI_DEVICE_TRACING is not set/CONFIG_IWLWIFI_DEVICE_TRACING=y/' config-nodebug
@perl -pi -e 's/# CONFIG_DMADEVICES_DEBUG is not set/CONFIG_DMADEVICES_DEBUG=y/' config-nodebug
- @perl -pi -e 's/# CONFIG_DMADEVICES_VDEBUG is not set/CONFIG_DMADEVICES_VDEBUG=y/' config-nodebug
@perl -pi -e 's/# CONFIG_CEPH_LIB_PRETTYDEBUG is not set/CONFIG_CEPH_LIB_PRETTYDEBUG=y/' config-nodebug
@perl -pi -e 's/# CONFIG_QUOTA_DEBUG is not set/CONFIG_QUOTA_DEBUG=y/' config-nodebug
@perl -pi -e 's/# CONFIG_KGDB_KDB is not set/CONFIG_KGDB_KDB=y/' config-nodebug
diff --git a/Makefile.release b/Makefile.release
index fcd90814f..d7e8844b7 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -58,7 +58,6 @@ config-release:
@perl -pi -e 's/CONFIG_CARL9170_DEBUGFS=y/# CONFIG_CARL9170_DEBUGFS is not set/' config-nodebug
@perl -pi -e 's/CONFIG_IWLWIFI_DEVICE_TRACING=y/# CONFIG_IWLWIFI_DEVICE_TRACING is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DMADEVICES_DEBUG=y/# CONFIG_DMADEVICES_DEBUG is not set/' config-nodebug
- @perl -pi -e 's/CONFIG_DMADEVICES_VDEBUG=y/# CONFIG_DMADEVICES_VDEBUG is not set/' config-nodebug
@perl -pi -e 's/CONFIG_CEPH_LIB_PRETTYDEBUG=y/# CONFIG_CEPH_LIB_PRETTYDEBUG is not set/' config-nodebug
@perl -pi -e 's/CONFIG_QUOTA_DEBUG=y/# CONFIG_QUOTA_DEBUG is not set/' config-nodebug
@perl -pi -e 's/CONFIG_CPU_NOTIFIER_ERROR_INJECT=m/# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set/' config-nodebug
diff --git a/config-arm-generic b/config-arm-generic
index 34357d323..fc3130431 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -7,6 +7,7 @@ CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
CONFIG_FB_SSD1307=m
CONFIG_HW_PERF_EVENTS=y
CONFIG_NFS_FS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_CRASH=m
CONFIG_CC_STACKPROTECTOR=y
@@ -136,6 +137,7 @@ CONFIG_THERMAL_OF=y
CONFIG_MAILBOX=y
CONFIG_ARM_MHU=m
# CONFIG_PL320_MBOX is not set
+CONFIG_ARM_SCPI_PROTOCOL=m
# USB
CONFIG_USB_OHCI_HCD_PLATFORM=m
@@ -227,6 +229,7 @@ CONFIG_SPI_PL022=m
# Sensors
CONFIG_SENSORS_IIO_HWMON=m
CONFIG_IIO_SYSFS_TRIGGER=m
+CONFIG_SENSORS_ARM_SCPI=m
# PHY framework
CONFIG_GENERIC_PHY=y
@@ -279,6 +282,7 @@ CONFIG_VFIO_AMBA=m
# CONFIG_COMMON_CLK_SI570 is not set
# CONFIG_COMMON_CLK_QCOM is not set
+CONFIG_COMMON_CLK_SCPI=m
# CONFIG_ARM_PTDUMP is not set
diff --git a/config-arm64 b/config-arm64
index 8aa288a63..daaef0398 100644
--- a/config-arm64
+++ b/config-arm64
@@ -21,7 +21,8 @@ CONFIG_ARCH_XGENE=y
# CONFIG_ARCH_BCM_IPROC is not set
# CONFIG_ARCH_BERLIN is not set
# CONFIG_ARCH_ROCKCHIP is not set
-
+# CONFIG_ARCH_LAYERSCAPE is not set
+# CONFIG_ARCH_STRATIX10 is not set
# Erratum
CONFIG_ARM64_ERRATUM_826319=y
diff --git a/config-armv7-generic b/config-armv7-generic
index b71b55e83..669d8aeed 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -76,6 +76,7 @@ CONFIG_ARCH_VIRT=y
# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_UNIPHIER is not set
# CONFIG_ARCH_ZX is not set
+# CONFIG_SOC_BRCMSTB is not set
# errata
# v5/v6
@@ -220,6 +221,7 @@ CONFIG_PWM_SUN4I=m
CONFIG_USB_MUSB_SUNXI=m
CONFIG_CRYPTO_DEV_SUN4I_SS=m
CONFIG_SND_SUN4I_CODEC=m
+CONFIG_SUNXI_RSB=m
# Exynos
CONFIG_ARCH_EXYNOS3=y
@@ -289,6 +291,7 @@ CONFIG_DRM_EXYNOS_HDMI=y
CONFIG_DRM_EXYNOS_IPP=y
CONFIG_DRM_EXYNOS_ROTATOR=y
CONFIG_DRM_EXYNOS_VIDI=y
+CONFIG_DRM_EXYNOS_MIXER=y
CONFIG_PHY_EXYNOS_DP_VIDEO=m
# CONFIG_FB_S3C is not set
CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
@@ -359,6 +362,7 @@ CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
CONFIG_REGULATOR_ACT8865=m
+CONFIG_ROCKCHIP_PM_DOMAINS=y
# Tegra
CONFIG_ARCH_TEGRA_114_SOC=y
@@ -479,6 +483,7 @@ CONFIG_DRM_PANEL_LG_LG4573=m
CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
CONFIG_DRM_DW_HDMI=m
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
# regmap
CONFIG_REGMAP_SPI=m
diff --git a/config-generic b/config-generic
index 1dd664562..5ce621244 100644
--- a/config-generic
+++ b/config-generic
@@ -2606,7 +2606,7 @@ CONFIG_I2C_CHARDEV=m
# CONFIG_I2C_MUX_PCA9541 is not set
# CONFIG_I2C_MUX_PINCTRL is not set
# CONFIG_I2C_MUX_REG is not set
-#
+# CONFIG_I2C_CADENCE is not set
#
# I2C Algorithms
@@ -3103,6 +3103,7 @@ CONFIG_WM831X_WATCHDOG=m
# CONFIG_GPIO_WATCHDOG is not set
# CONFIG_XILINX_WATCHDOG is not set
# CONFIG_CADENCE_WATCHDOG is not set
+# CONFIG_BCM7038_WDT is not set
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -3189,6 +3190,7 @@ CONFIG_RTC_DRV_PCF85063=m
# CONFIG_RTC_DRV_XGENE is not set
# CONFIG_RTC_DRV_ABB5ZES3 is not set
# CONFIG_RTC_DRV_ZYNQMP is not set
+# CONFIG_RTC_DRV_RV8803 is not set
CONFIG_R3964=m
# CONFIG_APPLICOM is not set
@@ -3615,6 +3617,7 @@ CONFIG_FB_EFI=y
# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_OPENCORES is not set
# CONFIG_FB_SM712 is not set
+# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FIRMWARE_EDID is not set
@@ -4593,6 +4596,7 @@ CONFIG_GFS2_FS_LOCKING_DLM=y
CONFIG_UBIFS_FS=m
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_ATIME_SUPPORT=y
#
# Partition Types
@@ -5244,6 +5248,7 @@ 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_INTEL_IDMA64 is not set
CONFIG_UNUSED_SYMBOLS=y
diff --git a/config-nodebug b/config-nodebug
index 9fb884068..1b93255c0 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -91,7 +91,7 @@ CONFIG_IWLWIFI_DEVICE_TRACING=y
CONFIG_DEBUG_OBJECTS_WORK=y
CONFIG_DMADEVICES_DEBUG=y
-CONFIG_DMADEVICES_VDEBUG=y
+# CONFIG_DMADEVICES_VDEBUG is not set
CONFIG_PM_ADVANCED_DEBUG=y
diff --git a/config-x86-generic b/config-x86-generic
index ddc2946ce..dff8775a6 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -347,6 +347,7 @@ CONFIG_ISCSI_IBFT=m
CONFIG_DMADEVICES=y
CONFIG_INTEL_IOATDMA=m
+CONFIG_INTEL_IDMA64=m
CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_FAM15H_POWER=m
diff --git a/gitrev b/gitrev
index 3ed53fc12..ef0beb01b 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-bd4f203e433387d39be404b67ad02acf6f76b7bc
+c5a37883f42be712a989e54d5d6c0159b0e56599
diff --git a/kernel.spec b/kernel.spec
index a2468730c..ee3224cad 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 6
+%define gitrev 7
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -502,8 +502,6 @@ Patch456: arm64-acpi-drop-expert-patch.patch
Patch457: ARM-tegra-usb-no-reset.patch
-Patch458: ARM-dts-Add-am335x-bonegreen.patch
-
Patch459: 0001-watchdog-omap_wdt-fix-null-pointer-dereference.patch
Patch463: arm-i.MX6-Utilite-device-dtb.patch
@@ -2045,6 +2043,10 @@ fi
#
#
%changelog
+* Wed Nov 11 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git7.1
+- Linux v4.3-11481-gc5a3788
+- Actually drop CONFIG_DMADEVICES_VDEBUG
+
* Tue Nov 10 2015 Laura Abbott <labbott@redhat.com>
- Enable CONFIG_CMA on x86_64 (rhbz 1278985)
diff --git a/sources b/sources
index 635d1501d..04f021593 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
58b35794eee3b6d52ce7be39357801e7 linux-4.3.tar.xz
7c516c9528b9f9aac0136944b0200b7e perf-man-4.3.tar.gz
-7f73d5b5f1919b3c5a73476b8360166f patch-4.3-git6.xz
+29d39a295a8e3e58aea6587a85295259 patch-4.3-git7.xz