Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc5.git3.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc5.git3.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc5.git3.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc5.git3.1.vanilla.knurd.1.fc22

10 files changed, 142 insertions, 226 deletions

diff --git a/ath9k-fix-GPIO-mask-for-AR9462-and-AR9565.patch b/ath9k-fix-GPIO-mask-for-AR9462-and-AR9565.patch
deleted file mode 100644
index f8cd716f8..000000000
--- a/ath9k-fix-GPIO-mask-for-AR9462-and-AR9565.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From patchwork Fri Jun  3 05:46:57 2016
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: ath9k: fix GPIO mask for AR9462 and AR9565
-From: miaoqing pan <miaoqing@codeaurora.org>
-X-Patchwork-Id: 9151847
-Message-Id: <1464932817-30988-1-git-send-email-miaoqing@codeaurora.org>
-To: kvalo@qca.qualcomm.com
-Cc: linux-wireless@vger.kernel.org, ath9k-devel@qca.qualcomm.com,
- sudipm.mukherjee@gmail.com, Miaoqing Pan <miaoqing@codeaurora.org>
-Date: Fri,  3 Jun 2016 13:46:57 +0800
-
-From: Miaoqing Pan <miaoqing@codeaurora.org>
-
-The incorrect GPIO mask cause kernel warning, when AR9462 access GPIO11.
-Also fix the mask for AR9565.
-
-WARNING: CPU: 1 PID: 199 at ../drivers/net/wireless/ath/ath9k/hw.c:2778 ath9k_hw_gpio_get+0x1a9/0x1b0 [ath9k_hw]
-CPU: 1 PID: 199 Comm: kworker/u16:9 Not tainted 4.7.0-rc1-next-20160530+ #5
-Hardware name: Acer TravelMate P243/BA40_HC, BIOS V1.01 04/20/2012
-Workqueue: events_power_efficient rfkill_poll
- 0000000000000000 ffff88002cf73d28 ffffffff813b8ddc 0000000000000000
- 0000000000000000 ffff88002cf73d68 ffffffff8107a331 00000ada00000086
- ffff880148d9c018 000000000000000b ffff880147e68720 0000000000000200
-Call Trace:
- [<ffffffff813b8ddc>] dump_stack+0x63/0x87
- [<ffffffff8107a331>] __warn+0xd1/0xf0
- [<ffffffff8107a41d>] warn_slowpath_null+0x1d/0x20
- [<ffffffffc0775b19>] ath9k_hw_gpio_get+0x1a9/0x1b0 [ath9k_hw]
- [<ffffffffc047f3e4>] ath9k_rfkill_poll_state+0x34/0x60 [ath9k]
- [<ffffffffc06dbb53>] ieee80211_rfkill_poll+0x33/0x40 [mac80211]
- [<ffffffffc03ad65a>] cfg80211_rfkill_poll+0x2a/0xc0 [cfg80211]
- [<ffffffff817c5514>] rfkill_poll+0x24/0x50
- [<ffffffff81093183>] process_one_work+0x153/0x3f0
- [<ffffffff8109393b>] worker_thread+0x12b/0x4b0
- [<ffffffff81093810>] ? rescuer_thread+0x340/0x340
- [<ffffffff81099129>] kthread+0xc9/0xe0
- [<ffffffff817d8f1f>] ret_from_fork+0x1f/0x40
- [<ffffffff81099060>] ? kthread_park+0x60/0x60
-
-Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
----
- drivers/net/wireless/ath/ath9k/reg.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
-index 9272ca9..80ff69f 100644
---- a/drivers/net/wireless/ath/ath9k/reg.h
-+++ b/drivers/net/wireless/ath/ath9k/reg.h
-@@ -1122,12 +1122,12 @@ enum {
- #define AR9300_NUM_GPIO                          16
- #define AR9330_NUM_GPIO				 16
- #define AR9340_NUM_GPIO				 23
--#define AR9462_NUM_GPIO				 10
-+#define AR9462_NUM_GPIO				 14
- #define AR9485_NUM_GPIO				 12
- #define AR9531_NUM_GPIO				 18
- #define AR9550_NUM_GPIO				 24
- #define AR9561_NUM_GPIO				 23
--#define AR9565_NUM_GPIO				 12
-+#define AR9565_NUM_GPIO				 14
- #define AR9580_NUM_GPIO				 16
- #define AR7010_NUM_GPIO                          16
- 
-@@ -1139,12 +1139,12 @@ enum {
- #define AR9300_GPIO_MASK			 0x0000F4FF
- #define AR9330_GPIO_MASK			 0x0000F4FF
- #define AR9340_GPIO_MASK			 0x0000000F
--#define AR9462_GPIO_MASK			 0x000003FF
-+#define AR9462_GPIO_MASK			 0x00003FFF
- #define AR9485_GPIO_MASK			 0x00000FFF
- #define AR9531_GPIO_MASK			 0x0000000F
- #define AR9550_GPIO_MASK			 0x0000000F
- #define AR9561_GPIO_MASK			 0x0000000F
--#define AR9565_GPIO_MASK			 0x00000FFF
-+#define AR9565_GPIO_MASK			 0x00003FFF
- #define AR9580_GPIO_MASK			 0x0000F4FF
- #define AR7010_GPIO_MASK			 0x0000FFFF
- 
diff --git a/config-arm64 b/config-arm64
index b8d477f3c..c13e44f5f 100644
--- a/config-arm64
+++ b/config-arm64
@@ -164,6 +164,7 @@ CONFIG_ARCH_TEGRA_132_SOC=y
 CONFIG_ARCH_TEGRA_210_SOC=y
 CONFIG_TEGRA210_ADMA=y
 CONFIG_MFD_MAX77620=y
+CONFIG_REGULATOR_MAX77620=m
 
 # AllWinner
 CONFIG_MACH_SUN50I=y
diff --git a/config-armv7-generic b/config-armv7-generic
index a1e4bf95e..5f275be66 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -577,7 +577,6 @@ CONFIG_RTC_DRV_DS1390=m
 CONFIG_RTC_DRV_M41T93=m
 CONFIG_RTC_DRV_M41T94=m
 CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RS5C348=m
 CONFIG_RTC_DRV_RX4581=m
diff --git a/config-generic b/config-generic
index 03f129372..0ac842731 100644
--- a/config-generic
+++ b/config-generic
@@ -1837,13 +1837,13 @@ CONFIG_B43=m
 CONFIG_B43_SDIO=y
 CONFIG_B43_BCMA=y
 CONFIG_B43_BCMA_PIO=y
-# CONFIG_B43_DEBUG is not set
+CONFIG_B43_DEBUG=y
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_HT=y
 CONFIG_B43_PHY_G=y
 CONFIG_B43LEGACY=m
-# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -4442,82 +4442,90 @@ CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_RTSX_USB=m
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
 CONFIG_MFD_VIPERBOARD=m
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8350 is not set
-# CONFIG_MFD_WM831X is not set
 # CONFIG_AB3100_OTP is not set
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_HTC_I2CPLD is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_AS3722 is not set
-# CONFIG_HTC_EGPIO is not set
-# CONFIG_TPS6507X is not set
 # CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_CS5535 is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_ARIZONA is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_INTEL_SOC_PMIC is not set
+# CONFIG_LPC_ICH is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_AS3722 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
+# CONFIG_MFD_ATMEL_HLCDC is not set
+# CONFIG_MFD_AXP20X_I2C is not set
+# CONFIG_MFD_AXP20X_RSB is not set
+# CONFIG_MFD_BCM590XX is not set
 # CONFIG_MFD_CROS_EC is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_TPS65912 is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_DLN2 is not set
+# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_LM3533 is not set
 # CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77620 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_DA9052_SPI is not set
 # CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_SI476X_CORE is not set
 # CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_MAX77843 is not set
-# 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
-# CONFIG_TS4800_IRQ is not set
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_AXP20X_RSB is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_MAX77620 is not set
-# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8350 is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_TS4800_IRQ is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
 
 #
 # File systems
@@ -5211,7 +5219,7 @@ CONFIG_PM_DEBUG=y
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
-# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_TEST_SUSPEND=y
 # CONFIG_PM_OPP is not set
 # CONFIG_PM_AUTOSLEEP is not set
 # CONFIG_PM_WAKELOCKS is not set
diff --git a/config-nodebug b/config-nodebug
index 4bd461d8f..0dc864752 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -2,102 +2,102 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_PROVE_RCU is not set
+CONFIG_DEBUG_ATOMIC_SLEEP=y
+
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_LOCK_TORTURE_TEST=m
+CONFIG_PROVE_LOCKING=y
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_PROVE_RCU=y
 # CONFIG_PROVE_RCU_REPEATEDLY is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_DEBUG_PER_CPU_MAPS=y
 CONFIG_CPUMASK_OFFSTACK=y
 
-# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
 
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_FAILSLAB is not set
-# CONFIG_FAIL_PAGE_ALLOC is not set
-# CONFIG_FAIL_MAKE_REQUEST is not set
-# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
-# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
-# CONFIG_FAIL_IO_TIMEOUT is not set
-# CONFIG_FAIL_MMC_REQUEST is not set
+CONFIG_FAULT_INJECTION=y
+CONFIG_FAILSLAB=y
+CONFIG_FAIL_PAGE_ALLOC=y
+CONFIG_FAIL_MAKE_REQUEST=y
+CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
+CONFIG_FAIL_IO_TIMEOUT=y
+CONFIG_FAIL_MMC_REQUEST=y
 # CONFIG_F2FS_FAULT_INJECTION is not set
 
-# CONFIG_LOCK_STAT is not set
+CONFIG_LOCK_STAT=y
 
-# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_STACK_USAGE=y
 
-# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_DEBUG=y
 # CONFIG_ACPI_DEBUGGER is not set
 
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_PI_LIST is not set
+CONFIG_DEBUG_SG=y
+CONFIG_DEBUG_PI_LIST=y
 
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-# CONFIG_DEBUG_OBJECTS is not set
+CONFIG_DEBUG_OBJECTS=y
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-# CONFIG_DEBUG_OBJECTS_FREE is not set
-# CONFIG_DEBUG_OBJECTS_TIMERS is not set
-# CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
+CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
 CONFIG_X86_PTDUMP=y
-# CONFIG_ARM64_PTDUMP is not set
-# CONFIG_EFI_PGT_DUMP is not set
+CONFIG_ARM64_PTDUMP=y
+CONFIG_EFI_PGT_DUMP=y
 
-# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_CAN_DEBUG_DEVICES=y
 
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 
 
-# CONFIG_DEBUG_NOTIFIERS is not set
+CONFIG_DEBUG_NOTIFIERS=y
 
-# CONFIG_DMA_API_DEBUG is not set
+CONFIG_DMA_API_DEBUG=y
 
-# CONFIG_MMIOTRACE is not set
+CONFIG_MMIOTRACE=y
 
-# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_DEBUG_CREDENTIALS=y
 
 # off in both production debug and nodebug builds,
 #  on in rawhide nodebug builds
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 
-# CONFIG_EXT4_DEBUG is not set
+CONFIG_EXT4_DEBUG=y
 
 # CONFIG_XFS_WARN is not set
 
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_DEBUG_PERF_USE_VMALLOC=y
 
-# CONFIG_JBD2_DEBUG is not set
+CONFIG_JBD2_DEBUG=y
 
-# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_NFSD_FAULT_INJECTION=y
 
-# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_DEBUG_BLK_CGROUP=y
 
-# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_DRBD_FAULT_INJECTION=y
 
-# CONFIG_ATH_DEBUG is not set
-# CONFIG_CARL9170_DEBUGFS is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_ATH_DEBUG=y
+CONFIG_CARL9170_DEBUGFS=y
+CONFIG_IWLWIFI_DEVICE_TRACING=y
 
 # CONFIG_RTLWIFI_DEBUG is not set
 
-# CONFIG_DEBUG_OBJECTS_WORK is not set
+CONFIG_DEBUG_OBJECTS_WORK=y
 
-# CONFIG_DMADEVICES_DEBUG is not set
+CONFIG_DMADEVICES_DEBUG=y
 # CONFIG_DMADEVICES_VDEBUG is not set
 
 CONFIG_PM_ADVANCED_DEBUG=y
 
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_QUOTA_DEBUG is not set
+CONFIG_CEPH_LIB_PRETTYDEBUG=y
+CONFIG_QUOTA_DEBUG=y
 
 
 CONFIG_KGDB_KDB=y
@@ -105,19 +105,19 @@ CONFIG_KDB_DEFAULT_ENABLE=0x0
 CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 
-# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set
+CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
 # CONFIG_PERCPU_TEST is not set
-# CONFIG_TEST_LIST_SORT is not set
+CONFIG_TEST_LIST_SORT=y
 # CONFIG_TEST_STRING_HELPERS is not set
 
-# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-# CONFIG_WQ_WATCHDOG is not set
+CONFIG_WQ_WATCHDOG=y
 
-# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 
-# CONFIG_DEBUG_KMEMLEAK is not set
+CONFIG_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
 # CONFIG_DEBUG_KMEMLEAK_TEST is not set
 CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
@@ -128,4 +128,4 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 
 # CONFIG_SPI_DEBUG is not set
 
-# CONFIG_DEBUG_VM_PGFLAGS is not set
+CONFIG_DEBUG_VM_PGFLAGS=y
diff --git a/config-powerpc64-generic b/config-powerpc64-generic
index af4bbb251..6135a9bd0 100644
--- a/config-powerpc64-generic
+++ b/config-powerpc64-generic
@@ -321,10 +321,6 @@ CONFIG_GPIO_WM831X=m
 # CONFIG_CAN_MSCAN is not set
 # CONFIG_CAN_MPC5XXX is not set
 # CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_XPS_USB_HCD_XILINX is not set
 # CONFIG_MMC_SDHCI_OF_HLWD is not set
 
diff --git a/config-x86-generic b/config-x86-generic
index d7dc0e365..ae80650a4 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -381,7 +381,7 @@ CONFIG_SP5100_TCO=m
 
 # CONFIG_MEMTEST is not set
 # CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_MAXSMP is not set
+CONFIG_MAXSMP=y
 
 
 CONFIG_HP_ILO=m
@@ -437,22 +437,10 @@ CONFIG_GPIO_ICH=m
 # CONFIG_MFD_DA9055 is not set
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_PALMAS is not set
-# CONFIG_MFD_TPS65090 is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_TWL6040_CORE is not set
 
 CONFIG_PCI_CNB20LE_QUIRK=y
 
diff --git a/gitrev b/gitrev
index e9d8d23b5..e17044e9c 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-02184c60eba8491ea574cd17b8ba766c86d468f2
+1a0a02d1efa066001fd315c1b4df583d939fa2c4
diff --git a/kernel.spec b/kernel.spec
index 403485c9a..a2122d5b1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 1
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -133,7 +133,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -619,9 +619,6 @@ Patch641: disable-CONFIG_EXPERT-for-ZONE_DMA.patch
 #CVE-2016-3134 rhbz 1317383 1317384
 Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
 
-#rhbz 1346145
-Patch666: ath9k-fix-GPIO-mask-for-AR9462-and-AR9565.patch
-
 #rhbz 1338025
 Patch728: hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
 
@@ -2172,6 +2169,13 @@ fi
 #
 # 
 %changelog
+* Fri Jul 01 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc5.git3.1
+- Linux v4.7-rc5-254-g1a0a02d
+
+* Thu Jun 30 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc5.git2.1
+- Linux v4.7-rc5-227-ge7bdea7
+- Reenable debugging options.
+
 * Tue Jun 28 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc5.git1.1
 - Linux v4.7-rc5-28-g02184c6
 
diff --git a/sources b/sources
index 0f8f296ab..608d65fca 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 d2927020e24a76da4ab482a8bc3e9ef3  linux-4.6.tar.xz
 fd23b14b9d474c3dfacb6e8ee82d3a51  perf-man-4.6.tar.gz
 9eb043e3e7ff77945c6dd6f243766ab0  patch-4.7-rc5.xz
-4a231ef452ae58e346c2d0c42bcbd3b1  patch-4.7-rc5-git1.xz
+633bbbdf25c79fae24ca30048841483e  patch-4.7-rc5-git3.xz