Merge remote-tracking branch 'origin/master'

16 files changed, 256 insertions, 226 deletions

diff --git a/KEYS-potential-uninitialized-variable.patch b/KEYS-potential-uninitialized-variable.patch
new file mode 100644
index 000000000..23cabbb2e
--- /dev/null
+++ b/KEYS-potential-uninitialized-variable.patch
@@ -0,0 +1,30 @@
+From 82a50018782f84e733e718d4b24e1653d19333be Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Wed, 15 Jun 2016 09:31:45 -0400
+Subject: [PATCH] KEYS: potential uninitialized variable
+
+If __key_link_begin() failed then "edit" would be uninitialized.  I've
+added a check to fix that.
+
+Fixes: f70e2e06196a ('KEYS: Do preallocation for __key_link()')
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+---
+ security/keys/key.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/security/keys/key.c b/security/keys/key.c
+index bd5a272f28a6..346fbf201c22 100644
+--- a/security/keys/key.c
++++ b/security/keys/key.c
+@@ -597,7 +597,7 @@ int key_reject_and_link(struct key *key,
+ 
+ 	mutex_unlock(&key_construction_mutex);
+ 
+-	if (keyring)
++	if (keyring && link_ret == 0)
+ 		__key_link_end(keyring, &key->index_key, edit);
+ 
+ 	/* wake up anyone waiting for a key to be constructed */
+-- 
+2.5.5
+
diff --git a/ath9k-fix-GPIO-mask-for-AR9462-and-AR9565.patch b/ath9k-fix-GPIO-mask-for-AR9462-and-AR9565.patch
new file mode 100644
index 000000000..f8cd716f8
--- /dev/null
+++ b/ath9k-fix-GPIO-mask-for-AR9462-and-AR9565.patch
@@ -0,0 +1,80 @@
+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-arm-generic b/config-arm-generic
index 8e8c8d8f8..2440e92fd 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -511,7 +511,6 @@ CONFIG_COMMON_CLK_SCPI=m
 
 # core
 
-# CONFIG_INFINIBAND is not set
 # CONFIG_ISDN is not set
 # CONFIG_PCMCIA is not set
 # CONFIG_PARPORT is not set
@@ -546,8 +545,6 @@ CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_SCSI_3W_SAS is not set
 # CONFIG_SCSI_PM8001 is not set
 # CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
 # CONFIG_SCSI_BFA_FC is not set
 # CONFIG_FUSION is not set
 # CONFIG_SCSI_3W_9XXX is not set
diff --git a/config-armv7 b/config-armv7
index 5a749ac0a..abdfbf4ea 100644
--- a/config-armv7
+++ b/config-armv7
@@ -21,7 +21,7 @@ CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 CONFIG_SOC_OMAP5=y
 # CONFIG_SOC_DRA7XX is not set
 CONFIG_SOC_OMAP3430=y
-# CONFIG_SOC_TI81XX is not set
+CONFIG_SOC_TI81XX=y
 # CONFIG_MACH_NOKIA_RX51 is not set
 # CONFIG_MACH_OMAP_LDP is not set
 # CONFIG_MACH_OMAP3517EVM is not set
@@ -72,6 +72,8 @@ CONFIG_TWL4030_USB=m
 CONFIG_TWL6030_USB=m
 CONFIG_TWL6040_CORE=y
 CONFIG_CLK_TWL6040=m
+# DM814x such as hp-t410
+CONFIG_COMMON_CLK_TI_ADPLL=m
 CONFIG_OMAP_INTERCONNECT=m
 CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_HDQ_MASTER_OMAP=m
diff --git a/config-generic b/config-generic
index 5b6bb8d45..49fb1906a 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
@@ -5209,7 +5209,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-x86-generic b/config-x86-generic
index d7dc0e365..b44f9f3da 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
diff --git a/filter-aarch64.sh b/filter-aarch64.sh
index 139d1791d..cc560ca97 100644
--- a/filter-aarch64.sh
+++ b/filter-aarch64.sh
@@ -13,4 +13,4 @@ driverdirs="atm auxdisplay bcma bluetooth firewire fmc infiniband isdn leds medi
 
 ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i"
diff --git a/filter-armv7hl.sh b/filter-armv7hl.sh
index 6de77659a..0ae6d925b 100644
--- a/filter-armv7hl.sh
+++ b/filter-armv7hl.sh
@@ -15,4 +15,4 @@ ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco d
 
 drmdrvs="amd armada bridge ast exynos i2c imx mgag200 msm omapdrm panel nouveau radeon rockchip tegra tilcdc via"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i"
diff --git a/gitrev b/gitrev
index b012c9a0d..ec30e609c 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-147d9e7bcad3b8d5465f6eea6292731e7f35dee8
+db06d759d6cf903aeda8c107fd3abd366dd80200
diff --git a/hp-wmi-fix-wifi-cannot-be-hard-unblock.patch b/hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
new file mode 100644
index 000000000..27744a0c3
--- /dev/null
+++ b/hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
@@ -0,0 +1,48 @@
+From patchwork Mon Jun 13 11:44:00 2016
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: hp-wmi: fix wifi cannot be hard-unblock
+From: Alex Hung <alex.hung@canonical.com>
+X-Patchwork-Id: 9172765
+Message-Id: <1465818240-11994-1-git-send-email-alex.hung@canonical.com>
+To: dvhart@infradead.org, platform-driver-x86@vger.kernel.org,
+ alex.hung@canonical.com, david.ward@ll.mit.edu
+Date: Mon, 13 Jun 2016 19:44:00 +0800
+
+Several users reported wifi cannot be unblocked as discussed in [1].
+This patch removes the useof 2009 flag by BIOS but uses the actual WMI
+function calls - it will be skipped if WMI reports unsupported
+
+[1] https://bugzilla.kernel.org/show_bug.cgi?id=69131
+
+Signed-off-by: Alex Hung <alex.hung@canonical.com>
+---
+ drivers/platform/x86/hp-wmi.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
+index 6f145f2..96ffda4 100644
+--- a/drivers/platform/x86/hp-wmi.c
++++ b/drivers/platform/x86/hp-wmi.c
+@@ -718,6 +718,11 @@ static int __init hp_wmi_rfkill_setup(struct platform_device *device)
+ 	if (err)
+ 		return err;
+ 
++	err = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 1, &wireless,
++				   sizeof(wireless), 0);
++	if (err)
++		return err;
++
+ 	if (wireless & 0x1) {
+ 		wifi_rfkill = rfkill_alloc("hp-wifi", &device->dev,
+ 					   RFKILL_TYPE_WLAN,
+@@ -882,7 +887,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
+ 	wwan_rfkill = NULL;
+ 	rfkill2_count = 0;
+ 
+-	if (hp_wmi_bios_2009_later() || hp_wmi_rfkill_setup(device))
++	if (hp_wmi_rfkill_setup(device))
+ 		hp_wmi_rfkill2_setup(device);
+ 
+ 	err = device_create_file(&device->dev, &dev_attr_display);
diff --git a/kernel.spec b/kernel.spec
index 6a58ef2f3..06ea2acf4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # 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,6 +619,15 @@ 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
+
+#CVE-2016-4470 rhbz 1341716 1346626
+Patch727: KEYS-potential-uninitialized-variable.patch
+
+#rhbz 1338025
+Patch728: hp-wmi-fix-wifi-cannot-be-hard-unblock.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2147,6 +2156,25 @@ fi
 #
 # 
 %changelog
+* Wed Jun 15 2016 Laura Abbott <labbott@fedoraproject.org>
+- hp-wmi: fix wifi cannot be hard-unblock (rhbz 1338025)
+
+* Wed Jun 15 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- CVE-2016-4470 keys: uninitialized variable crash (rhbz 1341716 1346626)
+
+* Wed Jun 15 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable support for TI dm81xx devices (kwizart)
+
+* Tue Jun 14 2016 Laura Abbott <labbott@redhat.com>
+- ath9k: fix GPIO mask for AR9462 and AR9565 (rhbz 1346145)
+
+* Tue Jun 14 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc3.git1.1
+- Linux v4.7-rc3-9-gdb06d75
+- Reenable debugging options.
+
+* Tue Jun 14 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable Infiniband on ARM now we have HW
+
 * Mon Jun 13 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc3.git0.1
 - Linux v4.7-rc3
 - Disable debugging options.
diff --git a/scripts/allarchconfig.sh b/scripts/allarchconfig.sh
deleted file mode 100755
index f80c23197..000000000
--- a/scripts/allarchconfig.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Run from within a source tree.
-
-for i in configs/kernel-*.config
-do
-  cp -f $i .config
-  Arch=`head -1 .config | cut -b 3-`
-  echo $Arch \($i\)
-  make ARCH=$Arch listnewconfig | grep -E '^CONFIG_' >.newoptions || true;
-  if [ -s .newoptions ]; then
-    cat .newoptions;
-    exit 1;
-  fi;
-  rm -f .newoptions;
-done
-
diff --git a/scripts/bumpspecfile.py b/scripts/bumpspecfile.py
deleted file mode 100755
index bc02ab300..000000000
--- a/scripts/bumpspecfile.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/python
-#
-# Uses git config options user.name and user.email, falls
-# back to env vars $GIT_COMMITTER_NAME and $GIT_COMMITTER_EMAIL
-#
-import re
-import sys
-import time
-import os
-import string
-
-class Specfile:
-    def __init__(self,filename):
-        file=open(filename,"r")
-        self.lines=file.readlines()
-        self.vr=""
-
-    def getNextVR(self,aspec):
-         # Get VR for changelog entry.
-        (ver,rel) = os.popen("LC_ALL=C rpm --specfile -q --qf '%%{version} %%{release}\n' --define 'dist %%{nil}' %s | head -1" % aspec).read().strip().split(' ')
-	pos = 0
-        # general released kernel case, bump 1st field
-        fedora_build = rel.split('.')[pos]
-        if fedora_build == "0":
-            # this is a devel kernel, bump 2nd field
-            pos = 1
-        elif rel.split('.')[-1] != fedora_build:
-            # this is a branch, must bump 3rd field
-            pos = 2
-        fedora_build = rel.split('.')[pos]
-        if pos == 1 and len(rel.split('.')) > 4:
-            # uh... what? devel kernel in a branch? private build? just do no VR in clog...
-            print "Warning: not adding any VR to changelog, couldn't tell for sure which field to bump"
-            pos = -1
-        next_fedora_build = int(fedora_build) + 1
-        if pos == 0:
-            nextrel = str(next_fedora_build)
-        elif pos == 1:
-            nextrel = "0." + str(next_fedora_build)
-        elif pos == 2:
-            nextrel = rel.split('.')[0] + "." + rel.split('.')[1] + "." + str(next_fedora_build)
-        if pos >= 0:
-            for s in rel.split('.')[pos + 1:]:
-                nextrel = nextrel + "." + s
-            self.vr = " "+ver+'-'+nextrel
-
-    def addChangelogEntry(self,entry):
-        user = os.popen("git config --get user.name").read().rstrip()
-        if (user == ""):
-            user = os.environ.get("GIT_COMMITTER_NAME","Unknown")
-        email = os.popen("git config --get user.email").read().rstrip()
-        if (email == ""):
-            email = os.environ.get("GIT_COMMITTER_EMAIL","unknown")
-        if (email == "unknown"):
-            email = os.environ.get("USER","unknown")+"@fedoraproject.org"
-        changematch=re.compile(r"^%changelog")
-        date=time.strftime("%a %b %d %Y",   time.localtime(time.time()))
-        newchangelogentry="%changelog\n* "+date+" "+user+" <"+email+">"+self.vr+"\n"+entry+"\n\n"
-        for i in range(len(self.lines)):
-            if(changematch.match(self.lines[i])):
-                self.lines[i]=newchangelogentry
-                break
-
-    def writeFile(self,filename):
-        file=open(filename,"w")
-        file.writelines(self.lines)
-        file.close()
-
-if __name__=="__main__":
-  aspec=(sys.argv[1])
-  s=Specfile(aspec)
-  entry=(sys.argv[2])
-  s.getNextVR(aspec)
-  s.addChangelogEntry(entry)
-  s.writeFile(aspec)
-
diff --git a/scripts/rediffall.pl b/scripts/rediffall.pl
deleted file mode 100644
index 29f12beb9..000000000
--- a/scripts/rediffall.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Script to rediff all patches in the spec
-# Usage: perl -w rediffall.pl < kernel-2.4.spec
-#
-# $workdir is where the new rediff'ed patches are created
-# $origdir is where the original patches and tarball are located
-#
-# Note that both $workdir and $origdir must be absolute path names.
-# Suggestion: create a /kernel symbolic link to the top of your CVS tree.
-
-my $workdir = "/dev/shm/redifftree";
-my $origdir = "/home/davej/devel";
-my $kernver = "linux-2.6.17";
-my $datestrip = "s/^\\(\\(+++\\|---\\) [^[:blank:]]\\+\\)[[:blank:]].*/\\1/";
-my $patchindex = 0;
-my @patchlist;
-
-# phase 1: create a tree
-print "Extracting pristine source..\n";
-system("mkdir -p $workdir");
-system("rm -rf $workdir/*");
-chdir("$workdir");
-system("tar -jxvf $origdir/$kernver.tar.bz2 > /dev/null");
-system("cp -al $kernver linux-$patchindex");
-
-# phase 2: read the spec from stdin and store all patches
-print "Reading specfile..\n";
-
-while (<>) {
-	my $line = $_;
-	if ($line =~ /^Patch([0-9]+)\: ([a-zA-Z0-9\-\_\.\+]+\.patch)/) {
-		$patchlist[$1] = $2;
-	} else {
-		if ($line =~ /^Patch([0-9]+)\: ([a-zA-Z0-9\-\_\.]+\.bz2)/) {
-			$patchlist[$1] = $2;
-		}
-	}
-
-	if ($line =~ /^%patch([0-9]+) -p1/) {
-		# copy the tree, apply the patch, diff and remove the old tree
-		my $oldindex = $patchindex;
-		$patchindex = $1;
-
-		print "rediffing patch number $patchindex: $patchlist[$patchindex]\n";
-
-		system("cp -al linux-$oldindex linux-$patchindex");
-		chdir("linux-$patchindex");
-		if ($patchlist[$patchindex] =~ /bz2/) {
-			system("bzcat $origdir/$patchlist[$patchindex] | patch -p1 &>/dev/null");
-		} else {
-			system("cat $origdir/$patchlist[$patchindex] | patch -p1 &>/dev/null");
-		}
-		chdir("$workdir");
-		system("rm -f `find -name \"*orig\"`");
-		if ($patchlist[$patchindex] =~ /bz2/) {
-		} else {
-			system("diff -urNp --exclude-from=/home/davej/.exclude linux-$oldindex linux-$patchindex | sed '$datestrip' > $patchlist[$patchindex]");
-		}
-		system("rm -rf linux-$oldindex");
-	}
-};
-
-1;
diff --git a/sources b/sources
index c18e1b585..1cf011274 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 d2927020e24a76da4ab482a8bc3e9ef3  linux-4.6.tar.xz
 fd23b14b9d474c3dfacb6e8ee82d3a51  perf-man-4.6.tar.gz
 4197bebd41db2f1cfe9ba8e98cc53832  patch-4.7-rc3.xz
+06bc4bab5d15641b4275557ce6f979a9  patch-4.7-rc3-git1.xz