main/linux-vserver: remove unused patch

1 files changed, 0 insertions, 9417 deletions

diff --git a/main/linux-vserver/patch-3.6.11-al2.patch b/main/linux-vserver/patch-3.6.11-al2.patch
deleted file mode 100644
index 3139bf3a63..0000000000
--- a/main/linux-vserver/patch-3.6.11-al2.patch
+++ /dev/null
@@ -1,9417 +0,0 @@
-diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c
-index df74518..ab1017b 100644
---- a/arch/arm/kernel/swp_emulate.c
-+++ b/arch/arm/kernel/swp_emulate.c
-@@ -109,10 +109,12 @@ static void set_segfault(struct pt_regs *regs, unsigned long addr)
- {
- 	siginfo_t info;
- 
-+	down_read(&current->mm->mmap_sem);
- 	if (find_vma(current->mm, addr) == NULL)
- 		info.si_code = SEGV_MAPERR;
- 	else
- 		info.si_code = SEGV_ACCERR;
-+	up_read(&current->mm->mmap_sem);
- 
- 	info.si_signo = SIGSEGV;
- 	info.si_errno = 0;
-diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
-index a611ad3..b6132aa 100644
---- a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
-+++ b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
-@@ -463,6 +463,9 @@
- 	GPIO76_LCD_PCLK,	\
- 	GPIO77_LCD_BIAS
- 
-+/* these enable a work-around for a hw bug in pxa27x during ac97 warm reset */
-+#define GPIO113_AC97_nRESET_GPIO_HIGH MFP_CFG_OUT(GPIO113, AF0, DEFAULT)
-+#define GPIO95_AC97_nRESET_GPIO_HIGH MFP_CFG_OUT(GPIO95, AF0, DEFAULT)
- 
- extern int keypad_set_wake(unsigned int on);
- #endif /* __ASM_ARCH_MFP_PXA27X_H */
-diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
-index 4726c24..a2fe795 100644
---- a/arch/arm/mach-pxa/pxa27x.c
-+++ b/arch/arm/mach-pxa/pxa27x.c
-@@ -47,9 +47,9 @@ void pxa27x_clear_otgph(void)
- EXPORT_SYMBOL(pxa27x_clear_otgph);
- 
- static unsigned long ac97_reset_config[] = {
--	GPIO113_GPIO,
-+	GPIO113_AC97_nRESET_GPIO_HIGH,
- 	GPIO113_AC97_nRESET,
--	GPIO95_GPIO,
-+	GPIO95_AC97_nRESET_GPIO_HIGH,
- 	GPIO95_AC97_nRESET,
- };
- 
-diff --git a/arch/arm/mach-realview/include/mach/board-eb.h b/arch/arm/mach-realview/include/mach/board-eb.h
-index 124bce6..a301e61 100644
---- a/arch/arm/mach-realview/include/mach/board-eb.h
-+++ b/arch/arm/mach-realview/include/mach/board-eb.h
-@@ -47,7 +47,7 @@
- #define REALVIEW_EB_USB_BASE		0x4F000000	/* USB */
- 
- #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB
--#define REALVIEW_EB11MP_PRIV_MEM_BASE	0x1F000000
-+#define REALVIEW_EB11MP_PRIV_MEM_BASE	0x10100000
- #define REALVIEW_EB11MP_L220_BASE	0x10102000	/* L220 registers */
- #define REALVIEW_EB11MP_SYS_PLD_CTRL1	0xD8		/* Register offset for MPCore sysctl */
- #else
-diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
-index c2fa21d..b68b531 100644
---- a/arch/arm/mm/mmu.c
-+++ b/arch/arm/mm/mmu.c
-@@ -498,7 +498,7 @@ static void __init build_mem_type_table(void)
- #endif
- 
- 	for (i = 0; i < 16; i++) {
--		unsigned long v = pgprot_val(protection_map[i]);
-+		pteval_t v = pgprot_val(protection_map[i]);
- 		protection_map[i] = __pgprot(v | user_pgprot);
- 	}
- 
-diff --git a/arch/cris/include/asm/io.h b/arch/cris/include/asm/io.h
-index 32567bc..ac12ae2 100644
---- a/arch/cris/include/asm/io.h
-+++ b/arch/cris/include/asm/io.h
-@@ -133,12 +133,39 @@ static inline void writel(unsigned int b, volatile void __iomem *addr)
- #define insb(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,1,count) : 0)
- #define insw(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,2,count) : 0)
- #define insl(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,4,count) : 0)
--#define outb(data,port) if (cris_iops) cris_iops->write_io(port,(void*)(unsigned)data,1,1)
--#define outw(data,port) if (cris_iops) cris_iops->write_io(port,(void*)(unsigned)data,2,1)
--#define outl(data,port) if (cris_iops) cris_iops->write_io(port,(void*)(unsigned)data,4,1)
--#define outsb(port,addr,count) if(cris_iops) cris_iops->write_io(port,(void*)addr,1,count)
--#define outsw(port,addr,count) if(cris_iops) cris_iops->write_io(port,(void*)addr,2,count)
--#define outsl(port,addr,count) if(cris_iops) cris_iops->write_io(port,(void*)addr,3,count)
-+static inline void outb(unsigned char data, unsigned int port)
-+{
-+	if (cris_iops)
-+		cris_iops->write_io(port, (void *) &data, 1, 1);
-+}
-+static inline void outw(unsigned short data, unsigned int port)
-+{
-+	if (cris_iops)
-+		cris_iops->write_io(port, (void *) &data, 2, 1);
-+}
-+static inline void outl(unsigned int data, unsigned int port)
-+{
-+	if (cris_iops)
-+		cris_iops->write_io(port, (void *) &data, 4, 1);
-+}
-+static inline void outsb(unsigned int port, const void *addr,
-+			 unsigned long count)
-+{
-+	if (cris_iops)
-+		cris_iops->write_io(port, (void *)addr, 1, count);
-+}
-+static inline void outsw(unsigned int port, const void *addr,
-+			 unsigned long count)
-+{
-+	if (cris_iops)
-+		cris_iops->write_io(port, (void *)addr, 2, count);
-+}
-+static inline void outsl(unsigned int port, const void *addr,
-+			 unsigned long count)
-+{
-+	if (cris_iops)
-+		cris_iops->write_io(port, (void *)addr, 4, count);
-+}
- 
- /*
-  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
-diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
-index e9a5fd7..69b17a9 100644
---- a/arch/mips/kernel/process.c
-+++ b/arch/mips/kernel/process.c
-@@ -72,9 +72,7 @@ void __noreturn cpu_idle(void)
- 			}
- 		}
- #ifdef CONFIG_HOTPLUG_CPU
--		if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map) &&
--		    (system_state == SYSTEM_RUNNING ||
--		     system_state == SYSTEM_BOOTING))
-+		if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map))
- 			play_dead();
- #endif
- 		rcu_idle_exit();
-diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
-index 58bddee..9e07bd0 100644
---- a/arch/powerpc/kernel/head_64.S
-+++ b/arch/powerpc/kernel/head_64.S
-@@ -422,7 +422,7 @@ _STATIC(__after_prom_start)
- 	tovirt(r6,r6)			/* on booke, we already run at PAGE_OFFSET */
- #endif
- 
--#ifdef CONFIG_CRASH_DUMP
-+#ifdef CONFIG_RELOCATABLE
- /*
-  * Check if the kernel has to be running as relocatable kernel based on the
-  * variable __run_at_load, if it is set the kernel is treated as relocatable
-diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
-index e49e931..5395666 100644
---- a/arch/powerpc/kernel/time.c
-+++ b/arch/powerpc/kernel/time.c
-@@ -759,13 +759,8 @@ void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
- 
- void update_vsyscall_tz(void)
- {
--	/* Make userspace gettimeofday spin until we're done. */
--	++vdso_data->tb_update_count;
--	smp_mb();
- 	vdso_data->tz_minuteswest = sys_tz.tz_minuteswest;
- 	vdso_data->tz_dsttime = sys_tz.tz_dsttime;
--	smp_mb();
--	++vdso_data->tb_update_count;
- }
- 
- static void __init clocksource_init(void)
-diff --git a/arch/powerpc/kvm/44x_emulate.c b/arch/powerpc/kvm/44x_emulate.c
-index c8c6157..c39cd0b 100644
---- a/arch/powerpc/kvm/44x_emulate.c
-+++ b/arch/powerpc/kvm/44x_emulate.c
-@@ -76,6 +76,7 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
- 				run->dcr.dcrn = dcrn;
- 				run->dcr.data =  0;
- 				run->dcr.is_write = 0;
-+				vcpu->arch.dcr_is_write = 0;
- 				vcpu->arch.io_gpr = rt;
- 				vcpu->arch.dcr_needed = 1;
- 				kvmppc_account_exit(vcpu, DCR_EXITS);
-@@ -94,6 +95,7 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
- 				run->dcr.dcrn = dcrn;
- 				run->dcr.data = kvmppc_get_gpr(vcpu, rs);
- 				run->dcr.is_write = 1;
-+				vcpu->arch.dcr_is_write = 1;
- 				vcpu->arch.dcr_needed = 1;
- 				kvmppc_account_exit(vcpu, DCR_EXITS);
- 				emulated = EMULATE_DO_DCR;
-diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
-index 9761206..f0eee75 100644
---- a/arch/powerpc/platforms/40x/ppc40x_simple.c
-+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
-@@ -57,7 +57,8 @@ static const char *board[] __initdata = {
- 	"amcc,makalu",
- 	"apm,klondike",
- 	"est,hotfoot",
--	"plathome,obs600"
-+	"plathome,obs600",
-+	NULL
- };
- 
- static int __init ppc40x_probe(void)
-diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h
-index fba4d66..4c060bb 100644
---- a/arch/s390/include/asm/timex.h
-+++ b/arch/s390/include/asm/timex.h
-@@ -128,4 +128,32 @@ static inline unsigned long long get_clock_monotonic(void)
- 	return get_clock_xt() - sched_clock_base_cc;
- }
- 
-+/**
-+ * tod_to_ns - convert a TOD format value to nanoseconds
-+ * @todval: to be converted TOD format value
-+ * Returns: number of nanoseconds that correspond to the TOD format value
-+ *
-+ * Converting a 64 Bit TOD format value to nanoseconds means that the value
-+ * must be divided by 4.096. In order to achieve that we multiply with 125
-+ * and divide by 512:
-+ *
-+ *    ns = (todval * 125) >> 9;
-+ *
-+ * In order to avoid an overflow with the multiplication we can rewrite this.
-+ * With a split todval == 2^32 * th + tl (th upper 32 bits, tl lower 32 bits)
-+ * we end up with
-+ *
-+ *    ns = ((2^32 * th + tl) * 125 ) >> 9;
-+ * -> ns = (2^23 * th * 125) + ((tl * 125) >> 9);
-+ *
-+ */
-+static inline unsigned long long tod_to_ns(unsigned long long todval)
-+{
-+	unsigned long long ns;
-+
-+	ns = ((todval >> 32) << 23) * 125;
-+	ns += ((todval & 0xffffffff) * 125) >> 9;
-+	return ns;
-+}
-+
- #endif
-diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
-index dcec960..0cb14ba 100644
---- a/arch/s390/kernel/time.c
-+++ b/arch/s390/kernel/time.c
-@@ -63,7 +63,7 @@ static DEFINE_PER_CPU(struct clock_event_device, comparators);
-  */
- unsigned long long notrace __kprobes sched_clock(void)
- {
--	return (get_clock_monotonic() * 125) >> 9;
-+	return tod_to_ns(get_clock_monotonic());
- }
- 
- /*
-diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
-index b7bc1aa..a80b585 100644
---- a/arch/s390/kvm/interrupt.c
-+++ b/arch/s390/kvm/interrupt.c
-@@ -390,7 +390,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu)
- 		return 0;
- 	}
- 
--	sltime = ((vcpu->arch.sie_block->ckc - now)*125)>>9;
-+	sltime = tod_to_ns(vcpu->arch.sie_block->ckc - now);
- 
- 	hrtimer_start(&vcpu->arch.ckc_timer, ktime_set (0, sltime) , HRTIMER_MODE_REL);
- 	VCPU_EVENT(vcpu, 5, "enabled wait via clock comparator: %llx ns", sltime);
-diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h
-index f38112b..978b7fd 100644
---- a/arch/sh/include/asm/elf.h
-+++ b/arch/sh/include/asm/elf.h
-@@ -202,9 +202,9 @@ extern void __kernel_vsyscall;
- 	if (vdso_enabled)					\
- 		NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);	\
- 	else							\
--		NEW_AUX_ENT(AT_IGNORE, 0);
-+		NEW_AUX_ENT(AT_IGNORE, 0)
- #else
--#define VSYSCALL_AUX_ENT
-+#define VSYSCALL_AUX_ENT	NEW_AUX_ENT(AT_IGNORE, 0)
- #endif /* CONFIG_VSYSCALL */
- 
- #ifdef CONFIG_SH_FPU
-diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/hugetlb.h
-index 1770610..f368cef 100644
---- a/arch/sparc/include/asm/hugetlb.h
-+++ b/arch/sparc/include/asm/hugetlb.h
-@@ -58,14 +58,20 @@ static inline pte_t huge_pte_wrprotect(pte_t pte)
- static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
- 					   unsigned long addr, pte_t *ptep)
- {
--	ptep_set_wrprotect(mm, addr, ptep);
-+	pte_t old_pte = *ptep;
-+	set_huge_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
- }
- 
- static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
- 					     unsigned long addr, pte_t *ptep,
- 					     pte_t pte, int dirty)
- {
--	return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
-+	int changed = !pte_same(*ptep, pte);
-+	if (changed) {
-+		set_huge_pte_at(vma->vm_mm, addr, ptep, pte);
-+		flush_tlb_page(vma, addr);
-+	}
-+	return changed;
- }
- 
- static inline pte_t huge_ptep_get(pte_t *ptep)
-diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
-index 8f8e8ee..2a6919e 100644
---- a/arch/x86/kernel/entry_32.S
-+++ b/arch/x86/kernel/entry_32.S
-@@ -1065,7 +1065,6 @@ ENTRY(xen_failsafe_callback)
- 	lea 16(%esp),%esp
- 	CFI_ADJUST_CFA_OFFSET -16
- 	jz 5f
--	addl $16,%esp
- 	jmp iret_exc
- 5:	pushl_cfi $-1 /* orig_ax = -1 => not a system call */
- 	SAVE_ALL
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 5cee802..53339c1 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -613,6 +613,81 @@ static __init void reserve_ibft_region(void)
- 
- static unsigned reserve_low = CONFIG_X86_RESERVE_LOW << 10;
- 
-+static bool __init snb_gfx_workaround_needed(void)
-+{
-+	int i;
-+	u16 vendor, devid;
-+	static const u16 snb_ids[] = {
-+		0x0102,
-+		0x0112,
-+		0x0122,
-+		0x0106,
-+		0x0116,
-+		0x0126,
-+		0x010a,
-+	};
-+
-+	/* Assume no if something weird is going on with PCI */
-+	if (!early_pci_allowed())
-+		return false;
-+
-+	vendor = read_pci_config_16(0, 2, 0, PCI_VENDOR_ID);
-+	if (vendor != 0x8086)
-+		return false;
-+
-+	devid = read_pci_config_16(0, 2, 0, PCI_DEVICE_ID);
-+	for (i = 0; i < ARRAY_SIZE(snb_ids); i++)
-+		if (devid == snb_ids[i])
-+			return true;
-+
-+	return false;
-+}
-+
-+/*
-+ * Sandy Bridge graphics has trouble with certain ranges, exclude
-+ * them from allocation.
-+ */
-+static void __init trim_snb_memory(void)
-+{
-+	static const unsigned long bad_pages[] = {
-+		0x20050000,
-+		0x20110000,
-+		0x20130000,
-+		0x20138000,
-+		0x40004000,
-+	};
-+	int i;
-+
-+	if (!snb_gfx_workaround_needed())
-+		return;
-+
-+	printk(KERN_DEBUG "reserving inaccessible SNB gfx pages\n");
-+
-+	/*
-+	 * Reserve all memory below the 1 MB mark that has not
-+	 * already been reserved.
-+	 */
-+	memblock_reserve(0, 1<<20);
-+
-+	for (i = 0; i < ARRAY_SIZE(bad_pages); i++) {
-+		if (memblock_reserve(bad_pages[i], PAGE_SIZE))
-+			printk(KERN_WARNING "failed to reserve 0x%08lx\n",
-+			       bad_pages[i]);
-+	}
-+}
-+
-+/*
-+ * Here we put platform-specific memory range workarounds, i.e.
-+ * memory known to be corrupt or otherwise in need to be reserved on
-+ * specific platforms.
-+ *
-+ * If this gets used more widely it could use a real dispatch mechanism.
-+ */
-+static void __init trim_platform_memory_ranges(void)
-+{
-+	trim_snb_memory();
-+}
-+
- static void __init trim_bios_range(void)
- {
- 	/*
-@@ -633,6 +708,7 @@ static void __init trim_bios_range(void)
- 	 * take them out.
- 	 */
- 	e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
-+
- 	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
- }
- 
-@@ -911,6 +987,8 @@ void __init setup_arch(char **cmdline_p)
- 
- 	setup_real_mode();
- 
-+	trim_platform_memory_ranges();
-+
- 	init_gbpages();
- 
- 	/* max_pfn_mapped is updated here */
-diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
-index ad3730b..aac684d 100644
---- a/drivers/acpi/processor_idle.c
-+++ b/drivers/acpi/processor_idle.c
-@@ -1009,6 +1009,9 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr)
- 		return -EINVAL;
- 	}
- 
-+	if (!dev)
-+		return -EINVAL;
-+
- 	dev->cpu = pr->id;
- 
- 	if (max_cstate == 0)
-@@ -1196,6 +1199,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
- 		}
- 
- 		/* Populate Updated C-state information */
-+		acpi_processor_get_power_info(pr);
- 		acpi_processor_setup_cpuidle_states(pr);
- 
- 		/* Enable all cpuidle devices */
-diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index d1ecca2..f1fcaca 100644
---- a/drivers/acpi/scan.c
-+++ b/drivers/acpi/scan.c
-@@ -807,8 +807,8 @@ acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,
- static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
- {
- 	struct acpi_device_id button_device_ids[] = {
--		{"PNP0C0D", 0},
- 		{"PNP0C0C", 0},
-+		{"PNP0C0D", 0},
- 		{"PNP0C0E", 0},
- 		{"", 0},
- 	};
-@@ -820,6 +820,11 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
- 	/* Power button, Lid switch always enable wakeup */
- 	if (!acpi_match_device_ids(device, button_device_ids)) {
- 		device->wakeup.flags.run_wake = 1;
-+		if (!acpi_match_device_ids(device, &button_device_ids[1])) {
-+			/* Do not use Lid/sleep button for S5 wakeup */
-+			if (device->wakeup.sleep_state == ACPI_STATE_S5)
-+				device->wakeup.sleep_state = ACPI_STATE_S4;
-+		}
- 		device_set_wakeup_capable(&device->dev, true);
- 		return;
- 	}
-@@ -1175,7 +1180,7 @@ static void acpi_device_set_id(struct acpi_device *device)
- 			acpi_add_id(device, ACPI_DOCK_HID);
- 		else if (!acpi_ibm_smbus_match(device))
- 			acpi_add_id(device, ACPI_SMBUS_IBM_HID);
--		else if (!acpi_device_hid(device) &&
-+		else if (list_empty(&device->pnp.ids) &&
- 			 ACPI_IS_ROOT_DEVICE(device->parent)) {
- 			acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */
- 			strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);
-diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
-index 847ed55..813aa38 100644
---- a/drivers/acpi/sleep.c
-+++ b/drivers/acpi/sleep.c
-@@ -109,6 +109,180 @@ void __init acpi_old_suspend_ordering(void)
- 	old_suspend_ordering = true;
- }
- 
-+static int __init init_old_suspend_ordering(const struct dmi_system_id *d)
-+{
-+	acpi_old_suspend_ordering();
-+	return 0;
-+}
-+
-+static int __init init_nvs_nosave(const struct dmi_system_id *d)
-+{
-+	acpi_nvs_nosave();
-+	return 0;
-+}
-+
-+static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
-+	{
-+	.callback = init_old_suspend_ordering,
-+	.ident = "Abit KN9 (nForce4 variant)",
-+	.matches = {
-+		DMI_MATCH(DMI_BOARD_VENDOR, "http://www.abit.com.tw/"),
-+		DMI_MATCH(DMI_BOARD_NAME, "KN9 Series(NF-CK804)"),
-+		},
-+	},
-+	{
-+	.callback = init_old_suspend_ordering,
-+	.ident = "HP xw4600 Workstation",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "HP xw4600 Workstation"),
-+		},
-+	},
-+	{
-+	.callback = init_old_suspend_ordering,
-+	.ident = "Asus Pundit P1-AH2 (M2N8L motherboard)",
-+	.matches = {
-+		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTek Computer INC."),
-+		DMI_MATCH(DMI_BOARD_NAME, "M2N8L"),
-+		},
-+	},
-+	{
-+	.callback = init_old_suspend_ordering,
-+	.ident = "Panasonic CF51-2L",
-+	.matches = {
-+		DMI_MATCH(DMI_BOARD_VENDOR,
-+				"Matsushita Electric Industrial Co.,Ltd."),
-+		DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Sony Vaio VGN-FW21E",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW21E"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Sony Vaio VPCEB17FX",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB17FX"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Sony Vaio VGN-SR11M",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR11M"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Everex StepNote Series",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Everex Systems, Inc."),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "Everex StepNote Series"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Sony Vaio VPCEB1Z1E",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1Z1E"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Sony Vaio VGN-NW130D",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Sony Vaio VPCCW29FX",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "VPCCW29FX"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Averatec AV1020-ED2",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"),
-+		},
-+	},
-+	{
-+	.callback = init_old_suspend_ordering,
-+	.ident = "Asus A8N-SLI DELUXE",
-+	.matches = {
-+		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
-+		DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI DELUXE"),
-+		},
-+	},
-+	{
-+	.callback = init_old_suspend_ordering,
-+	.ident = "Asus A8N-SLI Premium",
-+	.matches = {
-+		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
-+		DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI Premium"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Sony Vaio VGN-SR26GN_P",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR26GN_P"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Sony Vaio VPCEB1S1E",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1S1E"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Sony Vaio VGN-FW520F",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Asus K54C",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "K54C"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
-+	.ident = "Asus K54HR",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),
-+		},
-+	},
-+	{},
-+};
-+
-+static void acpi_sleep_dmi_check(void)
-+{
-+	dmi_check_system(acpisleep_dmi_table);
-+}
-+
- /**
-  * acpi_pm_freeze - Disable the GPEs and suspend EC transactions.
-  */
-@@ -224,6 +398,7 @@ static void acpi_pm_end(void)
- }
- #else /* !CONFIG_ACPI_SLEEP */
- #define acpi_target_sleep_state	ACPI_STATE_S0
-+static inline void acpi_sleep_dmi_check(void) {}
- #endif /* CONFIG_ACPI_SLEEP */
- 
- #ifdef CONFIG_SUSPEND
-@@ -382,175 +557,6 @@ static const struct platform_suspend_ops acpi_suspend_ops_old = {
- 	.end = acpi_pm_end,
- 	.recover = acpi_pm_finish,
- };
--
--static int __init init_old_suspend_ordering(const struct dmi_system_id *d)
--{
--	old_suspend_ordering = true;
--	return 0;
--}
--
--static int __init init_nvs_nosave(const struct dmi_system_id *d)
--{
--	acpi_nvs_nosave();
--	return 0;
--}
--
--static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
--	{
--	.callback = init_old_suspend_ordering,
--	.ident = "Abit KN9 (nForce4 variant)",
--	.matches = {
--		DMI_MATCH(DMI_BOARD_VENDOR, "http://www.abit.com.tw/"),
--		DMI_MATCH(DMI_BOARD_NAME, "KN9 Series(NF-CK804)"),
--		},
--	},
--	{
--	.callback = init_old_suspend_ordering,
--	.ident = "HP xw4600 Workstation",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
--		DMI_MATCH(DMI_PRODUCT_NAME, "HP xw4600 Workstation"),
--		},
--	},
--	{
--	.callback = init_old_suspend_ordering,
--	.ident = "Asus Pundit P1-AH2 (M2N8L motherboard)",
--	.matches = {
--		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTek Computer INC."),
--		DMI_MATCH(DMI_BOARD_NAME, "M2N8L"),
--		},
--	},
--	{
--	.callback = init_old_suspend_ordering,
--	.ident = "Panasonic CF51-2L",
--	.matches = {
--		DMI_MATCH(DMI_BOARD_VENDOR,
--				"Matsushita Electric Industrial Co.,Ltd."),
--		DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Sony Vaio VGN-FW21E",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
--		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW21E"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Sony Vaio VPCEB17FX",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
--		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB17FX"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Sony Vaio VGN-SR11M",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
--		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR11M"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Everex StepNote Series",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "Everex Systems, Inc."),
--		DMI_MATCH(DMI_PRODUCT_NAME, "Everex StepNote Series"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Sony Vaio VPCEB1Z1E",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
--		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1Z1E"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Sony Vaio VGN-NW130D",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
--		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-NW130D"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Sony Vaio VPCCW29FX",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
--		DMI_MATCH(DMI_PRODUCT_NAME, "VPCCW29FX"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Averatec AV1020-ED2",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "AVERATEC"),
--		DMI_MATCH(DMI_PRODUCT_NAME, "1000 Series"),
--		},
--	},
--	{
--	.callback = init_old_suspend_ordering,
--	.ident = "Asus A8N-SLI DELUXE",
--	.matches = {
--		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
--		DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI DELUXE"),
--		},
--	},
--	{
--	.callback = init_old_suspend_ordering,
--	.ident = "Asus A8N-SLI Premium",
--	.matches = {
--		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
--		DMI_MATCH(DMI_BOARD_NAME, "A8N-SLI Premium"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Sony Vaio VGN-SR26GN_P",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
--		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR26GN_P"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Sony Vaio VPCEB1S1E",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
--		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1S1E"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Sony Vaio VGN-FW520F",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
--		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Asus K54C",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
--		DMI_MATCH(DMI_PRODUCT_NAME, "K54C"),
--		},
--	},
--	{
--	.callback = init_nvs_nosave,
--	.ident = "Asus K54HR",
--	.matches = {
--		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
--		DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),
--		},
--	},
--	{},
--};
- #endif /* CONFIG_SUSPEND */
- 
- #ifdef CONFIG_HIBERNATION
-@@ -881,13 +887,13 @@ int __init acpi_sleep_init(void)
- 	u8 type_a, type_b;
- #ifdef CONFIG_SUSPEND
- 	int i = 0;
--
--	dmi_check_system(acpisleep_dmi_table);
- #endif
- 
- 	if (acpi_disabled)
- 		return 0;
- 
-+	acpi_sleep_dmi_check();
-+
- 	sleep_states[ACPI_STATE_S0] = 1;
- 	printk(KERN_INFO PREFIX "(supports S0");
- 
-diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
-index 7862d17..4979127 100644
---- a/drivers/ata/ahci.c
-+++ b/drivers/ata/ahci.c
-@@ -53,6 +53,7 @@
- 
- enum {
- 	AHCI_PCI_BAR_STA2X11	= 0,
-+	AHCI_PCI_BAR_ENMOTUS	= 2,
- 	AHCI_PCI_BAR_STANDARD	= 5,
- };
- 
-@@ -410,6 +411,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
- 	{ PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci },	/* ASM1061 */
- 	{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci },	/* ASM1062 */
- 
-+	/* Enmotus */
-+	{ PCI_DEVICE(0x1c44, 0x8000), board_ahci },
-+
- 	/* Generic, PCI class code for AHCI */
- 	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
- 	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
-@@ -1098,9 +1102,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
- 		dev_info(&pdev->dev,
- 			 "PDC42819 can only drive SATA devices with this driver\n");
- 
--	/* The Connext uses non-standard BAR */
-+	/* Both Connext and Enmotus devices use non-standard BARs */
- 	if (pdev->vendor == PCI_VENDOR_ID_STMICRO && pdev->device == 0xCC06)
- 		ahci_pci_bar = AHCI_PCI_BAR_STA2X11;
-+	else if (pdev->vendor == 0x1c44 && pdev->device == 0x8000)
-+		ahci_pci_bar = AHCI_PCI_BAR_ENMOTUS;
- 
- 	/* acquire resources */
- 	rc = pcim_enable_device(pdev);
-diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index 8e1039c..8789aef 100644
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
-@@ -2541,6 +2541,7 @@ int ata_bus_probe(struct ata_port *ap)
- 		 * bus as we may be talking too fast.
- 		 */
- 		dev->pio_mode = XFER_PIO_0;
-+		dev->dma_mode = 0xff;
- 
- 		/* If the controller has a pio mode setup function
- 		 * then use it to set the chipset to rights. Don't
-diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
-index 7d4535e..105e31f 100644
---- a/drivers/ata/libata-eh.c
-+++ b/drivers/ata/libata-eh.c
-@@ -2653,6 +2653,7 @@ int ata_eh_reset(struct ata_link *link, int classify,
- 		 * bus as we may be talking too fast.
- 		 */
- 		dev->pio_mode = XFER_PIO_0;
-+		dev->dma_mode = 0xff;
- 
- 		/* If the controller has a pio mode setup function
- 		 * then use it to set the chipset to rights. Don't
-diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
-index 8ec81ca..9f8b751 100644
---- a/drivers/ata/libata-scsi.c
-+++ b/drivers/ata/libata-scsi.c
-@@ -309,7 +309,8 @@ ata_scsi_activity_show(struct device *dev, struct device_attribute *attr,
- 	struct ata_port *ap = ata_shost_to_port(sdev->host);
- 	struct ata_device *atadev = ata_scsi_find_dev(ap, sdev);
- 
--	if (ap->ops->sw_activity_show && (ap->flags & ATA_FLAG_SW_ACTIVITY))
-+	if (atadev && ap->ops->sw_activity_show &&
-+	    (ap->flags & ATA_FLAG_SW_ACTIVITY))
- 		return ap->ops->sw_activity_show(atadev, buf);
- 	return -EINVAL;
- }
-@@ -324,7 +325,8 @@ ata_scsi_activity_store(struct device *dev, struct device_attribute *attr,
- 	enum sw_activity val;
- 	int rc;
- 
--	if (ap->ops->sw_activity_store && (ap->flags & ATA_FLAG_SW_ACTIVITY)) {
-+	if (atadev && ap->ops->sw_activity_store &&
-+	    (ap->flags & ATA_FLAG_SW_ACTIVITY)) {
- 		val = simple_strtoul(buf, NULL, 0);
- 		switch (val) {
- 		case OFF: case BLINK_ON: case BLINK_OFF:
-diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
-index 489c817..fb0dd87 100644
---- a/drivers/ata/sata_promise.c
-+++ b/drivers/ata/sata_promise.c
-@@ -147,6 +147,10 @@ struct pdc_port_priv {
- 	dma_addr_t		pkt_dma;
- };
- 
-+struct pdc_host_priv {
-+	spinlock_t hard_reset_lock;
-+};
-+
- static int pdc_sata_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);
- static int pdc_sata_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);
- static int pdc_ata_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
-@@ -801,9 +805,10 @@ static void pdc_hard_reset_port(struct ata_port *ap)
- 	void __iomem *host_mmio = ap->host->iomap[PDC_MMIO_BAR];
- 	void __iomem *pcictl_b1_mmio = host_mmio + PDC_PCI_CTL + 1;
- 	unsigned int ata_no = pdc_ata_port_to_ata_no(ap);
-+	struct pdc_host_priv *hpriv = ap->host->private_data;
- 	u8 tmp;
- 
--	spin_lock(&ap->host->lock);
-+	spin_lock(&hpriv->hard_reset_lock);
- 
- 	tmp = readb(pcictl_b1_mmio);
- 	tmp &= ~(0x10 << ata_no);
-@@ -814,7 +819,7 @@ static void pdc_hard_reset_port(struct ata_port *ap)
- 	writeb(tmp, pcictl_b1_mmio);
- 	readb(pcictl_b1_mmio); /* flush */
- 
--	spin_unlock(&ap->host->lock);
-+	spin_unlock(&hpriv->hard_reset_lock);
- }
- 
- static int pdc_sata_hardreset(struct ata_link *link, unsigned int *class,
-@@ -1182,6 +1187,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
- 	const struct ata_port_info *pi = &pdc_port_info[ent->driver_data];
- 	const struct ata_port_info *ppi[PDC_MAX_PORTS];
- 	struct ata_host *host;
-+	struct pdc_host_priv *hpriv;
- 	void __iomem *host_mmio;
- 	int n_ports, i, rc;
- 	int is_sataii_tx4;
-@@ -1218,6 +1224,11 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
- 		dev_err(&pdev->dev, "failed to allocate host\n");
- 		return -ENOMEM;
- 	}
-+	hpriv = devm_kzalloc(&pdev->dev, sizeof *hpriv, GFP_KERNEL);
-+	if (!hpriv)
-+		return -ENOMEM;
-+	spin_lock_init(&hpriv->hard_reset_lock);
-+	host->private_data = hpriv;
- 	host->iomap = pcim_iomap_table(pdev);
- 
- 	is_sataii_tx4 = pdc_is_sataii_tx4(pi->flags);
-diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
-index 9851093..1853a45 100644
---- a/drivers/atm/solos-pci.c
-+++ b/drivers/atm/solos-pci.c
-@@ -967,10 +967,11 @@ static uint32_t fpga_tx(struct solos_card *card)
- 	for (port = 0; tx_pending; tx_pending >>= 1, port++) {
- 		if (tx_pending & 1) {
- 			struct sk_buff *oldskb = card->tx_skb[port];
--			if (oldskb)
-+			if (oldskb) {
- 				pci_unmap_single(card->dev, SKB_CB(oldskb)->dma_addr,
- 						 oldskb->len, PCI_DMA_TODEVICE);
--
-+				card->tx_skb[port] = NULL;
-+			}
- 			spin_lock(&card->tx_queue_lock);
- 			skb = skb_dequeue(&card->tx_queue[port]);
- 			if (!skb)
-diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
-index bb1ff17..c394041 100644
---- a/drivers/base/regmap/regmap-debugfs.c
-+++ b/drivers/base/regmap/regmap-debugfs.c
-@@ -90,7 +90,7 @@ static ssize_t regmap_map_read_file(struct file *file, char __user *user_buf,
- 		/* If we're in the region the user is trying to read */
- 		if (p >= *ppos) {
- 			/* ...but not beyond it */
--			if (buf_pos >= count - 1 - tot_len)
-+			if (buf_pos + 1 + tot_len >= count)
- 				break;
- 
- 			/* Format the register */
-diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
-index cc65b45..b4e83b8 100644
---- a/drivers/bcma/driver_mips.c
-+++ b/drivers/bcma/driver_mips.c
-@@ -115,7 +115,7 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
- 			    bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) &
- 			    ~(1 << irqflag));
- 	else
--		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq), 0);
-+		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0);
- 
- 	/* assign the new one */
- 	if (irq == 0) {
-diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
-index db195ab..e49ddd0 100644
---- a/drivers/block/aoe/aoe.h
-+++ b/drivers/block/aoe/aoe.h
-@@ -1,5 +1,5 @@
- /* Copyright (c) 2007 Coraid, Inc.  See COPYING for GPL terms. */
--#define VERSION "47"
-+#define VERSION "47q"
- #define AOE_MAJOR 152
- #define DEVICE_NAME "aoe"
- 
-diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
-index 321de7b..7eca463 100644
---- a/drivers/block/aoe/aoeblk.c
-+++ b/drivers/block/aoe/aoeblk.c
-@@ -276,8 +276,6 @@ aoeblk_gdalloc(void *vp)
- 		goto err_mempool;
- 	blk_queue_make_request(d->blkq, aoeblk_make_request);
- 	d->blkq->backing_dev_info.name = "aoe";
--	if (bdi_init(&d->blkq->backing_dev_info))
--		goto err_blkq;
- 	spin_lock_irqsave(&d->lock, flags);
- 	gd->major = AOE_MAJOR;
- 	gd->first_minor = d->sysminor * AOE_PARTITIONS;
-@@ -298,9 +296,6 @@ aoeblk_gdalloc(void *vp)
- 	aoedisk_add_sysfs(d);
- 	return;
- 
--err_blkq:
--	blk_cleanup_queue(d->blkq);
--	d->blkq = NULL;
- err_mempool:
- 	mempool_destroy(d->bufpool);
- err_disk:
-diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
-index 54a55f0..7aac910 100644
---- a/drivers/block/rbd.c
-+++ b/drivers/block/rbd.c
-@@ -69,7 +69,7 @@
- #define DEV_NAME_LEN		32
- #define MAX_INT_FORMAT_WIDTH	((5 * sizeof (int)) / 2 + 1)
- 
--#define RBD_NOTIFY_TIMEOUT_DEFAULT 10
-+#define RBD_READ_ONLY_DEFAULT		false
- 
- /*
-  * block device image metadata (in-memory version)
-@@ -91,7 +91,7 @@ struct rbd_image_header {
- };
- 
- struct rbd_options {
--	int	notify_timeout;
-+	bool	read_only;
- };
- 
- /*
-@@ -177,7 +177,7 @@ struct rbd_device {
- 	u64                     snap_id;	/* current snapshot id */
- 	/* whether the snap_id this device reads from still exists */
- 	bool                    snap_exists;
--	int                     read_only;
-+	bool			read_only;
- 
- 	struct list_head	node;
- 
-@@ -186,6 +186,7 @@ struct rbd_device {
- 
- 	/* sysfs related */
- 	struct device		dev;
-+	unsigned long		open_count;
- };
- 
- static DEFINE_MUTEX(ctl_mutex);	  /* Serialize open/close/setup/teardown */
-@@ -249,8 +250,11 @@ static int rbd_open(struct block_device *bdev, fmode_t mode)
- 	if ((mode & FMODE_WRITE) && rbd_dev->read_only)
- 		return -EROFS;
- 
-+	mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
- 	rbd_get_dev(rbd_dev);
- 	set_device_ro(bdev, rbd_dev->read_only);
-+	rbd_dev->open_count++;
-+	mutex_unlock(&ctl_mutex);
- 
- 	return 0;
- }
-@@ -259,7 +263,11 @@ static int rbd_release(struct gendisk *disk, fmode_t mode)
- {
- 	struct rbd_device *rbd_dev = disk->private_data;
- 
-+	mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
-+	BUG_ON(!rbd_dev->open_count);
-+	rbd_dev->open_count--;
- 	rbd_put_dev(rbd_dev);
-+	mutex_unlock(&ctl_mutex);
- 
- 	return 0;
- }
-@@ -341,17 +349,24 @@ static struct rbd_client *__rbd_client_find(struct ceph_options *ceph_opts)
-  * mount options
-  */
- enum {
--	Opt_notify_timeout,
- 	Opt_last_int,
- 	/* int args above */
- 	Opt_last_string,
- 	/* string args above */
-+	Opt_read_only,
-+	Opt_read_write,
-+	/* Boolean args above */
-+	Opt_last_bool,
- };
- 
- static match_table_t rbd_opts_tokens = {
--	{Opt_notify_timeout, "notify_timeout=%d"},
- 	/* int args above */
- 	/* string args above */
-+	{Opt_read_only, "read_only"},
-+	{Opt_read_only, "ro"},		/* Alternate spelling */
-+	{Opt_read_write, "read_write"},
-+	{Opt_read_write, "rw"},		/* Alternate spelling */
-+	/* Boolean args above */
- 	{-1, NULL}
- };
- 
-@@ -376,13 +391,18 @@ static int parse_rbd_opts_token(char *c, void *private)
- 	} else if (token > Opt_last_int && token < Opt_last_string) {
- 		dout("got string token %d val %s\n", token,
- 		     argstr[0].from);
-+	} else if (token > Opt_last_string && token < Opt_last_bool) {
-+		dout("got Boolean token %d\n", token);
- 	} else {
- 		dout("got token %d\n", token);
- 	}
- 
- 	switch (token) {
--	case Opt_notify_timeout:
--		rbd_opts->notify_timeout = intval;
-+	case Opt_read_only:
-+		rbd_opts->read_only = true;
-+		break;
-+	case Opt_read_write:
-+		rbd_opts->read_only = false;
- 		break;
- 	default:
- 		BUG_ON(token);
-@@ -406,7 +426,7 @@ static struct rbd_client *rbd_get_client(const char *mon_addr,
- 	if (!rbd_opts)
- 		return ERR_PTR(-ENOMEM);
- 
--	rbd_opts->notify_timeout = RBD_NOTIFY_TIMEOUT_DEFAULT;
-+	rbd_opts->read_only = RBD_READ_ONLY_DEFAULT;
- 
- 	ceph_opts = ceph_parse_options(options, mon_addr,
- 					mon_addr + mon_addr_len,
-@@ -606,7 +626,7 @@ static int rbd_header_set_snap(struct rbd_device *rbd_dev, u64 *size)
- 		    sizeof (RBD_SNAP_HEAD_NAME))) {
- 		rbd_dev->snap_id = CEPH_NOSNAP;
- 		rbd_dev->snap_exists = false;
--		rbd_dev->read_only = 0;
-+		rbd_dev->read_only = rbd_dev->rbd_opts.read_only;
- 		if (size)
- 			*size = rbd_dev->header.image_size;
- 	} else {
-@@ -618,7 +638,7 @@ static int rbd_header_set_snap(struct rbd_device *rbd_dev, u64 *size)
- 			goto done;
- 		rbd_dev->snap_id = snap_id;
- 		rbd_dev->snap_exists = true;
--		rbd_dev->read_only = 1;
-+		rbd_dev->read_only = true;	/* No choice for snapshots */
- 	}
- 
- 	ret = 0;
-@@ -938,8 +958,9 @@ static int rbd_do_request(struct request *rq,
- 	layout->fl_stripe_count = cpu_to_le32(1);
- 	layout->fl_object_size = cpu_to_le32(1 << RBD_MAX_OBJ_ORDER);
- 	layout->fl_pg_pool = cpu_to_le32(rbd_dev->pool_id);
--	ceph_calc_raw_layout(osdc, layout, snapid, ofs, &len, &bno,
--				req, ops);
-+	ret = ceph_calc_raw_layout(osdc, layout, snapid, ofs, &len, &bno,
-+				   req, ops);
-+	rbd_assert(ret == 0);
- 
- 	ceph_osdc_build_request(req, ofs, &len,
- 				ops,
-@@ -2260,8 +2281,8 @@ static void rbd_id_put(struct rbd_device *rbd_dev)
- 		struct rbd_device *rbd_dev;
- 
- 		rbd_dev = list_entry(tmp, struct rbd_device, node);
--		if (rbd_id > max_id)
--			max_id = rbd_id;
-+		if (rbd_dev->id > max_id)
-+			max_id = rbd_dev->id;
- 	}
- 	spin_unlock(&rbd_dev_list_lock);
- 
-@@ -2623,6 +2644,11 @@ static ssize_t rbd_remove(struct bus_type *bus,
- 		goto done;
- 	}
- 
-+	if (rbd_dev->open_count) {
-+		ret = -EBUSY;
-+		goto done;
-+	}
-+
- 	__rbd_remove_all_snaps(rbd_dev);
- 	rbd_bus_del_dev(rbd_dev);
- 
-diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
-index fc2de55..b00000e 100644
---- a/drivers/bluetooth/ath3k.c
-+++ b/drivers/bluetooth/ath3k.c
-@@ -67,6 +67,7 @@ static struct usb_device_id ath3k_table[] = {
- 	{ USB_DEVICE(0x13d3, 0x3304) },
- 	{ USB_DEVICE(0x0930, 0x0215) },
- 	{ USB_DEVICE(0x0489, 0xE03D) },
-+	{ USB_DEVICE(0x0489, 0xE027) },
- 
- 	/* Atheros AR9285 Malbec with sflash firmware */
- 	{ USB_DEVICE(0x03F0, 0x311D) },
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 654e248..e023c65 100644
---- a/drivers/bluetooth/btusb.c
-+++ b/drivers/bluetooth/btusb.c
-@@ -123,6 +123,7 @@ static struct usb_device_id blacklist_table[] = {
- 	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
- 	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
- 	{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
-+	{ USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },
- 
- 	/* Atheros AR9285 Malbec with sflash firmware */
- 	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
-diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
-index f7f1dc6..ed0e8b7 100644
---- a/drivers/dma/ioat/dma_v3.c
-+++ b/drivers/dma/ioat/dma_v3.c
-@@ -951,7 +951,7 @@ static int __devinit ioat_xor_val_self_test(struct ioatdma_device *device)
- 			goto free_resources;
- 		}
- 	}
--	dma_sync_single_for_device(dev, dest_dma, PAGE_SIZE, DMA_TO_DEVICE);
-+	dma_sync_single_for_device(dev, dest_dma, PAGE_SIZE, DMA_FROM_DEVICE);
- 
- 	/* skip validate if the capability is not present */
- 	if (!dma_has_cap(DMA_XOR_VAL, dma_chan->device->cap_mask))
-diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
-index 08c6749..638e1f7 100644
---- a/drivers/firewire/net.c
-+++ b/drivers/firewire/net.c
-@@ -861,8 +861,8 @@ static void fwnet_receive_broadcast(struct fw_iso_context *context,
- 	if (specifier_id == IANA_SPECIFIER_ID && ver == RFC2734_SW_VERSION) {
- 		buf_ptr += 2;
- 		length -= IEEE1394_GASP_HDR_SIZE;
--		fwnet_incoming_packet(dev, buf_ptr, length,
--				      source_node_id, -1, true);
-+		fwnet_incoming_packet(dev, buf_ptr, length, source_node_id,
-+				      context->card->generation, true);
- 	}
- 
- 	packet.payload_length = dev->rcv_buffer_size;
-@@ -958,7 +958,12 @@ static void fwnet_transmit_packet_done(struct fwnet_packet_task *ptask)
- 			break;
- 		}
- 
--		skb_pull(skb, ptask->max_payload);
-+		if (ptask->dest_node == IEEE1394_ALL_NODES) {
-+			skb_pull(skb,
-+				 ptask->max_payload + IEEE1394_GASP_HDR_SIZE);
-+		} else {
-+			skb_pull(skb, ptask->max_payload);
-+		}
- 		if (ptask->outstanding_pkts > 1) {
- 			fwnet_make_sf_hdr(&ptask->hdr, RFC2374_HDR_INTFRAG,
- 					  dg_size, fg_off, datagram_label);
-@@ -1062,7 +1067,7 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask)
- 		smp_rmb();
- 		node_id = dev->card->node_id;
- 
--		p = skb_push(ptask->skb, 8);
-+		p = skb_push(ptask->skb, IEEE1394_GASP_HDR_SIZE);
- 		put_unaligned_be32(node_id << 16 | IANA_SPECIFIER_ID >> 8, p);
- 		put_unaligned_be32((IANA_SPECIFIER_ID & 0xff) << 24
- 						| RFC2734_SW_VERSION, &p[4]);
-diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
-index b298158..fd3ae62 100644
---- a/drivers/firmware/dmi_scan.c
-+++ b/drivers/firmware/dmi_scan.c
-@@ -16,6 +16,7 @@
-  */
- static char dmi_empty_string[] = "        ";
- 
-+static u16 __initdata dmi_ver;
- /*
-  * Catch too early calls to dmi_check_system():
-  */
-@@ -118,12 +119,12 @@ static int __init dmi_walk_early(void (*decode)(const struct dmi_header *,
- 	return 0;
- }
- 
--static int __init dmi_checksum(const u8 *buf)
-+static int __init dmi_checksum(const u8 *buf, u8 len)
- {
- 	u8 sum = 0;
- 	int a;
- 
--	for (a = 0; a < 15; a++)
-+	for (a = 0; a < len; a++)
- 		sum += buf[a];
- 
- 	return sum == 0;
-@@ -161,8 +162,10 @@ static void __init dmi_save_uuid(const struct dmi_header *dm, int slot, int inde
- 		return;
- 
- 	for (i = 0; i < 16 && (is_ff || is_00); i++) {
--		if(d[i] != 0x00) is_ff = 0;
--		if(d[i] != 0xFF) is_00 = 0;
-+		if (d[i] != 0x00)
-+			is_00 = 0;
-+		if (d[i] != 0xFF)
-+			is_ff = 0;
- 	}
- 
- 	if (is_ff || is_00)
-@@ -172,7 +175,15 @@ static void __init dmi_save_uuid(const struct dmi_header *dm, int slot, int inde
- 	if (!s)
- 		return;
- 
--	sprintf(s, "%pUB", d);
-+	/*
-+	 * As of version 2.6 of the SMBIOS specification, the first 3 fields of
-+	 * the UUID are supposed to be little-endian encoded.  The specification
-+	 * says that this is the defacto standard.
-+	 */
-+	if (dmi_ver >= 0x0206)
-+		sprintf(s, "%pUL", d);
-+	else
-+		sprintf(s, "%pUB", d);
- 
-         dmi_ident[slot] = s;
- }
-@@ -404,29 +415,57 @@ static int __init dmi_present(const char __iomem *p)
- 	u8 buf[15];
- 
- 	memcpy_fromio(buf, p, 15);
--	if ((memcmp(buf, "_DMI_", 5) == 0) && dmi_checksum(buf)) {
-+	if (dmi_checksum(buf, 15)) {
- 		dmi_num = (buf[13] << 8) | buf[12];
- 		dmi_len = (buf[7] << 8) | buf[6];
- 		dmi_base = (buf[11] << 24) | (buf[10] << 16) |
- 			(buf[9] << 8) | buf[8];
- 
--		/*
--		 * DMI version 0.0 means that the real version is taken from
--		 * the SMBIOS version, which we don't know at this point.
--		 */
--		if (buf[14] != 0)
--			printk(KERN_INFO "DMI %d.%d present.\n",
--			       buf[14] >> 4, buf[14] & 0xF);
--		else
--			printk(KERN_INFO "DMI present.\n");
- 		if (dmi_walk_early(dmi_decode) == 0) {
-+			if (dmi_ver)
-+				pr_info("SMBIOS %d.%d present.\n",
-+				       dmi_ver >> 8, dmi_ver & 0xFF);
-+			else {
-+				dmi_ver = (buf[14] & 0xF0) << 4 |
-+					   (buf[14] & 0x0F);
-+				pr_info("Legacy DMI %d.%d present.\n",
-+				       dmi_ver >> 8, dmi_ver & 0xFF);
-+			}
- 			dmi_dump_ids();
- 			return 0;
- 		}
- 	}
-+	dmi_ver = 0;
- 	return 1;
- }
- 
-+static int __init smbios_present(const char __iomem *p)
-+{
-+	u8 buf[32];
-+	int offset = 0;
-+
-+	memcpy_fromio(buf, p, 32);
-+	if ((buf[5] < 32) && dmi_checksum(buf, buf[5])) {
-+		dmi_ver = (buf[6] << 8) + buf[7];
-+
-+		/* Some BIOS report weird SMBIOS version, fix that up */
-+		switch (dmi_ver) {
-+		case 0x021F:
-+		case 0x0221:
-+			pr_debug("SMBIOS version fixup(2.%d->2.%d)\n",
-+			       dmi_ver & 0xFF, 3);
-+			dmi_ver = 0x0203;
-+			break;
-+		case 0x0233:
-+			pr_debug("SMBIOS version fixup(2.%d->2.%d)\n", 51, 6);
-+			dmi_ver = 0x0206;
-+			break;
-+		}
-+		offset = 16;
-+	}
-+	return dmi_present(buf + offset);
-+}
-+
- void __init dmi_scan_machine(void)
- {
- 	char __iomem *p, *q;
-@@ -444,7 +483,7 @@ void __init dmi_scan_machine(void)
- 		if (p == NULL)
- 			goto error;
- 
--		rc = dmi_present(p + 0x10); /* offset of _DMI_ string */
-+		rc = smbios_present(p);
- 		dmi_iounmap(p, 32);
- 		if (!rc) {
- 			dmi_available = 1;
-@@ -462,7 +501,12 @@ void __init dmi_scan_machine(void)
- 			goto error;
- 
- 		for (q = p; q < p + 0x10000; q += 16) {
--			rc = dmi_present(q);
-+			if (memcmp(q, "_SM_", 4) == 0 && q - p <= 0xFFE0)
-+				rc = smbios_present(q);
-+			else if (memcmp(q, "_DMI_", 5) == 0)
-+				rc = dmi_present(q);
-+			else
-+				continue;
- 			if (!rc) {
- 				dmi_available = 1;
- 				dmi_iounmap(p, 0x10000);
-diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-index cdf46b5..d8bb392 100644
---- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-@@ -749,6 +749,8 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
- 	total = 0;
- 	for (i = 0; i < count; i++) {
- 		struct drm_i915_gem_relocation_entry __user *user_relocs;
-+		u64 invalid_offset = (u64)-1;
-+		int j;
- 
- 		user_relocs = (void __user *)(uintptr_t)exec[i].relocs_ptr;
- 
-@@ -759,6 +761,25 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev,
- 			goto err;
- 		}
- 
-+		/* As we do not update the known relocation offsets after
-+		 * relocating (due to the complexities in lock handling),
-+		 * we need to mark them as invalid now so that we force the
-+		 * relocation processing next time. Just in case the target
-+		 * object is evicted and then rebound into its old
-+		 * presumed_offset before the next execbuffer - if that
-+		 * happened we would make the mistake of assuming that the
-+		 * relocations were valid.
-+		 */
-+		for (j = 0; j < exec[i].relocation_count; j++) {
-+			if (copy_to_user(&user_relocs[j].presumed_offset,
-+					 &invalid_offset,
-+					 sizeof(invalid_offset))) {
-+				ret = -EFAULT;
-+				mutex_lock(&dev->struct_mutex);
-+				goto err;
-+			}
-+		}
-+
- 		reloc_offset[i] = total;
- 		total += exec[i].relocation_count;
- 	}
-diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index f02cfad..380e7da 100644
---- a/drivers/gpu/drm/i915/i915_reg.h
-+++ b/drivers/gpu/drm/i915/i915_reg.h
-@@ -506,6 +506,7 @@
-  * the enables for writing to the corresponding low bit.
-  */
- #define _3D_CHICKEN	0x02084
-+#define  _3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB	(1 << 10)
- #define _3D_CHICKEN2	0x0208c
- /* Disables pipelining of read flushes past the SF-WIZ interface.
-  * Required on all Ironlake steppings according to the B-Spec, but the
-@@ -3274,6 +3275,8 @@
- #define _PFA_CTL_1               0x68080
- #define _PFB_CTL_1               0x68880
- #define  PF_ENABLE              (1<<31)
-+#define  PF_PIPE_SEL_MASK_IVB	(3<<29)
-+#define  PF_PIPE_SEL_IVB(pipe)	((pipe)<<29)
- #define  PF_FILTER_MASK		(3<<23)
- #define  PF_FILTER_PROGRAMMED	(0<<23)
- #define  PF_FILTER_MED_3x3	(1<<23)
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 0777c79..81e013f 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -2347,18 +2347,6 @@ static void intel_fdi_normal_train(struct drm_crtc *crtc)
- 			   FDI_FE_ERRC_ENABLE);
- }
- 
--static void cpt_phase_pointer_enable(struct drm_device *dev, int pipe)
--{
--	struct drm_i915_private *dev_priv = dev->dev_private;
--	u32 flags = I915_READ(SOUTH_CHICKEN1);
--
--	flags |= FDI_PHASE_SYNC_OVR(pipe);
--	I915_WRITE(SOUTH_CHICKEN1, flags); /* once to unlock... */
--	flags |= FDI_PHASE_SYNC_EN(pipe);
--	I915_WRITE(SOUTH_CHICKEN1, flags); /* then again to enable */
--	POSTING_READ(SOUTH_CHICKEN1);
--}
--
- /* The FDI link training functions for ILK/Ibexpeak. */
- static void ironlake_fdi_link_train(struct drm_crtc *crtc)
- {
-@@ -2509,9 +2497,6 @@ static void gen6_fdi_link_train(struct drm_crtc *crtc)
- 	POSTING_READ(reg);
- 	udelay(150);
- 
--	if (HAS_PCH_CPT(dev))
--		cpt_phase_pointer_enable(dev, pipe);
--
- 	for (i = 0; i < 4; i++) {
- 		reg = FDI_TX_CTL(pipe);
- 		temp = I915_READ(reg);
-@@ -2638,9 +2623,6 @@ static void ivb_manual_fdi_link_train(struct drm_crtc *crtc)
- 	POSTING_READ(reg);
- 	udelay(150);
- 
--	if (HAS_PCH_CPT(dev))
--		cpt_phase_pointer_enable(dev, pipe);
--
- 	for (i = 0; i < 4; i++) {
- 		reg = FDI_TX_CTL(pipe);
- 		temp = I915_READ(reg);
-@@ -2754,17 +2736,6 @@ static void ironlake_fdi_pll_enable(struct drm_crtc *crtc)
- 	}
- }
- 
--static void cpt_phase_pointer_disable(struct drm_device *dev, int pipe)
--{
--	struct drm_i915_private *dev_priv = dev->dev_private;
--	u32 flags = I915_READ(SOUTH_CHICKEN1);
--
--	flags &= ~(FDI_PHASE_SYNC_EN(pipe));
--	I915_WRITE(SOUTH_CHICKEN1, flags); /* once to disable... */
--	flags &= ~(FDI_PHASE_SYNC_OVR(pipe));
--	I915_WRITE(SOUTH_CHICKEN1, flags); /* then again to lock */
--	POSTING_READ(SOUTH_CHICKEN1);
--}
- static void ironlake_fdi_disable(struct drm_crtc *crtc)
- {
- 	struct drm_device *dev = crtc->dev;
-@@ -2794,8 +2765,6 @@ static void ironlake_fdi_disable(struct drm_crtc *crtc)
- 		I915_WRITE(FDI_RX_CHICKEN(pipe),
- 			   I915_READ(FDI_RX_CHICKEN(pipe) &
- 				     ~FDI_RX_PHASE_SYNC_POINTER_EN));
--	} else if (HAS_PCH_CPT(dev)) {
--		cpt_phase_pointer_disable(dev, pipe);
- 	}
- 
- 	/* still set train pattern 1 */
-@@ -3233,7 +3202,11 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
- 		 * as some pre-programmed values are broken,
- 		 * e.g. x201.
- 		 */
--		I915_WRITE(PF_CTL(pipe), PF_ENABLE | PF_FILTER_MED_3x3);
-+		if (IS_IVYBRIDGE(dev))
-+			I915_WRITE(PF_CTL(pipe), PF_ENABLE | PF_FILTER_MED_3x3 |
-+						 PF_PIPE_SEL_IVB(pipe));
-+		else
-+			I915_WRITE(PF_CTL(pipe), PF_ENABLE | PF_FILTER_MED_3x3);
- 		I915_WRITE(PF_WIN_POS(pipe), dev_priv->pch_pf_pos);
- 		I915_WRITE(PF_WIN_SZ(pipe), dev_priv->pch_pf_size);
- 	}
-diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
-index 0c52448..2e6448c 100644
---- a/drivers/gpu/drm/i915/intel_lvds.c
-+++ b/drivers/gpu/drm/i915/intel_lvds.c
-@@ -774,14 +774,6 @@ static const struct dmi_system_id intel_no_lvds[] = {
- 	},
- 	{
- 		.callback = intel_no_lvds_dmi_callback,
--		.ident = "ZOTAC ZBOXSD-ID12/ID13",
--		.matches = {
--			DMI_MATCH(DMI_BOARD_VENDOR, "ZOTAC"),
--			DMI_MATCH(DMI_BOARD_NAME, "ZBOXSD-ID12/ID13"),
--		},
--	},
--	{
--		.callback = intel_no_lvds_dmi_callback,
- 		.ident = "Gigabyte GA-D525TUD",
- 		.matches = {
- 			DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co., Ltd."),
-diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
-index c23c9ea..572b2ca 100644
---- a/drivers/gpu/drm/i915/intel_pm.c
-+++ b/drivers/gpu/drm/i915/intel_pm.c
-@@ -3324,6 +3324,10 @@ static void gen6_init_clock_gating(struct drm_device *dev)
- 		   I915_READ(ILK_DISPLAY_CHICKEN2) |
- 		   ILK_ELPIN_409_SELECT);
- 
-+	/* WaDisableHiZPlanesWhenMSAAEnabled */
-+	I915_WRITE(_3D_CHICKEN,
-+		   _MASKED_BIT_ENABLE(_3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB));
-+
- 	I915_WRITE(WM3_LP_ILK, 0);
- 	I915_WRITE(WM2_LP_ILK, 0);
- 	I915_WRITE(WM1_LP_ILK, 0);
-diff --git a/drivers/gpu/drm/nouveau/nv04_dfp.c b/drivers/gpu/drm/nouveau/nv04_dfp.c
-index 89640f2..2b59f41 100644
---- a/drivers/gpu/drm/nouveau/nv04_dfp.c
-+++ b/drivers/gpu/drm/nouveau/nv04_dfp.c
-@@ -504,7 +504,7 @@ static void nv04_dfp_update_backlight(struct drm_encoder *encoder, int mode)
- 
- static inline bool is_powersaving_dpms(int mode)
- {
--	return (mode != DRM_MODE_DPMS_ON);
-+	return mode != DRM_MODE_DPMS_ON && mode != NV_DPMS_CLEARED;
- }
- 
- static void nv04_lvds_dpms(struct drm_encoder *encoder, int mode)
-diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
-index 2eb418e..e53a91b 100644
---- a/drivers/gpu/drm/radeon/atombios_encoders.c
-+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
-@@ -95,7 +95,7 @@ static bool radeon_atom_mode_fixup(struct drm_encoder *encoder,
- 	    ((radeon_encoder->active_device & (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT)) ||
- 	     (radeon_encoder_get_dp_bridge_encoder_id(encoder) != ENCODER_OBJECT_ID_NONE))) {
- 		struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
--		radeon_dp_set_link_config(connector, mode);
-+		radeon_dp_set_link_config(connector, adjusted_mode);
- 	}
- 
- 	return true;
-diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
-index 4a33cdc..bf849ea 100644
---- a/drivers/gpu/drm/radeon/evergreen_cs.c
-+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
-@@ -2724,6 +2724,7 @@ static bool evergreen_vm_reg_valid(u32 reg)
- 
- 	/* check config regs */
- 	switch (reg) {
-+	case WAIT_UNTIL:
- 	case GRBM_GFX_INDEX:
- 	case CP_STRMOUT_CNTL:
- 	case CP_COHER_CNTL:
-diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
-index 895e628..a7e797c 100644
---- a/drivers/gpu/drm/radeon/radeon_connectors.c
-+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
-@@ -745,7 +745,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
- 		ret = connector_status_disconnected;
- 
- 	if (radeon_connector->ddc_bus)
--		dret = radeon_ddc_probe(radeon_connector);
-+		dret = radeon_ddc_probe(radeon_connector, false);
- 	if (dret) {
- 		radeon_connector->detected_by_load = false;
- 		if (radeon_connector->edid) {
-@@ -951,7 +951,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
- 		return connector->status;
- 
- 	if (radeon_connector->ddc_bus)
--		dret = radeon_ddc_probe(radeon_connector);
-+		dret = radeon_ddc_probe(radeon_connector, false);
- 	if (dret) {
- 		radeon_connector->detected_by_load = false;
- 		if (radeon_connector->edid) {
-@@ -1391,7 +1391,8 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
- 		if (encoder) {
- 			/* setup ddc on the bridge */
- 			radeon_atom_ext_encoder_setup_ddc(encoder);
--			if (radeon_ddc_probe(radeon_connector)) /* try DDC */
-+			/* bridge chips are always aux */
-+			if (radeon_ddc_probe(radeon_connector, true)) /* try DDC */
- 				ret = connector_status_connected;
- 			else if (radeon_connector->dac_load_detect) { /* try load detection */
- 				struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
-@@ -1409,7 +1410,8 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
- 				if (radeon_dp_getdpcd(radeon_connector))
- 					ret = connector_status_connected;
- 			} else {
--				if (radeon_ddc_probe(radeon_connector))
-+				/* try non-aux ddc (DP to DVI/HMDI/etc. adapter) */
-+				if (radeon_ddc_probe(radeon_connector, false))
- 					ret = connector_status_connected;
- 			}
- 		}
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 7ddef8f..0125d34 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -695,10 +695,15 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)
- 	if (radeon_connector->router.ddc_valid)
- 		radeon_router_select_ddc_port(radeon_connector);
- 
--	if ((radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||
--	    (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP) ||
--	    (radeon_connector_encoder_get_dp_bridge_encoder_id(&radeon_connector->base) !=
--	     ENCODER_OBJECT_ID_NONE)) {
-+	if (radeon_connector_encoder_get_dp_bridge_encoder_id(&radeon_connector->base) !=
-+	    ENCODER_OBJECT_ID_NONE) {
-+		struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
-+
-+		if (dig->dp_i2c_bus)
-+			radeon_connector->edid = drm_get_edid(&radeon_connector->base,
-+							      &dig->dp_i2c_bus->adapter);
-+	} else if ((radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||
-+		   (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP)) {
- 		struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
- 
- 		if ((dig->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT ||
-diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c
-index 3edec1c..6076e85 100644
---- a/drivers/gpu/drm/radeon/radeon_i2c.c
-+++ b/drivers/gpu/drm/radeon/radeon_i2c.c
-@@ -39,7 +39,7 @@ extern u32 radeon_atom_hw_i2c_func(struct i2c_adapter *adap);
-  * radeon_ddc_probe
-  *
-  */
--bool radeon_ddc_probe(struct radeon_connector *radeon_connector)
-+bool radeon_ddc_probe(struct radeon_connector *radeon_connector, bool use_aux)
- {
- 	u8 out = 0x0;
- 	u8 buf[8];
-@@ -63,7 +63,13 @@ bool radeon_ddc_probe(struct radeon_connector *radeon_connector)
- 	if (radeon_connector->router.ddc_valid)
- 		radeon_router_select_ddc_port(radeon_connector);
- 
--	ret = i2c_transfer(&radeon_connector->ddc_bus->adapter, msgs, 2);
-+	if (use_aux) {
-+		struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
-+		ret = i2c_transfer(&dig->dp_i2c_bus->adapter, msgs, 2);
-+	} else {
-+		ret = i2c_transfer(&radeon_connector->ddc_bus->adapter, msgs, 2);
-+	}
-+
- 	if (ret != 2)
- 		/* Couldn't find an accessible DDC on this connector */
- 		return false;
-diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
-index dd402bb..9633dbb 100644
---- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
-+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
-@@ -618,6 +618,14 @@ static enum drm_connector_status radeon_legacy_primary_dac_detect(struct drm_enc
- 	enum drm_connector_status found = connector_status_disconnected;
- 	bool color = true;
- 
-+	/* just don't bother on RN50 those chip are often connected to remoting
-+	 * console hw and often we get failure to load detect those. So to make
-+	 * everyone happy report the encoder as always connected.
-+	 */
-+	if (ASIC_IS_RN50(rdev)) {
-+		return connector_status_connected;
-+	}
-+
- 	/* save the regs we need */
- 	vclk_ecp_cntl = RREG32_PLL(RADEON_VCLK_ECP_CNTL);
- 	crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL);
-diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
-index d569789..485d16e 100644
---- a/drivers/gpu/drm/radeon/radeon_mode.h
-+++ b/drivers/gpu/drm/radeon/radeon_mode.h
-@@ -534,7 +534,7 @@ extern void radeon_i2c_put_byte(struct radeon_i2c_chan *i2c,
- 				u8 val);
- extern void radeon_router_select_ddc_port(struct radeon_connector *radeon_connector);
- extern void radeon_router_select_cd_port(struct radeon_connector *radeon_connector);
--extern bool radeon_ddc_probe(struct radeon_connector *radeon_connector);
-+extern bool radeon_ddc_probe(struct radeon_connector *radeon_connector, bool use_aux);
- extern int radeon_ddc_get_modes(struct radeon_connector *radeon_connector);
- 
- extern struct drm_encoder *radeon_best_encoder(struct drm_connector *connector);
-diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
-index 8d9dc44..3234224 100644
---- a/drivers/gpu/drm/udl/udl_connector.c
-+++ b/drivers/gpu/drm/udl/udl_connector.c
-@@ -22,13 +22,17 @@
- static u8 *udl_get_edid(struct udl_device *udl)
- {
- 	u8 *block;
--	char rbuf[3];
-+	char *rbuf;
- 	int ret, i;
- 
- 	block = kmalloc(EDID_LENGTH, GFP_KERNEL);
- 	if (block == NULL)
- 		return NULL;
- 
-+	rbuf = kmalloc(2, GFP_KERNEL);
-+	if (rbuf == NULL)
-+		goto error;
-+
- 	for (i = 0; i < EDID_LENGTH; i++) {
- 		ret = usb_control_msg(udl->ddev->usbdev,
- 				      usb_rcvctrlpipe(udl->ddev->usbdev, 0), (0x02),
-@@ -36,16 +40,17 @@ static u8 *udl_get_edid(struct udl_device *udl)
- 				      HZ);
- 		if (ret < 1) {
- 			DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret);
--			i--;
- 			goto error;
- 		}
- 		block[i] = rbuf[1];
- 	}
- 
-+	kfree(rbuf);
- 	return block;
- 
- error:
- 	kfree(block);
-+	kfree(rbuf);
- 	return NULL;
- }
- 
-@@ -59,6 +64,14 @@ static int udl_get_modes(struct drm_connector *connector)
- 
- 	connector->display_info.raw_edid = (char *)edid;
- 
-+	/*
-+	 * We only read the main block, but if the monitor reports extension
-+	 * blocks then the drm edid code expects them to be present, so patch
-+	 * the extension count to 0.
-+	 */
-+	edid->checksum += edid->extensions;
-+	edid->extensions = 0;
-+
- 	drm_mode_connector_update_edid_property(connector, edid);
- 	ret = drm_add_edid_modes(connector, edid);
- 	connector->display_info.raw_edid = NULL;
-diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 5de3bb3..10ef742 100644
---- a/drivers/hid/hid-core.c
-+++ b/drivers/hid/hid-core.c
-@@ -1528,6 +1528,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
-+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI) },
- 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index ab8ce9f..2a3f007 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -681,6 +681,9 @@
- #define USB_VENDOR_ID_SIGMA_MICRO	0x1c4f
- #define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD	0x0002
- 
-+#define USB_VENDOR_ID_SIGMATEL		0x066F
-+#define USB_DEVICE_ID_SIGMATEL_STMP3780	0x3780
-+
- #define USB_VENDOR_ID_SKYCABLE			0x1223
- #define	USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER	0x3F07
- 
-diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
-index 8865fa3..eb55cef 100644
---- a/drivers/hid/usbhid/hid-quirks.c
-+++ b/drivers/hid/usbhid/hid-quirks.c
-@@ -79,6 +79,7 @@ static const struct hid_blacklist {
- 	{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },
- 	{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
- 	{ USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },
-+	{ USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET },
- 	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
- 	{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET },
- 	{ USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },
-diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c
-index 8fa2632..7272176 100644
---- a/drivers/hwmon/lm73.c
-+++ b/drivers/hwmon/lm73.c
-@@ -49,6 +49,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
- 	struct i2c_client *client = to_i2c_client(dev);
- 	long temp;
- 	short value;
-+	s32 err;
- 
- 	int status = kstrtol(buf, 10, &temp);
- 	if (status < 0)
-@@ -57,8 +58,8 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
- 	/* Write value */
- 	value = (short) SENSORS_LIMIT(temp/250, (LM73_TEMP_MIN*4),
- 		(LM73_TEMP_MAX*4)) << 5;
--	i2c_smbus_write_word_swapped(client, attr->index, value);
--	return count;
-+	err = i2c_smbus_write_word_swapped(client, attr->index, value);
-+	return (err < 0) ? err : count;
- }
- 
- static ssize_t show_temp(struct device *dev, struct device_attribute *da,
-@@ -66,11 +67,16 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *da,
- {
- 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
- 	struct i2c_client *client = to_i2c_client(dev);
-+	int temp;
-+
-+	s32 err = i2c_smbus_read_word_swapped(client, attr->index);
-+	if (err < 0)
-+		return err;
-+
- 	/* use integer division instead of equivalent right shift to
- 	   guarantee arithmetic shift and preserve the sign */
--	int temp = ((s16) (i2c_smbus_read_word_swapped(client,
--		    attr->index))*250) / 32;
--	return sprintf(buf, "%d\n", temp);
-+	temp = (((s16) err) * 250) / 32;
-+	return scnprintf(buf, PAGE_SIZE, "%d\n", temp);
- }
- 
- 
-diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
-index c438e46..3f41d9f 100644
---- a/drivers/infiniband/hw/nes/nes.h
-+++ b/drivers/infiniband/hw/nes/nes.h
-@@ -524,6 +524,7 @@ void nes_iwarp_ce_handler(struct nes_device *, struct nes_hw_cq *);
- int nes_destroy_cqp(struct nes_device *);
- int nes_nic_cm_xmit(struct sk_buff *, struct net_device *);
- void nes_recheck_link_status(struct work_struct *work);
-+void nes_terminate_timeout(unsigned long context);
- 
- /* nes_nic.c */
- struct net_device *nes_netdev_init(struct nes_device *, void __iomem *);
-diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
-index d42c9f4..96801c3 100644
---- a/drivers/infiniband/hw/nes/nes_hw.c
-+++ b/drivers/infiniband/hw/nes/nes_hw.c
-@@ -75,7 +75,6 @@ static void nes_process_iwarp_aeqe(struct nes_device *nesdev,
- static void process_critical_error(struct nes_device *nesdev);
- static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number);
- static unsigned int nes_reset_adapter_ne020(struct nes_device *nesdev, u8 *OneG_Mode);
--static void nes_terminate_timeout(unsigned long context);
- static void nes_terminate_start_timer(struct nes_qp *nesqp);
- 
- #ifdef CONFIG_INFINIBAND_NES_DEBUG
-@@ -3522,7 +3521,7 @@ static void nes_terminate_received(struct nes_device *nesdev,
- }
- 
- /* Timeout routine in case terminate fails to complete */
--static void nes_terminate_timeout(unsigned long context)
-+void nes_terminate_timeout(unsigned long context)
- {
- 	struct nes_qp *nesqp = (struct nes_qp *)(unsigned long)context;
- 
-@@ -3532,11 +3531,7 @@ static void nes_terminate_timeout(unsigned long context)
- /* Set a timer in case hw cannot complete the terminate sequence */
- static void nes_terminate_start_timer(struct nes_qp *nesqp)
- {
--	init_timer(&nesqp->terminate_timer);
--	nesqp->terminate_timer.function = nes_terminate_timeout;
--	nesqp->terminate_timer.expires = jiffies + HZ;
--	nesqp->terminate_timer.data = (unsigned long)nesqp;
--	add_timer(&nesqp->terminate_timer);
-+	mod_timer(&nesqp->terminate_timer, (jiffies + HZ));
- }
- 
- /**
-diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
-index 8b8812d..da84ea3 100644
---- a/drivers/infiniband/hw/nes/nes_verbs.c
-+++ b/drivers/infiniband/hw/nes/nes_verbs.c
-@@ -1404,6 +1404,9 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
- 	}
- 
- 	nesqp->sig_all = (init_attr->sq_sig_type == IB_SIGNAL_ALL_WR);
-+	init_timer(&nesqp->terminate_timer);
-+	nesqp->terminate_timer.function = nes_terminate_timeout;
-+	nesqp->terminate_timer.data = (unsigned long)nesqp;
- 
- 	/* update the QP table */
- 	nesdev->nesadapter->qp_table[nesqp->hwqp.qp_id-NES_FIRST_QPN] = nesqp;
-@@ -1413,7 +1416,6 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
- 	return &nesqp->ibqp;
- }
- 
--
- /**
-  * nes_clean_cq
-  */
-@@ -2559,6 +2561,11 @@ static struct ib_mr *nes_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
- 			return ibmr;
- 		case IWNES_MEMREG_TYPE_QP:
- 		case IWNES_MEMREG_TYPE_CQ:
-+			if (!region->length) {
-+				nes_debug(NES_DBG_MR, "Unable to register zero length region for CQ\n");
-+				ib_umem_release(region);
-+				return ERR_PTR(-EINVAL);
-+			}
- 			nespbl = kzalloc(sizeof(*nespbl), GFP_KERNEL);
- 			if (!nespbl) {
- 				nes_debug(NES_DBG_MR, "Unable to allocate PBL\n");
-diff --git a/drivers/input/joystick/walkera0701.c b/drivers/input/joystick/walkera0701.c
-index 4dfa1ee..f8f892b 100644
---- a/drivers/input/joystick/walkera0701.c
-+++ b/drivers/input/joystick/walkera0701.c
-@@ -196,6 +196,7 @@ static void walkera0701_close(struct input_dev *dev)
- 	struct walkera_dev *w = input_get_drvdata(dev);
- 
- 	parport_disable_irq(w->parport);
-+	hrtimer_cancel(&w->timer);
- }
- 
- static int walkera0701_connect(struct walkera_dev *w, int parport)
-@@ -224,6 +225,9 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
- 	if (parport_claim(w->pardevice))
- 		goto init_err1;
- 
-+	hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-+	w->timer.function = timer_handler;
-+
- 	w->input_dev = input_allocate_device();
- 	if (!w->input_dev)
- 		goto init_err2;
-@@ -254,8 +258,6 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
- 	if (err)
- 		goto init_err3;
- 
--	hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
--	w->timer.function = timer_handler;
- 	return 0;
- 
-  init_err3:
-@@ -271,7 +273,6 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
- 
- static void walkera0701_disconnect(struct walkera_dev *w)
- {
--	hrtimer_cancel(&w->timer);
- 	input_unregister_device(w->input_dev);
- 	parport_release(w->pardevice);
- 	parport_unregister_device(w->pardevice);
-diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c
-index a261d85..c4c9218 100644
---- a/drivers/input/mouse/sentelic.c
-+++ b/drivers/input/mouse/sentelic.c
-@@ -791,7 +791,7 @@ static psmouse_ret_t fsp_process_byte(struct psmouse *psmouse)
- 			fsp_set_slot(dev, 0, fgrs > 0, abs_x, abs_y);
- 			fsp_set_slot(dev, 1, false, 0, 0);
- 		}
--		if (fgrs > 0) {
-+		if (fgrs == 1 || (fgrs == 2 && !(packet[0] & FSP_PB0_MFMC_FGR2))) {
- 			input_report_abs(dev, ABS_X, abs_x);
- 			input_report_abs(dev, ABS_Y, abs_y);
- 		}
-diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
-index d6cc77a..5f306f7 100644
---- a/drivers/input/serio/i8042-x86ia64io.h
-+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -921,6 +921,7 @@ static int __init i8042_platform_init(void)
- 	int retval;
- 
- #ifdef CONFIG_X86
-+	u8 a20_on = 0xdf;
- 	/* Just return if pre-detection shows no i8042 controller exist */
- 	if (!x86_platform.i8042_detect())
- 		return -ENODEV;
-@@ -960,6 +961,14 @@ static int __init i8042_platform_init(void)
- 
- 	if (dmi_check_system(i8042_dmi_dritek_table))
- 		i8042_dritek = true;
-+
-+	/*
-+	 * A20 was already enabled during early kernel init. But some buggy
-+	 * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
-+	 * resume from S3. So we do it here and hope that nothing breaks.
-+	 */
-+	i8042_command(&a20_on, 0x10d1);
-+	i8042_command(NULL, 0x00ff);	/* Null command for SMM firmware */
- #endif /* CONFIG_X86 */
- 
- 	return retval;
-diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
-index 554e6ac..c646a8e 100644
---- a/drivers/iommu/intel-iommu.c
-+++ b/drivers/iommu/intel-iommu.c
-@@ -1827,10 +1827,17 @@ static int __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn,
- 			if (!pte)
- 				return -ENOMEM;
- 			/* It is large page*/
--			if (largepage_lvl > 1)
-+			if (largepage_lvl > 1) {
- 				pteval |= DMA_PTE_LARGE_PAGE;
--			else
-+				/* Ensure that old small page tables are removed to make room
-+				   for superpage, if they exist. */
-+				dma_pte_clear_range(domain, iov_pfn,
-+						    iov_pfn + lvl_to_nr_pages(largepage_lvl) - 1);
-+				dma_pte_free_pagetable(domain, iov_pfn,
-+						       iov_pfn + lvl_to_nr_pages(largepage_lvl) - 1);
-+			} else {
- 				pteval &= ~(uint64_t)DMA_PTE_LARGE_PAGE;
-+			}
- 
- 		}
- 		/* We don't need lock here, nobody else
-@@ -2320,8 +2327,39 @@ static int domain_add_dev_info(struct dmar_domain *domain,
- 	return 0;
- }
- 
-+static bool device_has_rmrr(struct pci_dev *dev)
-+{
-+	struct dmar_rmrr_unit *rmrr;
-+	int i;
-+
-+	for_each_rmrr_units(rmrr) {
-+		for (i = 0; i < rmrr->devices_cnt; i++) {
-+			/*
-+			 * Return TRUE if this RMRR contains the device that
-+			 * is passed in.
-+			 */
-+			if (rmrr->devices[i] == dev)
-+				return true;
-+		}
-+	}
-+	return false;
-+}
-+
- static int iommu_should_identity_map(struct pci_dev *pdev, int startup)
- {
-+
-+	/*
-+	 * We want to prevent any device associated with an RMRR from
-+	 * getting placed into the SI Domain. This is done because
-+	 * problems exist when devices are moved in and out of domains
-+	 * and their respective RMRR info is lost. We exempt USB devices
-+	 * from this process due to their usage of RMRRs that are known
-+	 * to not be needed after BIOS hand-off to OS.
-+	 */
-+	if (device_has_rmrr(pdev) &&
-+	    (pdev->class >> 8) != PCI_CLASS_SERIAL_USB)
-+		return 0;
-+
- 	if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev))
- 		return 1;
- 
-diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
-index afd9598..a651d52 100644
---- a/drivers/md/dm-ioctl.c
-+++ b/drivers/md/dm-ioctl.c
-@@ -1566,6 +1566,14 @@ static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl **param)
- 	if (copy_from_user(dmi, user, tmp.data_size))
- 		goto bad;
- 
-+	/*
-+	 * Abort if something changed the ioctl data while it was being copied.
-+	 */
-+	if (dmi->data_size != tmp.data_size) {
-+		DMERR("rejecting ioctl: data size modified while processing parameters");
-+		goto bad;
-+	}
-+
- 	/* Wipe the user buffer so we do not return it to userspace */
- 	if (secure_data && clear_user(user, tmp.data_size))
- 		goto bad;
-diff --git a/drivers/md/persistent-data/dm-btree-internal.h b/drivers/md/persistent-data/dm-btree-internal.h
-index 5709bfe..accbb05 100644
---- a/drivers/md/persistent-data/dm-btree-internal.h
-+++ b/drivers/md/persistent-data/dm-btree-internal.h
-@@ -36,13 +36,13 @@ struct node_header {
- 	__le32 padding;
- } __packed;
- 
--struct node {
-+struct btree_node {
- 	struct node_header header;
- 	__le64 keys[0];
- } __packed;
- 
- 
--void inc_children(struct dm_transaction_manager *tm, struct node *n,
-+void inc_children(struct dm_transaction_manager *tm, struct btree_node *n,
- 		  struct dm_btree_value_type *vt);
- 
- int new_block(struct dm_btree_info *info, struct dm_block **result);
-@@ -64,7 +64,7 @@ struct ro_spine {
- void init_ro_spine(struct ro_spine *s, struct dm_btree_info *info);
- int exit_ro_spine(struct ro_spine *s);
- int ro_step(struct ro_spine *s, dm_block_t new_child);
--struct node *ro_node(struct ro_spine *s);
-+struct btree_node *ro_node(struct ro_spine *s);
- 
- struct shadow_spine {
- 	struct dm_btree_info *info;
-@@ -98,17 +98,17 @@ int shadow_root(struct shadow_spine *s);
- /*
-  * Some inlines.
-  */
--static inline __le64 *key_ptr(struct node *n, uint32_t index)
-+static inline __le64 *key_ptr(struct btree_node *n, uint32_t index)
- {
- 	return n->keys + index;
- }
- 
--static inline void *value_base(struct node *n)
-+static inline void *value_base(struct btree_node *n)
- {
- 	return &n->keys[le32_to_cpu(n->header.max_entries)];
- }
- 
--static inline void *value_ptr(struct node *n, uint32_t index)
-+static inline void *value_ptr(struct btree_node *n, uint32_t index)
- {
- 	uint32_t value_size = le32_to_cpu(n->header.value_size);
- 	return value_base(n) + (value_size * index);
-@@ -117,7 +117,7 @@ static inline void *value_ptr(struct node *n, uint32_t index)
- /*
-  * Assumes the values are suitably-aligned and converts to core format.
-  */
--static inline uint64_t value64(struct node *n, uint32_t index)
-+static inline uint64_t value64(struct btree_node *n, uint32_t index)
- {
- 	__le64 *values_le = value_base(n);
- 
-@@ -127,7 +127,7 @@ static inline uint64_t value64(struct node *n, uint32_t index)
- /*
-  * Searching for a key within a single node.
-  */
--int lower_bound(struct node *n, uint64_t key);
-+int lower_bound(struct btree_node *n, uint64_t key);
- 
- extern struct dm_block_validator btree_node_validator;
- 
-diff --git a/drivers/md/persistent-data/dm-btree-remove.c b/drivers/md/persistent-data/dm-btree-remove.c
-index aa71e23..c4f2813 100644
---- a/drivers/md/persistent-data/dm-btree-remove.c
-+++ b/drivers/md/persistent-data/dm-btree-remove.c
-@@ -53,7 +53,7 @@
- /*
-  * Some little utilities for moving node data around.
-  */
--static void node_shift(struct node *n, int shift)
-+static void node_shift(struct btree_node *n, int shift)
- {
- 	uint32_t nr_entries = le32_to_cpu(n->header.nr_entries);
- 	uint32_t value_size = le32_to_cpu(n->header.value_size);
-@@ -79,7 +79,7 @@ static void node_shift(struct node *n, int shift)
- 	}
- }
- 
--static void node_copy(struct node *left, struct node *right, int shift)
-+static void node_copy(struct btree_node *left, struct btree_node *right, int shift)
- {
- 	uint32_t nr_left = le32_to_cpu(left->header.nr_entries);
- 	uint32_t value_size = le32_to_cpu(left->header.value_size);
-@@ -108,7 +108,7 @@ static void node_copy(struct node *left, struct node *right, int shift)
- /*
-  * Delete a specific entry from a leaf node.
-  */
--static void delete_at(struct node *n, unsigned index)
-+static void delete_at(struct btree_node *n, unsigned index)
- {
- 	unsigned nr_entries = le32_to_cpu(n->header.nr_entries);
- 	unsigned nr_to_copy = nr_entries - (index + 1);
-@@ -128,7 +128,7 @@ static void delete_at(struct node *n, unsigned index)
- 	n->header.nr_entries = cpu_to_le32(nr_entries - 1);
- }
- 
--static unsigned merge_threshold(struct node *n)
-+static unsigned merge_threshold(struct btree_node *n)
- {
- 	return le32_to_cpu(n->header.max_entries) / 3;
- }
-@@ -136,7 +136,7 @@ static unsigned merge_threshold(struct node *n)
- struct child {
- 	unsigned index;
- 	struct dm_block *block;
--	struct node *n;
-+	struct btree_node *n;
- };
- 
- static struct dm_btree_value_type le64_type = {
-@@ -147,7 +147,7 @@ static struct dm_btree_value_type le64_type = {
- 	.equal = NULL
- };
- 
--static int init_child(struct dm_btree_info *info, struct node *parent,
-+static int init_child(struct dm_btree_info *info, struct btree_node *parent,
- 		      unsigned index, struct child *result)
- {
- 	int r, inc;
-@@ -177,7 +177,7 @@ static int exit_child(struct dm_btree_info *info, struct child *c)
- 	return dm_tm_unlock(info->tm, c->block);
- }
- 
--static void shift(struct node *left, struct node *right, int count)
-+static void shift(struct btree_node *left, struct btree_node *right, int count)
- {
- 	uint32_t nr_left = le32_to_cpu(left->header.nr_entries);
- 	uint32_t nr_right = le32_to_cpu(right->header.nr_entries);
-@@ -203,11 +203,11 @@ static void shift(struct node *left, struct node *right, int count)
- 	right->header.nr_entries = cpu_to_le32(nr_right + count);
- }
- 
--static void __rebalance2(struct dm_btree_info *info, struct node *parent,
-+static void __rebalance2(struct dm_btree_info *info, struct btree_node *parent,
- 			 struct child *l, struct child *r)
- {
--	struct node *left = l->n;
--	struct node *right = r->n;
-+	struct btree_node *left = l->n;
-+	struct btree_node *right = r->n;
- 	uint32_t nr_left = le32_to_cpu(left->header.nr_entries);
- 	uint32_t nr_right = le32_to_cpu(right->header.nr_entries);
- 	unsigned threshold = 2 * merge_threshold(left) + 1;
-@@ -239,7 +239,7 @@ static int rebalance2(struct shadow_spine *s, struct dm_btree_info *info,
- 		      unsigned left_index)
- {
- 	int r;
--	struct node *parent;
-+	struct btree_node *parent;
- 	struct child left, right;
- 
- 	parent = dm_block_data(shadow_current(s));
-@@ -270,9 +270,9 @@ static int rebalance2(struct shadow_spine *s, struct dm_btree_info *info,
-  * in right, then rebalance2.  This wastes some cpu, but I want something
-  * simple atm.
-  */
--static void delete_center_node(struct dm_btree_info *info, struct node *parent,
-+static void delete_center_node(struct dm_btree_info *info, struct btree_node *parent,
- 			       struct child *l, struct child *c, struct child *r,
--			       struct node *left, struct node *center, struct node *right,
-+			       struct btree_node *left, struct btree_node *center, struct btree_node *right,
- 			       uint32_t nr_left, uint32_t nr_center, uint32_t nr_right)
- {
- 	uint32_t max_entries = le32_to_cpu(left->header.max_entries);
-@@ -301,9 +301,9 @@ static void delete_center_node(struct dm_btree_info *info, struct node *parent,
- /*
-  * Redistributes entries among 3 sibling nodes.
-  */
--static void redistribute3(struct dm_btree_info *info, struct node *parent,
-+static void redistribute3(struct dm_btree_info *info, struct btree_node *parent,
- 			  struct child *l, struct child *c, struct child *r,
--			  struct node *left, struct node *center, struct node *right,
-+			  struct btree_node *left, struct btree_node *center, struct btree_node *right,
- 			  uint32_t nr_left, uint32_t nr_center, uint32_t nr_right)
- {
- 	int s;
-@@ -343,12 +343,12 @@ static void redistribute3(struct dm_btree_info *info, struct node *parent,
- 	*key_ptr(parent, r->index) = right->keys[0];
- }
- 
--static void __rebalance3(struct dm_btree_info *info, struct node *parent,
-+static void __rebalance3(struct dm_btree_info *info, struct btree_node *parent,
- 			 struct child *l, struct child *c, struct child *r)
- {
--	struct node *left = l->n;
--	struct node *center = c->n;
--	struct node *right = r->n;
-+	struct btree_node *left = l->n;
-+	struct btree_node *center = c->n;
-+	struct btree_node *right = r->n;
- 
- 	uint32_t nr_left = le32_to_cpu(left->header.nr_entries);
- 	uint32_t nr_center = le32_to_cpu(center->header.nr_entries);
-@@ -371,7 +371,7 @@ static int rebalance3(struct shadow_spine *s, struct dm_btree_info *info,
- 		      unsigned left_index)
- {
- 	int r;
--	struct node *parent = dm_block_data(shadow_current(s));
-+	struct btree_node *parent = dm_block_data(shadow_current(s));
- 	struct child left, center, right;
- 
- 	/*
-@@ -421,7 +421,7 @@ static int get_nr_entries(struct dm_transaction_manager *tm,
- {
- 	int r;
- 	struct dm_block *block;
--	struct node *n;
-+	struct btree_node *n;
- 
- 	r = dm_tm_read_lock(tm, b, &btree_node_validator, &block);
- 	if (r)
-@@ -438,7 +438,7 @@ static int rebalance_children(struct shadow_spine *s,
- {
- 	int i, r, has_left_sibling, has_right_sibling;
- 	uint32_t child_entries;
--	struct node *n;
-+	struct btree_node *n;
- 
- 	n = dm_block_data(shadow_current(s));
- 
-@@ -483,7 +483,7 @@ static int rebalance_children(struct shadow_spine *s,
- 	return r;
- }
- 
--static int do_leaf(struct node *n, uint64_t key, unsigned *index)
-+static int do_leaf(struct btree_node *n, uint64_t key, unsigned *index)
- {
- 	int i = lower_bound(n, key);
- 
-@@ -506,7 +506,7 @@ static int remove_raw(struct shadow_spine *s, struct dm_btree_info *info,
- 		      uint64_t key, unsigned *index)
- {
- 	int i = *index, r;
--	struct node *n;
-+	struct btree_node *n;
- 
- 	for (;;) {
- 		r = shadow_step(s, root, vt);
-@@ -556,7 +556,7 @@ int dm_btree_remove(struct dm_btree_info *info, dm_block_t root,
- 	unsigned level, last_level = info->levels - 1;
- 	int index = 0, r = 0;
- 	struct shadow_spine spine;
--	struct node *n;
-+	struct btree_node *n;
- 
- 	init_shadow_spine(&spine, info);
- 	for (level = 0; level < info->levels; level++) {
-diff --git a/drivers/md/persistent-data/dm-btree-spine.c b/drivers/md/persistent-data/dm-btree-spine.c
-index d9a7912..2f0805c 100644
---- a/drivers/md/persistent-data/dm-btree-spine.c
-+++ b/drivers/md/persistent-data/dm-btree-spine.c
-@@ -23,7 +23,7 @@ static void node_prepare_for_write(struct dm_block_validator *v,
- 				   struct dm_block *b,
- 				   size_t block_size)
- {
--	struct node *n = dm_block_data(b);
-+	struct btree_node *n = dm_block_data(b);
- 	struct node_header *h = &n->header;
- 
- 	h->blocknr = cpu_to_le64(dm_block_location(b));
-@@ -38,7 +38,7 @@ static int node_check(struct dm_block_validator *v,
- 		      struct dm_block *b,
- 		      size_t block_size)
- {
--	struct node *n = dm_block_data(b);
-+	struct btree_node *n = dm_block_data(b);
- 	struct node_header *h = &n->header;
- 	size_t value_size;
- 	__le32 csum_disk;
-@@ -164,7 +164,7 @@ int ro_step(struct ro_spine *s, dm_block_t new_child)
- 	return r;
- }
- 
--struct node *ro_node(struct ro_spine *s)
-+struct btree_node *ro_node(struct ro_spine *s)
- {
- 	struct dm_block *block;
- 
-diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
-index d12b2cc..371f3d4 100644
---- a/drivers/md/persistent-data/dm-btree.c
-+++ b/drivers/md/persistent-data/dm-btree.c
-@@ -38,7 +38,7 @@ static void array_insert(void *base, size_t elt_size, unsigned nr_elts,
- /*----------------------------------------------------------------*/
- 
- /* makes the assumption that no two keys are the same. */
--static int bsearch(struct node *n, uint64_t key, int want_hi)
-+static int bsearch(struct btree_node *n, uint64_t key, int want_hi)
- {
- 	int lo = -1, hi = le32_to_cpu(n->header.nr_entries);
- 
-@@ -58,12 +58,12 @@ static int bsearch(struct node *n, uint64_t key, int want_hi)
- 	return want_hi ? hi : lo;
- }
- 
--int lower_bound(struct node *n, uint64_t key)
-+int lower_bound(struct btree_node *n, uint64_t key)
- {
- 	return bsearch(n, key, 0);
- }
- 
--void inc_children(struct dm_transaction_manager *tm, struct node *n,
-+void inc_children(struct dm_transaction_manager *tm, struct btree_node *n,
- 		  struct dm_btree_value_type *vt)
- {
- 	unsigned i;
-@@ -77,7 +77,7 @@ void inc_children(struct dm_transaction_manager *tm, struct node *n,
- 			vt->inc(vt->context, value_ptr(n, i));
- }
- 
--static int insert_at(size_t value_size, struct node *node, unsigned index,
-+static int insert_at(size_t value_size, struct btree_node *node, unsigned index,
- 		      uint64_t key, void *value)
- 		      __dm_written_to_disk(value)
- {
-@@ -122,7 +122,7 @@ int dm_btree_empty(struct dm_btree_info *info, dm_block_t *root)
- {
- 	int r;
- 	struct dm_block *b;
--	struct node *n;
-+	struct btree_node *n;
- 	size_t block_size;
- 	uint32_t max_entries;
- 
-@@ -154,7 +154,7 @@ EXPORT_SYMBOL_GPL(dm_btree_empty);
- #define MAX_SPINE_DEPTH 64
- struct frame {
- 	struct dm_block *b;
--	struct node *n;
-+	struct btree_node *n;
- 	unsigned level;
- 	unsigned nr_children;
- 	unsigned current_child;
-@@ -295,7 +295,7 @@ EXPORT_SYMBOL_GPL(dm_btree_del);
- /*----------------------------------------------------------------*/
- 
- static int btree_lookup_raw(struct ro_spine *s, dm_block_t block, uint64_t key,
--			    int (*search_fn)(struct node *, uint64_t),
-+			    int (*search_fn)(struct btree_node *, uint64_t),
- 			    uint64_t *result_key, void *v, size_t value_size)
- {
- 	int i, r;
-@@ -406,7 +406,7 @@ static int btree_split_sibling(struct shadow_spine *s, dm_block_t root,
- 	size_t size;
- 	unsigned nr_left, nr_right;
- 	struct dm_block *left, *right, *parent;
--	struct node *ln, *rn, *pn;
-+	struct btree_node *ln, *rn, *pn;
- 	__le64 location;
- 
- 	left = shadow_current(s);
-@@ -491,7 +491,7 @@ static int btree_split_beneath(struct shadow_spine *s, uint64_t key)
- 	size_t size;
- 	unsigned nr_left, nr_right;
- 	struct dm_block *left, *right, *new_parent;
--	struct node *pn, *ln, *rn;
-+	struct btree_node *pn, *ln, *rn;
- 	__le64 val;
- 
- 	new_parent = shadow_current(s);
-@@ -576,7 +576,7 @@ static int btree_insert_raw(struct shadow_spine *s, dm_block_t root,
- 			    uint64_t key, unsigned *index)
- {
- 	int r, i = *index, top = 1;
--	struct node *node;
-+	struct btree_node *node;
- 
- 	for (;;) {
- 		r = shadow_step(s, root, vt);
-@@ -643,7 +643,7 @@ static int insert(struct dm_btree_info *info, dm_block_t root,
- 	unsigned level, index = -1, last_level = info->levels - 1;
- 	dm_block_t block = root;
- 	struct shadow_spine spine;
--	struct node *n;
-+	struct btree_node *n;
- 	struct dm_btree_value_type le64_type;
- 
- 	le64_type.context = NULL;
-diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
-index f8b7771..7604f4e 100644
---- a/drivers/mfd/mfd-core.c
-+++ b/drivers/mfd/mfd-core.c
-@@ -21,6 +21,10 @@
- #include <linux/irqdomain.h>
- #include <linux/of.h>
- 
-+static struct device_type mfd_dev_type = {
-+	.name	= "mfd_device",
-+};
-+
- int mfd_cell_enable(struct platform_device *pdev)
- {
- 	const struct mfd_cell *cell = mfd_get_cell(pdev);
-@@ -91,6 +95,7 @@ static int mfd_add_device(struct device *parent, int id,
- 		goto fail_device;
- 
- 	pdev->dev.parent = parent;
-+	pdev->dev.type = &mfd_dev_type;
- 
- 	if (parent->of_node && cell->of_compatible) {
- 		for_each_child_of_node(parent->of_node, np) {
-@@ -204,10 +209,16 @@ EXPORT_SYMBOL(mfd_add_devices);
- 
- static int mfd_remove_devices_fn(struct device *dev, void *c)
- {
--	struct platform_device *pdev = to_platform_device(dev);
--	const struct mfd_cell *cell = mfd_get_cell(pdev);
-+	struct platform_device *pdev;
-+	const struct mfd_cell *cell;
- 	atomic_t **usage_count = c;
- 
-+	if (dev->type != &mfd_dev_type)
-+		return 0;
-+
-+	pdev = to_platform_device(dev);
-+	cell = mfd_get_cell(pdev);
-+
- 	/* find the base address of usage_count pointers (for freeing) */
- 	if (!*usage_count || (cell->usage_count < *usage_count))
- 		*usage_count = cell->usage_count;
-diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
-index 2febf88..38de846 100644
---- a/drivers/mfd/wm8994-core.c
-+++ b/drivers/mfd/wm8994-core.c
-@@ -557,6 +557,7 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq)
- 		case 1:
- 		case 2:
- 		case 3:
-+		case 4:
- 			regmap_patch = wm1811_reva_patch;
- 			patch_regs = ARRAY_SIZE(wm1811_reva_patch);
- 			break;
-diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
-index 8d082b4..d971817 100644
---- a/drivers/misc/sgi-xp/xpc_main.c
-+++ b/drivers/misc/sgi-xp/xpc_main.c
-@@ -53,6 +53,10 @@
- #include <linux/kthread.h>
- #include "xpc.h"
- 
-+#ifdef CONFIG_X86_64
-+#include <asm/traps.h>
-+#endif
-+
- /* define two XPC debug device structures to be used with dev_dbg() et al */
- 
- struct device_driver xpc_dbg_name = {
-@@ -1079,6 +1083,9 @@ xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused)
- 	return NOTIFY_DONE;
- }
- 
-+/* Used to only allow one cpu to complete disconnect */
-+static unsigned int xpc_die_disconnecting;
-+
- /*
-  * Notify other partitions to deactivate from us by first disengaging from all
-  * references to our memory.
-@@ -1092,6 +1099,9 @@ xpc_die_deactivate(void)
- 	long keep_waiting;
- 	long wait_to_print;
- 
-+	if (cmpxchg(&xpc_die_disconnecting, 0, 1))
-+		return;
-+
- 	/* keep xpc_hb_checker thread from doing anything (just in case) */
- 	xpc_exiting = 1;
- 
-@@ -1159,7 +1169,7 @@ xpc_die_deactivate(void)
-  * about the lack of a heartbeat.
-  */
- static int
--xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused)
-+xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
- {
- #ifdef CONFIG_IA64		/* !!! temporary kludge */
- 	switch (event) {
-@@ -1191,7 +1201,27 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused)
- 		break;
- 	}
- #else
--	xpc_die_deactivate();
-+	struct die_args *die_args = _die_args;
-+
-+	switch (event) {
-+	case DIE_TRAP:
-+		if (die_args->trapnr == X86_TRAP_DF)
-+			xpc_die_deactivate();
-+
-+		if (((die_args->trapnr == X86_TRAP_MF) ||
-+		     (die_args->trapnr == X86_TRAP_XF)) &&
-+		    !user_mode_vm(die_args->regs))
-+			xpc_die_deactivate();
-+
-+		break;
-+	case DIE_INT3:
-+	case DIE_DEBUG:
-+		break;
-+	case DIE_OOPS:
-+	case DIE_GPF:
-+	default:
-+		xpc_die_deactivate();
-+	}
- #endif
- 
- 	return NOTIFY_DONE;
-diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
-index adb6c3e..2cdeab8 100644
---- a/drivers/mtd/nand/cs553x_nand.c
-+++ b/drivers/mtd/nand/cs553x_nand.c
-@@ -237,6 +237,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
- 	this->ecc.hwctl  = cs_enable_hwecc;
- 	this->ecc.calculate = cs_calculate_ecc;
- 	this->ecc.correct  = nand_correct_data;
-+	this->ecc.strength = 1;
- 
- 	/* Enable the following for a flash based bad block table */
- 	this->bbt_options = NAND_BBT_USE_FLASH;
-@@ -247,8 +248,6 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
- 		goto out_ior;
- 	}
- 
--	this->ecc.strength = 1;
--
- 	new_mtd->name = kasprintf(GFP_KERNEL, "cs553x_nand_cs%d", cs);
- 
- 	cs553x_mtd[cs] = new_mtd;
-diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
-index a1f4332..b27e215 100644
---- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
-+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
-@@ -136,6 +136,15 @@ int gpmi_init(struct gpmi_nand_data *this)
- 	if (ret)
- 		goto err_out;
- 
-+	/*
-+	 * Reset BCH here, too. We got failures otherwise :(
-+	 * See later BCH reset for explanation of MX23 handling
-+	 */
-+	ret = gpmi_reset_block(r->bch_regs, GPMI_IS_MX23(this));
-+	if (ret)
-+		goto err_out;
-+
-+
- 	/* Choose NAND mode. */
- 	writel(BM_GPMI_CTRL1_GPMI_MODE, r->gpmi_regs + HW_GPMI_CTRL1_CLR);
- 
-diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
-index 963e2cc..8233e5e 100644
---- a/drivers/net/can/dev.c
-+++ b/drivers/net/can/dev.c
-@@ -609,8 +609,7 @@ void close_candev(struct net_device *dev)
- {
- 	struct can_priv *priv = netdev_priv(dev);
- 
--	if (del_timer_sync(&priv->restart_timer))
--		dev_put(dev);
-+	del_timer_sync(&priv->restart_timer);
- 	can_flush_echo_skb(dev);
- }
- EXPORT_SYMBOL_GPL(close_candev);
-diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
-index 48cc4fb..b1b8e96 100644
---- a/drivers/net/ethernet/intel/igb/igb_main.c
-+++ b/drivers/net/ethernet/intel/igb/igb_main.c
-@@ -936,17 +936,18 @@ static int igb_request_msix(struct igb_adapter *adapter)
- {
- 	struct net_device *netdev = adapter->netdev;
- 	struct e1000_hw *hw = &adapter->hw;
--	int i, err = 0, vector = 0;
-+	int i, err = 0, vector = 0, free_vector = 0;
- 
- 	err = request_irq(adapter->msix_entries[vector].vector,
- 	                  igb_msix_other, 0, netdev->name, adapter);
- 	if (err)
--		goto out;
--	vector++;
-+		goto err_out;
- 
- 	for (i = 0; i < adapter->num_q_vectors; i++) {
- 		struct igb_q_vector *q_vector = adapter->q_vector[i];
- 
-+		vector++;
-+
- 		q_vector->itr_register = hw->hw_addr + E1000_EITR(vector);
- 
- 		if (q_vector->rx.ring && q_vector->tx.ring)
-@@ -965,13 +966,22 @@ static int igb_request_msix(struct igb_adapter *adapter)
- 		                  igb_msix_ring, 0, q_vector->name,
- 		                  q_vector);
- 		if (err)
--			goto out;
--		vector++;
-+			goto err_free;
- 	}
- 
- 	igb_configure_msix(adapter);
- 	return 0;
--out:
-+
-+err_free:
-+	/* free already assigned IRQs */
-+	free_irq(adapter->msix_entries[free_vector++].vector, adapter);
-+
-+	vector--;
-+	for (i = 0; i < vector; i++) {
-+		free_irq(adapter->msix_entries[free_vector++].vector,
-+			 adapter->q_vector[i]);
-+	}
-+err_out:
- 	return err;
- }
- 
-diff --git a/drivers/net/wimax/i2400m/i2400m-usb.h b/drivers/net/wimax/i2400m/i2400m-usb.h
-index 6650fde..9f1e947 100644
---- a/drivers/net/wimax/i2400m/i2400m-usb.h
-+++ b/drivers/net/wimax/i2400m/i2400m-usb.h
-@@ -152,6 +152,9 @@ enum {
- 	/* Device IDs */
- 	USB_DEVICE_ID_I6050 = 0x0186,
- 	USB_DEVICE_ID_I6050_2 = 0x0188,
-+	USB_DEVICE_ID_I6150 = 0x07d6,
-+	USB_DEVICE_ID_I6150_2 = 0x07d7,
-+	USB_DEVICE_ID_I6150_3 = 0x07d9,
- 	USB_DEVICE_ID_I6250 = 0x0187,
- };
- 
-diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
-index 713d033..080f363 100644
---- a/drivers/net/wimax/i2400m/usb.c
-+++ b/drivers/net/wimax/i2400m/usb.c
-@@ -510,6 +510,9 @@ int i2400mu_probe(struct usb_interface *iface,
- 	switch (id->idProduct) {
- 	case USB_DEVICE_ID_I6050:
- 	case USB_DEVICE_ID_I6050_2:
-+	case USB_DEVICE_ID_I6150:
-+	case USB_DEVICE_ID_I6150_2:
-+	case USB_DEVICE_ID_I6150_3:
- 	case USB_DEVICE_ID_I6250:
- 		i2400mu->i6050 = 1;
- 		break;
-@@ -759,6 +762,9 @@ static
- struct usb_device_id i2400mu_id_table[] = {
- 	{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6050) },
- 	{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6050_2) },
-+	{ USB_DEVICE(0x8087, USB_DEVICE_ID_I6150) },
-+	{ USB_DEVICE(0x8087, USB_DEVICE_ID_I6150_2) },
-+	{ USB_DEVICE(0x8087, USB_DEVICE_ID_I6150_3) },
- 	{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6250) },
- 	{ USB_DEVICE(0x8086, 0x0181) },
- 	{ USB_DEVICE(0x8086, 0x1403) },
-diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
-index 2aab20e..68a4046 100644
---- a/drivers/net/wireless/ath/ath5k/base.c
-+++ b/drivers/net/wireless/ath/ath5k/base.c
-@@ -848,7 +848,7 @@ ath5k_txbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf)
- 		return;
- 	dma_unmap_single(ah->dev, bf->skbaddr, bf->skb->len,
- 			DMA_TO_DEVICE);
--	dev_kfree_skb_any(bf->skb);
-+	ieee80211_free_txskb(ah->hw, bf->skb);
- 	bf->skb = NULL;
- 	bf->skbaddr = 0;
- 	bf->desc->ds_data = 0;
-@@ -1575,7 +1575,7 @@ ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,
- 	return;
- 
- drop_packet:
--	dev_kfree_skb_any(skb);
-+	ieee80211_free_txskb(hw, skb);
- }
- 
- static void
-diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-index d56453e..b010a77 100644
---- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
-@@ -61,7 +61,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
- 	u16 qnum = skb_get_queue_mapping(skb);
- 
- 	if (WARN_ON(qnum >= ah->ah_capabilities.cap_queues.q_tx_num)) {
--		dev_kfree_skb_any(skb);
-+		ieee80211_free_txskb(hw, skb);
- 		return;
- 	}
- 
-diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
-index 6f7cf49..262e1e0 100644
---- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
-@@ -534,98 +534,98 @@ static const u32 ar9300_2p2_baseband_core[][2] = {
- 
- static const u32 ar9300Modes_high_power_tx_gain_table_2p2[][5] = {
- 	/* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
--	{0x0000a2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
--	{0x0000a2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
--	{0x0000a2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
-+	{0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-+	{0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-+	{0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
- 	{0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
--	{0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
--	{0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
--	{0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
--	{0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
--	{0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
--	{0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
--	{0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
--	{0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
--	{0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
--	{0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
--	{0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
--	{0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
--	{0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
--	{0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
--	{0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
--	{0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
--	{0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
--	{0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
--	{0x0000a544, 0x52022470, 0x52022470, 0x3f001861, 0x3f001861},
--	{0x0000a548, 0x55022490, 0x55022490, 0x43001a81, 0x43001a81},
--	{0x0000a54c, 0x59022492, 0x59022492, 0x47001a83, 0x47001a83},
--	{0x0000a550, 0x5d022692, 0x5d022692, 0x4a001c84, 0x4a001c84},
--	{0x0000a554, 0x61022892, 0x61022892, 0x4e001ce3, 0x4e001ce3},
--	{0x0000a558, 0x65024890, 0x65024890, 0x52001ce5, 0x52001ce5},
--	{0x0000a55c, 0x69024892, 0x69024892, 0x56001ce9, 0x56001ce9},
--	{0x0000a560, 0x6e024c92, 0x6e024c92, 0x5a001ceb, 0x5a001ceb},
--	{0x0000a564, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
--	{0x0000a568, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
--	{0x0000a56c, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
--	{0x0000a570, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
--	{0x0000a574, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
--	{0x0000a578, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
--	{0x0000a57c, 0x74026e92, 0x74026e92, 0x5d001eec, 0x5d001eec},
--	{0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
--	{0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
--	{0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
--	{0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
--	{0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
--	{0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
--	{0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
--	{0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
--	{0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
--	{0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
--	{0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
--	{0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
--	{0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
--	{0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
--	{0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
--	{0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
--	{0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
--	{0x0000a5c4, 0x52822470, 0x52822470, 0x3f801861, 0x3f801861},
--	{0x0000a5c8, 0x55822490, 0x55822490, 0x43801a81, 0x43801a81},
--	{0x0000a5cc, 0x59822492, 0x59822492, 0x47801a83, 0x47801a83},
--	{0x0000a5d0, 0x5d822692, 0x5d822692, 0x4a801c84, 0x4a801c84},
--	{0x0000a5d4, 0x61822892, 0x61822892, 0x4e801ce3, 0x4e801ce3},
--	{0x0000a5d8, 0x65824890, 0x65824890, 0x52801ce5, 0x52801ce5},
--	{0x0000a5dc, 0x69824892, 0x69824892, 0x56801ce9, 0x56801ce9},
--	{0x0000a5e0, 0x6e824c92, 0x6e824c92, 0x5a801ceb, 0x5a801ceb},
--	{0x0000a5e4, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
--	{0x0000a5e8, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
--	{0x0000a5ec, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
--	{0x0000a5f0, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
--	{0x0000a5f4, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
--	{0x0000a5f8, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
--	{0x0000a5fc, 0x74826e92, 0x74826e92, 0x5d801eec, 0x5d801eec},
-+	{0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
-+	{0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-+	{0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
-+	{0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
-+	{0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
-+	{0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
-+	{0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
-+	{0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
-+	{0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
-+	{0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
-+	{0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
-+	{0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
-+	{0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
-+	{0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
-+	{0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
-+	{0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
-+	{0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
-+	{0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
-+	{0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
-+	{0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
-+	{0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
-+	{0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
-+	{0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
-+	{0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
-+	{0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
-+	{0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
-+	{0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-+	{0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-+	{0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-+	{0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-+	{0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-+	{0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-+	{0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-+	{0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-+	{0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
-+	{0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
-+	{0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
-+	{0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
-+	{0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
-+	{0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
-+	{0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
-+	{0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
-+	{0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
-+	{0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
-+	{0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
-+	{0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
-+	{0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
-+	{0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
-+	{0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
-+	{0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
-+	{0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
-+	{0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
-+	{0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
-+	{0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
-+	{0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
-+	{0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
-+	{0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
-+	{0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
-+	{0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-+	{0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-+	{0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-+	{0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-+	{0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-+	{0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-+	{0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
- 	{0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
- 	{0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
- 	{0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
- 	{0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
--	{0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
--	{0x0000a614, 0x02004000, 0x02004000, 0x01404000, 0x01404000},
--	{0x0000a618, 0x02004801, 0x02004801, 0x01404501, 0x01404501},
--	{0x0000a61c, 0x02808a02, 0x02808a02, 0x02008501, 0x02008501},
--	{0x0000a620, 0x0380ce03, 0x0380ce03, 0x0280ca03, 0x0280ca03},
--	{0x0000a624, 0x04411104, 0x04411104, 0x03010c04, 0x03010c04},
--	{0x0000a628, 0x04411104, 0x04411104, 0x04014c04, 0x04014c04},
--	{0x0000a62c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
--	{0x0000a630, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
--	{0x0000a634, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
--	{0x0000a638, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
--	{0x0000a63c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
--	{0x0000b2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
--	{0x0000b2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
--	{0x0000b2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
-+	{0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
-+	{0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
-+	{0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
-+	{0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
-+	{0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
-+	{0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
-+	{0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
-+	{0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-+	{0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-+	{0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-+	{0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-+	{0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-+	{0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-+	{0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-+	{0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
- 	{0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
--	{0x0000c2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
--	{0x0000c2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
--	{0x0000c2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
-+	{0x0000c2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-+	{0x0000c2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-+	{0x0000c2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
- 	{0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
- 	{0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
- 	{0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
-diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
-index 3a1ff55..a633aea 100644
---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
-@@ -68,13 +68,13 @@
- #define AR9300_BASE_ADDR 0x3ff
- #define AR9300_BASE_ADDR_512 0x1ff
- 
--#define AR9300_OTP_BASE			0x14000
--#define AR9300_OTP_STATUS		0x15f18
-+#define AR9300_OTP_BASE			(AR_SREV_9340(ah) ? 0x30000 : 0x14000)
-+#define AR9300_OTP_STATUS		(AR_SREV_9340(ah) ? 0x30018 : 0x15f18)
- #define AR9300_OTP_STATUS_TYPE		0x7
- #define AR9300_OTP_STATUS_VALID		0x4
- #define AR9300_OTP_STATUS_ACCESS_BUSY	0x2
- #define AR9300_OTP_STATUS_SM_BUSY	0x1
--#define AR9300_OTP_READ_DATA		0x15f1c
-+#define AR9300_OTP_READ_DATA		(AR_SREV_9340(ah) ? 0x3001c : 0x15f1c)
- 
- enum targetPowerHTRates {
- 	HT_TARGET_RATE_0_8_16,
-diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
-index e5cceb0..bbd249d 100644
---- a/drivers/net/wireless/ath/ath9k/calib.c
-+++ b/drivers/net/wireless/ath/ath9k/calib.c
-@@ -69,6 +69,7 @@ s16 ath9k_hw_getchan_noise(struct ath_hw *ah, struct ath9k_channel *chan)
- 
- 	if (chan && chan->noisefloor) {
- 		s8 delta = chan->noisefloor -
-+			   ATH9K_NF_CAL_NOISE_THRESH -
- 			   ath9k_hw_get_default_nf(ah, chan);
- 		if (delta > 0)
- 			noise += delta;
-diff --git a/drivers/net/wireless/ath/ath9k/calib.h b/drivers/net/wireless/ath/ath9k/calib.h
-index 1060c19..60dcb6c 100644
---- a/drivers/net/wireless/ath/ath9k/calib.h
-+++ b/drivers/net/wireless/ath/ath9k/calib.h
-@@ -21,6 +21,9 @@
- 
- #define AR_PHY_CCA_FILTERWINDOW_LENGTH          5
- 
-+/* Internal noise floor can vary by about 6db depending on the frequency */
-+#define ATH9K_NF_CAL_NOISE_THRESH		6
-+
- #define NUM_NF_READINGS       6
- #define ATH9K_NF_CAL_HIST_MAX 5
- 
-diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
-index 7c899fc..ac593ab 100644
---- a/drivers/net/wireless/b43/b43.h
-+++ b/drivers/net/wireless/b43/b43.h
-@@ -7,6 +7,7 @@
- #include <linux/hw_random.h>
- #include <linux/bcma/bcma.h>
- #include <linux/ssb/ssb.h>
-+#include <linux/completion.h>
- #include <net/mac80211.h>
- 
- #include "debugfs.h"
-@@ -718,6 +719,10 @@ enum b43_firmware_file_type {
- struct b43_request_fw_context {
- 	/* The device we are requesting the fw for. */
- 	struct b43_wldev *dev;
-+	/* a completion event structure needed if this call is asynchronous */
-+	struct completion fw_load_complete;
-+	/* a pointer to the firmware object */
-+	const struct firmware *blob;
- 	/* The type of firmware to request. */
- 	enum b43_firmware_file_type req_type;
- 	/* Error messages for each firmware type. */
-diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
-index 777cd74..38bc5a7 100644
---- a/drivers/net/wireless/b43/dma.c
-+++ b/drivers/net/wireless/b43/dma.c
-@@ -409,7 +409,10 @@ static inline
- 				struct b43_dmadesc_meta *meta)
- {
- 	if (meta->skb) {
--		dev_kfree_skb_any(meta->skb);
-+		if (ring->tx)
-+			ieee80211_free_txskb(ring->dev->wl->hw, meta->skb);
-+		else
-+			dev_kfree_skb_any(meta->skb);
- 		meta->skb = NULL;
- 	}
- }
-@@ -1454,7 +1457,7 @@ int b43_dma_tx(struct b43_wldev *dev, struct sk_buff *skb)
- 	if (unlikely(err == -ENOKEY)) {
- 		/* Drop this packet, as we don't have the encryption key
- 		 * anymore and must not transmit it unencrypted. */
--		dev_kfree_skb_any(skb);
-+		ieee80211_free_txskb(dev->wl->hw, skb);
- 		err = 0;
- 		goto out;
- 	}
-diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
-index 46d9d4e..b70bc2d 100644
---- a/drivers/net/wireless/b43/main.c
-+++ b/drivers/net/wireless/b43/main.c
-@@ -2088,11 +2088,18 @@ static void b43_print_fw_helptext(struct b43_wl *wl, bool error)
- 		b43warn(wl, text);
- }
- 
-+static void b43_fw_cb(const struct firmware *firmware, void *context)
-+{
-+	struct b43_request_fw_context *ctx = context;
-+
-+	ctx->blob = firmware;
-+	complete(&ctx->fw_load_complete);
-+}
-+
- int b43_do_request_fw(struct b43_request_fw_context *ctx,
- 		      const char *name,
--		      struct b43_firmware_file *fw)
-+		      struct b43_firmware_file *fw, bool async)
- {
--	const struct firmware *blob;
- 	struct b43_fw_header *hdr;
- 	u32 size;
- 	int err;
-@@ -2131,11 +2138,31 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx,
- 		B43_WARN_ON(1);
- 		return -ENOSYS;
- 	}
--	err = request_firmware(&blob, ctx->fwname, ctx->dev->dev->dev);
-+	if (async) {
-+		/* do this part asynchronously */
-+		init_completion(&ctx->fw_load_complete);
-+		err = request_firmware_nowait(THIS_MODULE, 1, ctx->fwname,
-+					      ctx->dev->dev->dev, GFP_KERNEL,
-+					      ctx, b43_fw_cb);
-+		if (err < 0) {
-+			pr_err("Unable to load firmware\n");
-+			return err;
-+		}
-+		/* stall here until fw ready */
-+		wait_for_completion(&ctx->fw_load_complete);
-+		if (ctx->blob)
-+			goto fw_ready;
-+	/* On some ARM systems, the async request will fail, but the next sync
-+	 * request works. For this reason, we dall through here
-+	 */
-+	}
-+	err = request_firmware(&ctx->blob, ctx->fwname,
-+			       ctx->dev->dev->dev);
- 	if (err == -ENOENT) {
- 		snprintf(ctx->errors[ctx->req_type],
- 			 sizeof(ctx->errors[ctx->req_type]),
--			 "Firmware file \"%s\" not found\n", ctx->fwname);
-+			 "Firmware file \"%s\" not found\n",
-+			 ctx->fwname);
- 		return err;
- 	} else if (err) {
- 		snprintf(ctx->errors[ctx->req_type],
-@@ -2144,14 +2171,15 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx,
- 			 ctx->fwname, err);
- 		return err;
- 	}
--	if (blob->size < sizeof(struct b43_fw_header))
-+fw_ready:
-+	if (ctx->blob->size < sizeof(struct b43_fw_header))
- 		goto err_format;
--	hdr = (struct b43_fw_header *)(blob->data);
-+	hdr = (struct b43_fw_header *)(ctx->blob->data);
- 	switch (hdr->type) {
- 	case B43_FW_TYPE_UCODE:
- 	case B43_FW_TYPE_PCM:
- 		size = be32_to_cpu(hdr->size);
--		if (size != blob->size - sizeof(struct b43_fw_header))
-+		if (size != ctx->blob->size - sizeof(struct b43_fw_header))
- 			goto err_format;
- 		/* fallthrough */
- 	case B43_FW_TYPE_IV:
-@@ -2162,7 +2190,7 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx,
- 		goto err_format;
- 	}
- 
--	fw->data = blob;
-+	fw->data = ctx->blob;
- 	fw->filename = name;
- 	fw->type = ctx->req_type;
- 
-@@ -2172,7 +2200,7 @@ err_format:
- 	snprintf(ctx->errors[ctx->req_type],
- 		 sizeof(ctx->errors[ctx->req_type]),
- 		 "Firmware file \"%s\" format error.\n", ctx->fwname);
--	release_firmware(blob);
-+	release_firmware(ctx->blob);
- 
- 	return -EPROTO;
- }
-@@ -2223,7 +2251,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
- 			goto err_no_ucode;
- 		}
- 	}
--	err = b43_do_request_fw(ctx, filename, &fw->ucode);
-+	err = b43_do_request_fw(ctx, filename, &fw->ucode, true);
- 	if (err)
- 		goto err_load;
- 
-@@ -2235,7 +2263,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
- 	else
- 		goto err_no_pcm;
- 	fw->pcm_request_failed = false;
--	err = b43_do_request_fw(ctx, filename, &fw->pcm);
-+	err = b43_do_request_fw(ctx, filename, &fw->pcm, false);
- 	if (err == -ENOENT) {
- 		/* We did not find a PCM file? Not fatal, but
- 		 * core rev <= 10 must do without hwcrypto then. */
-@@ -2296,7 +2324,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
- 	default:
- 		goto err_no_initvals;
- 	}
--	err = b43_do_request_fw(ctx, filename, &fw->initvals);
-+	err = b43_do_request_fw(ctx, filename, &fw->initvals, false);
- 	if (err)
- 		goto err_load;
- 
-@@ -2355,7 +2383,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
- 	default:
- 		goto err_no_initvals;
- 	}
--	err = b43_do_request_fw(ctx, filename, &fw->initvals_band);
-+	err = b43_do_request_fw(ctx, filename, &fw->initvals_band, false);
- 	if (err)
- 		goto err_load;
- 
-@@ -3397,7 +3425,7 @@ static void b43_tx_work(struct work_struct *work)
- 				break;
- 			}
- 			if (unlikely(err))
--				dev_kfree_skb(skb); /* Drop it */
-+				ieee80211_free_txskb(wl->hw, skb);
- 			err = 0;
- 		}
- 
-@@ -3418,7 +3446,7 @@ static void b43_op_tx(struct ieee80211_hw *hw,
- 
- 	if (unlikely(skb->len < 2 + 2 + 6)) {
- 		/* Too short, this can't be a valid frame. */
--		dev_kfree_skb_any(skb);
-+		ieee80211_free_txskb(hw, skb);
- 		return;
- 	}
- 	B43_WARN_ON(skb_shinfo(skb)->nr_frags);
-@@ -4228,8 +4256,12 @@ redo:
- 
- 	/* Drain all TX queues. */
- 	for (queue_num = 0; queue_num < B43_QOS_QUEUE_NUM; queue_num++) {
--		while (skb_queue_len(&wl->tx_queue[queue_num]))
--			dev_kfree_skb(skb_dequeue(&wl->tx_queue[queue_num]));
-+		while (skb_queue_len(&wl->tx_queue[queue_num])) {
-+			struct sk_buff *skb;
-+
-+			skb = skb_dequeue(&wl->tx_queue[queue_num]);
-+			ieee80211_free_txskb(wl->hw, skb);
-+		}
- 	}
- 
- 	b43_mac_suspend(dev);
-diff --git a/drivers/net/wireless/b43/main.h b/drivers/net/wireless/b43/main.h
-index 8c684cd..abac25e 100644
---- a/drivers/net/wireless/b43/main.h
-+++ b/drivers/net/wireless/b43/main.h
-@@ -137,9 +137,8 @@ void b43_mac_phy_clock_set(struct b43_wldev *dev, bool on);
- 
- 
- struct b43_request_fw_context;
--int b43_do_request_fw(struct b43_request_fw_context *ctx,
--		      const char *name,
--		      struct b43_firmware_file *fw);
-+int b43_do_request_fw(struct b43_request_fw_context *ctx, const char *name,
-+		      struct b43_firmware_file *fw, bool async);
- void b43_do_release_fw(struct b43_firmware_file *fw);
- 
- #endif /* B43_MAIN_H_ */
-diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c
-index 3533ab8..a73ff8c 100644
---- a/drivers/net/wireless/b43/pio.c
-+++ b/drivers/net/wireless/b43/pio.c
-@@ -196,7 +196,7 @@ static void b43_pio_cancel_tx_packets(struct b43_pio_txqueue *q)
- 	for (i = 0; i < ARRAY_SIZE(q->packets); i++) {
- 		pack = &(q->packets[i]);
- 		if (pack->skb) {
--			dev_kfree_skb_any(pack->skb);
-+			ieee80211_free_txskb(q->dev->wl->hw, pack->skb);
- 			pack->skb = NULL;
- 		}
- 	}
-@@ -552,7 +552,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)
- 	if (unlikely(err == -ENOKEY)) {
- 		/* Drop this packet, as we don't have the encryption key
- 		 * anymore and must not transmit it unencrypted. */
--		dev_kfree_skb_any(skb);
-+		ieee80211_free_txskb(dev->wl->hw, skb);
- 		err = 0;
- 		goto out;
- 	}
-diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/b43legacy/b43legacy.h
-index a29da67..482476f 100644
---- a/drivers/net/wireless/b43legacy/b43legacy.h
-+++ b/drivers/net/wireless/b43legacy/b43legacy.h
-@@ -13,6 +13,7 @@
- 
- #include <linux/ssb/ssb.h>
- #include <linux/ssb/ssb_driver_chipcommon.h>
-+#include <linux/completion.h>
- 
- #include <net/mac80211.h>
- 
-@@ -733,6 +734,10 @@ struct b43legacy_wldev {
- 
- 	/* Firmware data */
- 	struct b43legacy_firmware fw;
-+	const struct firmware *fwp;	/* needed to pass fw pointer */
-+
-+	/* completion struct for firmware loading */
-+	struct completion fw_load_complete;
- 
- 	/* Devicelist in struct b43legacy_wl (all 802.11 cores) */
- 	struct list_head list;
-diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
-index 0ef08e0..aa87fb7 100644
---- a/drivers/net/wireless/b43legacy/main.c
-+++ b/drivers/net/wireless/b43legacy/main.c
-@@ -1513,9 +1513,17 @@ static void b43legacy_print_fw_helptext(struct b43legacy_wl *wl)
- 		     "and download the correct firmware (version 3).\n");
- }
- 
-+static void b43legacy_fw_cb(const struct firmware *firmware, void *context)
-+{
-+	struct b43legacy_wldev *dev = context;
-+
-+	dev->fwp = firmware;
-+	complete(&dev->fw_load_complete);
-+}
-+
- static int do_request_fw(struct b43legacy_wldev *dev,
- 			 const char *name,
--			 const struct firmware **fw)
-+			 const struct firmware **fw, bool async)
- {
- 	char path[sizeof(modparam_fwpostfix) + 32];
- 	struct b43legacy_fw_header *hdr;
-@@ -1528,7 +1536,24 @@ static int do_request_fw(struct b43legacy_wldev *dev,
- 	snprintf(path, ARRAY_SIZE(path),
- 		 "b43legacy%s/%s.fw",
- 		 modparam_fwpostfix, name);
--	err = request_firmware(fw, path, dev->dev->dev);
-+	b43legacyinfo(dev->wl, "Loading firmware %s\n", path);
-+	if (async) {
-+		init_completion(&dev->fw_load_complete);
-+		err = request_firmware_nowait(THIS_MODULE, 1, path,
-+					      dev->dev->dev, GFP_KERNEL,
-+					      dev, b43legacy_fw_cb);
-+		if (err) {
-+			b43legacyerr(dev->wl, "Unable to load firmware\n");
-+			return err;
-+		}
-+		/* stall here until fw ready */
-+		wait_for_completion(&dev->fw_load_complete);
-+		if (!dev->fwp)
-+			err = -EINVAL;
-+		*fw = dev->fwp;
-+	} else {
-+		err = request_firmware(fw, path, dev->dev->dev);
-+	}
- 	if (err) {
- 		b43legacyerr(dev->wl, "Firmware file \"%s\" not found "
- 		       "or load failed.\n", path);
-@@ -1580,7 +1605,7 @@ static void b43legacy_request_firmware(struct work_struct *work)
- 			filename = "ucode4";
- 		else
- 			filename = "ucode5";
--		err = do_request_fw(dev, filename, &fw->ucode);
-+		err = do_request_fw(dev, filename, &fw->ucode, true);
- 		if (err)
- 			goto err_load;
- 	}
-@@ -1589,7 +1614,7 @@ static void b43legacy_request_firmware(struct work_struct *work)
- 			filename = "pcm4";
- 		else
- 			filename = "pcm5";
--		err = do_request_fw(dev, filename, &fw->pcm);
-+		err = do_request_fw(dev, filename, &fw->pcm, false);
- 		if (err)
- 			goto err_load;
- 	}
-@@ -1607,7 +1632,7 @@ static void b43legacy_request_firmware(struct work_struct *work)
- 		default:
- 			goto err_no_initvals;
- 		}
--		err = do_request_fw(dev, filename, &fw->initvals);
-+		err = do_request_fw(dev, filename, &fw->initvals, false);
- 		if (err)
- 			goto err_load;
- 	}
-@@ -1627,7 +1652,7 @@ static void b43legacy_request_firmware(struct work_struct *work)
- 		default:
- 			goto err_no_initvals;
- 		}
--		err = do_request_fw(dev, filename, &fw->initvals_band);
-+		err = do_request_fw(dev, filename, &fw->initvals_band, false);
- 		if (err)
- 			goto err_load;
- 	}
-diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
-index fb21360..8951285 100644
---- a/drivers/net/wireless/mwifiex/sta_ioctl.c
-+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
-@@ -53,7 +53,6 @@ int mwifiex_copy_mcast_addr(struct mwifiex_multicast_list *mlist,
-  */
- int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter)
- {
--	bool cancel_flag = false;
- 	int status;
- 	struct cmd_ctrl_node *cmd_queued;
- 
-@@ -67,14 +66,11 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter)
- 	atomic_inc(&adapter->cmd_pending);
- 
- 	/* Wait for completion */
--	wait_event_interruptible(adapter->cmd_wait_q.wait,
--				 *(cmd_queued->condition));
--	if (!*(cmd_queued->condition))
--		cancel_flag = true;
--
--	if (cancel_flag) {
--		mwifiex_cancel_pending_ioctl(adapter);
--		dev_dbg(adapter->dev, "cmd cancel\n");
-+	status = wait_event_interruptible(adapter->cmd_wait_q.wait,
-+					  *(cmd_queued->condition));
-+	if (status) {
-+		dev_err(adapter->dev, "cmd_wait_q terminated: %d\n", status);
-+		return status;
- 	}
- 
- 	status = adapter->cmd_wait_q.status;
-@@ -427,8 +423,11 @@ int mwifiex_enable_hs(struct mwifiex_adapter *adapter)
- 		return false;
- 	}
- 
--	wait_event_interruptible(adapter->hs_activate_wait_q,
--				 adapter->hs_activate_wait_q_woken);
-+	if (wait_event_interruptible(adapter->hs_activate_wait_q,
-+				     adapter->hs_activate_wait_q_woken)) {
-+		dev_err(adapter->dev, "hs_activate_wait_q terminated\n");
-+		return false;
-+	}
- 
- 	return true;
- }
-diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
-index effb044..4191294 100644
---- a/drivers/net/wireless/p54/p54usb.c
-+++ b/drivers/net/wireless/p54/p54usb.c
-@@ -47,6 +47,7 @@ static struct usb_device_id p54u_table[] = {
- 	{USB_DEVICE(0x0411, 0x0050)},	/* Buffalo WLI2-USB2-G54 */
- 	{USB_DEVICE(0x045e, 0x00c2)},	/* Microsoft MN-710 */
- 	{USB_DEVICE(0x0506, 0x0a11)},	/* 3COM 3CRWE254G72 */
-+	{USB_DEVICE(0x0675, 0x0530)},	/* DrayTek Vigor 530 */
- 	{USB_DEVICE(0x06b9, 0x0120)},	/* Thomson SpeedTouch 120g */
- 	{USB_DEVICE(0x0707, 0xee06)},	/* SMC 2862W-G */
- 	{USB_DEVICE(0x07aa, 0x001c)},	/* Corega CG-WLUSB2GT */
-@@ -82,6 +83,8 @@ static struct usb_device_id p54u_table[] = {
- 	{USB_DEVICE(0x06a9, 0x000e)},	/* Westell 802.11g USB (A90-211WG-01) */
- 	{USB_DEVICE(0x06b9, 0x0121)},	/* Thomson SpeedTouch 121g */
- 	{USB_DEVICE(0x0707, 0xee13)},   /* SMC 2862W-G version 2 */
-+	{USB_DEVICE(0x0803, 0x4310)},	/* Zoom 4410a */
-+	{USB_DEVICE(0x083a, 0x4503)},	/* T-Com Sinus 154 data II */
- 	{USB_DEVICE(0x083a, 0x4521)},   /* Siemens Gigaset USB Adapter 54 version 2 */
- 	{USB_DEVICE(0x083a, 0xc501)},	/* Zoom Wireless-G 4410 */
- 	{USB_DEVICE(0x083a, 0xf503)},	/* Accton FD7050E ver 1010ec  */
-@@ -101,6 +104,7 @@ static struct usb_device_id p54u_table[] = {
- 	{USB_DEVICE(0x13B1, 0x000C)},	/* Linksys WUSB54AG */
- 	{USB_DEVICE(0x1413, 0x5400)},   /* Telsey 802.11g USB2.0 Adapter */
- 	{USB_DEVICE(0x1435, 0x0427)},	/* Inventel UR054G */
-+	/* {USB_DEVICE(0x15a9, 0x0002)}, * Also SparkLAN WL-682 with 3887 */
- 	{USB_DEVICE(0x1668, 0x1050)},	/* Actiontec 802UIG-1 */
- 	{USB_DEVICE(0x1740, 0x1000)},	/* Senao NUB-350 */
- 	{USB_DEVICE(0x2001, 0x3704)},	/* DLink DWL-G122 rev A2 */
-diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
-index aa970fc..8fa144f 100644
---- a/drivers/net/wireless/rtlwifi/usb.c
-+++ b/drivers/net/wireless/rtlwifi/usb.c
-@@ -210,17 +210,16 @@ static void _usb_writeN_sync(struct rtl_priv *rtlpriv, u32 addr, void *data,
- 	u16 index = REALTEK_USB_VENQT_CMD_IDX;
- 	int pipe = usb_sndctrlpipe(udev, 0); /* write_out */
- 	u8 *buffer;
--	dma_addr_t dma_addr;
- 
--	wvalue = (u16)(addr&0x0000ffff);
--	buffer = usb_alloc_coherent(udev, (size_t)len, GFP_ATOMIC, &dma_addr);
-+	wvalue = (u16)(addr & 0x0000ffff);
-+	buffer = kmalloc(len, GFP_ATOMIC);
- 	if (!buffer)
- 		return;
- 	memcpy(buffer, data, len);
- 	usb_control_msg(udev, pipe, request, reqtype, wvalue,
- 			index, buffer, len, 50);
- 
--	usb_free_coherent(udev, (size_t)len, buffer, dma_addr);
-+	kfree(buffer);
- }
- 
- static void _rtl_usb_io_handler_init(struct device *dev,
-diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
-index 26ffd3e..2c113de 100644
---- a/drivers/pci/hotplug/pciehp.h
-+++ b/drivers/pci/hotplug/pciehp.h
-@@ -44,7 +44,6 @@ extern bool pciehp_poll_mode;
- extern int pciehp_poll_time;
- extern bool pciehp_debug;
- extern bool pciehp_force;
--extern struct workqueue_struct *pciehp_wq;
- 
- #define dbg(format, arg...)						\
- do {									\
-@@ -78,6 +77,7 @@ struct slot {
- 	struct hotplug_slot *hotplug_slot;
- 	struct delayed_work work;	/* work for button event */
- 	struct mutex lock;
-+	struct workqueue_struct *wq;
- };
- 
- struct event_info {
-diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
-index 365c6b9..9e39df9 100644
---- a/drivers/pci/hotplug/pciehp_core.c
-+++ b/drivers/pci/hotplug/pciehp_core.c
-@@ -42,7 +42,6 @@ bool pciehp_debug;
- bool pciehp_poll_mode;
- int pciehp_poll_time;
- bool pciehp_force;
--struct workqueue_struct *pciehp_wq;
- 
- #define DRIVER_VERSION	"0.4"
- #define DRIVER_AUTHOR	"Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
-@@ -340,18 +339,13 @@ static int __init pcied_init(void)
- {
- 	int retval = 0;
- 
--	pciehp_wq = alloc_workqueue("pciehp", 0, 0);
--	if (!pciehp_wq)
--		return -ENOMEM;
--
- 	pciehp_firmware_init();
- 	retval = pcie_port_service_register(&hpdriver_portdrv);
-  	dbg("pcie_port_service_register = %d\n", retval);
-   	info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
-- 	if (retval) {
--		destroy_workqueue(pciehp_wq);
-+	if (retval)
- 		dbg("Failure to register service\n");
--	}
-+
- 	return retval;
- }
- 
-@@ -359,7 +353,6 @@ static void __exit pcied_cleanup(void)
- {
- 	dbg("unload_pciehpd()\n");
- 	pcie_port_service_unregister(&hpdriver_portdrv);
--	destroy_workqueue(pciehp_wq);
- 	info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");
- }
- 
-diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
-index 27f4429..38f0186 100644
---- a/drivers/pci/hotplug/pciehp_ctrl.c
-+++ b/drivers/pci/hotplug/pciehp_ctrl.c
-@@ -49,7 +49,7 @@ static int queue_interrupt_event(struct slot *p_slot, u32 event_type)
- 	info->p_slot = p_slot;
- 	INIT_WORK(&info->work, interrupt_event_handler);
- 
--	queue_work(pciehp_wq, &info->work);
-+	queue_work(p_slot->wq, &info->work);
- 
- 	return 0;
- }
-@@ -344,7 +344,7 @@ void pciehp_queue_pushbutton_work(struct work_struct *work)
- 		kfree(info);
- 		goto out;
- 	}
--	queue_work(pciehp_wq, &info->work);
-+	queue_work(p_slot->wq, &info->work);
-  out:
- 	mutex_unlock(&p_slot->lock);
- }
-@@ -377,7 +377,7 @@ static void handle_button_press_event(struct slot *p_slot)
- 		if (ATTN_LED(ctrl))
- 			pciehp_set_attention_status(p_slot, 0);
- 
--		queue_delayed_work(pciehp_wq, &p_slot->work, 5*HZ);
-+		queue_delayed_work(p_slot->wq, &p_slot->work, 5*HZ);
- 		break;
- 	case BLINKINGOFF_STATE:
- 	case BLINKINGON_STATE:
-@@ -439,7 +439,7 @@ static void handle_surprise_event(struct slot *p_slot)
- 	else
- 		p_slot->state = POWERON_STATE;
- 
--	queue_work(pciehp_wq, &info->work);
-+	queue_work(p_slot->wq, &info->work);
- }
- 
- static void interrupt_event_handler(struct work_struct *work)
-diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
-index 302451e..61632c5 100644
---- a/drivers/pci/hotplug/pciehp_hpc.c
-+++ b/drivers/pci/hotplug/pciehp_hpc.c
-@@ -773,23 +773,32 @@ static void pcie_shutdown_notification(struct controller *ctrl)
- static int pcie_init_slot(struct controller *ctrl)
- {
- 	struct slot *slot;
-+	char name[32];
- 
- 	slot = kzalloc(sizeof(*slot), GFP_KERNEL);
- 	if (!slot)
- 		return -ENOMEM;
- 
-+	snprintf(name, sizeof(name), "pciehp-%u", PSN(ctrl));
-+	slot->wq = alloc_workqueue(name, 0, 0);
-+	if (!slot->wq)
-+		goto abort;
-+
- 	slot->ctrl = ctrl;
- 	mutex_init(&slot->lock);
- 	INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);
- 	ctrl->slot = slot;
- 	return 0;
-+abort:
-+	kfree(slot);
-+	return -ENOMEM;
- }
- 
- static void pcie_cleanup_slot(struct controller *ctrl)
- {
- 	struct slot *slot = ctrl->slot;
- 	cancel_delayed_work(&slot->work);
--	flush_workqueue(pciehp_wq);
-+	destroy_workqueue(slot->wq);
- 	kfree(slot);
- }
- 
-diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
-index ca64932..1b69d95 100644
---- a/drivers/pci/hotplug/shpchp.h
-+++ b/drivers/pci/hotplug/shpchp.h
-@@ -47,7 +47,6 @@ extern bool shpchp_poll_mode;
- extern int shpchp_poll_time;
- extern bool shpchp_debug;
- extern struct workqueue_struct *shpchp_wq;
--extern struct workqueue_struct *shpchp_ordered_wq;
- 
- #define dbg(format, arg...)						\
- do {									\
-diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
-index b6de307..8c6d645 100644
---- a/drivers/pci/hotplug/shpchp_core.c
-+++ b/drivers/pci/hotplug/shpchp_core.c
-@@ -40,7 +40,6 @@ bool shpchp_debug;
- bool shpchp_poll_mode;
- int shpchp_poll_time;
- struct workqueue_struct *shpchp_wq;
--struct workqueue_struct *shpchp_ordered_wq;
- 
- #define DRIVER_VERSION	"0.4"
- #define DRIVER_AUTHOR	"Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
-@@ -181,7 +180,6 @@ void cleanup_slots(struct controller *ctrl)
- 		list_del(&slot->slot_list);
- 		cancel_delayed_work(&slot->work);
- 		flush_workqueue(shpchp_wq);
--		flush_workqueue(shpchp_ordered_wq);
- 		pci_hp_deregister(slot->hotplug_slot);
- 	}
- }
-@@ -370,17 +368,10 @@ static int __init shpcd_init(void)
- 	if (!shpchp_wq)
- 		return -ENOMEM;
- 
--	shpchp_ordered_wq = alloc_ordered_workqueue("shpchp_ordered", 0);
--	if (!shpchp_ordered_wq) {
--		destroy_workqueue(shpchp_wq);
--		return -ENOMEM;
--	}
--
- 	retval = pci_register_driver(&shpc_driver);
- 	dbg("%s: pci_register_driver = %d\n", __func__, retval);
- 	info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
- 	if (retval) {
--		destroy_workqueue(shpchp_ordered_wq);
- 		destroy_workqueue(shpchp_wq);
- 	}
- 	return retval;
-@@ -390,7 +381,6 @@ static void __exit shpcd_cleanup(void)
- {
- 	dbg("unload_shpchpd()\n");
- 	pci_unregister_driver(&shpc_driver);
--	destroy_workqueue(shpchp_ordered_wq);
- 	destroy_workqueue(shpchp_wq);
- 	info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");
- }
-diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
-index f9b5a52..fd2cae9 100644
---- a/drivers/pci/hotplug/shpchp_ctrl.c
-+++ b/drivers/pci/hotplug/shpchp_ctrl.c
-@@ -453,7 +453,7 @@ void shpchp_queue_pushbutton_work(struct work_struct *work)
- 		kfree(info);
- 		goto out;
- 	}
--	queue_work(shpchp_ordered_wq, &info->work);
-+	queue_work(shpchp_wq, &info->work);
-  out:
- 	mutex_unlock(&p_slot->lock);
- }
-diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
-index 1b7d05d..b0c92a5 100644
---- a/drivers/pci/pcie/aer/aerdrv_core.c
-+++ b/drivers/pci/pcie/aer/aerdrv_core.c
-@@ -649,6 +649,7 @@ static void aer_recover_work_func(struct work_struct *work)
- 			continue;
- 		}
- 		do_recovery(pdev, entry.severity);
-+		pci_dev_put(pdev);
- 	}
- }
- #endif
-diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
-index b500840..474f22f 100644
---- a/drivers/pci/pcie/aspm.c
-+++ b/drivers/pci/pcie/aspm.c
-@@ -798,6 +798,9 @@ void pcie_clear_aspm(struct pci_bus *bus)
- {
- 	struct pci_dev *child;
- 
-+	if (aspm_force)
-+		return;
-+
- 	/*
- 	 * Clear any ASPM setup that the firmware has carried out on this bus
- 	 */
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 5155317..161e7f0 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -2686,7 +2686,7 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
- 	if (PCI_FUNC(dev->devfn))
- 		return;
- 	/*
--	 * RICOH 0xe823 SD/MMC card reader fails to recognize
-+	 * RICOH 0xe822 and 0xe823 SD/MMC card readers fail to recognize
- 	 * certain types of SD/MMC cards. Lowering the SD base
- 	 * clock frequency from 200Mhz to 50Mhz fixes this issue.
- 	 *
-@@ -2697,7 +2697,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
- 	 * 0xf9  - Key register for 0x150
- 	 * 0xfc  - key register for 0xe1
- 	 */
--	if (dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
-+	if (dev->device == PCI_DEVICE_ID_RICOH_R5CE822 ||
-+	    dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
- 		pci_write_config_byte(dev, 0xf9, 0xfc);
- 		pci_write_config_byte(dev, 0x150, 0x10);
- 		pci_write_config_byte(dev, 0xf9, 0x00);
-@@ -2724,6 +2725,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
- }
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
- DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
-+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
-+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
- DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
- #endif /*CONFIG_MMC_RICOH_MMC*/
-diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
-index dd90d15..71623a2 100644
---- a/drivers/platform/x86/samsung-laptop.c
-+++ b/drivers/platform/x86/samsung-laptop.c
-@@ -1523,6 +1523,16 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = {
- 		},
- 	 .driver_data = &samsung_broken_acpi_video,
- 	},
-+	{
-+	 .callback = samsung_dmi_matched,
-+	 .ident = "N250P",
-+	 .matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "N250P"),
-+		DMI_MATCH(DMI_BOARD_NAME, "N250P"),
-+		},
-+	 .driver_data = &samsung_broken_acpi_video,
-+	},
- 	{ },
- };
- MODULE_DEVICE_TABLE(dmi, samsung_dmi_table);
-diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
-index e49871d..3c5c353 100644
---- a/drivers/pnp/pnpacpi/core.c
-+++ b/drivers/pnp/pnpacpi/core.c
-@@ -58,7 +58,7 @@ static inline int __init is_exclusive_device(struct acpi_device *dev)
- 	if (!(('0' <= (c) && (c) <= '9') || ('A' <= (c) && (c) <= 'F'))) \
- 		return 0
- #define TEST_ALPHA(c) \
--	if (!('@' <= (c) || (c) <= 'Z')) \
-+	if (!('A' <= (c) && (c) <= 'Z')) \
- 		return 0
- static int __init ispnpidacpi(const char *id)
- {
-diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
-index 7413885..d4b9b1e 100644
---- a/drivers/regulator/wm831x-dcdc.c
-+++ b/drivers/regulator/wm831x-dcdc.c
-@@ -290,7 +290,7 @@ static int wm831x_buckv_set_voltage_sel(struct regulator_dev *rdev,
- 	if (vsel > dcdc->dvs_vsel) {
- 		ret = wm831x_set_bits(wm831x, dvs_reg,
- 				      WM831X_DC1_DVS_VSEL_MASK,
--				      dcdc->dvs_vsel);
-+				      vsel);
- 		if (ret == 0)
- 			dcdc->dvs_vsel = vsel;
- 		else
-diff --git a/drivers/rtc/rtc-vt8500.c b/drivers/rtc/rtc-vt8500.c
-index 9e94fb1..44878da 100644
---- a/drivers/rtc/rtc-vt8500.c
-+++ b/drivers/rtc/rtc-vt8500.c
-@@ -69,7 +69,7 @@
- 				| ALARM_SEC_BIT)
- 
- #define VT8500_RTC_CR_ENABLE	(1 << 0)	/* Enable RTC */
--#define VT8500_RTC_CR_24H	(1 << 1)	/* 24h time format */
-+#define VT8500_RTC_CR_12H	(1 << 1)	/* 12h time format */
- #define VT8500_RTC_CR_SM_ENABLE	(1 << 2)	/* Enable periodic irqs */
- #define VT8500_RTC_CR_SM_SEC	(1 << 3)	/* 0: 1Hz/60, 1: 1Hz */
- #define VT8500_RTC_CR_CALIB	(1 << 4)	/* Enable calibration */
-@@ -118,7 +118,7 @@ static int vt8500_rtc_read_time(struct device *dev, struct rtc_time *tm)
- 	tm->tm_min = bcd2bin((time & TIME_MIN_MASK) >> TIME_MIN_S);
- 	tm->tm_hour = bcd2bin((time & TIME_HOUR_MASK) >> TIME_HOUR_S);
- 	tm->tm_mday = bcd2bin(date & DATE_DAY_MASK);
--	tm->tm_mon = bcd2bin((date & DATE_MONTH_MASK) >> DATE_MONTH_S);
-+	tm->tm_mon = bcd2bin((date & DATE_MONTH_MASK) >> DATE_MONTH_S) - 1;
- 	tm->tm_year = bcd2bin((date & DATE_YEAR_MASK) >> DATE_YEAR_S)
- 			+ ((date >> DATE_CENTURY_S) & 1 ? 200 : 100);
- 	tm->tm_wday = (time & TIME_DOW_MASK) >> TIME_DOW_S;
-@@ -137,8 +137,9 @@ static int vt8500_rtc_set_time(struct device *dev, struct rtc_time *tm)
- 	}
- 
- 	writel((bin2bcd(tm->tm_year - 100) << DATE_YEAR_S)
--		| (bin2bcd(tm->tm_mon) << DATE_MONTH_S)
--		| (bin2bcd(tm->tm_mday)),
-+		| (bin2bcd(tm->tm_mon + 1) << DATE_MONTH_S)
-+		| (bin2bcd(tm->tm_mday))
-+		| ((tm->tm_year >= 200) << DATE_CENTURY_S),
- 		vt8500_rtc->regbase + VT8500_RTC_DS);
- 	writel((bin2bcd(tm->tm_wday) << TIME_DOW_S)
- 		| (bin2bcd(tm->tm_hour) << TIME_HOUR_S)
-@@ -248,7 +249,7 @@ static int __devinit vt8500_rtc_probe(struct platform_device *pdev)
- 	}
- 
- 	/* Enable RTC and set it to 24-hour mode */
--	writel(VT8500_RTC_CR_ENABLE | VT8500_RTC_CR_24H,
-+	writel(VT8500_RTC_CR_ENABLE,
- 	       vt8500_rtc->regbase + VT8500_RTC_CR);
- 
- 	vt8500_rtc->rtc = rtc_device_register("vt8500-rtc", &pdev->dev,
-diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
-index 368368f..908d287 100644
---- a/drivers/s390/cio/device_pgid.c
-+++ b/drivers/s390/cio/device_pgid.c
-@@ -234,7 +234,7 @@ static int pgid_cmp(struct pgid *p1, struct pgid *p2)
-  * Determine pathgroup state from PGID data.
-  */
- static void pgid_analyze(struct ccw_device *cdev, struct pgid **p,
--			 int *mismatch, int *reserved, u8 *reset)
-+			 int *mismatch, u8 *reserved, u8 *reset)
- {
- 	struct pgid *pgid = &cdev->private->pgid[0];
- 	struct pgid *first = NULL;
-@@ -248,7 +248,7 @@ static void pgid_analyze(struct ccw_device *cdev, struct pgid **p,
- 		if ((cdev->private->pgid_valid_mask & lpm) == 0)
- 			continue;
- 		if (pgid->inf.ps.state2 == SNID_STATE2_RESVD_ELSE)
--			*reserved = 1;
-+			*reserved |= lpm;
- 		if (pgid_is_reset(pgid)) {
- 			*reset |= lpm;
- 			continue;
-@@ -316,14 +316,14 @@ static void snid_done(struct ccw_device *cdev, int rc)
- 	struct subchannel *sch = to_subchannel(cdev->dev.parent);
- 	struct pgid *pgid;
- 	int mismatch = 0;
--	int reserved = 0;
-+	u8 reserved = 0;
- 	u8 reset = 0;
- 	u8 donepm;
- 
- 	if (rc)
- 		goto out;
- 	pgid_analyze(cdev, &pgid, &mismatch, &reserved, &reset);
--	if (reserved)
-+	if (reserved == cdev->private->pgid_valid_mask)
- 		rc = -EUSERS;
- 	else if (mismatch)
- 		rc = -EOPNOTSUPP;
-@@ -336,7 +336,7 @@ static void snid_done(struct ccw_device *cdev, int rc)
- 	}
- out:
- 	CIO_MSG_EVENT(2, "snid: device 0.%x.%04x: rc=%d pvm=%02x vpm=%02x "
--		      "todo=%02x mism=%d rsvd=%d reset=%02x\n", id->ssid,
-+		      "todo=%02x mism=%d rsvd=%02x reset=%02x\n", id->ssid,
- 		      id->devno, rc, cdev->private->pgid_valid_mask, sch->vpm,
- 		      cdev->private->pgid_todo_mask, mismatch, reserved, reset);
- 	switch (rc) {
-diff --git a/drivers/scsi/mvsas/mv_94xx.h b/drivers/scsi/mvsas/mv_94xx.h
-index 8f7eb4f..487aa6f 100644
---- a/drivers/scsi/mvsas/mv_94xx.h
-+++ b/drivers/scsi/mvsas/mv_94xx.h
-@@ -258,21 +258,11 @@ enum sas_sata_phy_regs {
- #define SPI_ADDR_VLD_94XX         	(1U << 1)
- #define SPI_CTRL_SpiStart_94XX     	(1U << 0)
- 
--#define mv_ffc(x)   ffz(x)
--
- static inline int
- mv_ffc64(u64 v)
- {
--	int i;
--	i = mv_ffc((u32)v);
--	if (i >= 0)
--		return i;
--	i = mv_ffc((u32)(v>>32));
--
--	if (i != 0)
--		return 32 + i;
--
--	return -1;
-+	u64 x = ~v;
-+	return x ? __ffs64(x) : -1;
- }
- 
- #define r_reg_set_enable(i) \
-diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
-index 4539d59..a3776d6 100644
---- a/drivers/scsi/mvsas/mv_sas.c
-+++ b/drivers/scsi/mvsas/mv_sas.c
-@@ -1629,7 +1629,7 @@ int mvs_abort_task(struct sas_task *task)
- 			mv_dprintk("mvs_abort_task() mvi=%p task=%p "
- 				   "slot=%p slot_idx=x%x\n",
- 				   mvi, task, slot, slot_idx);
--			mvs_tmf_timedout((unsigned long)task);
-+			task->task_state_flags |= SAS_TASK_STATE_ABORTED;
- 			mvs_slot_task_free(mvi, task, slot, slot_idx);
- 			rc = TMF_RESP_FUNC_COMPLETE;
- 			goto out;
-diff --git a/drivers/scsi/mvsas/mv_sas.h b/drivers/scsi/mvsas/mv_sas.h
-index c04a4f5..da24955 100644
---- a/drivers/scsi/mvsas/mv_sas.h
-+++ b/drivers/scsi/mvsas/mv_sas.h
-@@ -69,7 +69,7 @@ extern struct kmem_cache *mvs_task_list_cache;
- #define DEV_IS_EXPANDER(type)	\
- 	((type == EDGE_DEV) || (type == FANOUT_DEV))
- 
--#define bit(n) ((u32)1 << n)
-+#define bit(n) ((u64)1 << n)
- 
- #define for_each_phy(__lseq_mask, __mc, __lseq)			\
- 	for ((__mc) = (__lseq_mask), (__lseq) = 0;		\
-diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
-index fb8cd38..0076210 100644
---- a/drivers/scsi/qla2xxx/qla_os.c
-+++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -3801,9 +3801,9 @@ qla2x00_do_dpc(void *data)
- 			    "ISP abort end.\n");
- 		}
- 
--		if (test_bit(FCPORT_UPDATE_NEEDED, &base_vha->dpc_flags)) {
-+		if (test_and_clear_bit(FCPORT_UPDATE_NEEDED,
-+		    &base_vha->dpc_flags)) {
- 			qla2x00_update_fcports(base_vha);
--			clear_bit(FCPORT_UPDATE_NEEDED, &base_vha->dpc_flags);
- 		}
- 
- 		if (test_bit(SCR_PENDING, &base_vha->dpc_flags)) {
-diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
-index ce5224c..931a7d9 100644
---- a/drivers/scsi/scsi_sysfs.c
-+++ b/drivers/scsi/scsi_sysfs.c
-@@ -247,11 +247,11 @@ show_shost_active_mode(struct device *dev,
- 
- static DEVICE_ATTR(active_mode, S_IRUGO | S_IWUSR, show_shost_active_mode, NULL);
- 
--static int check_reset_type(char *str)
-+static int check_reset_type(const char *str)
- {
--	if (strncmp(str, "adapter", 10) == 0)
-+	if (sysfs_streq(str, "adapter"))
- 		return SCSI_ADAPTER_RESET;
--	else if (strncmp(str, "firmware", 10) == 0)
-+	else if (sysfs_streq(str, "firmware"))
- 		return SCSI_FIRMWARE_RESET;
- 	else
- 		return 0;
-@@ -264,12 +264,9 @@ store_host_reset(struct device *dev, struct device_attribute *attr,
- 	struct Scsi_Host *shost = class_to_shost(dev);
- 	struct scsi_host_template *sht = shost->hostt;
- 	int ret = -EINVAL;
--	char str[10];
- 	int type;
- 
--	sscanf(buf, "%s", str);
--	type = check_reset_type(str);
--
-+	type = check_reset_type(buf);
- 	if (!type)
- 		goto exit_store_host_reset;
- 
-diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 4df73e5..8afedd6 100644
---- a/drivers/scsi/sd.c
-+++ b/drivers/scsi/sd.c
-@@ -2926,10 +2926,6 @@ static int __init init_sd(void)
- 	if (err)
- 		goto err_out;
- 
--	err = scsi_register_driver(&sd_template.gendrv);
--	if (err)
--		goto err_out_class;
--
- 	sd_cdb_cache = kmem_cache_create("sd_ext_cdb", SD_EXT_CDB_SIZE,
- 					 0, 0, NULL);
- 	if (!sd_cdb_cache) {
-@@ -2943,8 +2939,15 @@ static int __init init_sd(void)
- 		goto err_out_cache;
- 	}
- 
-+	err = scsi_register_driver(&sd_template.gendrv);
-+	if (err)
-+		goto err_out_driver;
-+
- 	return 0;
- 
-+err_out_driver:
-+	mempool_destroy(sd_cdb_pool);
-+
- err_out_cache:
- 	kmem_cache_destroy(sd_cdb_cache);
- 
-@@ -2967,10 +2970,10 @@ static void __exit exit_sd(void)
- 
- 	SCSI_LOG_HLQUEUE(3, printk("exit_sd: exiting sd driver\n"));
- 
-+	scsi_unregister_driver(&sd_template.gendrv);
- 	mempool_destroy(sd_cdb_pool);
- 	kmem_cache_destroy(sd_cdb_cache);
- 
--	scsi_unregister_driver(&sd_template.gendrv);
- 	class_unregister(&sd_disk_class);
- 
- 	for (i = 0; i < SD_MAJORS; i++)
-diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
-index 6cee785..2701546 100644
---- a/drivers/staging/comedi/Kconfig
-+++ b/drivers/staging/comedi/Kconfig
-@@ -444,6 +444,7 @@ config COMEDI_ADQ12B
- 
- config COMEDI_NI_AT_A2150
- 	tristate "NI AT-A2150 ISA card support"
-+	select COMEDI_FC
- 	depends on VIRT_TO_BUS
- 	---help---
- 	  Enable support for National Instruments AT-A2150 cards
-diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
-index 41dea18..260441c 100644
---- a/drivers/staging/comedi/comedi_fops.c
-+++ b/drivers/staging/comedi/comedi_fops.c
-@@ -1547,6 +1547,9 @@ static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
- 	if (cmd == COMEDI_DEVCONFIG) {
- 		rc = do_devconfig_ioctl(dev,
- 					(struct comedi_devconfig __user *)arg);
-+		if (rc == 0)
-+			/* Evade comedi_auto_unconfig(). */
-+			dev_file_info->hardware_device = NULL;
- 		goto done;
- 	}
- 
-diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c
-index 523a809..e38bd64 100644
---- a/drivers/staging/comedi/drivers/comedi_test.c
-+++ b/drivers/staging/comedi/drivers/comedi_test.c
-@@ -396,7 +396,7 @@ static int waveform_ai_cancel(struct comedi_device *dev,
- 			      struct comedi_subdevice *s)
- {
- 	devpriv->timer_running = 0;
--	del_timer(&devpriv->timer);
-+	del_timer_sync(&devpriv->timer);
- 	return 0;
- }
- 
-diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
-index 89f4d43..af5007c 100644
---- a/drivers/staging/comedi/drivers/ni_pcimio.c
-+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
-@@ -963,7 +963,7 @@ static const struct ni_board_struct ni_boards[] = {
- 	 .ao_range_table = &range_ni_M_625x_ao,
- 	 .reg_type = ni_reg_625x,
- 	 .ao_unipolar = 0,
--	 .ao_speed = 357,
-+	 .ao_speed = 350,
- 	 .num_p0_dio_channels = 8,
- 	 .caldac = {caldac_none},
- 	 .has_8255 = 0,
-@@ -982,7 +982,7 @@ static const struct ni_board_struct ni_boards[] = {
- 	 .ao_range_table = &range_ni_M_625x_ao,
- 	 .reg_type = ni_reg_625x,
- 	 .ao_unipolar = 0,
--	 .ao_speed = 357,
-+	 .ao_speed = 350,
- 	 .num_p0_dio_channels = 8,
- 	 .caldac = {caldac_none},
- 	 .has_8255 = 0,
-@@ -1001,7 +1001,7 @@ static const struct ni_board_struct ni_boards[] = {
- 	 .ao_range_table = &range_ni_M_625x_ao,
- 	 .reg_type = ni_reg_625x,
- 	 .ao_unipolar = 0,
--	 .ao_speed = 357,
-+	 .ao_speed = 350,
- 	 .num_p0_dio_channels = 8,
- 	 .caldac = {caldac_none},
- 	 .has_8255 = 0,
-@@ -1037,7 +1037,7 @@ static const struct ni_board_struct ni_boards[] = {
- 	 .ao_range_table = &range_ni_M_625x_ao,
- 	 .reg_type = ni_reg_625x,
- 	 .ao_unipolar = 0,
--	 .ao_speed = 357,
-+	 .ao_speed = 350,
- 	 .num_p0_dio_channels = 32,
- 	 .caldac = {caldac_none},
- 	 .has_8255 = 0,
-@@ -1056,7 +1056,7 @@ static const struct ni_board_struct ni_boards[] = {
- 	 .ao_range_table = &range_ni_M_625x_ao,
- 	 .reg_type = ni_reg_625x,
- 	 .ao_unipolar = 0,
--	 .ao_speed = 357,
-+	 .ao_speed = 350,
- 	 .num_p0_dio_channels = 32,
- 	 .caldac = {caldac_none},
- 	 .has_8255 = 0,
-@@ -1092,7 +1092,7 @@ static const struct ni_board_struct ni_boards[] = {
- 	 .ao_range_table = &range_ni_M_628x_ao,
- 	 .reg_type = ni_reg_628x,
- 	 .ao_unipolar = 1,
--	 .ao_speed = 357,
-+	 .ao_speed = 350,
- 	 .num_p0_dio_channels = 8,
- 	 .caldac = {caldac_none},
- 	 .has_8255 = 0,
-@@ -1111,7 +1111,7 @@ static const struct ni_board_struct ni_boards[] = {
- 	 .ao_range_table = &range_ni_M_628x_ao,
- 	 .reg_type = ni_reg_628x,
- 	 .ao_unipolar = 1,
--	 .ao_speed = 357,
-+	 .ao_speed = 350,
- 	 .num_p0_dio_channels = 8,
- 	 .caldac = {caldac_none},
- 	 .has_8255 = 0,
-@@ -1147,7 +1147,7 @@ static const struct ni_board_struct ni_boards[] = {
- 	 .ao_range_table = &range_ni_M_628x_ao,
- 	 .reg_type = ni_reg_628x,
- 	 .ao_unipolar = 1,
--	 .ao_speed = 357,
-+	 .ao_speed = 350,
- 	 .num_p0_dio_channels = 32,
- 	 .caldac = {caldac_none},
- 	 .has_8255 = 0,
-diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
-index c758c40..ad53781 100644
---- a/drivers/staging/rtl8712/usb_intf.c
-+++ b/drivers/staging/rtl8712/usb_intf.c
-@@ -64,6 +64,8 @@ static struct usb_device_id rtl871x_usb_id_tbl[] = {
- 	{USB_DEVICE(0x0B05, 0x1791)}, /* 11n mode disable */
- 	/* Belkin */
- 	{USB_DEVICE(0x050D, 0x945A)},
-+	/* ISY IWL - Belkin clone */
-+	{USB_DEVICE(0x050D, 0x11F1)},
- 	/* Corega */
- 	{USB_DEVICE(0x07AA, 0x0047)},
- 	/* D-Link */
-diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
-index df95337..7616f05 100644
---- a/drivers/staging/speakup/synth.c
-+++ b/drivers/staging/speakup/synth.c
-@@ -342,7 +342,7 @@ int synth_init(char *synth_name)
- 
- 	mutex_lock(&spk_mutex);
- 	/* First, check if we already have it loaded. */
--	for (i = 0; synths[i] != NULL && i < MAXSYNTHS; i++)
-+	for (i = 0; i < MAXSYNTHS && synths[i] != NULL; i++)
- 		if (strcmp(synths[i]->name, synth_name) == 0)
- 			synth = synths[i];
- 
-@@ -423,7 +423,7 @@ int synth_add(struct spk_synth *in_synth)
- 	int i;
- 	int status = 0;
- 	mutex_lock(&spk_mutex);
--	for (i = 0; synths[i] != NULL && i < MAXSYNTHS; i++)
-+	for (i = 0; i < MAXSYNTHS && synths[i] != NULL; i++)
- 		/* synth_remove() is responsible for rotating the array down */
- 		if (in_synth == synths[i]) {
- 			mutex_unlock(&spk_mutex);
-diff --git a/drivers/staging/vt6656/bssdb.h b/drivers/staging/vt6656/bssdb.h
-index 6b2ec39..806cbf7 100644
---- a/drivers/staging/vt6656/bssdb.h
-+++ b/drivers/staging/vt6656/bssdb.h
-@@ -90,7 +90,6 @@ typedef struct tagSRSNCapObject {
- } SRSNCapObject, *PSRSNCapObject;
- 
- // BSS info(AP)
--#pragma pack(1)
- typedef struct tagKnownBSS {
-     // BSS info
-     BOOL            bActive;
-diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
-index 3aa895e..a510b29 100644
---- a/drivers/staging/vt6656/dpc.c
-+++ b/drivers/staging/vt6656/dpc.c
-@@ -1238,7 +1238,7 @@ static BOOL s_bHandleRxEncryption (
- 
-         PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc
-         *pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4));
--        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16);
-+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %x\n", *pdwRxTSC47_16);
-         if (byDecMode == KEY_CTL_TKIP) {
-             *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));
-         } else {
-@@ -1349,7 +1349,7 @@ static BOOL s_bHostWepRxEncryption (
- 
-         PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc
-         *pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4));
--        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16);
-+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %x\n", *pdwRxTSC47_16);
- 
-         if (byDecMode == KEY_CTL_TKIP) {
-             *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));
-diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h
-index 3734e2c..91ceb77 100644
---- a/drivers/staging/vt6656/int.h
-+++ b/drivers/staging/vt6656/int.h
-@@ -34,7 +34,6 @@
- #include "device.h"
- 
- /*---------------------  Export Definitions -------------------------*/
--#pragma pack(1)
- typedef struct tagSINTData {
- 	BYTE byTSR0;
- 	BYTE byPkt0;
-diff --git a/drivers/staging/vt6656/iocmd.h b/drivers/staging/vt6656/iocmd.h
-index 22710ce..ae6e2d2 100644
---- a/drivers/staging/vt6656/iocmd.h
-+++ b/drivers/staging/vt6656/iocmd.h
-@@ -95,13 +95,12 @@ typedef enum tagWZONETYPE {
- // Ioctl interface structure
- // Command structure
- //
--#pragma pack(1)
- typedef struct tagSCmdRequest {
- 	u8 name[16];
- 	void	*data;
- 	u16	    wResult;
- 	u16     wCmdCode;
--} SCmdRequest, *PSCmdRequest;
-+} __packed SCmdRequest, *PSCmdRequest;
- 
- //
- // Scan
-@@ -111,7 +110,7 @@ typedef struct tagSCmdScan {
- 
-     u8	    ssid[SSID_MAXLEN + 2];
- 
--} SCmdScan, *PSCmdScan;
-+} __packed SCmdScan, *PSCmdScan;
- 
- //
- // BSS Join
-@@ -126,7 +125,7 @@ typedef struct tagSCmdBSSJoin {
-     BOOL    bPSEnable;
-     BOOL    bShareKeyAuth;
- 
--} SCmdBSSJoin, *PSCmdBSSJoin;
-+} __packed SCmdBSSJoin, *PSCmdBSSJoin;
- 
- //
- // Zonetype Setting
-@@ -137,7 +136,7 @@ typedef struct tagSCmdZoneTypeSet {
-  BOOL       bWrite;
-  WZONETYPE  ZoneType;
- 
--} SCmdZoneTypeSet, *PSCmdZoneTypeSet;
-+} __packed SCmdZoneTypeSet, *PSCmdZoneTypeSet;
- 
- typedef struct tagSWPAResult {
-          char	ifname[100];
-@@ -145,7 +144,7 @@ typedef struct tagSWPAResult {
- 	u8 key_mgmt;
- 	u8 eap_type;
-          BOOL authenticated;
--} SWPAResult, *PSWPAResult;
-+} __packed SWPAResult, *PSWPAResult;
- 
- typedef struct tagSCmdStartAP {
- 
-@@ -157,7 +156,7 @@ typedef struct tagSCmdStartAP {
-     BOOL    bShareKeyAuth;
-     u8      byBasicRate;
- 
--} SCmdStartAP, *PSCmdStartAP;
-+} __packed SCmdStartAP, *PSCmdStartAP;
- 
- typedef struct tagSCmdSetWEP {
- 
-@@ -167,7 +166,7 @@ typedef struct tagSCmdSetWEP {
-     BOOL    bWepKeyAvailable[WEP_NKEYS];
-     u32     auWepKeyLength[WEP_NKEYS];
- 
--} SCmdSetWEP, *PSCmdSetWEP;
-+} __packed SCmdSetWEP, *PSCmdSetWEP;
- 
- typedef struct tagSBSSIDItem {
- 
-@@ -180,14 +179,14 @@ typedef struct tagSBSSIDItem {
-     BOOL    bWEPOn;
-     u32     uRSSI;
- 
--} SBSSIDItem;
-+} __packed SBSSIDItem;
- 
- 
- typedef struct tagSBSSIDList {
- 
- 	u32		    uItem;
- 	SBSSIDItem	sBSSIDList[0];
--} SBSSIDList, *PSBSSIDList;
-+} __packed SBSSIDList, *PSBSSIDList;
- 
- 
- typedef struct tagSNodeItem {
-@@ -208,7 +207,7 @@ typedef struct tagSNodeItem {
-     u32            uTxAttempts;
-     u16            wFailureRatio;
- 
--} SNodeItem;
-+} __packed SNodeItem;
- 
- 
- typedef struct tagSNodeList {
-@@ -216,7 +215,7 @@ typedef struct tagSNodeList {
- 	u32		    uItem;
- 	SNodeItem	sNodeList[0];
- 
--} SNodeList, *PSNodeList;
-+} __packed SNodeList, *PSNodeList;
- 
- 
- typedef struct tagSCmdLinkStatus {
-@@ -229,7 +228,7 @@ typedef struct tagSCmdLinkStatus {
-     u32     uChannel;
-     u32     uLinkRate;
- 
--} SCmdLinkStatus, *PSCmdLinkStatus;
-+} __packed SCmdLinkStatus, *PSCmdLinkStatus;
- 
- //
- // 802.11 counter
-@@ -247,7 +246,7 @@ typedef struct tagSDot11MIBCount {
-     u32 ReceivedFragmentCount;
-     u32 MulticastReceivedFrameCount;
-     u32 FCSErrorCount;
--} SDot11MIBCount, *PSDot11MIBCount;
-+} __packed SDot11MIBCount, *PSDot11MIBCount;
- 
- 
- 
-@@ -355,13 +354,13 @@ typedef struct tagSStatMIBCount {
-     u32   ullTxBroadcastBytes[2];
-     u32   ullTxMulticastBytes[2];
-     u32   ullTxDirectedBytes[2];
--} SStatMIBCount, *PSStatMIBCount;
-+} __packed SStatMIBCount, *PSStatMIBCount;
- 
- typedef struct tagSCmdValue {
- 
-     u32     dwValue;
- 
--} SCmdValue,  *PSCmdValue;
-+} __packed SCmdValue,  *PSCmdValue;
- 
- //
- // hostapd & viawget ioctl related
-@@ -431,7 +430,7 @@ struct viawget_hostapd_param {
- 			u8 ssid[32];
- 		} scan_req;
- 	} u;
--};
-+} __packed;
- 
- /*---------------------  Export Classes  ----------------------------*/
- 
-diff --git a/drivers/staging/vt6656/iowpa.h b/drivers/staging/vt6656/iowpa.h
-index 959c886..2522dde 100644
---- a/drivers/staging/vt6656/iowpa.h
-+++ b/drivers/staging/vt6656/iowpa.h
-@@ -67,12 +67,11 @@ enum {
- 
- 
- 
--#pragma pack(1)
- typedef struct viawget_wpa_header {
- 	u8 type;
- 	u16 req_ie_len;
- 	u16 resp_ie_len;
--} viawget_wpa_header;
-+} __packed viawget_wpa_header;
- 
- struct viawget_wpa_param {
- 	u32 cmd;
-@@ -113,9 +112,8 @@ struct viawget_wpa_param {
- 			u8 *buf;
- 		} scan_results;
- 	} u;
--};
-+} __packed;
- 
--#pragma pack(1)
- struct viawget_scan_result {
- 	u8 bssid[6];
- 	u8 ssid[32];
-@@ -130,7 +128,7 @@ struct viawget_scan_result {
- 	int noise;
- 	int level;
- 	int maxrate;
--};
-+} __packed;
- 
- /*---------------------  Export Classes  ----------------------------*/
- 
-diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c
-index ee62a06..ba3a561 100644
---- a/drivers/staging/vt6656/key.c
-+++ b/drivers/staging/vt6656/key.c
-@@ -223,7 +223,7 @@ BOOL KeybSetKey(
-     PSKeyManagement pTable,
-     PBYTE           pbyBSSID,
-     DWORD           dwKeyIndex,
--    unsigned long           uKeyLength,
-+	u32 uKeyLength,
-     PQWORD          pKeyRSC,
-     PBYTE           pbyKey,
-     BYTE            byKeyDecMode
-@@ -235,7 +235,8 @@ BOOL KeybSetKey(
-     PSKeyItem   pKey;
-     unsigned int        uKeyIdx;
- 
--    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetKey: %lX\n", dwKeyIndex);
-+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
-+		"Enter KeybSetKey: %X\n", dwKeyIndex);
- 
-     j = (MAX_KEY_TABLE-1);
-     for (i=0;i<(MAX_KEY_TABLE-1);i++) {
-@@ -261,7 +262,9 @@ BOOL KeybSetKey(
-                 if ((dwKeyIndex & TRANSMIT_KEY) != 0)  {
-                     // Group transmit key
-                     pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex;
--                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i);
-+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
-+				"Group transmit key(R)[%X]: %d\n",
-+					pTable->KeyTable[i].dwGTKeyIndex, i);
-                 }
-                 pTable->KeyTable[i].wKeyCtl &= 0xFF0F;          // clear group key control filed
-                 pTable->KeyTable[i].wKeyCtl |= (byKeyDecMode << 4);
-@@ -302,9 +305,12 @@ BOOL KeybSetKey(
-             }
-             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
- 
--            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16);
--            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0);
--            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex);
-+		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n ",
-+			pKey->dwTSC47_16);
-+		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ",
-+			pKey->wTSC15_0);
-+		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n ",
-+			pKey->dwKeyIndex);
- 
-             return (TRUE);
-         }
-@@ -326,7 +332,9 @@ BOOL KeybSetKey(
-             if ((dwKeyIndex & TRANSMIT_KEY) != 0)  {
-                 // Group transmit key
-                 pTable->KeyTable[j].dwGTKeyIndex = dwKeyIndex;
--                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(N)[%lX]: %d\n", pTable->KeyTable[j].dwGTKeyIndex, j);
-+		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
-+			"Group transmit key(N)[%X]: %d\n",
-+				pTable->KeyTable[j].dwGTKeyIndex, j);
-             }
-             pTable->KeyTable[j].wKeyCtl &= 0xFF0F;          // clear group key control filed
-             pTable->KeyTable[j].wKeyCtl |= (byKeyDecMode << 4);
-@@ -367,9 +375,11 @@ BOOL KeybSetKey(
-         }
-         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
- 
--        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16);
-+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n ",
-+		pKey->dwTSC47_16);
-         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0);
--        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex);
-+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n ",
-+		pKey->dwKeyIndex);
- 
-         return (TRUE);
-     }
-@@ -597,7 +607,8 @@ BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType,
-                             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%x ", pTable->KeyTable[i].abyBSSID[ii]);
-                         }
-                         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
--                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwGTKeyIndex: %lX\n", pTable->KeyTable[i].dwGTKeyIndex);
-+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwGTKeyIndex: %X\n",
-+				pTable->KeyTable[i].dwGTKeyIndex);
- 
-                     return (TRUE);
-                 }
-@@ -664,7 +675,7 @@ BOOL KeybSetDefaultKey(
-     void *pDeviceHandler,
-     PSKeyManagement pTable,
-     DWORD           dwKeyIndex,
--    unsigned long           uKeyLength,
-+	u32 uKeyLength,
-     PQWORD          pKeyRSC,
-     PBYTE           pbyKey,
-     BYTE            byKeyDecMode
-@@ -696,7 +707,10 @@ BOOL KeybSetDefaultKey(
-     if ((dwKeyIndex & TRANSMIT_KEY) != 0)  {
-         // Group transmit key
-         pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex = dwKeyIndex;
--        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex, MAX_KEY_TABLE-1);
-+		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
-+		"Group transmit key(R)[%X]: %d\n",
-+		pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex,
-+		MAX_KEY_TABLE-1);
- 
-     }
-     pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl &= 0x7F00;          // clear all key control filed
-@@ -747,9 +761,11 @@ BOOL KeybSetDefaultKey(
-     }
-     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
- 
--    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n", pKey->dwTSC47_16);
-+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %x\n",
-+		pKey->dwTSC47_16);
-     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n", pKey->wTSC15_0);
--    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n", pKey->dwKeyIndex);
-+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %x\n",
-+		pKey->dwKeyIndex);
- 
-     return (TRUE);
- }
-@@ -775,7 +791,7 @@ BOOL KeybSetAllGroupKey(
-     void *pDeviceHandler,
-     PSKeyManagement pTable,
-     DWORD           dwKeyIndex,
--    unsigned long           uKeyLength,
-+	u32 uKeyLength,
-     PQWORD          pKeyRSC,
-     PBYTE           pbyKey,
-     BYTE            byKeyDecMode
-@@ -787,7 +803,8 @@ BOOL KeybSetAllGroupKey(
-     PSKeyItem   pKey;
-     unsigned int        uKeyIdx;
- 
--    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex);
-+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %X\n",
-+		dwKeyIndex);
- 
- 
-     if ((dwKeyIndex & PAIRWISE_KEY) != 0) {                  // Pairwise key
-@@ -804,7 +821,9 @@ BOOL KeybSetAllGroupKey(
-             if ((dwKeyIndex & TRANSMIT_KEY) != 0)  {
-                 // Group transmit key
-                 pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex;
--                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i);
-+		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
-+			"Group transmit key(R)[%X]: %d\n",
-+			pTable->KeyTable[i].dwGTKeyIndex, i);
- 
-             }
-             pTable->KeyTable[i].wKeyCtl &= 0xFF0F;          // clear group key control filed
-diff --git a/drivers/staging/vt6656/key.h b/drivers/staging/vt6656/key.h
-index f749c7a..bd35d39 100644
---- a/drivers/staging/vt6656/key.h
-+++ b/drivers/staging/vt6656/key.h
-@@ -58,7 +58,7 @@
- typedef struct tagSKeyItem
- {
-     BOOL        bKeyValid;
--    unsigned long       uKeyLength;
-+	u32 uKeyLength;
-     BYTE        abyKey[MAX_KEY_LEN];
-     QWORD       KeyRSC;
-     DWORD       dwTSC47_16;
-@@ -107,7 +107,7 @@ BOOL KeybSetKey(
-     PSKeyManagement pTable,
-     PBYTE           pbyBSSID,
-     DWORD           dwKeyIndex,
--    unsigned long           uKeyLength,
-+	u32 uKeyLength,
-     PQWORD          pKeyRSC,
-     PBYTE           pbyKey,
-     BYTE            byKeyDecMode
-@@ -146,7 +146,7 @@ BOOL KeybSetDefaultKey(
-     void *pDeviceHandler,
-     PSKeyManagement pTable,
-     DWORD           dwKeyIndex,
--    unsigned long           uKeyLength,
-+	u32 uKeyLength,
-     PQWORD          pKeyRSC,
-     PBYTE           pbyKey,
-     BYTE            byKeyDecMode
-@@ -156,7 +156,7 @@ BOOL KeybSetAllGroupKey(
-     void *pDeviceHandler,
-     PSKeyManagement pTable,
-     DWORD           dwKeyIndex,
--    unsigned long           uKeyLength,
-+	u32 uKeyLength,
-     PQWORD          pKeyRSC,
-     PBYTE           pbyKey,
-     BYTE            byKeyDecMode
-diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
-index af4a29d..8fddc7b 100644
---- a/drivers/staging/vt6656/mac.c
-+++ b/drivers/staging/vt6656/mac.c
-@@ -260,7 +260,8 @@ BYTE            pbyData[24];
-     dwData1 <<= 16;
-     dwData1 |= MAKEWORD(*(pbyAddr+4), *(pbyAddr+5));
- 
--    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %lX, KeyCtl:%X\n", wOffset, dwData1, wKeyCtl);
-+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %X,"\
-+		" KeyCtl:%X\n", wOffset, dwData1, wKeyCtl);
- 
-     //VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
-     //VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
-@@ -277,7 +278,8 @@ BYTE            pbyData[24];
-     dwData2 <<= 8;
-     dwData2 |= *(pbyAddr+0);
- 
--    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2. wOffset: %d, Data: %lX\n", wOffset, dwData2);
-+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2. wOffset: %d, Data: %X\n",
-+		wOffset, dwData2);
- 
-     //VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
-     //VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
-diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
-index 3fd0478..8cf0881 100644
---- a/drivers/staging/vt6656/rf.c
-+++ b/drivers/staging/vt6656/rf.c
-@@ -769,6 +769,9 @@ BYTE    byPwr = pDevice->byCCKPwr;
-         return TRUE;
-     }
- 
-+	if (uCH == 0)
-+		return -EINVAL;
-+
-     switch (uRATE) {
-     case RATE_1M:
-     case RATE_2M:
-diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
-index b6e04e7..7a56929 100644
---- a/drivers/staging/vt6656/rxtx.c
-+++ b/drivers/staging/vt6656/rxtx.c
-@@ -375,7 +375,8 @@ s_vFillTxKey (
-         *(pbyIVHead+3) = (BYTE)(((pDevice->byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV
-         // Append IV&ExtIV after Mac Header
-         *pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16);
--        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %lx\n", *pdwExtIV);
-+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %x\n",
-+		*pdwExtIV);
- 
-     } else if (pTransmitKey->byCipherSuite == KEY_CTL_CCMP) {
-         pTransmitKey->wTSC15_0++;
-@@ -1751,7 +1752,8 @@ s_bPacketToWirelessUsb(
-         MIC_vAppend((PBYTE)&(psEthHeader->abyDstAddr[0]), 12);
-         dwMIC_Priority = 0;
-         MIC_vAppend((PBYTE)&dwMIC_Priority, 4);
--        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC KEY: %lX, %lX\n", dwMICKey0, dwMICKey1);
-+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC KEY: %X, %X\n",
-+		dwMICKey0, dwMICKey1);
- 
-         ///////////////////////////////////////////////////////////////////
- 
-@@ -2633,7 +2635,8 @@ vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb) {
-             MIC_vAppend((PBYTE)&(sEthHeader.abyDstAddr[0]), 12);
-             dwMIC_Priority = 0;
-             MIC_vAppend((PBYTE)&dwMIC_Priority, 4);
--            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0_tx_8021:MIC KEY: %lX, %lX\n", dwMICKey0, dwMICKey1);
-+		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0_tx_8021:MIC KEY:"\
-+			" %X, %X\n", dwMICKey0, dwMICKey1);
- 
-             uLength = cbHeaderSize + cbMacHdLen + uPadding + cbIVlen;
- 
-@@ -2653,7 +2656,8 @@ vDMA0_tx_80211(PSDevice  pDevice, struct sk_buff *skb) {
- 
-             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"uLength: %d, %d\n", uLength, cbFrameBodySize);
-             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"cbReqCount:%d, %d, %d, %d\n", cbReqCount, cbHeaderSize, uPadding, cbIVlen);
--            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC:%lx, %lx\n", *pdwMIC_L, *pdwMIC_R);
-+		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC:%x, %x\n",
-+			*pdwMIC_L, *pdwMIC_R);
- 
-         }
- 
-@@ -3027,7 +3031,8 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
-                         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"error: KEY is GTK!!~~\n");
-                     }
-                     else {
--                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%lX]\n", pTransmitKey->dwKeyIndex);
-+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%X]\n",
-+				pTransmitKey->dwKeyIndex);
-                         bNeedEncryption = TRUE;
-                     }
-                 }
-@@ -3041,7 +3046,8 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
-             if (pDevice->bEnableHostWEP) {
-                 if ((uNodeIndex != 0) &&
-                     (pMgmt->sNodeDBTable[uNodeIndex].dwKeyIndex & PAIRWISE_KEY)) {
--                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%lX]\n", pTransmitKey->dwKeyIndex);
-+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%X]\n",
-+				pTransmitKey->dwKeyIndex);
-                     bNeedEncryption = TRUE;
-                  }
-              }
-diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h
-index 8e9450e..dfbf747 100644
---- a/drivers/staging/vt6656/ttype.h
-+++ b/drivers/staging/vt6656/ttype.h
-@@ -29,6 +29,8 @@
- #ifndef __TTYPE_H__
- #define __TTYPE_H__
- 
-+#include <linux/types.h>
-+
- /******* Common definitions and typedefs ***********************************/
- 
- typedef int             BOOL;
-@@ -42,17 +44,17 @@ typedef int             BOOL;
- 
- /****** Simple typedefs  ***************************************************/
- 
--typedef unsigned char   BYTE;           //  8-bit
--typedef unsigned short  WORD;           // 16-bit
--typedef unsigned long   DWORD;          // 32-bit
-+typedef u8 BYTE;
-+typedef u16 WORD;
-+typedef u32 DWORD;
- 
- // QWORD is for those situation that we want
- // an 8-byte-aligned 8 byte long structure
- // which is NOT really a floating point number.
- typedef union tagUQuadWord {
-     struct {
--        DWORD   dwLowDword;
--        DWORD   dwHighDword;
-+	u32 dwLowDword;
-+	u32 dwHighDword;
-     } u;
-     double      DoNotUseThisField;
- } UQuadWord;
-@@ -60,8 +62,8 @@ typedef UQuadWord       QWORD;          // 64-bit
- 
- /****** Common pointer types ***********************************************/
- 
--typedef unsigned long   ULONG_PTR;      // 32-bit
--typedef unsigned long   DWORD_PTR;      // 32-bit
-+typedef u32 ULONG_PTR;
-+typedef u32 DWORD_PTR;
- 
- // boolean pointer
- 
-diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
-index 9d2caa8..2225b9e 100644
---- a/drivers/staging/vt6656/wcmd.c
-+++ b/drivers/staging/vt6656/wcmd.c
-@@ -316,17 +316,19 @@ s_MgrMakeProbeRequest(
-     return pTxPacket;
- }
- 
--void vCommandTimerWait(void *hDeviceContext, unsigned int MSecond)
-+void vCommandTimerWait(void *hDeviceContext, unsigned long MSecond)
- {
--    PSDevice        pDevice = (PSDevice)hDeviceContext;
-+	PSDevice pDevice = (PSDevice)hDeviceContext;
- 
--    init_timer(&pDevice->sTimerCommand);
--    pDevice->sTimerCommand.data = (unsigned long)pDevice;
--    pDevice->sTimerCommand.function = (TimerFunction)vRunCommand;
--    // RUN_AT :1 msec ~= (HZ/1024)
--    pDevice->sTimerCommand.expires = (unsigned int)RUN_AT((MSecond * HZ) >> 10);
--    add_timer(&pDevice->sTimerCommand);
--    return;
-+	init_timer(&pDevice->sTimerCommand);
-+
-+	pDevice->sTimerCommand.data = (unsigned long)pDevice;
-+	pDevice->sTimerCommand.function = (TimerFunction)vRunCommand;
-+	pDevice->sTimerCommand.expires = RUN_AT((MSecond * HZ) / 1000);
-+
-+	add_timer(&pDevice->sTimerCommand);
-+
-+	return;
- }
- 
- void vRunCommand(void *hDeviceContext)
-diff --git a/drivers/staging/vt6656/wpa2.h b/drivers/staging/vt6656/wpa2.h
-index 46c2959..c359252 100644
---- a/drivers/staging/vt6656/wpa2.h
-+++ b/drivers/staging/vt6656/wpa2.h
-@@ -45,8 +45,8 @@ typedef struct tagsPMKIDInfo {
- } PMKIDInfo, *PPMKIDInfo;
- 
- typedef struct tagSPMKIDCache {
--    unsigned long       BSSIDInfoCount;
--    PMKIDInfo   BSSIDInfo[MAX_PMKID_CACHE];
-+	u32 BSSIDInfoCount;
-+	PMKIDInfo BSSIDInfo[MAX_PMKID_CACHE];
- } SPMKIDCache, *PSPMKIDCache;
- 
- 
-diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
-index 4efa9bc..89bfd85 100644
---- a/drivers/staging/wlan-ng/prism2mgmt.c
-+++ b/drivers/staging/wlan-ng/prism2mgmt.c
-@@ -406,7 +406,7 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
- 	/* SSID */
- 	req->ssid.status = P80211ENUM_msgitem_status_data_ok;
- 	req->ssid.data.len = le16_to_cpu(item->ssid.len);
--	req->ssid.data.len = min_t(u16, req->ssid.data.len, WLAN_BSSID_LEN);
-+	req->ssid.data.len = min_t(u16, req->ssid.data.len, WLAN_SSID_MAXLEN);
- 	memcpy(req->ssid.data.data, item->ssid.data, req->ssid.data.len);
- 
- 	/* supported rates */
-diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
-index 6b6f50a..5bafd2d 100644
---- a/drivers/target/iscsi/iscsi_target.c
-+++ b/drivers/target/iscsi/iscsi_target.c
-@@ -2384,7 +2384,7 @@ static void iscsit_build_conn_drop_async_message(struct iscsi_conn *conn)
- 	if (!conn_p)
- 		return;
- 
--	cmd = iscsit_allocate_cmd(conn_p, GFP_KERNEL);
-+	cmd = iscsit_allocate_cmd(conn_p, GFP_ATOMIC);
- 	if (!cmd) {
- 		iscsit_dec_conn_usage_count(conn_p);
- 		return;
-diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
-index 68d4c10..f141b4f 100644
---- a/drivers/target/target_core_device.c
-+++ b/drivers/target/target_core_device.c
-@@ -1622,6 +1622,7 @@ int core_dev_setup_virtual_lun0(void)
- 		ret = PTR_ERR(dev);
- 		goto out;
- 	}
-+	dev->dev_link_magic = SE_DEV_LINK_MAGIC;
- 	se_dev->se_dev_ptr = dev;
- 	g_lun0_dev = dev;
- 
-diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
-index ea479e5..0bbcd35 100644
---- a/drivers/target/target_core_fabric_configfs.c
-+++ b/drivers/target/target_core_fabric_configfs.c
-@@ -72,6 +72,12 @@ static int target_fabric_mappedlun_link(
- 	struct se_portal_group *se_tpg;
- 	struct config_item *nacl_ci, *tpg_ci, *tpg_ci_s, *wwn_ci, *wwn_ci_s;
- 	int ret = 0, lun_access;
-+
-+	if (lun->lun_link_magic != SE_LUN_LINK_MAGIC) {
-+		pr_err("Bad lun->lun_link_magic, not a valid lun_ci pointer:"
-+			" %p to struct lun: %p\n", lun_ci, lun);
-+		return -EFAULT;
-+	}
- 	/*
- 	 * Ensure that the source port exists
- 	 */
-@@ -746,6 +752,12 @@ static int target_fabric_port_link(
- 	struct target_fabric_configfs *tf;
- 	int ret;
- 
-+	if (dev->dev_link_magic != SE_DEV_LINK_MAGIC) {
-+		pr_err("Bad dev->dev_link_magic, not a valid se_dev_ci pointer:"
-+			" %p to struct se_device: %p\n", se_dev_ci, dev);
-+		return -EFAULT;
-+	}
-+
- 	tpg_ci = &lun_ci->ci_parent->ci_group->cg_item;
- 	se_tpg = container_of(to_config_group(tpg_ci),
- 				struct se_portal_group, tpg_group);
-diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
-index b8628a5..8dfe6f5 100644
---- a/drivers/target/target_core_tpg.c
-+++ b/drivers/target/target_core_tpg.c
-@@ -672,6 +672,7 @@ int core_tpg_register(
- 	for (i = 0; i < TRANSPORT_MAX_LUNS_PER_TPG; i++) {
- 		lun = se_tpg->tpg_lun_list[i];
- 		lun->unpacked_lun = i;
-+		lun->lun_link_magic = SE_LUN_LINK_MAGIC;
- 		lun->lun_status = TRANSPORT_LUN_STATUS_FREE;
- 		atomic_set(&lun->lun_acl_count, 0);
- 		init_completion(&lun->lun_shutdown_comp);
-diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
-index c87ef74..65e6320 100644
---- a/drivers/target/target_core_transport.c
-+++ b/drivers/target/target_core_transport.c
-@@ -1085,6 +1085,7 @@ struct se_device *transport_add_device_to_core_hba(
- 	dev->se_hba		= hba;
- 	dev->se_sub_dev		= se_dev;
- 	dev->transport		= transport;
-+	dev->dev_link_magic	= SE_DEV_LINK_MAGIC;
- 	INIT_LIST_HEAD(&dev->dev_list);
- 	INIT_LIST_HEAD(&dev->dev_sep_list);
- 	INIT_LIST_HEAD(&dev->dev_tmr_list);
-@@ -1553,6 +1554,8 @@ static void target_complete_tmr_failure(struct work_struct *work)
- 
- 	se_cmd->se_tmr_req->response = TMR_LUN_DOES_NOT_EXIST;
- 	se_cmd->se_tfo->queue_tm_rsp(se_cmd);
-+
-+	transport_cmd_check_stop_to_fabric(se_cmd);
- }
- 
- /**
-diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
-index 3c9e5b5..230d8ec 100644
---- a/drivers/target/tcm_fc/tfc_sess.c
-+++ b/drivers/target/tcm_fc/tfc_sess.c
-@@ -356,11 +356,11 @@ static int ft_prli_locked(struct fc_rport_priv *rdata, u32 spp_len,
- 
- 	tport = ft_tport_create(rdata->local_port);
- 	if (!tport)
--		return 0;	/* not a target for this local port */
-+		goto not_target;	/* not a target for this local port */
- 
- 	acl = ft_acl_get(tport->tpg, rdata);
- 	if (!acl)
--		return 0;
-+		goto not_target;	/* no target for this remote */
- 
- 	if (!rspp)
- 		goto fill;
-@@ -397,12 +397,18 @@ static int ft_prli_locked(struct fc_rport_priv *rdata, u32 spp_len,
- 
- 	/*
- 	 * OR in our service parameters with other provider (initiator), if any.
--	 * TBD XXX - indicate RETRY capability?
- 	 */
- fill:
- 	fcp_parm = ntohl(spp->spp_params);
-+	fcp_parm &= ~FCP_SPPF_RETRY;
- 	spp->spp_params = htonl(fcp_parm | FCP_SPPF_TARG_FCN);
- 	return FC_SPP_RESP_ACK;
-+
-+not_target:
-+	fcp_parm = ntohl(spp->spp_params);
-+	fcp_parm &= ~FCP_SPPF_TARG_FCN;
-+	spp->spp_params = htonl(fcp_parm);
-+	return 0;
- }
- 
- /**
-@@ -431,7 +437,6 @@ static void ft_sess_rcu_free(struct rcu_head *rcu)
- {
- 	struct ft_sess *sess = container_of(rcu, struct ft_sess, rcu);
- 
--	transport_deregister_session(sess->se_sess);
- 	kfree(sess);
- }
- 
-@@ -439,6 +444,7 @@ static void ft_sess_free(struct kref *kref)
- {
- 	struct ft_sess *sess = container_of(kref, struct ft_sess, kref);
- 
-+	transport_deregister_session(sess->se_sess);
- 	call_rcu(&sess->rcu, ft_sess_rcu_free);
- }
- 
-diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
-index f574eef..b6dc908 100644
---- a/drivers/tty/serial/8250/8250_dw.c
-+++ b/drivers/tty/serial/8250/8250_dw.c
-@@ -79,7 +79,7 @@ static int dw8250_handle_irq(struct uart_port *p)
- 	} else if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
- 		/* Clear the USR and write the LCR again. */
- 		(void)p->serial_in(p, UART_USR);
--		p->serial_out(p, d->last_lcr, UART_LCR);
-+		p->serial_out(p, UART_LCR, d->last_lcr);
- 
- 		return 1;
- 	}
-diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
-index 3ad079f..f43156f 100644
---- a/drivers/tty/serial/ifx6x60.c
-+++ b/drivers/tty/serial/ifx6x60.c
-@@ -552,6 +552,7 @@ static void ifx_port_shutdown(struct tty_port *port)
- 		container_of(port, struct ifx_spi_device, tty_port);
- 
- 	mrdy_set_low(ifx_dev);
-+	del_timer(&ifx_dev->spi_timer);
- 	clear_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags);
- 	tasklet_kill(&ifx_dev->io_work_tasklet);
- }
-diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
-index 89c752a..d775bc9 100644
---- a/drivers/usb/class/cdc-acm.c
-+++ b/drivers/usb/class/cdc-acm.c
-@@ -1602,6 +1602,9 @@ static const struct usb_device_id acm_ids[] = {
- 	{ USB_DEVICE(0x0572, 0x1340), /* Conexant CX93010-2x UCMxx */
- 	.driver_info = NO_UNION_NORMAL,
- 	},
-+	{ USB_DEVICE(0x05f9, 0x4002), /* PSC Scanning, Magellan 800i */
-+	.driver_info = NO_UNION_NORMAL,
-+	},
- 	{ USB_DEVICE(0x1bbb, 0x0003), /* Alcatel OT-I650 */
- 	.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
- 	},
-diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index fe7faf0..3736c65 100644
---- a/drivers/usb/core/hub.c
-+++ b/drivers/usb/core/hub.c
-@@ -867,6 +867,60 @@ static int hub_hub_status(struct usb_hub *hub,
- 	return ret;
- }
- 
-+static int hub_set_port_link_state(struct usb_hub *hub, int port1,
-+			unsigned int link_status)
-+{
-+	return set_port_feature(hub->hdev,
-+			port1 | (link_status << 3),
-+			USB_PORT_FEAT_LINK_STATE);
-+}
-+
-+/*
-+ * If USB 3.0 ports are placed into the Disabled state, they will no longer
-+ * detect any device connects or disconnects.  This is generally not what the
-+ * USB core wants, since it expects a disabled port to produce a port status
-+ * change event when a new device connects.
-+ *
-+ * Instead, set the link state to Disabled, wait for the link to settle into
-+ * that state, clear any change bits, and then put the port into the RxDetect
-+ * state.
-+ */
-+static int hub_usb3_port_disable(struct usb_hub *hub, int port1)
-+{
-+	int ret;
-+	int total_time;
-+	u16 portchange, portstatus;
-+
-+	if (!hub_is_superspeed(hub->hdev))
-+		return -EINVAL;
-+
-+	ret = hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_SS_DISABLED);
-+	if (ret) {
-+		dev_err(hub->intfdev, "cannot disable port %d (err = %d)\n",
-+				port1, ret);
-+		return ret;
-+	}
-+
-+	/* Wait for the link to enter the disabled state. */
-+	for (total_time = 0; ; total_time += HUB_DEBOUNCE_STEP) {
-+		ret = hub_port_status(hub, port1, &portstatus, &portchange);
-+		if (ret < 0)
-+			return ret;
-+
-+		if ((portstatus & USB_PORT_STAT_LINK_STATE) ==
-+				USB_SS_PORT_LS_SS_DISABLED)
-+			break;
-+		if (total_time >= HUB_DEBOUNCE_TIMEOUT)
-+			break;
-+		msleep(HUB_DEBOUNCE_STEP);
-+	}
-+	if (total_time >= HUB_DEBOUNCE_TIMEOUT)
-+		dev_warn(hub->intfdev, "Could not disable port %d after %d ms\n",
-+				port1, total_time);
-+
-+	return hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_RX_DETECT);
-+}
-+
- static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
- {
- 	struct usb_device *hdev = hub->hdev;
-@@ -875,8 +929,13 @@ static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
- 	if (hdev->children[port1-1] && set_state)
- 		usb_set_device_state(hdev->children[port1-1],
- 				USB_STATE_NOTATTACHED);
--	if (!hub->error && !hub_is_superspeed(hub->hdev))
--		ret = clear_port_feature(hdev, port1, USB_PORT_FEAT_ENABLE);
-+	if (!hub->error) {
-+		if (hub_is_superspeed(hub->hdev))
-+			ret = hub_usb3_port_disable(hub, port1);
-+		else
-+			ret = clear_port_feature(hdev, port1,
-+					USB_PORT_FEAT_ENABLE);
-+	}
- 	if (ret)
- 		dev_err(hub->intfdev, "cannot disable port %d (err = %d)\n",
- 				port1, ret);
-@@ -2339,7 +2398,7 @@ static unsigned hub_is_wusb(struct usb_hub *hub)
- #define HUB_SHORT_RESET_TIME	10
- #define HUB_BH_RESET_TIME	50
- #define HUB_LONG_RESET_TIME	200
--#define HUB_RESET_TIMEOUT	500
-+#define HUB_RESET_TIMEOUT	800
- 
- static int hub_port_reset(struct usb_hub *hub, int port1,
- 			struct usb_device *udev, unsigned int delay, bool warm);
-@@ -2374,6 +2433,10 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
- 		if (ret < 0)
- 			return ret;
- 
-+		/* The port state is unknown until the reset completes. */
-+		if ((portstatus & USB_PORT_STAT_RESET))
-+			goto delay;
-+
- 		/*
- 		 * Some buggy devices require a warm reset to be issued even
- 		 * when the port appears not to be connected.
-@@ -2419,11 +2482,7 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
- 			if ((portchange & USB_PORT_STAT_C_CONNECTION))
- 				return -ENOTCONN;
- 
--			/* if we`ve finished resetting, then break out of
--			 * the loop
--			 */
--			if (!(portstatus & USB_PORT_STAT_RESET) &&
--			    (portstatus & USB_PORT_STAT_ENABLE)) {
-+			if ((portstatus & USB_PORT_STAT_ENABLE)) {
- 				if (hub_is_wusb(hub))
- 					udev->speed = USB_SPEED_WIRELESS;
- 				else if (hub_is_superspeed(hub->hdev))
-@@ -2437,10 +2496,15 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
- 				return 0;
- 			}
- 		} else {
--			if (portchange & USB_PORT_STAT_C_BH_RESET)
--				return 0;
-+			if (!(portstatus & USB_PORT_STAT_CONNECTION) ||
-+					hub_port_warm_reset_required(hub,
-+						portstatus))
-+				return -ENOTCONN;
-+
-+			return 0;
- 		}
- 
-+delay:
- 		/* switch to the long delay after two short delay failures */
- 		if (delay_time >= 2 * HUB_SHORT_RESET_TIME)
- 			delay = HUB_LONG_RESET_TIME;
-@@ -2464,14 +2528,11 @@ static void hub_port_finish_reset(struct usb_hub *hub, int port1,
- 			msleep(10 + 40);
- 			update_devnum(udev, 0);
- 			hcd = bus_to_hcd(udev->bus);
--			if (hcd->driver->reset_device) {
--				*status = hcd->driver->reset_device(hcd, udev);
--				if (*status < 0) {
--					dev_err(&udev->dev, "Cannot reset "
--							"HCD device state\n");
--					break;
--				}
--			}
-+			/* The xHC may think the device is already reset,
-+			 * so ignore the status.
-+			 */
-+			if (hcd->driver->reset_device)
-+				hcd->driver->reset_device(hcd, udev);
- 		}
- 		/* FALL THROUGH */
- 	case -ENOTCONN:
-@@ -2479,16 +2540,16 @@ static void hub_port_finish_reset(struct usb_hub *hub, int port1,
- 		clear_port_feature(hub->hdev,
- 				port1, USB_PORT_FEAT_C_RESET);
- 		/* FIXME need disconnect() for NOTATTACHED device */
--		if (warm) {
-+		if (hub_is_superspeed(hub->hdev)) {
- 			clear_port_feature(hub->hdev, port1,
- 					USB_PORT_FEAT_C_BH_PORT_RESET);
- 			clear_port_feature(hub->hdev, port1,
- 					USB_PORT_FEAT_C_PORT_LINK_STATE);
--		} else {
-+		}
-+		if (!warm)
- 			usb_set_device_state(udev, *status
- 					? USB_STATE_NOTATTACHED
- 					: USB_STATE_DEFAULT);
--		}
- 		break;
- 	}
- }
-@@ -2837,7 +2898,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
- static int finish_port_resume(struct usb_device *udev)
- {
- 	int	status = 0;
--	u16	devstatus;
-+	u16	devstatus = 0;
- 
- 	/* caller owns the udev device lock */
- 	dev_dbg(&udev->dev, "%s\n",
-@@ -2882,7 +2943,13 @@ static int finish_port_resume(struct usb_device *udev)
- 	if (status) {
- 		dev_dbg(&udev->dev, "gone after usb resume? status %d\n",
- 				status);
--	} else if (udev->actconfig) {
-+	/*
-+	 * There are a few quirky devices which violate the standard
-+	 * by claiming to have remote wakeup enabled after a reset,
-+	 * which crash if the feature is cleared, hence check for
-+	 * udev->reset_resume
-+	 */
-+	} else if (udev->actconfig && !udev->reset_resume) {
- 		le16_to_cpus(&devstatus);
- 		if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP)) {
- 			status = usb_control_msg(udev,
-@@ -4511,9 +4578,14 @@ static void hub_events(void)
- 			 * SS.Inactive state.
- 			 */
- 			if (hub_port_warm_reset_required(hub, portstatus)) {
-+				int status;
-+
- 				dev_dbg(hub_dev, "warm reset port %d\n", i);
--				hub_port_reset(hub, i, NULL,
-+				status = hub_port_reset(hub, i, NULL,
- 						HUB_BH_RESET_TIME, true);
-+				if (status < 0)
-+					hub_port_disable(hub, i, 1);
-+				connect_change = 0;
- 			}
- 
- 			if (connect_change)
-diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
-index 0ab7da2..583150b 100644
---- a/drivers/usb/core/message.c
-+++ b/drivers/usb/core/message.c
-@@ -1808,29 +1808,8 @@ free_interfaces:
- 		goto free_interfaces;
- 	}
- 
--	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
--			      USB_REQ_SET_CONFIGURATION, 0, configuration, 0,
--			      NULL, 0, USB_CTRL_SET_TIMEOUT);
--	if (ret < 0) {
--		/* All the old state is gone, so what else can we do?
--		 * The device is probably useless now anyway.
--		 */
--		cp = NULL;
--	}
--
--	dev->actconfig = cp;
--	if (!cp) {
--		usb_set_device_state(dev, USB_STATE_ADDRESS);
--		usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
--		/* Leave LPM disabled while the device is unconfigured. */
--		mutex_unlock(hcd->bandwidth_mutex);
--		usb_autosuspend_device(dev);
--		goto free_interfaces;
--	}
--	mutex_unlock(hcd->bandwidth_mutex);
--	usb_set_device_state(dev, USB_STATE_CONFIGURED);
--
--	/* Initialize the new interface structures and the
-+	/*
-+	 * Initialize the new interface structures and the
- 	 * hc/hcd/usbcore interface/endpoint state.
- 	 */
- 	for (i = 0; i < nintf; ++i) {
-@@ -1874,6 +1853,35 @@ free_interfaces:
- 	}
- 	kfree(new_interfaces);
- 
-+	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-+			      USB_REQ_SET_CONFIGURATION, 0, configuration, 0,
-+			      NULL, 0, USB_CTRL_SET_TIMEOUT);
-+	if (ret < 0 && cp) {
-+		/*
-+		 * All the old state is gone, so what else can we do?
-+		 * The device is probably useless now anyway.
-+		 */
-+		usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
-+		for (i = 0; i < nintf; ++i) {
-+			usb_disable_interface(dev, cp->interface[i], true);
-+			put_device(&cp->interface[i]->dev);
-+			cp->interface[i] = NULL;
-+		}
-+		cp = NULL;
-+	}
-+
-+	dev->actconfig = cp;
-+	mutex_unlock(hcd->bandwidth_mutex);
-+
-+	if (!cp) {
-+		usb_set_device_state(dev, USB_STATE_ADDRESS);
-+
-+		/* Leave LPM disabled while the device is unconfigured. */
-+		usb_autosuspend_device(dev);
-+		return ret;
-+	}
-+	usb_set_device_state(dev, USB_STATE_CONFIGURED);
-+
- 	if (cp->string == NULL &&
- 			!(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
- 		cp->string = usb_cache_string(dev, cp->desc.iConfiguration);
-diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
-index eb0fd10..b6c4084 100644
---- a/drivers/usb/dwc3/gadget.c
-+++ b/drivers/usb/dwc3/gadget.c
-@@ -1619,6 +1619,7 @@ static int __devinit dwc3_gadget_init_endpoints(struct dwc3 *dwc)
- 
- 		if (epnum == 0 || epnum == 1) {
- 			dep->endpoint.maxpacket = 512;
-+			dep->endpoint.maxburst = 1;
- 			dep->endpoint.ops = &dwc3_gadget_ep0_ops;
- 			if (!epnum)
- 				dwc->gadget.ep0 = &dep->endpoint;
-diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
-index afdbb1c..4ad1f1c 100644
---- a/drivers/usb/gadget/dummy_hcd.c
-+++ b/drivers/usb/gadget/dummy_hcd.c
-@@ -126,10 +126,7 @@ static const char ep0name[] = "ep0";
- static const char *const ep_name[] = {
- 	ep0name,				/* everyone has ep0 */
- 
--	/* act like a net2280: high speed, six configurable endpoints */
--	"ep-a", "ep-b", "ep-c", "ep-d", "ep-e", "ep-f",
--
--	/* or like pxa250: fifteen fixed function endpoints */
-+	/* act like a pxa250: fifteen fixed function endpoints */
- 	"ep1in-bulk", "ep2out-bulk", "ep3in-iso", "ep4out-iso", "ep5in-int",
- 	"ep6in-bulk", "ep7out-bulk", "ep8in-iso", "ep9out-iso", "ep10in-int",
- 	"ep11in-bulk", "ep12out-bulk", "ep13in-iso", "ep14out-iso",
-@@ -137,6 +134,10 @@ static const char *const ep_name[] = {
- 
- 	/* or like sa1100: two fixed function endpoints */
- 	"ep1out-bulk", "ep2in-bulk",
-+
-+	/* and now some generic EPs so we have enough in multi config */
-+	"ep3out", "ep4in", "ep5out", "ep6out", "ep7in", "ep8out", "ep9in",
-+	"ep10out", "ep11out", "ep12in", "ep13out", "ep14in", "ep15out",
- };
- #define DUMMY_ENDPOINTS	ARRAY_SIZE(ep_name)
- 
-diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c
-index 30b908f..672c66a 100644
---- a/drivers/usb/gadget/f_ecm.c
-+++ b/drivers/usb/gadget/f_ecm.c
-@@ -808,9 +808,9 @@ fail:
- 	/* we might as well release our claims on endpoints */
- 	if (ecm->notify)
- 		ecm->notify->driver_data = NULL;
--	if (ecm->port.out_ep->desc)
-+	if (ecm->port.out_ep)
- 		ecm->port.out_ep->driver_data = NULL;
--	if (ecm->port.in_ep->desc)
-+	if (ecm->port.in_ep)
- 		ecm->port.in_ep->driver_data = NULL;
- 
- 	ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
-diff --git a/drivers/usb/gadget/f_eem.c b/drivers/usb/gadget/f_eem.c
-index 1a7b2dd..a9cf2052 100644
---- a/drivers/usb/gadget/f_eem.c
-+++ b/drivers/usb/gadget/f_eem.c
-@@ -319,10 +319,9 @@ fail:
- 	if (f->hs_descriptors)
- 		usb_free_descriptors(f->hs_descriptors);
- 
--	/* we might as well release our claims on endpoints */
--	if (eem->port.out_ep->desc)
-+	if (eem->port.out_ep)
- 		eem->port.out_ep->driver_data = NULL;
--	if (eem->port.in_ep->desc)
-+	if (eem->port.in_ep)
- 		eem->port.in_ep->driver_data = NULL;
- 
- 	ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
-diff --git a/drivers/usb/gadget/f_midi.c b/drivers/usb/gadget/f_midi.c
-index 2f7e8f2..1bf9596 100644
---- a/drivers/usb/gadget/f_midi.c
-+++ b/drivers/usb/gadget/f_midi.c
-@@ -416,6 +416,7 @@ static void f_midi_unbind(struct usb_configuration *c, struct usb_function *f)
- 	midi->id = NULL;
- 
- 	usb_free_descriptors(f->descriptors);
-+	usb_free_descriptors(f->hs_descriptors);
- 	kfree(midi);
- }
- 
-diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
-index aab8ede..d7811ae 100644
---- a/drivers/usb/gadget/f_ncm.c
-+++ b/drivers/usb/gadget/f_ncm.c
-@@ -1259,9 +1259,9 @@ fail:
- 	/* we might as well release our claims on endpoints */
- 	if (ncm->notify)
- 		ncm->notify->driver_data = NULL;
--	if (ncm->port.out_ep->desc)
-+	if (ncm->port.out_ep)
- 		ncm->port.out_ep->driver_data = NULL;
--	if (ncm->port.in_ep->desc)
-+	if (ncm->port.in_ep)
- 		ncm->port.in_ep->driver_data = NULL;
- 
- 	ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
-diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
-index 8ee9268..a6c19a4 100644
---- a/drivers/usb/gadget/f_phonet.c
-+++ b/drivers/usb/gadget/f_phonet.c
-@@ -531,7 +531,7 @@ int pn_bind(struct usb_configuration *c, struct usb_function *f)
- 
- 		req = usb_ep_alloc_request(fp->out_ep, GFP_KERNEL);
- 		if (!req)
--			goto err;
-+			goto err_req;
- 
- 		req->complete = pn_rx_complete;
- 		fp->out_reqv[i] = req;
-@@ -540,14 +540,18 @@ int pn_bind(struct usb_configuration *c, struct usb_function *f)
- 	/* Outgoing USB requests */
- 	fp->in_req = usb_ep_alloc_request(fp->in_ep, GFP_KERNEL);
- 	if (!fp->in_req)
--		goto err;
-+		goto err_req;
- 
- 	INFO(cdev, "USB CDC Phonet function\n");
- 	INFO(cdev, "using %s, OUT %s, IN %s\n", cdev->gadget->name,
- 		fp->out_ep->name, fp->in_ep->name);
- 	return 0;
- 
-+err_req:
-+	for (i = 0; i < phonet_rxq_size && fp->out_reqv[i]; i++)
-+		usb_ep_free_request(fp->out_ep, fp->out_reqv[i]);
- err:
-+
- 	if (fp->out_ep)
- 		fp->out_ep->driver_data = NULL;
- 	if (fp->in_ep)
-diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
-index b1681e4..47953fe 100644
---- a/drivers/usb/gadget/f_rndis.c
-+++ b/drivers/usb/gadget/f_rndis.c
-@@ -803,9 +803,9 @@ fail:
- 	/* we might as well release our claims on endpoints */
- 	if (rndis->notify)
- 		rndis->notify->driver_data = NULL;
--	if (rndis->port.out_ep->desc)
-+	if (rndis->port.out_ep)
- 		rndis->port.out_ep->driver_data = NULL;
--	if (rndis->port.in_ep->desc)
-+	if (rndis->port.in_ep)
- 		rndis->port.in_ep->driver_data = NULL;
- 
- 	ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
-diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
-index 21ab474..e5bb966 100644
---- a/drivers/usb/gadget/f_subset.c
-+++ b/drivers/usb/gadget/f_subset.c
-@@ -370,9 +370,9 @@ fail:
- 		usb_free_descriptors(f->hs_descriptors);
- 
- 	/* we might as well release our claims on endpoints */
--	if (geth->port.out_ep->desc)
-+	if (geth->port.out_ep)
- 		geth->port.out_ep->driver_data = NULL;
--	if (geth->port.in_ep->desc)
-+	if (geth->port.in_ep)
- 		geth->port.in_ep->driver_data = NULL;
- 
- 	ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
-diff --git a/drivers/usb/gadget/f_uvc.c b/drivers/usb/gadget/f_uvc.c
-index 2a8bf06..10f13c1 100644
---- a/drivers/usb/gadget/f_uvc.c
-+++ b/drivers/usb/gadget/f_uvc.c
-@@ -417,7 +417,6 @@ uvc_register_video(struct uvc_device *uvc)
- 		return -ENOMEM;
- 
- 	video->parent = &cdev->gadget->dev;
--	video->minor = -1;
- 	video->fops = &uvc_v4l2_fops;
- 	video->release = video_device_release;
- 	strncpy(video->name, cdev->gadget->name, sizeof(video->name));
-@@ -577,23 +576,12 @@ uvc_function_unbind(struct usb_configuration *c, struct usb_function *f)
- 
- 	INFO(cdev, "uvc_function_unbind\n");
- 
--	if (uvc->vdev) {
--		if (uvc->vdev->minor == -1)
--			video_device_release(uvc->vdev);
--		else
--			video_unregister_device(uvc->vdev);
--		uvc->vdev = NULL;
--	}
--
--	if (uvc->control_ep)
--		uvc->control_ep->driver_data = NULL;
--	if (uvc->video.ep)
--		uvc->video.ep->driver_data = NULL;
-+	video_unregister_device(uvc->vdev);
-+	uvc->control_ep->driver_data = NULL;
-+	uvc->video.ep->driver_data = NULL;
- 
--	if (uvc->control_req) {
--		usb_ep_free_request(cdev->gadget->ep0, uvc->control_req);
--		kfree(uvc->control_buf);
--	}
-+	usb_ep_free_request(cdev->gadget->ep0, uvc->control_req);
-+	kfree(uvc->control_buf);
- 
- 	kfree(f->descriptors);
- 	kfree(f->hs_descriptors);
-@@ -740,7 +728,22 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
- 	return 0;
- 
- error:
--	uvc_function_unbind(c, f);
-+	if (uvc->vdev)
-+		video_device_release(uvc->vdev);
-+
-+	if (uvc->control_ep)
-+		uvc->control_ep->driver_data = NULL;
-+	if (uvc->video.ep)
-+		uvc->video.ep->driver_data = NULL;
-+
-+	if (uvc->control_req) {
-+		usb_ep_free_request(cdev->gadget->ep0, uvc->control_req);
-+		kfree(uvc->control_buf);
-+	}
-+
-+	kfree(f->descriptors);
-+	kfree(f->hs_descriptors);
-+	kfree(f->ss_descriptors);
- 	return ret;
- }
- 
-diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
-index 2cb7d37..f42b68e 100644
---- a/drivers/usb/host/ehci-pci.c
-+++ b/drivers/usb/host/ehci-pci.c
-@@ -334,7 +334,8 @@ static bool usb_is_intel_switchable_ehci(struct pci_dev *pdev)
- 		pdev->vendor == PCI_VENDOR_ID_INTEL &&
- 		(pdev->device == 0x1E26 ||
- 		 pdev->device == 0x8C2D ||
--		 pdev->device == 0x8C26);
-+		 pdev->device == 0x8C26 ||
-+		 pdev->device == 0x9C26);
- }
- 
- static void ehci_enable_xhci_companion(void)
-diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
-index 39f9e4a..eb5563a 100644
---- a/drivers/usb/host/pci-quirks.c
-+++ b/drivers/usb/host/pci-quirks.c
-@@ -723,6 +723,7 @@ static int handshake(void __iomem *ptr, u32 mask, u32 done,
- }
- 
- #define PCI_DEVICE_ID_INTEL_LYNX_POINT_XHCI	0x8C31
-+#define PCI_DEVICE_ID_INTEL_LYNX_POINT_LP_XHCI	0x9C31
- 
- bool usb_is_intel_ppt_switchable_xhci(struct pci_dev *pdev)
- {
-@@ -736,7 +737,8 @@ bool usb_is_intel_lpt_switchable_xhci(struct pci_dev *pdev)
- {
- 	return pdev->class == PCI_CLASS_SERIAL_USB_XHCI &&
- 		pdev->vendor == PCI_VENDOR_ID_INTEL &&
--		pdev->device == PCI_DEVICE_ID_INTEL_LYNX_POINT_XHCI;
-+		(pdev->device == PCI_DEVICE_ID_INTEL_LYNX_POINT_XHCI ||
-+		 pdev->device == PCI_DEVICE_ID_INTEL_LYNX_POINT_LP_XHCI);
- }
- 
- bool usb_is_intel_switchable_xhci(struct pci_dev *pdev)
-diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
-index e4db350..3fe069f 100644
---- a/drivers/usb/host/uhci-hcd.c
-+++ b/drivers/usb/host/uhci-hcd.c
-@@ -447,6 +447,10 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)
- 		return IRQ_NONE;
- 	uhci_writew(uhci, status, USBSTS);		/* Clear it */
- 
-+	spin_lock(&uhci->lock);
-+	if (unlikely(!uhci->is_initialized))	/* not yet configured */
-+		goto done;
-+
- 	if (status & ~(USBSTS_USBINT | USBSTS_ERROR | USBSTS_RD)) {
- 		if (status & USBSTS_HSE)
- 			dev_err(uhci_dev(uhci), "host system error, "
-@@ -455,7 +459,6 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)
- 			dev_err(uhci_dev(uhci), "host controller process "
- 					"error, something bad happened!\n");
- 		if (status & USBSTS_HCH) {
--			spin_lock(&uhci->lock);
- 			if (uhci->rh_state >= UHCI_RH_RUNNING) {
- 				dev_err(uhci_dev(uhci),
- 					"host controller halted, "
-@@ -473,15 +476,15 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)
- 				 * pending unlinks */
- 				mod_timer(&hcd->rh_timer, jiffies);
- 			}
--			spin_unlock(&uhci->lock);
- 		}
- 	}
- 
--	if (status & USBSTS_RD)
-+	if (status & USBSTS_RD) {
-+		spin_unlock(&uhci->lock);
- 		usb_hcd_poll_rh_status(hcd);
--	else {
--		spin_lock(&uhci->lock);
-+	} else {
- 		uhci_scan_schedule(uhci);
-+ done:
- 		spin_unlock(&uhci->lock);
- 	}
- 
-@@ -662,9 +665,9 @@ static int uhci_start(struct usb_hcd *hcd)
- 	 */
- 	mb();
- 
-+	spin_lock_irq(&uhci->lock);
- 	configure_hc(uhci);
- 	uhci->is_initialized = 1;
--	spin_lock_irq(&uhci->lock);
- 	start_rh(uhci);
- 	spin_unlock_irq(&uhci->lock);
- 	return 0;
-diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
-index d5eb357..abb9772 100644
---- a/drivers/usb/host/xhci-hub.c
-+++ b/drivers/usb/host/xhci-hub.c
-@@ -762,12 +762,39 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
- 			break;
- 		case USB_PORT_FEAT_LINK_STATE:
- 			temp = xhci_readl(xhci, port_array[wIndex]);
-+
-+			/* Disable port */
-+			if (link_state == USB_SS_PORT_LS_SS_DISABLED) {
-+				xhci_dbg(xhci, "Disable port %d\n", wIndex);
-+				temp = xhci_port_state_to_neutral(temp);
-+				/*
-+				 * Clear all change bits, so that we get a new
-+				 * connection event.
-+				 */
-+				temp |= PORT_CSC | PORT_PEC | PORT_WRC |
-+					PORT_OCC | PORT_RC | PORT_PLC |
-+					PORT_CEC;
-+				xhci_writel(xhci, temp | PORT_PE,
-+					port_array[wIndex]);
-+				temp = xhci_readl(xhci, port_array[wIndex]);
-+				break;
-+			}
-+
-+			/* Put link in RxDetect (enable port) */
-+			if (link_state == USB_SS_PORT_LS_RX_DETECT) {
-+				xhci_dbg(xhci, "Enable port %d\n", wIndex);
-+				xhci_set_link_state(xhci, port_array, wIndex,
-+						link_state);
-+				temp = xhci_readl(xhci, port_array[wIndex]);
-+				break;
-+			}
-+
- 			/* Software should not attempt to set
--			 * port link state above '5' (Rx.Detect) and the port
-+			 * port link state above '3' (U3) and the port
- 			 * must be enabled.
- 			 */
- 			if ((temp & PORT_PE) == 0 ||
--				(link_state > USB_SS_PORT_LS_RX_DETECT)) {
-+				(link_state > USB_SS_PORT_LS_U3)) {
- 				xhci_warn(xhci, "Cannot set link state.\n");
- 				goto error;
- 			}
-@@ -938,6 +965,7 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
- 	int max_ports;
- 	__le32 __iomem **port_array;
- 	struct xhci_bus_state *bus_state;
-+	bool reset_change = false;
- 
- 	max_ports = xhci_get_ports(hcd, &port_array);
- 	bus_state = &xhci->bus_state[hcd_index(hcd)];
-@@ -969,6 +997,12 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
- 			buf[(i + 1) / 8] |= 1 << (i + 1) % 8;
- 			status = 1;
- 		}
-+		if ((temp & PORT_RC))
-+			reset_change = true;
-+	}
-+	if (!status && !reset_change) {
-+		xhci_dbg(xhci, "%s: stopping port polling.\n", __func__);
-+		clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);
- 	}
- 	spin_unlock_irqrestore(&xhci->lock, flags);
- 	return status ? retval : 0;
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 487bc08..35616ff 100644
---- a/drivers/usb/host/xhci-mem.c
-+++ b/drivers/usb/host/xhci-mem.c
-@@ -205,7 +205,12 @@ static int xhci_alloc_segments_for_ring(struct xhci_hcd *xhci,
- 
- 		next = xhci_segment_alloc(xhci, cycle_state, flags);
- 		if (!next) {
--			xhci_free_segments_for_ring(xhci, *first);
-+			prev = *first;
-+			while (prev) {
-+				next = prev->next;
-+				xhci_segment_free(xhci, prev);
-+				prev = next;
-+			}
- 			return -ENOMEM;
- 		}
- 		xhci_link_segments(xhci, prev, next, type);
-@@ -258,7 +263,7 @@ static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci,
- 	return ring;
- 
- fail:
--	xhci_ring_free(xhci, ring);
-+	kfree(ring);
- 	return NULL;
- }
- 
-@@ -1245,6 +1250,8 @@ static unsigned int xhci_microframes_to_exponent(struct usb_device *udev,
- static unsigned int xhci_parse_microframe_interval(struct usb_device *udev,
- 		struct usb_host_endpoint *ep)
- {
-+	if (ep->desc.bInterval == 0)
-+		return 0;
- 	return xhci_microframes_to_exponent(udev, ep,
- 			ep->desc.bInterval, 0, 15);
- }
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index 4f1e265..7024536 100644
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -1725,6 +1725,15 @@ cleanup:
- 	if (bogus_port_status)
- 		return;
- 
-+	/*
-+	 * xHCI port-status-change events occur when the "or" of all the
-+	 * status-change bits in the portsc register changes from 0 to 1.
-+	 * New status changes won't cause an event if any other change
-+	 * bits are still set.  When an event occurs, switch over to
-+	 * polling to avoid losing status changes.
-+	 */
-+	xhci_dbg(xhci, "%s: starting port polling.\n", __func__);
-+	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);
- 	spin_unlock(&xhci->lock);
- 	/* Pass this up to the core */
- 	usb_hcd_poll_rh_status(hcd);
-@@ -3069,11 +3078,11 @@ static u32 xhci_td_remainder(unsigned int remainder)
- }
- 
- /*
-- * For xHCI 1.0 host controllers, TD size is the number of packets remaining in
-- * the TD (*not* including this TRB).
-+ * For xHCI 1.0 host controllers, TD size is the number of max packet sized
-+ * packets remaining in the TD (*not* including this TRB).
-  *
-  * Total TD packet count = total_packet_count =
-- *     roundup(TD size in bytes / wMaxPacketSize)
-+ *     DIV_ROUND_UP(TD size in bytes / wMaxPacketSize)
-  *
-  * Packets transferred up to and including this TRB = packets_transferred =
-  *     rounddown(total bytes transferred including this TRB / wMaxPacketSize)
-@@ -3081,15 +3090,16 @@ static u32 xhci_td_remainder(unsigned int remainder)
-  * TD size = total_packet_count - packets_transferred
-  *
-  * It must fit in bits 21:17, so it can't be bigger than 31.
-+ * The last TRB in a TD must have the TD size set to zero.
-  */
--
- static u32 xhci_v1_0_td_remainder(int running_total, int trb_buff_len,
--		unsigned int total_packet_count, struct urb *urb)
-+		unsigned int total_packet_count, struct urb *urb,
-+		unsigned int num_trbs_left)
- {
- 	int packets_transferred;
- 
- 	/* One TRB with a zero-length data packet. */
--	if (running_total == 0 && trb_buff_len == 0)
-+	if (num_trbs_left == 0 || (running_total == 0 && trb_buff_len == 0))
- 		return 0;
- 
- 	/* All the TRB queueing functions don't count the current TRB in
-@@ -3098,7 +3108,9 @@ static u32 xhci_v1_0_td_remainder(int running_total, int trb_buff_len,
- 	packets_transferred = (running_total + trb_buff_len) /
- 		usb_endpoint_maxp(&urb->ep->desc);
- 
--	return xhci_td_remainder(total_packet_count - packets_transferred);
-+	if ((total_packet_count - packets_transferred) > 31)
-+		return 31 << 17;
-+	return (total_packet_count - packets_transferred) << 17;
- }
- 
- static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
-@@ -3125,7 +3137,7 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 
- 	num_trbs = count_sg_trbs_needed(xhci, urb);
- 	num_sgs = urb->num_mapped_sgs;
--	total_packet_count = roundup(urb->transfer_buffer_length,
-+	total_packet_count = DIV_ROUND_UP(urb->transfer_buffer_length,
- 			usb_endpoint_maxp(&urb->ep->desc));
- 
- 	trb_buff_len = prepare_transfer(xhci, xhci->devs[slot_id],
-@@ -3208,7 +3220,8 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 					running_total);
- 		} else {
- 			remainder = xhci_v1_0_td_remainder(running_total,
--					trb_buff_len, total_packet_count, urb);
-+					trb_buff_len, total_packet_count, urb,
-+					num_trbs - 1);
- 		}
- 		length_field = TRB_LEN(trb_buff_len) |
- 			remainder |
-@@ -3316,7 +3329,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 	start_cycle = ep_ring->cycle_state;
- 
- 	running_total = 0;
--	total_packet_count = roundup(urb->transfer_buffer_length,
-+	total_packet_count = DIV_ROUND_UP(urb->transfer_buffer_length,
- 			usb_endpoint_maxp(&urb->ep->desc));
- 	/* How much data is in the first TRB? */
- 	addr = (u64) urb->transfer_dma;
-@@ -3362,7 +3375,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 					running_total);
- 		} else {
- 			remainder = xhci_v1_0_td_remainder(running_total,
--					trb_buff_len, total_packet_count, urb);
-+					trb_buff_len, total_packet_count, urb,
-+					num_trbs - 1);
- 		}
- 		length_field = TRB_LEN(trb_buff_len) |
- 			remainder |
-@@ -3625,7 +3639,7 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 		addr = start_addr + urb->iso_frame_desc[i].offset;
- 		td_len = urb->iso_frame_desc[i].length;
- 		td_remain_len = td_len;
--		total_packet_count = roundup(td_len,
-+		total_packet_count = DIV_ROUND_UP(td_len,
- 				usb_endpoint_maxp(&urb->ep->desc));
- 		/* A zero-length transfer still involves at least one packet. */
- 		if (total_packet_count == 0)
-@@ -3704,7 +3718,8 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 			} else {
- 				remainder = xhci_v1_0_td_remainder(
- 						running_total, trb_buff_len,
--						total_packet_count, urb);
-+						total_packet_count, urb,
-+						(trbs_per_td - j - 1));
- 			}
- 			length_field = TRB_LEN(trb_buff_len) |
- 				remainder |
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index a6e910b..b6586e3 100644
---- a/drivers/usb/host/xhci.c
-+++ b/drivers/usb/host/xhci.c
-@@ -480,7 +480,7 @@ static bool compliance_mode_recovery_timer_quirk_check(void)
- 	if (strstr(dmi_product_name, "Z420") ||
- 			strstr(dmi_product_name, "Z620") ||
- 			strstr(dmi_product_name, "Z820") ||
--			strstr(dmi_product_name, "Z1"))
-+			strstr(dmi_product_name, "Z1 Workstation"))
- 		return true;
- 
- 	return false;
-@@ -880,6 +880,11 @@ int xhci_suspend(struct xhci_hcd *xhci)
- 	struct usb_hcd		*hcd = xhci_to_hcd(xhci);
- 	u32			command;
- 
-+	/* Don't poll the roothubs on bus suspend. */
-+	xhci_dbg(xhci, "%s: stopping port polling.\n", __func__);
-+	clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);
-+	del_timer_sync(&hcd->rh_timer);
-+
- 	spin_lock_irq(&xhci->lock);
- 	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
- 	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);
-@@ -1064,6 +1069,11 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
- 	if (xhci->quirks & XHCI_COMP_MODE_QUIRK)
- 		compliance_mode_recovery_timer_init(xhci);
- 
-+	/* Re-enable port polling. */
-+	xhci_dbg(xhci, "%s: starting port polling.\n", __func__);
-+	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);
-+	usb_hcd_poll_rh_status(hcd);
-+
- 	return retval;
- }
- #endif	/* CONFIG_PM */
-@@ -2253,7 +2263,7 @@ static bool xhci_is_async_ep(unsigned int ep_type)
- 
- static bool xhci_is_sync_in_ep(unsigned int ep_type)
- {
--	return (ep_type == ISOC_IN_EP || ep_type != INT_IN_EP);
-+	return (ep_type == ISOC_IN_EP || ep_type == INT_IN_EP);
- }
- 
- static unsigned int xhci_get_ss_bw_consumed(struct xhci_bw_info *ep_bw)
-diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
-index 8637c1f..c5835e8 100644
---- a/drivers/usb/musb/cppi_dma.c
-+++ b/drivers/usb/musb/cppi_dma.c
-@@ -1314,6 +1314,7 @@ irqreturn_t cppi_interrupt(int irq, void *dev_id)
- 
- 	return IRQ_HANDLED;
- }
-+EXPORT_SYMBOL_GPL(cppi_interrupt);
- 
- /* Instantiate a software object representing a DMA controller. */
- struct dma_controller *__init
-diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
-index 26f1bef..c5630c2 100644
---- a/drivers/usb/musb/musb_core.c
-+++ b/drivers/usb/musb/musb_core.c
-@@ -2402,10 +2402,7 @@ static int __init musb_init(void)
- 	if (usb_disabled())
- 		return 0;
- 
--	pr_info("%s: version " MUSB_VERSION ", "
--		"?dma?"
--		", "
--		"otg (peripheral+host)",
-+	pr_info("%s: version " MUSB_VERSION ", ?dma?, otg (peripheral+host)\n",
- 		musb_driver_name);
- 	return platform_driver_register(&musb_driver);
- }
-diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
-index 360bdeb..653139b 100644
---- a/drivers/usb/serial/ftdi_sio.c
-+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -881,6 +881,8 @@ static struct usb_device_id id_table_combined [] = {
- 	{ USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID),
- 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
- 	{ USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) },
-+	/* Crucible Devices */
-+	{ USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) },
- 	{ },					/* Optional parameter entry */
- 	{ }					/* Terminating entry */
- };
-diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
-index 049b6e7..fa5d560 100644
---- a/drivers/usb/serial/ftdi_sio_ids.h
-+++ b/drivers/usb/serial/ftdi_sio_ids.h
-@@ -1259,3 +1259,9 @@
-  * ATI command output: Cinterion MC55i
-  */
- #define FTDI_CINTERION_MC55I_PID	0xA951
-+
-+/*
-+ * Product: Comet Caller ID decoder
-+ * Manufacturer: Crucible Technologies
-+ */
-+#define FTDI_CT_COMET_PID	0x8e08
-diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 56fed62..a3eac65 100644
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -289,6 +289,7 @@ static void option_instat_callback(struct urb *urb);
- #define ALCATEL_VENDOR_ID			0x1bbb
- #define ALCATEL_PRODUCT_X060S_X200		0x0000
- #define ALCATEL_PRODUCT_X220_X500D		0x0017
-+#define ALCATEL_PRODUCT_L100V			0x011e
- 
- #define PIRELLI_VENDOR_ID			0x1266
- #define PIRELLI_PRODUCT_C100_1			0x1002
-@@ -430,9 +431,12 @@ static void option_instat_callback(struct urb *urb);
- #define MEDIATEK_VENDOR_ID			0x0e8d
- #define MEDIATEK_PRODUCT_DC_1COM		0x00a0
- #define MEDIATEK_PRODUCT_DC_4COM		0x00a5
-+#define MEDIATEK_PRODUCT_DC_4COM2		0x00a7
- #define MEDIATEK_PRODUCT_DC_5COM		0x00a4
- #define MEDIATEK_PRODUCT_7208_1COM		0x7101
- #define MEDIATEK_PRODUCT_7208_2COM		0x7102
-+#define MEDIATEK_PRODUCT_7103_2COM		0x7103
-+#define MEDIATEK_PRODUCT_7106_2COM		0x7106
- #define MEDIATEK_PRODUCT_FP_1COM		0x0003
- #define MEDIATEK_PRODUCT_FP_2COM		0x0023
- #define MEDIATEK_PRODUCT_FPDC_1COM		0x0043
-@@ -442,6 +446,14 @@ static void option_instat_callback(struct urb *urb);
- #define CELLIENT_VENDOR_ID			0x2692
- #define CELLIENT_PRODUCT_MEN200			0x9005
- 
-+/* Hyundai Petatel Inc. products */
-+#define PETATEL_VENDOR_ID			0x1ff4
-+#define PETATEL_PRODUCT_NP10T			0x600e
-+
-+/* TP-LINK Incorporated products */
-+#define TPLINK_VENDOR_ID			0x2357
-+#define TPLINK_PRODUCT_MA180			0x0201
-+
- /* some devices interfaces need special handling due to a number of reasons */
- enum option_blacklist_reason {
- 		OPTION_BLACKLIST_NONE = 0,
-@@ -923,8 +935,10 @@ static const struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0254, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0257, 0xff, 0xff, 0xff), /* ZTE MF821 */
- 	  .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff) },
--	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff), /* ONDA MT8205 */
-+	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff), /* ZTE MF880 */
-+	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0317, 0xff, 0xff, 0xff) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0326, 0xff, 0xff, 0xff),
- 	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
-@@ -1191,6 +1205,8 @@ static const struct usb_device_id option_ids[] = {
- 	  .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist
- 	},
- 	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) },
-+	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V),
-+	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
- 	{ USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
- 	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
- 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
-@@ -1295,7 +1311,14 @@ static const struct usb_device_id option_ids[] = {
- 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FP_2COM, 0x0a, 0x00, 0x00) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FPDC_1COM, 0x0a, 0x00, 0x00) },
- 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FPDC_2COM, 0x0a, 0x00, 0x00) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_7103_2COM, 0xff, 0x00, 0x00) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_7106_2COM, 0x02, 0x02, 0x01) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x02, 0x01) },
-+	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) },
- 	{ USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) },
-+	{ USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) },
-+	{ USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180),
-+	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
- 	{ } /* Terminating entry */
- };
- MODULE_DEVICE_TABLE(usb, option_ids);
-diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
-index 49619b4..f2a49ef 100644
---- a/drivers/video/mxsfb.c
-+++ b/drivers/video/mxsfb.c
-@@ -369,7 +369,8 @@ static void mxsfb_disable_controller(struct fb_info *fb_info)
- 		loop--;
- 	}
- 
--	writel(VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4 + REG_CLR);
-+	reg = readl(host->base + LCDC_VDCTRL4);
-+	writel(reg & ~VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4);
- 
- 	clk_disable_unprepare(host->clk);
- 
-diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
-index 5aa43c3..52bfd07 100644
---- a/drivers/virtio/virtio_ring.c
-+++ b/drivers/virtio/virtio_ring.c
-@@ -132,6 +132,13 @@ static int vring_add_indirect(struct vring_virtqueue *vq,
- 	unsigned head;
- 	int i;
- 
-+	/*
-+	 * We require lowmem mappings for the descriptors because
-+	 * otherwise virt_to_phys will give us bogus addresses in the
-+	 * virtqueue.
-+	 */
-+	gfp &= ~(__GFP_HIGHMEM | __GFP_HIGH);
-+
- 	desc = kmalloc((out + in) * sizeof(struct vring_desc), gfp);
- 	if (!desc)
- 		return -ENOMEM;
-diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
-index 0067266..22be735 100644
---- a/drivers/xen/grant-table.c
-+++ b/drivers/xen/grant-table.c
-@@ -54,10 +54,6 @@
- /* External tools reserve first few grant table entries. */
- #define NR_RESERVED_ENTRIES 8
- #define GNTTAB_LIST_END 0xffffffff
--#define GREFS_PER_GRANT_FRAME \
--(grant_table_version == 1 ?                      \
--(PAGE_SIZE / sizeof(struct grant_entry_v1)) :   \
--(PAGE_SIZE / sizeof(union grant_entry_v2)))
- 
- static grant_ref_t **gnttab_list;
- static unsigned int nr_grant_frames;
-@@ -152,6 +148,7 @@ static struct gnttab_ops *gnttab_interface;
- static grant_status_t *grstatus;
- 
- static int grant_table_version;
-+static int grefs_per_grant_frame;
- 
- static struct gnttab_free_callback *gnttab_free_callback_list;
- 
-@@ -766,12 +763,14 @@ static int grow_gnttab_list(unsigned int more_frames)
- 	unsigned int new_nr_grant_frames, extra_entries, i;
- 	unsigned int nr_glist_frames, new_nr_glist_frames;
- 
-+	BUG_ON(grefs_per_grant_frame == 0);
-+
- 	new_nr_grant_frames = nr_grant_frames + more_frames;
--	extra_entries       = more_frames * GREFS_PER_GRANT_FRAME;
-+	extra_entries       = more_frames * grefs_per_grant_frame;
- 
--	nr_glist_frames = (nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP;
-+	nr_glist_frames = (nr_grant_frames * grefs_per_grant_frame + RPP - 1) / RPP;
- 	new_nr_glist_frames =
--		(new_nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP;
-+		(new_nr_grant_frames * grefs_per_grant_frame + RPP - 1) / RPP;
- 	for (i = nr_glist_frames; i < new_nr_glist_frames; i++) {
- 		gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_ATOMIC);
- 		if (!gnttab_list[i])
-@@ -779,12 +778,12 @@ static int grow_gnttab_list(unsigned int more_frames)
- 	}
- 
- 
--	for (i = GREFS_PER_GRANT_FRAME * nr_grant_frames;
--	     i < GREFS_PER_GRANT_FRAME * new_nr_grant_frames - 1; i++)
-+	for (i = grefs_per_grant_frame * nr_grant_frames;
-+	     i < grefs_per_grant_frame * new_nr_grant_frames - 1; i++)
- 		gnttab_entry(i) = i + 1;
- 
- 	gnttab_entry(i) = gnttab_free_head;
--	gnttab_free_head = GREFS_PER_GRANT_FRAME * nr_grant_frames;
-+	gnttab_free_head = grefs_per_grant_frame * nr_grant_frames;
- 	gnttab_free_count += extra_entries;
- 
- 	nr_grant_frames = new_nr_grant_frames;
-@@ -904,7 +903,8 @@ EXPORT_SYMBOL_GPL(gnttab_unmap_refs);
- 
- static unsigned nr_status_frames(unsigned nr_grant_frames)
- {
--	return (nr_grant_frames * GREFS_PER_GRANT_FRAME + SPP - 1) / SPP;
-+	BUG_ON(grefs_per_grant_frame == 0);
-+	return (nr_grant_frames * grefs_per_grant_frame + SPP - 1) / SPP;
- }
- 
- static int gnttab_map_frames_v1(unsigned long *frames, unsigned int nr_gframes)
-@@ -1062,6 +1062,7 @@ static void gnttab_request_version(void)
- 	rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gsv, 1);
- 	if (rc == 0 && gsv.version == 2) {
- 		grant_table_version = 2;
-+		grefs_per_grant_frame = PAGE_SIZE / sizeof(union grant_entry_v2);
- 		gnttab_interface = &gnttab_v2_ops;
- 	} else if (grant_table_version == 2) {
- 		/*
-@@ -1074,17 +1075,17 @@ static void gnttab_request_version(void)
- 		panic("we need grant tables version 2, but only version 1 is available");
- 	} else {
- 		grant_table_version = 1;
-+		grefs_per_grant_frame = PAGE_SIZE / sizeof(struct grant_entry_v1);
- 		gnttab_interface = &gnttab_v1_ops;
- 	}
- 	printk(KERN_INFO "Grant tables using version %d layout.\n",
- 		grant_table_version);
- }
- 
--int gnttab_resume(void)
-+static int gnttab_setup(void)
- {
- 	unsigned int max_nr_gframes;
- 
--	gnttab_request_version();
- 	max_nr_gframes = gnttab_max_grant_frames();
- 	if (max_nr_gframes < nr_grant_frames)
- 		return -ENOSYS;
-@@ -1107,6 +1108,12 @@ int gnttab_resume(void)
- 	return 0;
- }
- 
-+int gnttab_resume(void)
-+{
-+	gnttab_request_version();
-+	return gnttab_setup();
-+}
-+
- int gnttab_suspend(void)
- {
- 	gnttab_interface->unmap_frames();
-@@ -1118,9 +1125,10 @@ static int gnttab_expand(unsigned int req_entries)
- 	int rc;
- 	unsigned int cur, extra;
- 
-+	BUG_ON(grefs_per_grant_frame == 0);
- 	cur = nr_grant_frames;
--	extra = ((req_entries + (GREFS_PER_GRANT_FRAME-1)) /
--		 GREFS_PER_GRANT_FRAME);
-+	extra = ((req_entries + (grefs_per_grant_frame-1)) /
-+		 grefs_per_grant_frame);
- 	if (cur + extra > gnttab_max_grant_frames())
- 		return -ENOSPC;
- 
-@@ -1138,21 +1146,23 @@ int gnttab_init(void)
- 	unsigned int nr_init_grefs;
- 	int ret;
- 
-+	gnttab_request_version();
- 	nr_grant_frames = 1;
- 	boot_max_nr_grant_frames = __max_nr_grant_frames();
- 
- 	/* Determine the maximum number of frames required for the
- 	 * grant reference free list on the current hypervisor.
- 	 */
-+	BUG_ON(grefs_per_grant_frame == 0);
- 	max_nr_glist_frames = (boot_max_nr_grant_frames *
--			       GREFS_PER_GRANT_FRAME / RPP);
-+			       grefs_per_grant_frame / RPP);
- 
- 	gnttab_list = kmalloc(max_nr_glist_frames * sizeof(grant_ref_t *),
- 			      GFP_KERNEL);
- 	if (gnttab_list == NULL)
- 		return -ENOMEM;
- 
--	nr_glist_frames = (nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP;
-+	nr_glist_frames = (nr_grant_frames * grefs_per_grant_frame + RPP - 1) / RPP;
- 	for (i = 0; i < nr_glist_frames; i++) {
- 		gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_KERNEL);
- 		if (gnttab_list[i] == NULL) {
-@@ -1161,12 +1171,12 @@ int gnttab_init(void)
- 		}
- 	}
- 
--	if (gnttab_resume() < 0) {
-+	if (gnttab_setup() < 0) {
- 		ret = -ENODEV;
- 		goto ini_nomem;
- 	}
- 
--	nr_init_grefs = nr_grant_frames * GREFS_PER_GRANT_FRAME;
-+	nr_init_grefs = nr_grant_frames * grefs_per_grant_frame;
- 
- 	for (i = NR_RESERVED_ENTRIES; i < nr_init_grefs - 1; i++)
- 		gnttab_entry(i) = i + 1;
-diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
-index 790b3cd..772428d 100644
---- a/fs/binfmt_misc.c
-+++ b/fs/binfmt_misc.c
-@@ -176,7 +176,10 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
- 		goto _error;
- 	bprm->argc ++;
- 
--	bprm->interp = iname;	/* for binfmt_script */
-+	/* Update interp in case binfmt_script needs it. */
-+	retval = bprm_change_interp(iname, bprm);
-+	if (retval < 0)
-+		goto _error;
- 
- 	interp_file = open_exec (iname);
- 	retval = PTR_ERR (interp_file);
-diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c
-index d3b8c1f..df49d48 100644
---- a/fs/binfmt_script.c
-+++ b/fs/binfmt_script.c
-@@ -82,7 +82,9 @@ static int load_script(struct linux_binprm *bprm,struct pt_regs *regs)
- 	retval = copy_strings_kernel(1, &i_name, bprm);
- 	if (retval) return retval; 
- 	bprm->argc++;
--	bprm->interp = interp;
-+	retval = bprm_change_interp(interp, bprm);
-+	if (retval < 0)
-+		return retval;
- 
- 	/*
- 	 * OK, now restart the process with the interpreter's dentry.
-diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
-index 1ced2d8..a2e0b94 100644
---- a/fs/ceph/addr.c
-+++ b/fs/ceph/addr.c
-@@ -267,6 +267,14 @@ static void finish_read(struct ceph_osd_request *req, struct ceph_msg *msg)
- 	kfree(req->r_pages);
- }
- 
-+static void ceph_unlock_page_vector(struct page **pages, int num_pages)
-+{
-+	int i;
-+
-+	for (i = 0; i < num_pages; i++)
-+		unlock_page(pages[i]);
-+}
-+
- /*
-  * start an async read(ahead) operation.  return nr_pages we submitted
-  * a read for on success, or negative error code.
-@@ -308,8 +316,8 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max)
- 				    NULL, 0,
- 				    ci->i_truncate_seq, ci->i_truncate_size,
- 				    NULL, false, 1, 0);
--	if (!req)
--		return -ENOMEM;
-+	if (IS_ERR(req))
-+		return PTR_ERR(req);
- 
- 	/* build page vector */
- 	nr_pages = len >> PAGE_CACHE_SHIFT;
-@@ -347,6 +355,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max)
- 	return nr_pages;
- 
- out_pages:
-+	ceph_unlock_page_vector(pages, nr_pages);
- 	ceph_release_page_vector(pages, nr_pages);
- out:
- 	ceph_osdc_put_request(req);
-@@ -831,8 +840,8 @@ get_more_pages:
- 					    ci->i_truncate_size,
- 					    &inode->i_mtime, true, 1, 0);
- 
--				if (!req) {
--					rc = -ENOMEM;
-+				if (IS_ERR(req)) {
-+					rc = PTR_ERR(req);
- 					unlock_page(page);
- 					break;
- 				}
-diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
-index 620daad..e7d4077 100644
---- a/fs/ceph/caps.c
-+++ b/fs/ceph/caps.c
-@@ -1349,11 +1349,15 @@ int __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask)
- 		if (!ci->i_head_snapc)
- 			ci->i_head_snapc = ceph_get_snap_context(
- 				ci->i_snap_realm->cached_context);
--		dout(" inode %p now dirty snapc %p\n", &ci->vfs_inode,
--			ci->i_head_snapc);
-+		dout(" inode %p now dirty snapc %p auth cap %p\n",
-+		     &ci->vfs_inode, ci->i_head_snapc, ci->i_auth_cap);
- 		BUG_ON(!list_empty(&ci->i_dirty_item));
- 		spin_lock(&mdsc->cap_dirty_lock);
--		list_add(&ci->i_dirty_item, &mdsc->cap_dirty);
-+		if (ci->i_auth_cap)
-+			list_add(&ci->i_dirty_item, &mdsc->cap_dirty);
-+		else
-+			list_add(&ci->i_dirty_item,
-+				 &mdsc->cap_dirty_migrating);
- 		spin_unlock(&mdsc->cap_dirty_lock);
- 		if (ci->i_flushing_caps == 0) {
- 			ihold(inode);
-@@ -2388,7 +2392,7 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
- 			    &atime);
- 
- 	/* max size increase? */
--	if (max_size != ci->i_max_size) {
-+	if (ci->i_auth_cap == cap && max_size != ci->i_max_size) {
- 		dout("max_size %lld -> %llu\n", ci->i_max_size, max_size);
- 		ci->i_max_size = max_size;
- 		if (max_size >= ci->i_wanted_max_size) {
-@@ -2745,6 +2749,7 @@ static void handle_cap_import(struct ceph_mds_client *mdsc,
- 
- 	/* make sure we re-request max_size, if necessary */
- 	spin_lock(&ci->i_ceph_lock);
-+	ci->i_wanted_max_size = 0;  /* reset */
- 	ci->i_requested_max_size = 0;
- 	spin_unlock(&ci->i_ceph_lock);
- }
-@@ -2840,8 +2845,6 @@ void ceph_handle_caps(struct ceph_mds_session *session,
- 	case CEPH_CAP_OP_IMPORT:
- 		handle_cap_import(mdsc, inode, h, session,
- 				  snaptrace, snaptrace_len);
--		ceph_check_caps(ceph_inode(inode), 0, session);
--		goto done_unlocked;
- 	}
- 
- 	/* the rest require a cap */
-@@ -2858,6 +2861,7 @@ void ceph_handle_caps(struct ceph_mds_session *session,
- 	switch (op) {
- 	case CEPH_CAP_OP_REVOKE:
- 	case CEPH_CAP_OP_GRANT:
-+	case CEPH_CAP_OP_IMPORT:
- 		handle_cap_grant(inode, h, session, cap, msg->middle);
- 		goto done_unlocked;
- 
-diff --git a/fs/ceph/file.c b/fs/ceph/file.c
-index ecebbc0..5840d2a 100644
---- a/fs/ceph/file.c
-+++ b/fs/ceph/file.c
-@@ -536,8 +536,8 @@ more:
- 				    do_sync,
- 				    ci->i_truncate_seq, ci->i_truncate_size,
- 				    &mtime, false, 2, page_align);
--	if (!req)
--		return -ENOMEM;
-+	if (IS_ERR(req))
-+		return PTR_ERR(req);
- 
- 	if (file->f_flags & O_DIRECT) {
- 		pages = ceph_get_direct_page_vector(data, num_pages, false);
-diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
-index 4b5762e..81613bc 100644
---- a/fs/ceph/inode.c
-+++ b/fs/ceph/inode.c
-@@ -1466,7 +1466,7 @@ void __ceph_do_pending_vmtruncate(struct inode *inode)
- {
- 	struct ceph_inode_info *ci = ceph_inode(inode);
- 	u64 to;
--	int wrbuffer_refs, wake = 0;
-+	int wrbuffer_refs, finish = 0;
- 
- retry:
- 	spin_lock(&ci->i_ceph_lock);
-@@ -1498,15 +1498,18 @@ retry:
- 	truncate_inode_pages(inode->i_mapping, to);
- 
- 	spin_lock(&ci->i_ceph_lock);
--	ci->i_truncate_pending--;
--	if (ci->i_truncate_pending == 0)
--		wake = 1;
-+	if (to == ci->i_truncate_size) {
-+		ci->i_truncate_pending = 0;
-+		finish = 1;
-+	}
- 	spin_unlock(&ci->i_ceph_lock);
-+	if (!finish)
-+		goto retry;
- 
- 	if (wrbuffer_refs == 0)
- 		ceph_check_caps(ci, CHECK_CAPS_AUTHONLY, NULL);
--	if (wake)
--		wake_up_all(&ci->i_cap_wq);
-+
-+	wake_up_all(&ci->i_cap_wq);
- }
- 
- 
-diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
-index 1bcf712..0d9864f 100644
---- a/fs/ceph/mds_client.c
-+++ b/fs/ceph/mds_client.c
-@@ -1876,9 +1876,14 @@ finish:
- static void __wake_requests(struct ceph_mds_client *mdsc,
- 			    struct list_head *head)
- {
--	struct ceph_mds_request *req, *nreq;
-+	struct ceph_mds_request *req;
-+	LIST_HEAD(tmp_list);
-+
-+	list_splice_init(head, &tmp_list);
- 
--	list_for_each_entry_safe(req, nreq, head, r_wait) {
-+	while (!list_empty(&tmp_list)) {
-+		req = list_entry(tmp_list.next,
-+				 struct ceph_mds_request, r_wait);
- 		list_del_init(&req->r_wait);
- 		__do_request(mdsc, req);
- 	}
-diff --git a/fs/ceph/super.c b/fs/ceph/super.c
-index b982239..2f6212e 100644
---- a/fs/ceph/super.c
-+++ b/fs/ceph/super.c
-@@ -388,8 +388,6 @@ static int ceph_show_options(struct seq_file *m, struct dentry *root)
- 		seq_printf(m, ",mount_timeout=%d", opt->mount_timeout);
- 	if (opt->osd_idle_ttl != CEPH_OSD_IDLE_TTL_DEFAULT)
- 		seq_printf(m, ",osd_idle_ttl=%d", opt->osd_idle_ttl);
--	if (opt->osd_timeout != CEPH_OSD_TIMEOUT_DEFAULT)
--		seq_printf(m, ",osdtimeout=%d", opt->osd_timeout);
- 	if (opt->osd_keepalive_timeout != CEPH_OSD_KEEPALIVE_DEFAULT)
- 		seq_printf(m, ",osdkeepalivetimeout=%d",
- 			   opt->osd_keepalive_timeout);
-diff --git a/fs/eventpoll.c b/fs/eventpoll.c
-index eedec84..3b032dd 100644
---- a/fs/eventpoll.c
-+++ b/fs/eventpoll.c
-@@ -1285,7 +1285,7 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi, struct epoll_even
- 	 * otherwise we might miss an event that happens between the
- 	 * f_op->poll() call and the new event set registering.
- 	 */
--	epi->event.events = event->events;
-+	epi->event.events = event->events; /* need barrier below */
- 	pt._key = event->events;
- 	epi->event.data = event->data; /* protected by mtx */
- 	if (epi->event.events & EPOLLWAKEUP) {
-@@ -1296,6 +1296,26 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi, struct epoll_even
- 	}
- 
- 	/*
-+	 * The following barrier has two effects:
-+	 *
-+	 * 1) Flush epi changes above to other CPUs.  This ensures
-+	 *    we do not miss events from ep_poll_callback if an
-+	 *    event occurs immediately after we call f_op->poll().
-+	 *    We need this because we did not take ep->lock while
-+	 *    changing epi above (but ep_poll_callback does take
-+	 *    ep->lock).
-+	 *
-+	 * 2) We also need to ensure we do not miss _past_ events
-+	 *    when calling f_op->poll().  This barrier also
-+	 *    pairs with the barrier in wq_has_sleeper (see
-+	 *    comments for wq_has_sleeper).
-+	 *
-+	 * This barrier will now guarantee ep_poll_callback or f_op->poll
-+	 * (or both) will notice the readiness of an item.
-+	 */
-+	smp_mb();
-+
-+	/*
- 	 * Get current event bits. We can safely use the file* here because
- 	 * its usage count has been increased by the caller of this function.
- 	 */
-diff --git a/fs/exec.c b/fs/exec.c
-index fab2c6d..59896ae 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -1202,9 +1202,24 @@ void free_bprm(struct linux_binprm *bprm)
- 		mutex_unlock(&current->signal->cred_guard_mutex);
- 		abort_creds(bprm->cred);
- 	}
-+	/* If a binfmt changed the interp, free it. */
-+	if (bprm->interp != bprm->filename)
-+		kfree(bprm->interp);
- 	kfree(bprm);
- }
- 
-+int bprm_change_interp(char *interp, struct linux_binprm *bprm)
-+{
-+	/* If a binfmt changed the interp, free it first. */
-+	if (bprm->interp != bprm->filename)
-+		kfree(bprm->interp);
-+	bprm->interp = kstrdup(interp, GFP_KERNEL);
-+	if (!bprm->interp)
-+		return -ENOMEM;
-+	return 0;
-+}
-+EXPORT_SYMBOL(bprm_change_interp);
-+
- /*
-  * install the new credentials for this executable
-  */
-diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
-index a5c29bb..8535c45 100644
---- a/fs/ext4/acl.c
-+++ b/fs/ext4/acl.c
-@@ -410,8 +410,10 @@ ext4_xattr_set_acl(struct dentry *dentry, const char *name, const void *value,
- 
- retry:
- 	handle = ext4_journal_start(inode, EXT4_DATA_TRANS_BLOCKS(inode->i_sb));
--	if (IS_ERR(handle))
--		return PTR_ERR(handle);
-+	if (IS_ERR(handle)) {
-+		error = PTR_ERR(handle);
-+		goto release_and_out;
-+	}
- 	error = ext4_set_acl(handle, inode, type, acl);
- 	ext4_journal_stop(handle);
- 	if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
-diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
-index 741bb94..31be24d 100644
---- a/fs/ext4/extents.c
-+++ b/fs/ext4/extents.c
-@@ -2176,13 +2176,14 @@ ext4_ext_in_cache(struct inode *inode, ext4_lblk_t block,
-  * removes index from the index block.
-  */
- static int ext4_ext_rm_idx(handle_t *handle, struct inode *inode,
--			struct ext4_ext_path *path)
-+			struct ext4_ext_path *path, int depth)
- {
- 	int err;
- 	ext4_fsblk_t leaf;
- 
- 	/* free index block */
--	path--;
-+	depth--;
-+	path = path + depth;
- 	leaf = ext4_idx_pblock(path->p_idx);
- 	if (unlikely(path->p_hdr->eh_entries == 0)) {
- 		EXT4_ERROR_INODE(inode, "path->p_hdr->eh_entries == 0");
-@@ -2207,6 +2208,19 @@ static int ext4_ext_rm_idx(handle_t *handle, struct inode *inode,
- 
- 	ext4_free_blocks(handle, inode, NULL, leaf, 1,
- 			 EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET);
-+
-+	while (--depth >= 0) {
-+		if (path->p_idx != EXT_FIRST_INDEX(path->p_hdr))
-+			break;
-+		path--;
-+		err = ext4_ext_get_access(handle, inode, path);
-+		if (err)
-+			break;
-+		path->p_idx->ei_block = (path+1)->p_idx->ei_block;
-+		err = ext4_ext_dirty(handle, inode, path);
-+		if (err)
-+			break;
-+	}
- 	return err;
- }
- 
-@@ -2540,7 +2554,7 @@ ext4_ext_rm_leaf(handle_t *handle, struct inode *inode,
- 	/* if this leaf is free, then we should
- 	 * remove it from index block above */
- 	if (err == 0 && eh->eh_entries == 0 && path[depth].p_bh != NULL)
--		err = ext4_ext_rm_idx(handle, inode, path + depth);
-+		err = ext4_ext_rm_idx(handle, inode, path, depth);
- 
- out:
- 	return err;
-@@ -2741,7 +2755,7 @@ cont:
- 				/* index is empty, remove it;
- 				 * handle must be already prepared by the
- 				 * truncatei_leaf() */
--				err = ext4_ext_rm_idx(handle, inode, path + i);
-+				err = ext4_ext_rm_idx(handle, inode, path, i);
- 			}
- 			/* root level has p_bh == NULL, brelse() eats this */
- 			brelse(path[i].p_bh);
-diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
-index cc2d77c..c7c6e09 100644
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -753,7 +753,6 @@ got:
- 
- 		BUFFER_TRACE(block_bitmap_bh, "dirty block bitmap");
- 		err = ext4_handle_dirty_metadata(handle, NULL, block_bitmap_bh);
--		brelse(block_bitmap_bh);
- 
- 		/* recheck and clear flag under lock if we still need to */
- 		ext4_lock_group(sb, group);
-@@ -766,6 +765,7 @@ got:
- 			ext4_group_desc_csum_set(sb, group, gdp);
- 		}
- 		ext4_unlock_group(sb, group);
-+		brelse(block_bitmap_bh);
- 
- 		if (err)
- 			goto fail;
-diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
-index 2ce16af..7e424eb 100644
---- a/fs/ext4/inode.c
-+++ b/fs/ext4/inode.c
-@@ -1501,6 +1501,8 @@ static void ext4_da_block_invalidatepages(struct mpage_da_data *mpd)
- 
- 	index = mpd->first_page;
- 	end   = mpd->next_page - 1;
-+
-+	pagevec_init(&pvec, 0);
- 	while (index <= end) {
- 		nr_pages = pagevec_lookup(&pvec, mapping, index, PAGEVEC_SIZE);
- 		if (nr_pages == 0)
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 2b5fb60..f4665ec 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -1643,9 +1643,7 @@ static int parse_options(char *options, struct super_block *sb,
- 			 unsigned int *journal_ioprio,
- 			 int is_remount)
- {
--#ifdef CONFIG_QUOTA
- 	struct ext4_sb_info *sbi = EXT4_SB(sb);
--#endif
- 	char *p;
- 	substring_t args[MAX_OPT_ARGS];
- 	int token;
-@@ -1694,6 +1692,16 @@ static int parse_options(char *options, struct super_block *sb,
- 		}
- 	}
- #endif
-+	if (test_opt(sb, DIOREAD_NOLOCK)) {
-+		int blocksize =
-+			BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size);
-+
-+		if (blocksize < PAGE_CACHE_SIZE) {
-+			ext4_msg(sb, KERN_ERR, "can't mount with "
-+				 "dioread_nolock if block size != PAGE_SIZE");
-+			return 0;
-+		}
-+	}
- 	return 1;
- }
- 
-@@ -2184,7 +2192,9 @@ static void ext4_orphan_cleanup(struct super_block *sb,
- 				__func__, inode->i_ino, inode->i_size);
- 			jbd_debug(2, "truncating inode %lu to %lld bytes\n",
- 				  inode->i_ino, inode->i_size);
-+			mutex_lock(&inode->i_mutex);
- 			ext4_truncate(inode);
-+			mutex_unlock(&inode->i_mutex);
- 			nr_truncates++;
- 		} else {
- 			ext4_msg(sb, KERN_DEBUG,
-@@ -3409,15 +3419,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
- 			clear_opt(sb, DELALLOC);
- 	}
- 
--	blocksize = BLOCK_SIZE << le32_to_cpu(es->s_log_block_size);
--	if (test_opt(sb, DIOREAD_NOLOCK)) {
--		if (blocksize < PAGE_SIZE) {
--			ext4_msg(sb, KERN_ERR, "can't mount with "
--				 "dioread_nolock if block size != PAGE_SIZE");
--			goto failed_mount;
--		}
--	}
--
- 	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
- 		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
- 
-@@ -3459,6 +3460,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
- 	if (!ext4_feature_set_ok(sb, (sb->s_flags & MS_RDONLY)))
- 		goto failed_mount;
- 
-+	blocksize = BLOCK_SIZE << le32_to_cpu(es->s_log_block_size);
- 	if (blocksize < EXT4_MIN_BLOCK_SIZE ||
- 	    blocksize > EXT4_MAX_BLOCK_SIZE) {
- 		ext4_msg(sb, KERN_ERR,
-@@ -4694,7 +4696,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
- 	}
- 
- 	ext4_setup_system_zone(sb);
--	if (sbi->s_journal == NULL)
-+	if (sbi->s_journal == NULL && !(old_sb_flags & MS_RDONLY))
- 		ext4_commit_super(sb, 1);
- 
- 	unlock_super(sb);
-diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
-index fb1ab953..2fb20f5 100644
---- a/fs/jbd2/transaction.c
-+++ b/fs/jbd2/transaction.c
-@@ -209,7 +209,8 @@ repeat:
- 		if (!new_transaction)
- 			goto alloc_transaction;
- 		write_lock(&journal->j_state_lock);
--		if (!journal->j_running_transaction) {
-+		if (!journal->j_running_transaction &&
-+		    !journal->j_barrier_count) {
- 			jbd2_get_transaction(journal, new_transaction);
- 			new_transaction = NULL;
- 		}
-diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c
-index 0c96eb5..0331072 100644
---- a/fs/jffs2/nodemgmt.c
-+++ b/fs/jffs2/nodemgmt.c
-@@ -417,14 +417,16 @@ static int jffs2_do_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,
- 			spin_unlock(&c->erase_completion_lock);
- 
- 			ret = jffs2_prealloc_raw_node_refs(c, jeb, 1);
--			if (ret)
--				return ret;
-+
- 			/* Just lock it again and continue. Nothing much can change because
- 			   we hold c->alloc_sem anyway. In fact, it's not entirely clear why
- 			   we hold c->erase_completion_lock in the majority of this function...
- 			   but that's a question for another (more caffeine-rich) day. */
- 			spin_lock(&c->erase_completion_lock);
- 
-+			if (ret)
-+				return ret;
-+
- 			waste = jeb->free_size;
- 			jffs2_link_node_ref(c, jeb,
- 					    (jeb->offset + c->sector_size - waste) | REF_OBSOLETE,
-diff --git a/fs/nfs/client.c b/fs/nfs/client.c
-index 0e7cd89..b59f1d8 100644
---- a/fs/nfs/client.c
-+++ b/fs/nfs/client.c
-@@ -614,8 +614,7 @@ EXPORT_SYMBOL_GPL(nfs_create_rpc_client);
-  */
- static void nfs_destroy_server(struct nfs_server *server)
- {
--	if (!(server->flags & NFS_MOUNT_LOCAL_FLOCK) ||
--			!(server->flags & NFS_MOUNT_LOCAL_FCNTL))
-+	if (server->nlm_host)
- 		nlmclnt_done(server->nlm_host);
- }
- 
-diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
-index 627f108..e210a66 100644
---- a/fs/nfs/dir.c
-+++ b/fs/nfs/dir.c
-@@ -1155,11 +1155,14 @@ static int nfs_dentry_delete(const struct dentry *dentry)
- 
- }
- 
-+/* Ensure that we revalidate inode->i_nlink */
- static void nfs_drop_nlink(struct inode *inode)
- {
- 	spin_lock(&inode->i_lock);
--	if (inode->i_nlink > 0)
--		drop_nlink(inode);
-+	/* drop the inode if we're reasonably sure this is the last link */
-+	if (inode->i_nlink == 1)
-+		clear_nlink(inode);
-+	NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ATTR;
- 	spin_unlock(&inode->i_lock);
- }
- 
-@@ -1174,8 +1177,8 @@ static void nfs_dentry_iput(struct dentry *dentry, struct inode *inode)
- 		NFS_I(inode)->cache_validity |= NFS_INO_INVALID_DATA;
- 
- 	if (dentry->d_flags & DCACHE_NFSFS_RENAMED) {
--		drop_nlink(inode);
- 		nfs_complete_unlink(dentry, inode);
-+		nfs_drop_nlink(inode);
- 	}
- 	iput(inode);
- }
-@@ -1646,10 +1649,8 @@ static int nfs_safe_remove(struct dentry *dentry)
- 	if (inode != NULL) {
- 		NFS_PROTO(inode)->return_delegation(inode);
- 		error = NFS_PROTO(dir)->remove(dir, &dentry->d_name);
--		/* The VFS may want to delete this inode */
- 		if (error == 0)
- 			nfs_drop_nlink(inode);
--		nfs_mark_for_revalidate(inode);
- 	} else
- 		error = NFS_PROTO(dir)->remove(dir, &dentry->d_name);
- 	if (error == -ENOENT)
-diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
-index 7bff871..5e61aac 100644
---- a/fs/nfs/nfs4proc.c
-+++ b/fs/nfs/nfs4proc.c
-@@ -5999,13 +5999,26 @@ static void nfs41_sequence_prepare(struct rpc_task *task, void *data)
- 	rpc_call_start(task);
- }
- 
-+static void nfs41_sequence_prepare_privileged(struct rpc_task *task, void *data)
-+{
-+	rpc_task_set_priority(task, RPC_PRIORITY_PRIVILEGED);
-+	nfs41_sequence_prepare(task, data);
-+}
-+
- static const struct rpc_call_ops nfs41_sequence_ops = {
- 	.rpc_call_done = nfs41_sequence_call_done,
- 	.rpc_call_prepare = nfs41_sequence_prepare,
- 	.rpc_release = nfs41_sequence_release,
- };
- 
--static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp, struct rpc_cred *cred)
-+static const struct rpc_call_ops nfs41_sequence_privileged_ops = {
-+	.rpc_call_done = nfs41_sequence_call_done,
-+	.rpc_call_prepare = nfs41_sequence_prepare_privileged,
-+	.rpc_release = nfs41_sequence_release,
-+};
-+
-+static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp, struct rpc_cred *cred,
-+					     const struct rpc_call_ops *seq_ops)
- {
- 	struct nfs4_sequence_data *calldata;
- 	struct rpc_message msg = {
-@@ -6015,7 +6028,7 @@ static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp, struct rpc_
- 	struct rpc_task_setup task_setup_data = {
- 		.rpc_client = clp->cl_rpcclient,
- 		.rpc_message = &msg,
--		.callback_ops = &nfs41_sequence_ops,
-+		.callback_ops = seq_ops,
- 		.flags = RPC_TASK_ASYNC | RPC_TASK_SOFT,
- 	};
- 
-@@ -6042,7 +6055,7 @@ static int nfs41_proc_async_sequence(struct nfs_client *clp, struct rpc_cred *cr
- 
- 	if ((renew_flags & NFS4_RENEW_TIMEOUT) == 0)
- 		return 0;
--	task = _nfs41_proc_sequence(clp, cred);
-+	task = _nfs41_proc_sequence(clp, cred, &nfs41_sequence_ops);
- 	if (IS_ERR(task))
- 		ret = PTR_ERR(task);
- 	else
-@@ -6056,7 +6069,7 @@ static int nfs4_proc_sequence(struct nfs_client *clp, struct rpc_cred *cred)
- 	struct rpc_task *task;
- 	int ret;
- 
--	task = _nfs41_proc_sequence(clp, cred);
-+	task = _nfs41_proc_sequence(clp, cred, &nfs41_sequence_privileged_ops);
- 	if (IS_ERR(task)) {
- 		ret = PTR_ERR(task);
- 		goto out;
-diff --git a/fs/nfs/super.c b/fs/nfs/super.c
-index d8d7396..2a31c7f 100644
---- a/fs/nfs/super.c
-+++ b/fs/nfs/super.c
-@@ -1095,7 +1095,7 @@ static int nfs_get_option_str(substring_t args[], char **option)
- {
- 	kfree(*option);
- 	*option = match_strdup(args);
--	return !option;
-+	return !*option;
- }
- 
- static int nfs_get_option_ul(substring_t args[], unsigned long *option)
-diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
-index c9c1c0a..ac784eb 100644
---- a/fs/nfsd/nfs4proc.c
-+++ b/fs/nfsd/nfs4proc.c
-@@ -194,6 +194,7 @@ static __be32
- do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open)
- {
- 	struct svc_fh *resfh;
-+	int accmode;
- 	__be32 status;
- 
- 	resfh = kmalloc(sizeof(struct svc_fh), GFP_KERNEL);
-@@ -253,9 +254,10 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o
- 	/* set reply cache */
- 	fh_copy_shallow(&open->op_openowner->oo_owner.so_replay.rp_openfh,
- 			&resfh->fh_handle);
--	if (!open->op_created)
--		status = do_open_permission(rqstp, resfh, open,
--					    NFSD_MAY_NOP);
-+	accmode = NFSD_MAY_NOP;
-+	if (open->op_created)
-+		accmode |= NFSD_MAY_OWNER_OVERRIDE;
-+	status = do_open_permission(rqstp, resfh, open, accmode);
- 	set_change_info(&open->op_cinfo, current_fh);
- 	fh_dup2(current_fh, resfh);
- out:
-diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
-index 5b3224c..0953c6c 100644
---- a/fs/nfsd/nfs4state.c
-+++ b/fs/nfsd/nfs4state.c
-@@ -2341,7 +2341,7 @@ nfsd4_init_slabs(void)
- 	if (openowner_slab == NULL)
- 		goto out_nomem;
- 	lockowner_slab = kmem_cache_create("nfsd4_lockowners",
--			sizeof(struct nfs4_openowner), 0, 0, NULL);
-+			sizeof(struct nfs4_lockowner), 0, 0, NULL);
- 	if (lockowner_slab == NULL)
- 		goto out_nomem;
- 	file_slab = kmem_cache_create("nfsd4_files",
-diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index 6322df3..1e83186 100644
---- a/fs/nfsd/nfs4xdr.c
-+++ b/fs/nfsd/nfs4xdr.c
-@@ -2946,11 +2946,16 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
- 	len = maxcount;
- 	v = 0;
- 	while (len > 0) {
--		pn = resp->rqstp->rq_resused++;
-+		pn = resp->rqstp->rq_resused;
-+		if (!resp->rqstp->rq_respages[pn]) { /* ran out of pages */
-+			maxcount -= len;
-+			break;
-+		}
- 		resp->rqstp->rq_vec[v].iov_base =
- 			page_address(resp->rqstp->rq_respages[pn]);
- 		resp->rqstp->rq_vec[v].iov_len =
- 			len < PAGE_SIZE ? len : PAGE_SIZE;
-+		resp->rqstp->rq_resused++;
- 		v++;
- 		len -= PAGE_SIZE;
- 	}
-@@ -2996,6 +3001,8 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd
- 		return nfserr;
- 	if (resp->xbuf->page_len)
- 		return nfserr_resource;
-+	if (!resp->rqstp->rq_respages[resp->rqstp->rq_resused])
-+		return nfserr_resource;
- 
- 	page = page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused++]);
- 
-@@ -3045,6 +3052,8 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4
- 		return nfserr;
- 	if (resp->xbuf->page_len)
- 		return nfserr_resource;
-+	if (!resp->rqstp->rq_respages[resp->rqstp->rq_resused])
-+		return nfserr_resource;
- 
- 	RESERVE_SPACE(NFS4_VERIFIER_SIZE);
- 	savep = p;
-diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
-index 240473c..0d5e021 100644
---- a/fs/nfsd/nfssvc.c
-+++ b/fs/nfsd/nfssvc.c
-@@ -650,7 +650,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp)
- 	}
- 
- 	/* Store reply in cache. */
--	nfsd_cache_update(rqstp, proc->pc_cachetype, statp + 1);
-+	nfsd_cache_update(rqstp, rqstp->rq_cachetype, statp + 1);
- 	return 1;
- }
- 
-diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
-index a9269f1..e1b40c7 100644
---- a/fs/nfsd/vfs.c
-+++ b/fs/nfsd/vfs.c
-@@ -1485,13 +1485,19 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
- 		case NFS3_CREATE_EXCLUSIVE:
- 			if (   dchild->d_inode->i_mtime.tv_sec == v_mtime
- 			    && dchild->d_inode->i_atime.tv_sec == v_atime
--			    && dchild->d_inode->i_size  == 0 )
-+			    && dchild->d_inode->i_size  == 0 ) {
-+				if (created)
-+					*created = 1;
- 				break;
-+			}
- 		case NFS4_CREATE_EXCLUSIVE4_1:
- 			if (   dchild->d_inode->i_mtime.tv_sec == v_mtime
- 			    && dchild->d_inode->i_atime.tv_sec == v_atime
--			    && dchild->d_inode->i_size  == 0 )
-+			    && dchild->d_inode->i_size  == 0 ) {
-+				if (created)
-+					*created = 1;
- 				goto set_attr;
-+			}
- 			 /* fallthru */
- 		case NFS3_CREATE_GUARDED:
- 			err = nfserr_exist;
-diff --git a/fs/splice.c b/fs/splice.c
-index 41514dd..c69fbb7 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -696,8 +696,10 @@ static int pipe_to_sendpage(struct pipe_inode_info *pipe,
- 		return -EINVAL;
- 
- 	more = (sd->flags & SPLICE_F_MORE) ? MSG_MORE : 0;
--	if (sd->len < sd->total_len)
-+
-+	if (sd->len < sd->total_len && pipe->nrbufs > 1)
- 		more |= MSG_SENDPAGE_NOTLAST;
-+
- 	return file->f_op->sendpage(file, buf->page, buf->offset,
- 				    sd->len, &pos, more);
- }
-diff --git a/fs/udf/inode.c b/fs/udf/inode.c
-index aa23346..585ee1c 100644
---- a/fs/udf/inode.c
-+++ b/fs/udf/inode.c
-@@ -574,6 +574,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
- 	struct udf_inode_info *iinfo = UDF_I(inode);
- 	int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
- 	int lastblock = 0;
-+	bool isBeyondEOF;
- 
- 	*err = 0;
- 	*new = 0;
-@@ -653,7 +654,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
- 	/* Are we beyond EOF? */
- 	if (etype == -1) {
- 		int ret;
--
-+		isBeyondEOF = 1;
- 		if (count) {
- 			if (c)
- 				laarr[0] = laarr[1];
-@@ -696,6 +697,7 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
- 		endnum = c + 1;
- 		lastblock = 1;
- 	} else {
-+		isBeyondEOF = 0;
- 		endnum = startnum = ((count > 2) ? 2 : count);
- 
- 		/* if the current extent is in position 0,
-@@ -738,10 +740,13 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
- 				goal, err);
- 		if (!newblocknum) {
- 			brelse(prev_epos.bh);
-+			brelse(cur_epos.bh);
-+			brelse(next_epos.bh);
- 			*err = -ENOSPC;
- 			return 0;
- 		}
--		iinfo->i_lenExtents += inode->i_sb->s_blocksize;
-+		if (isBeyondEOF)
-+			iinfo->i_lenExtents += inode->i_sb->s_blocksize;
- 	}
- 
- 	/* if the extent the requsted block is located in contains multiple
-@@ -768,6 +773,8 @@ static sector_t inode_getblk(struct inode *inode, sector_t block,
- 	udf_update_extents(inode, laarr, startnum, endnum, &prev_epos);
- 
- 	brelse(prev_epos.bh);
-+	brelse(cur_epos.bh);
-+	brelse(next_epos.bh);
- 
- 	newblock = udf_get_pblock(inode->i_sb, newblocknum,
- 				iinfo->i_location.partitionReferenceNum, 0);
-diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
-index ed6642a..25f01d0 100644
---- a/include/asm-generic/tlb.h
-+++ b/include/asm-generic/tlb.h
-@@ -78,6 +78,14 @@ struct mmu_gather_batch {
- #define MAX_GATHER_BATCH	\
- 	((PAGE_SIZE - sizeof(struct mmu_gather_batch)) / sizeof(void *))
- 
-+/*
-+ * Limit the maximum number of mmu_gather batches to reduce a risk of soft
-+ * lockups for non-preemptible kernels on huge machines when a lot of memory
-+ * is zapped during unmapping.
-+ * 10K pages freed at once should be safe even without a preemption point.
-+ */
-+#define MAX_GATHER_BATCH_COUNT	(10000UL/MAX_GATHER_BATCH)
-+
- /* struct mmu_gather is an opaque type used by the mm code for passing around
-  * any data needed by arch specific code for tlb_remove_page.
-  */
-@@ -96,6 +104,7 @@ struct mmu_gather {
- 	struct mmu_gather_batch *active;
- 	struct mmu_gather_batch	local;
- 	struct page		*__pages[MMU_GATHER_BUNDLE];
-+	unsigned int		batch_count;
- };
- 
- #define HAVE_GENERIC_MMU_GATHER
-diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
-index 366422b..eb53e15 100644
---- a/include/linux/binfmts.h
-+++ b/include/linux/binfmts.h
-@@ -128,6 +128,7 @@ extern int setup_arg_pages(struct linux_binprm * bprm,
- 			   unsigned long stack_top,
- 			   int executable_stack);
- extern int bprm_mm_init(struct linux_binprm *bprm);
-+extern int bprm_change_interp(char *interp, struct linux_binprm *bprm);
- extern int copy_strings_kernel(int argc, const char *const *argv,
- 			       struct linux_binprm *bprm);
- extern int prepare_bprm_creds(struct linux_binprm *bprm);
-diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
-index 4262478..317aff8 100644
---- a/include/linux/ceph/libceph.h
-+++ b/include/linux/ceph/libceph.h
-@@ -43,7 +43,6 @@ struct ceph_options {
- 	struct ceph_entity_addr my_addr;
- 	int mount_timeout;
- 	int osd_idle_ttl;
--	int osd_timeout;
- 	int osd_keepalive_timeout;
- 
- 	/*
-@@ -63,7 +62,6 @@ struct ceph_options {
-  * defaults
-  */
- #define CEPH_MOUNT_TIMEOUT_DEFAULT  60
--#define CEPH_OSD_TIMEOUT_DEFAULT    60  /* seconds */
- #define CEPH_OSD_KEEPALIVE_DEFAULT  5
- #define CEPH_OSD_IDLE_TTL_DEFAULT    60
- 
-diff --git a/include/linux/freezer.h b/include/linux/freezer.h
-index d09af4b..ee89932 100644
---- a/include/linux/freezer.h
-+++ b/include/linux/freezer.h
-@@ -75,28 +75,62 @@ static inline bool cgroup_freezing(struct task_struct *task)
-  */
- 
- 
--/* Tell the freezer not to count the current task as freezable. */
-+/**
-+ * freezer_do_not_count - tell freezer to ignore %current
-+ *
-+ * Tell freezers to ignore the current task when determining whether the
-+ * target frozen state is reached.  IOW, the current task will be
-+ * considered frozen enough by freezers.
-+ *
-+ * The caller shouldn't do anything which isn't allowed for a frozen task
-+ * until freezer_cont() is called.  Usually, freezer[_do_not]_count() pair
-+ * wrap a scheduling operation and nothing much else.
-+ */
- static inline void freezer_do_not_count(void)
- {
- 	current->flags |= PF_FREEZER_SKIP;
- }
- 
--/*
-- * Tell the freezer to count the current task as freezable again and try to
-- * freeze it.
-+/**
-+ * freezer_count - tell freezer to stop ignoring %current
-+ *
-+ * Undo freezer_do_not_count().  It tells freezers that %current should be
-+ * considered again and tries to freeze if freezing condition is already in
-+ * effect.
-  */
- static inline void freezer_count(void)
- {
- 	current->flags &= ~PF_FREEZER_SKIP;
-+	/*
-+	 * If freezing is in progress, the following paired with smp_mb()
-+	 * in freezer_should_skip() ensures that either we see %true
-+	 * freezing() or freezer_should_skip() sees !PF_FREEZER_SKIP.
-+	 */
-+	smp_mb();
- 	try_to_freeze();
- }
- 
--/*
-- * Check if the task should be counted as freezable by the freezer
-+/**
-+ * freezer_should_skip - whether to skip a task when determining frozen
-+ *			 state is reached
-+ * @p: task in quesion
-+ *
-+ * This function is used by freezers after establishing %true freezing() to
-+ * test whether a task should be skipped when determining the target frozen
-+ * state is reached.  IOW, if this function returns %true, @p is considered
-+ * frozen enough.
-  */
--static inline int freezer_should_skip(struct task_struct *p)
-+static inline bool freezer_should_skip(struct task_struct *p)
- {
--	return !!(p->flags & PF_FREEZER_SKIP);
-+	/*
-+	 * The following smp_mb() paired with the one in freezer_count()
-+	 * ensures that either freezer_count() sees %true freezing() or we
-+	 * see cleared %PF_FREEZER_SKIP and return %false.  This makes it
-+	 * impossible for a task to slip frozen state testing after
-+	 * clearing %PF_FREEZER_SKIP.
-+	 */
-+	smp_mb();
-+	return p->flags & PF_FREEZER_SKIP;
- }
- 
- /*
-diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
-index b5d1384..70473da 100644
---- a/include/linux/page-flags.h
-+++ b/include/linux/page-flags.h
-@@ -362,7 +362,7 @@ static inline void ClearPageCompound(struct page *page)
-  * pages on the LRU and/or pagecache.
-  */
- TESTPAGEFLAG(Compound, compound)
--__PAGEFLAG(Head, compound)
-+__SETPAGEFLAG(Head, compound)  __CLEARPAGEFLAG(Head, compound)
- 
- /*
-  * PG_reclaim is used in combination with PG_compound to mark the
-@@ -374,8 +374,14 @@ __PAGEFLAG(Head, compound)
-  * PG_compound & PG_reclaim	=> Tail page
-  * PG_compound & ~PG_reclaim	=> Head page
-  */
-+#define PG_head_mask ((1L << PG_compound))
- #define PG_head_tail_mask ((1L << PG_compound) | (1L << PG_reclaim))
- 
-+static inline int PageHead(struct page *page)
-+{
-+	return ((page->flags & PG_head_tail_mask) == PG_head_mask);
-+}
-+
- static inline int PageTail(struct page *page)
- {
- 	return ((page->flags & PG_head_tail_mask) == PG_head_tail_mask);
-diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
-index 8d3c427..50a6cbe 100644
---- a/include/linux/pci_ids.h
-+++ b/include/linux/pci_ids.h
-@@ -1566,6 +1566,7 @@
- #define PCI_DEVICE_ID_RICOH_RL5C476	0x0476
- #define PCI_DEVICE_ID_RICOH_RL5C478	0x0478
- #define PCI_DEVICE_ID_RICOH_R5C822	0x0822
-+#define PCI_DEVICE_ID_RICOH_R5CE822	0xe822
- #define PCI_DEVICE_ID_RICOH_R5CE823	0xe823
- #define PCI_DEVICE_ID_RICOH_R5C832	0x0832
- #define PCI_DEVICE_ID_RICOH_R5C843	0x0843
-diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 23bddac..d2bbc12 100644
---- a/include/linux/sched.h
-+++ b/include/linux/sched.h
-@@ -2684,7 +2684,16 @@ static inline void thread_group_cputime_init(struct signal_struct *sig)
- extern void recalc_sigpending_and_wake(struct task_struct *t);
- extern void recalc_sigpending(void);
- 
--extern void signal_wake_up(struct task_struct *t, int resume_stopped);
-+extern void signal_wake_up_state(struct task_struct *t, unsigned int state);
-+
-+static inline void signal_wake_up(struct task_struct *t, bool resume)
-+{
-+	signal_wake_up_state(t, resume ? TASK_WAKEKILL : 0);
-+}
-+static inline void ptrace_signal_wake_up(struct task_struct *t, bool resume)
-+{
-+	signal_wake_up_state(t, resume ? __TASK_TRACED : 0);
-+}
- 
- /*
-  * Wrappers for p->thread_info->cpu access. No-op on UP.
-diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
-index ba1d361..1832927 100644
---- a/include/net/inet_connection_sock.h
-+++ b/include/net/inet_connection_sock.h
-@@ -318,6 +318,7 @@ extern void inet_csk_reqsk_queue_prune(struct sock *parent,
- 				       const unsigned long max_rto);
- 
- extern void inet_csk_destroy_sock(struct sock *sk);
-+extern void inet_csk_prepare_forced_close(struct sock *sk);
- 
- /*
-  * LISTEN is a special case for poll..
-diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
-index 5be8937..fca8bbe 100644
---- a/include/target/target_core_base.h
-+++ b/include/target/target_core_base.h
-@@ -734,6 +734,8 @@ struct se_subsystem_dev {
- };
- 
- struct se_device {
-+#define SE_DEV_LINK_MAGIC			0xfeeddeef
-+	u32			dev_link_magic;
- 	/* RELATIVE TARGET PORT IDENTIFER Counter */
- 	u16			dev_rpti_counter;
- 	/* Used for SAM Task Attribute ordering */
-@@ -820,6 +822,8 @@ struct se_port_stat_grps {
- };
- 
- struct se_lun {
-+#define SE_LUN_LINK_MAGIC			0xffff7771
-+	u32			lun_link_magic;
- 	/* See transport_lun_status_table */
- 	enum transport_lun_status_table lun_status;
- 	u32			lun_access;
-diff --git a/kernel/cgroup.c b/kernel/cgroup.c
-index ff2bce5..2c0d5d0 100644
---- a/kernel/cgroup.c
-+++ b/kernel/cgroup.c
-@@ -2635,9 +2635,7 @@ static int cgroup_create_dir(struct cgroup *cgrp, struct dentry *dentry,
- 		dentry->d_fsdata = cgrp;
- 		inc_nlink(parent->d_inode);
- 		rcu_assign_pointer(cgrp->dentry, dentry);
--		dget(dentry);
- 	}
--	dput(dentry);
- 
- 	return error;
- }
-diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
-index 4c69326..e48caf8 100644
---- a/kernel/irq/manage.c
-+++ b/kernel/irq/manage.c
-@@ -716,6 +716,7 @@ static void
- irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)
- {
- 	cpumask_var_t mask;
-+	bool valid = true;
- 
- 	if (!test_and_clear_bit(IRQTF_AFFINITY, &action->thread_flags))
- 		return;
-@@ -730,10 +731,18 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)
- 	}
- 
- 	raw_spin_lock_irq(&desc->lock);
--	cpumask_copy(mask, desc->irq_data.affinity);
-+	/*
-+	 * This code is triggered unconditionally. Check the affinity
-+	 * mask pointer. For CPU_MASK_OFFSTACK=n this is optimized out.
-+	 */
-+	if (desc->irq_data.affinity)
-+		cpumask_copy(mask, desc->irq_data.affinity);
-+	else
-+		valid = false;
- 	raw_spin_unlock_irq(&desc->lock);
- 
--	set_cpus_allowed_ptr(current, mask);
-+	if (valid)
-+		set_cpus_allowed_ptr(current, mask);
- 	free_cpumask_var(mask);
- }
- #else
-@@ -936,6 +945,16 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
- 		 */
- 		get_task_struct(t);
- 		new->thread = t;
-+		/*
-+		 * Tell the thread to set its affinity. This is
-+		 * important for shared interrupt handlers as we do
-+		 * not invoke setup_affinity() for the secondary
-+		 * handlers as everything is already set up. Even for
-+		 * interrupts marked with IRQF_NO_BALANCE this is
-+		 * correct as we want the thread to move to the cpu(s)
-+		 * on which the requesting code placed the interrupt.
-+		 */
-+		set_bit(IRQTF_AFFINITY, &new->thread_flags);
- 	}
- 
- 	if (!alloc_cpumask_var(&mask, GFP_KERNEL)) {
-diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index a232bb5..b96de86b4 100644
---- a/kernel/ptrace.c
-+++ b/kernel/ptrace.c
-@@ -117,11 +117,45 @@ void __ptrace_unlink(struct task_struct *child)
- 	 * TASK_KILLABLE sleeps.
- 	 */
- 	if (child->jobctl & JOBCTL_STOP_PENDING || task_is_traced(child))
--		signal_wake_up(child, task_is_traced(child));
-+		ptrace_signal_wake_up(child, true);
- 
- 	spin_unlock(&child->sighand->siglock);
- }
- 
-+/* Ensure that nothing can wake it up, even SIGKILL */
-+static bool ptrace_freeze_traced(struct task_struct *task)
-+{
-+	bool ret = false;
-+
-+	/* Lockless, nobody but us can set this flag */
-+	if (task->jobctl & JOBCTL_LISTENING)
-+		return ret;
-+
-+	spin_lock_irq(&task->sighand->siglock);
-+	if (task_is_traced(task) && !__fatal_signal_pending(task)) {
-+		task->state = __TASK_TRACED;
-+		ret = true;
-+	}
-+	spin_unlock_irq(&task->sighand->siglock);
-+
-+	return ret;
-+}
-+
-+static void ptrace_unfreeze_traced(struct task_struct *task)
-+{
-+	if (task->state != __TASK_TRACED)
-+		return;
-+
-+	WARN_ON(!task->ptrace || task->parent != current);
-+
-+	spin_lock_irq(&task->sighand->siglock);
-+	if (__fatal_signal_pending(task))
-+		wake_up_state(task, __TASK_TRACED);
-+	else
-+		task->state = TASK_TRACED;
-+	spin_unlock_irq(&task->sighand->siglock);
-+}
-+
- /**
-  * ptrace_check_attach - check whether ptracee is ready for ptrace operation
-  * @child: ptracee to check for
-@@ -151,24 +185,29 @@ int ptrace_check_attach(struct task_struct *child, bool ignore_state)
- 	 * be changed by us so it's not changing right after this.
- 	 */
- 	read_lock(&tasklist_lock);
--	if ((child->ptrace & PT_PTRACED) && child->parent == current) {
-+	if (child->ptrace && child->parent == current) {
-+		WARN_ON(child->state == __TASK_TRACED);
- 		/*
- 		 * child->sighand can't be NULL, release_task()
- 		 * does ptrace_unlink() before __exit_signal().
- 		 */
--		spin_lock_irq(&child->sighand->siglock);
--		WARN_ON_ONCE(task_is_stopped(child));
--		if (ignore_state || (task_is_traced(child) &&
--				     !(child->jobctl & JOBCTL_LISTENING)))
-+		if (ignore_state || ptrace_freeze_traced(child))
- 			ret = 0;
--		spin_unlock_irq(&child->sighand->siglock);
- 	}
- 	read_unlock(&tasklist_lock);
- 
--	if (!ret && !ignore_state)
--		ret = wait_task_inactive(child, TASK_TRACED) ? 0 : -ESRCH;
-+	if (!ret && !ignore_state) {
-+		if (!wait_task_inactive(child, __TASK_TRACED)) {
-+			/*
-+			 * This can only happen if may_ptrace_stop() fails and
-+			 * ptrace_stop() changes ->state back to TASK_RUNNING,
-+			 * so we should not worry about leaking __TASK_TRACED.
-+			 */
-+			WARN_ON(child->state == __TASK_TRACED);
-+			ret = -ESRCH;
-+		}
-+	}
- 
--	/* All systems go.. */
- 	return ret;
- }
- 
-@@ -310,7 +349,7 @@ static int ptrace_attach(struct task_struct *task, long request,
- 	 */
- 	if (task_is_stopped(task) &&
- 	    task_set_jobctl_pending(task, JOBCTL_TRAP_STOP | JOBCTL_TRAPPING))
--		signal_wake_up(task, 1);
-+		signal_wake_up_state(task, __TASK_STOPPED);
- 
- 	spin_unlock(&task->sighand->siglock);
- 
-@@ -727,7 +766,7 @@ int ptrace_request(struct task_struct *child, long request,
- 		 * tracee into STOP.
- 		 */
- 		if (likely(task_set_jobctl_pending(child, JOBCTL_TRAP_STOP)))
--			signal_wake_up(child, child->jobctl & JOBCTL_LISTENING);
-+			ptrace_signal_wake_up(child, child->jobctl & JOBCTL_LISTENING);
- 
- 		unlock_task_sighand(child, &flags);
- 		ret = 0;
-@@ -753,7 +792,7 @@ int ptrace_request(struct task_struct *child, long request,
- 			 * start of this trap and now.  Trigger re-trap.
- 			 */
- 			if (child->jobctl & JOBCTL_TRAP_NOTIFY)
--				signal_wake_up(child, true);
-+				ptrace_signal_wake_up(child, true);
- 			ret = 0;
- 		}
- 		unlock_task_sighand(child, &flags);
-@@ -890,6 +929,8 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
- 		goto out_put_task_struct;
- 
- 	ret = arch_ptrace(child, request, addr, data);
-+	if (ret || request != PTRACE_DETACH)
-+		ptrace_unfreeze_traced(child);
- 
-  out_put_task_struct:
- 	put_task_struct(child);
-@@ -1029,8 +1070,11 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
- 
- 	ret = ptrace_check_attach(child, request == PTRACE_KILL ||
- 				  request == PTRACE_INTERRUPT);
--	if (!ret)
-+	if (!ret) {
- 		ret = compat_arch_ptrace(child, request, addr, data);
-+		if (ret || request != PTRACE_DETACH)
-+			ptrace_unfreeze_traced(child);
-+	}
- 
-  out_put_task_struct:
- 	put_task_struct(child);
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 1a48cdb..5eb6c96 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -1686,7 +1686,8 @@ out:
-  */
- int wake_up_process(struct task_struct *p)
- {
--	return try_to_wake_up(p, TASK_ALL, 0);
-+	WARN_ON(task_is_stopped_or_traced(p));
-+	return try_to_wake_up(p, TASK_NORMAL, 0);
- }
- EXPORT_SYMBOL(wake_up_process);
- 
-diff --git a/kernel/signal.c b/kernel/signal.c
-index be4f856..67b64be 100644
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -678,23 +678,17 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
-  * No need to set need_resched since signal event passing
-  * goes through ->blocked
-  */
--void signal_wake_up(struct task_struct *t, int resume)
-+void signal_wake_up_state(struct task_struct *t, unsigned int state)
- {
--	unsigned int mask;
--
- 	set_tsk_thread_flag(t, TIF_SIGPENDING);
--
- 	/*
--	 * For SIGKILL, we want to wake it up in the stopped/traced/killable
-+	 * TASK_WAKEKILL also means wake it up in the stopped/traced/killable
- 	 * case. We don't check t->state here because there is a race with it
- 	 * executing another processor and just now entering stopped state.
- 	 * By using wake_up_state, we ensure the process will wake up and
- 	 * handle its death signal.
- 	 */
--	mask = TASK_INTERRUPTIBLE;
--	if (resume)
--		mask |= TASK_WAKEKILL;
--	if (!wake_up_state(t, mask))
-+	if (!wake_up_state(t, state | TASK_INTERRUPTIBLE))
- 		kick_process(t);
- }
- 
-@@ -842,7 +836,7 @@ static void ptrace_trap_notify(struct task_struct *t)
- 	assert_spin_locked(&t->sighand->siglock);
- 
- 	task_set_jobctl_pending(t, JOBCTL_TRAP_NOTIFY);
--	signal_wake_up(t, t->jobctl & JOBCTL_LISTENING);
-+	ptrace_signal_wake_up(t, t->jobctl & JOBCTL_LISTENING);
- }
- 
- /*
-@@ -1797,6 +1791,10 @@ static inline int may_ptrace_stop(void)
- 	 * If SIGKILL was already sent before the caller unlocked
- 	 * ->siglock we must see ->core_state != NULL. Otherwise it
- 	 * is safe to enter schedule().
-+	 *
-+	 * This is almost outdated, a task with the pending SIGKILL can't
-+	 * block in TASK_TRACED. But PTRACE_EVENT_EXIT can be reported
-+	 * after SIGKILL was already dequeued.
- 	 */
- 	if (unlikely(current->mm->core_state) &&
- 	    unlikely(current->mm == current->parent->mm))
-@@ -1922,6 +1920,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
- 		if (gstop_done)
- 			do_notify_parent_cldstop(current, false, why);
- 
-+		/* tasklist protects us from ptrace_freeze_traced() */
- 		__set_current_state(TASK_RUNNING);
- 		if (clear_code)
- 			current->exit_code = 0;
-diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
-index 781ecc2..7f8a8df 100644
---- a/kernel/trace/ftrace.c
-+++ b/kernel/trace/ftrace.c
-@@ -3863,7 +3863,7 @@ static int ftrace_module_notify(struct notifier_block *self,
- 
- struct notifier_block ftrace_module_nb = {
- 	.notifier_call = ftrace_module_notify,
--	.priority = 0,
-+	.priority = INT_MAX,	/* Run before anything that can use kprobes */
- };
- 
- extern unsigned long __start_mcount_loc[];
-diff --git a/lib/atomic64.c b/lib/atomic64.c
-index 9785378..08a4f06 100644
---- a/lib/atomic64.c
-+++ b/lib/atomic64.c
-@@ -31,7 +31,11 @@
- static union {
- 	raw_spinlock_t lock;
- 	char pad[L1_CACHE_BYTES];
--} atomic64_lock[NR_LOCKS] __cacheline_aligned_in_smp;
-+} atomic64_lock[NR_LOCKS] __cacheline_aligned_in_smp = {
-+	[0 ... (NR_LOCKS - 1)] = {
-+		.lock =  __RAW_SPIN_LOCK_UNLOCKED(atomic64_lock.lock),
-+	},
-+};
- 
- static inline raw_spinlock_t *lock_addr(const atomic64_t *v)
- {
-@@ -173,14 +177,3 @@ int atomic64_add_unless(atomic64_t *v, long long a, long long u)
- 	return ret;
- }
- EXPORT_SYMBOL(atomic64_add_unless);
--
--static int init_atomic64_lock(void)
--{
--	int i;
--
--	for (i = 0; i < NR_LOCKS; ++i)
--		raw_spin_lock_init(&atomic64_lock[i].lock);
--	return 0;
--}
--
--pure_initcall(init_atomic64_lock);
-diff --git a/mm/compaction.c b/mm/compaction.c
-index 7fcd3a5..214944a 100644
---- a/mm/compaction.c
-+++ b/mm/compaction.c
-@@ -956,7 +956,7 @@ static int compact_node(int nid)
- }
- 
- /* Compact all nodes in the system */
--static int compact_nodes(void)
-+static void compact_nodes(void)
- {
- 	int nid;
- 
-@@ -965,8 +965,6 @@ static int compact_nodes(void)
- 
- 	for_each_online_node(nid)
- 		compact_node(nid);
--
--	return COMPACT_COMPLETE;
- }
- 
- /* The written value is actually unused, all memory is compacted */
-@@ -977,7 +975,7 @@ int sysctl_compaction_handler(struct ctl_table *table, int write,
- 			void __user *buffer, size_t *length, loff_t *ppos)
- {
- 	if (write)
--		return compact_nodes();
-+		compact_nodes();
- 
- 	return 0;
- }
-diff --git a/mm/memory.c b/mm/memory.c
-index 5736170..29ffb5c 100644
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -182,10 +182,14 @@ static int tlb_next_batch(struct mmu_gather *tlb)
- 		return 1;
- 	}
- 
-+	if (tlb->batch_count == MAX_GATHER_BATCH_COUNT)
-+		return 0;
-+
- 	batch = (void *)__get_free_pages(GFP_NOWAIT | __GFP_NOWARN, 0);
- 	if (!batch)
- 		return 0;
- 
-+	tlb->batch_count++;
- 	batch->next = NULL;
- 	batch->nr   = 0;
- 	batch->max  = MAX_GATHER_BATCH;
-@@ -214,6 +218,7 @@ void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, bool fullmm)
- 	tlb->local.nr   = 0;
- 	tlb->local.max  = ARRAY_SIZE(tlb->__pages);
- 	tlb->active     = &tlb->local;
-+	tlb->batch_count = 0;
- 
- #ifdef CONFIG_HAVE_RCU_TABLE_FREE
- 	tlb->batch = NULL;
-diff --git a/mm/mempolicy.c b/mm/mempolicy.c
-index 01350d3..5e0fea1 100644
---- a/mm/mempolicy.c
-+++ b/mm/mempolicy.c
-@@ -2370,8 +2370,7 @@ void numa_default_policy(void)
-  */
- 
- /*
-- * "local" is pseudo-policy:  MPOL_PREFERRED with MPOL_F_LOCAL flag
-- * Used only for mpol_parse_str() and mpol_to_str()
-+ * "local" is implemented internally by MPOL_PREFERRED with MPOL_F_LOCAL flag.
-  */
- #define MPOL_LOCAL MPOL_MAX
- static const char * const policy_modes[] =
-@@ -2386,28 +2385,21 @@ static const char * const policy_modes[] =
- 
- #ifdef CONFIG_TMPFS
- /**
-- * mpol_parse_str - parse string to mempolicy
-+ * mpol_parse_str - parse string to mempolicy, for tmpfs mpol mount option.
-  * @str:  string containing mempolicy to parse
-  * @mpol:  pointer to struct mempolicy pointer, returned on success.
-- * @no_context:  flag whether to "contextualize" the mempolicy
-+ * @unused:  redundant argument, to be removed later.
-  *
-  * Format of input:
-  *	<mode>[=<flags>][:<nodelist>]
-  *
-- * if @no_context is true, save the input nodemask in w.user_nodemask in
-- * the returned mempolicy.  This will be used to "clone" the mempolicy in
-- * a specific context [cpuset] at a later time.  Used to parse tmpfs mpol
-- * mount option.  Note that if 'static' or 'relative' mode flags were
-- * specified, the input nodemask will already have been saved.  Saving
-- * it again is redundant, but safe.
-- *
-  * On success, returns 0, else 1
-  */
--int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
-+int mpol_parse_str(char *str, struct mempolicy **mpol, int unused)
- {
- 	struct mempolicy *new = NULL;
- 	unsigned short mode;
--	unsigned short uninitialized_var(mode_flags);
-+	unsigned short mode_flags;
- 	nodemask_t nodes;
- 	char *nodelist = strchr(str, ':');
- 	char *flags = strchr(str, '=');
-@@ -2495,24 +2487,23 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
- 	if (IS_ERR(new))
- 		goto out;
- 
--	if (no_context) {
--		/* save for contextualization */
--		new->w.user_nodemask = nodes;
--	} else {
--		int ret;
--		NODEMASK_SCRATCH(scratch);
--		if (scratch) {
--			task_lock(current);
--			ret = mpol_set_nodemask(new, &nodes, scratch);
--			task_unlock(current);
--		} else
--			ret = -ENOMEM;
--		NODEMASK_SCRATCH_FREE(scratch);
--		if (ret) {
--			mpol_put(new);
--			goto out;
--		}
--	}
-+	/*
-+	 * Save nodes for mpol_to_str() to show the tmpfs mount options
-+	 * for /proc/mounts, /proc/pid/mounts and /proc/pid/mountinfo.
-+	 */
-+	if (mode != MPOL_PREFERRED)
-+		new->v.nodes = nodes;
-+	else if (nodelist)
-+		new->v.preferred_node = first_node(nodes);
-+	else
-+		new->flags |= MPOL_F_LOCAL;
-+
-+	/*
-+	 * Save nodes for contextualization: this will be used to "clone"
-+	 * the mempolicy in a specific context [cpuset] at a later time.
-+	 */
-+	new->w.user_nodemask = nodes;
-+
- 	err = 0;
- 
- out:
-@@ -2532,13 +2523,13 @@ out:
-  * @buffer:  to contain formatted mempolicy string
-  * @maxlen:  length of @buffer
-  * @pol:  pointer to mempolicy to be formatted
-- * @no_context:  "context free" mempolicy - use nodemask in w.user_nodemask
-+ * @unused:  redundant argument, to be removed later.
-  *
-  * Convert a mempolicy into a string.
-  * Returns the number of characters in buffer (if positive)
-  * or an error (negative)
-  */
--int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int no_context)
-+int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int unused)
- {
- 	char *p = buffer;
- 	int l;
-@@ -2564,7 +2555,7 @@ int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int no_context)
- 	case MPOL_PREFERRED:
- 		nodes_clear(nodes);
- 		if (flags & MPOL_F_LOCAL)
--			mode = MPOL_LOCAL;	/* pseudo-policy */
-+			mode = MPOL_LOCAL;
- 		else
- 			node_set(pol->v.preferred_node, nodes);
- 		break;
-@@ -2572,10 +2563,7 @@ int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int no_context)
- 	case MPOL_BIND:
- 		/* Fall through */
- 	case MPOL_INTERLEAVE:
--		if (no_context)
--			nodes = pol->w.user_nodemask;
--		else
--			nodes = pol->v.nodes;
-+		nodes = pol->v.nodes;
- 		break;
- 
- 	default:
-diff --git a/mm/page-writeback.c b/mm/page-writeback.c
-index 5ad5ce2..7a5f842 100644
---- a/mm/page-writeback.c
-+++ b/mm/page-writeback.c
-@@ -201,6 +201,18 @@ static unsigned long highmem_dirtyable_memory(unsigned long total)
- 		     zone_reclaimable_pages(z) - z->dirty_balance_reserve;
- 	}
- 	/*
-+	 * Unreclaimable memory (kernel memory or anonymous memory
-+	 * without swap) can bring down the dirtyable pages below
-+	 * the zone's dirty balance reserve and the above calculation
-+	 * will underflow.  However we still want to add in nodes
-+	 * which are below threshold (negative values) to get a more
-+	 * accurate calculation but make sure that the total never
-+	 * underflows.
-+	 */
-+	if ((long)x < 0)
-+		x = 0;
-+
-+	/*
- 	 * Make sure that the number of highmem pages is never larger
- 	 * than the number of the total dirtyable memory. This can only
- 	 * occur in very strange VM situations but we want to make sure
-@@ -222,8 +234,8 @@ static unsigned long global_dirtyable_memory(void)
- {
- 	unsigned long x;
- 
--	x = global_page_state(NR_FREE_PAGES) + global_reclaimable_pages() -
--	    dirty_balance_reserve;
-+	x = global_page_state(NR_FREE_PAGES) + global_reclaimable_pages();
-+	x -= min(x, dirty_balance_reserve);
- 
- 	if (!vm_highmem_is_dirtyable)
- 		x -= highmem_dirtyable_memory(x);
-@@ -290,9 +302,12 @@ static unsigned long zone_dirtyable_memory(struct zone *zone)
- 	 * highmem zone can hold its share of dirty pages, so we don't
- 	 * care about vm_highmem_is_dirtyable here.
- 	 */
--	return zone_page_state(zone, NR_FREE_PAGES) +
--	       zone_reclaimable_pages(zone) -
--	       zone->dirty_balance_reserve;
-+	unsigned long nr_pages = zone_page_state(zone, NR_FREE_PAGES) +
-+		zone_reclaimable_pages(zone);
-+
-+	/* don't allow this to underflow */
-+	nr_pages -= min(nr_pages, zone->dirty_balance_reserve);
-+	return nr_pages;
- }
- 
- /**
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index d2d8f54..fd56833 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -5455,7 +5455,7 @@ static inline int pfn_to_bitidx(struct zone *zone, unsigned long pfn)
- 	pfn &= (PAGES_PER_SECTION-1);
- 	return (pfn >> pageblock_order) * NR_PAGEBLOCK_BITS;
- #else
--	pfn = pfn - zone->zone_start_pfn;
-+	pfn = pfn - round_down(zone->zone_start_pfn, pageblock_nr_pages);
- 	return (pfn >> pageblock_order) * NR_PAGEBLOCK_BITS;
- #endif /* CONFIG_SPARSEMEM */
- }
-diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
-index 469daab..1476f26 100644
---- a/net/batman-adv/bat_iv_ogm.c
-+++ b/net/batman-adv/bat_iv_ogm.c
-@@ -119,7 +119,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv)
- 	unsigned int msecs;
- 
- 	msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER;
--	msecs += (random32() % 2 * BATADV_JITTER);
-+	msecs += random32() % (2 * BATADV_JITTER);
- 
- 	return jiffies + msecs_to_jiffies(msecs);
- }
-diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
-index 0b997c8..aeb0962 100644
---- a/net/bluetooth/hci_core.c
-+++ b/net/bluetooth/hci_core.c
-@@ -1789,6 +1789,8 @@ void hci_unregister_dev(struct hci_dev *hdev)
- 	for (i = 0; i < NUM_REASSEMBLY; i++)
- 		kfree_skb(hdev->reassembly[i]);
- 
-+	cancel_work_sync(&hdev->power_on);
-+
- 	if (!test_bit(HCI_INIT, &hdev->flags) &&
- 	    !test_bit(HCI_SETUP, &hdev->dev_flags)) {
- 		hci_dev_lock(hdev);
-diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
-index 1a17850..32893a0 100644
---- a/net/bluetooth/rfcomm/sock.c
-+++ b/net/bluetooth/rfcomm/sock.c
-@@ -467,7 +467,7 @@ static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int f
- 	long timeo;
- 	int err = 0;
- 
--	lock_sock(sk);
-+	lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
- 
- 	if (sk->sk_type != SOCK_STREAM) {
- 		err = -EINVAL;
-@@ -504,7 +504,7 @@ static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int f
- 
- 		release_sock(sk);
- 		timeo = schedule_timeout(timeo);
--		lock_sock(sk);
-+		lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
- 	}
- 	__set_current_state(TASK_RUNNING);
- 	remove_wait_queue(sk_sleep(sk), &wait);
-diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
-index a802029..ee71ea2 100644
---- a/net/ceph/ceph_common.c
-+++ b/net/ceph/ceph_common.c
-@@ -305,7 +305,6 @@ ceph_parse_options(char *options, const char *dev_name,
- 
- 	/* start with defaults */
- 	opt->flags = CEPH_OPT_DEFAULT;
--	opt->osd_timeout = CEPH_OSD_TIMEOUT_DEFAULT;
- 	opt->osd_keepalive_timeout = CEPH_OSD_KEEPALIVE_DEFAULT;
- 	opt->mount_timeout = CEPH_MOUNT_TIMEOUT_DEFAULT; /* seconds */
- 	opt->osd_idle_ttl = CEPH_OSD_IDLE_TTL_DEFAULT;   /* seconds */
-@@ -391,7 +390,7 @@ ceph_parse_options(char *options, const char *dev_name,
- 
- 			/* misc */
- 		case Opt_osdtimeout:
--			opt->osd_timeout = intval;
-+			pr_warning("ignoring deprecated osdtimeout option\n");
- 			break;
- 		case Opt_osdkeepalivetimeout:
- 			opt->osd_keepalive_timeout = intval;
-diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
-index 3ef1759..e9f2159 100644
---- a/net/ceph/messenger.c
-+++ b/net/ceph/messenger.c
-@@ -506,6 +506,7 @@ static void reset_connection(struct ceph_connection *con)
- {
- 	/* reset connection, out_queue, msg_ and connect_seq */
- 	/* discard existing out_queue and msg_seq */
-+	dout("reset_connection %p\n", con);
- 	ceph_msg_remove_list(&con->out_queue);
- 	ceph_msg_remove_list(&con->out_sent);
- 
-@@ -561,7 +562,7 @@ void ceph_con_open(struct ceph_connection *con,
- 	mutex_lock(&con->mutex);
- 	dout("con_open %p %s\n", con, ceph_pr_addr(&addr->in_addr));
- 
--	BUG_ON(con->state != CON_STATE_CLOSED);
-+	WARN_ON(con->state != CON_STATE_CLOSED);
- 	con->state = CON_STATE_PREOPEN;
- 
- 	con->peer_name.type = (__u8) entity_type;
-@@ -1506,13 +1507,6 @@ static int process_banner(struct ceph_connection *con)
- 	return 0;
- }
- 
--static void fail_protocol(struct ceph_connection *con)
--{
--	reset_connection(con);
--	BUG_ON(con->state != CON_STATE_NEGOTIATING);
--	con->state = CON_STATE_CLOSED;
--}
--
- static int process_connect(struct ceph_connection *con)
- {
- 	u64 sup_feat = con->msgr->supported_features;
-@@ -1530,7 +1524,7 @@ static int process_connect(struct ceph_connection *con)
- 		       ceph_pr_addr(&con->peer_addr.in_addr),
- 		       sup_feat, server_feat, server_feat & ~sup_feat);
- 		con->error_msg = "missing required protocol features";
--		fail_protocol(con);
-+		reset_connection(con);
- 		return -1;
- 
- 	case CEPH_MSGR_TAG_BADPROTOVER:
-@@ -1541,7 +1535,7 @@ static int process_connect(struct ceph_connection *con)
- 		       le32_to_cpu(con->out_connect.protocol_version),
- 		       le32_to_cpu(con->in_reply.protocol_version));
- 		con->error_msg = "protocol version mismatch";
--		fail_protocol(con);
-+		reset_connection(con);
- 		return -1;
- 
- 	case CEPH_MSGR_TAG_BADAUTHORIZER:
-@@ -1631,11 +1625,11 @@ static int process_connect(struct ceph_connection *con)
- 			       ceph_pr_addr(&con->peer_addr.in_addr),
- 			       req_feat, server_feat, req_feat & ~server_feat);
- 			con->error_msg = "missing required protocol features";
--			fail_protocol(con);
-+			reset_connection(con);
- 			return -1;
- 		}
- 
--		BUG_ON(con->state != CON_STATE_NEGOTIATING);
-+		WARN_ON(con->state != CON_STATE_NEGOTIATING);
- 		con->state = CON_STATE_OPEN;
- 
- 		con->peer_global_seq = le32_to_cpu(con->in_reply.global_seq);
-@@ -2132,7 +2126,6 @@ more:
- 		if (ret < 0)
- 			goto out;
- 
--		BUG_ON(con->state != CON_STATE_CONNECTING);
- 		con->state = CON_STATE_NEGOTIATING;
- 
- 		/*
-@@ -2160,7 +2153,7 @@ more:
- 		goto more;
- 	}
- 
--	BUG_ON(con->state != CON_STATE_OPEN);
-+	WARN_ON(con->state != CON_STATE_OPEN);
- 
- 	if (con->in_base_pos < 0) {
- 		/*
-@@ -2262,6 +2255,35 @@ static void queue_con(struct ceph_connection *con)
- 	}
- }
- 
-+static bool con_sock_closed(struct ceph_connection *con)
-+{
-+	if (!test_and_clear_bit(CON_FLAG_SOCK_CLOSED, &con->flags))
-+		return false;
-+
-+#define CASE(x)								\
-+	case CON_STATE_ ## x:						\
-+		con->error_msg = "socket closed (con state " #x ")";	\
-+		break;
-+
-+	switch (con->state) {
-+	CASE(CLOSED);
-+	CASE(PREOPEN);
-+	CASE(CONNECTING);
-+	CASE(NEGOTIATING);
-+	CASE(OPEN);
-+	CASE(STANDBY);
-+	default:
-+		pr_warning("%s con %p unrecognized state %lu\n",
-+			__func__, con, con->state);
-+		con->error_msg = "unrecognized con state";
-+		BUG();
-+		break;
-+	}
-+#undef CASE
-+
-+	return true;
-+}
-+
- /*
-  * Do some work on a connection.  Drop a connection ref when we're done.
-  */
-@@ -2273,24 +2295,8 @@ static void con_work(struct work_struct *work)
- 
- 	mutex_lock(&con->mutex);
- restart:
--	if (test_and_clear_bit(CON_FLAG_SOCK_CLOSED, &con->flags)) {
--		switch (con->state) {
--		case CON_STATE_CONNECTING:
--			con->error_msg = "connection failed";
--			break;
--		case CON_STATE_NEGOTIATING:
--			con->error_msg = "negotiation failed";
--			break;
--		case CON_STATE_OPEN:
--			con->error_msg = "socket closed";
--			break;
--		default:
--			dout("unrecognized con state %d\n", (int)con->state);
--			con->error_msg = "unrecognized con state";
--			BUG();
--		}
-+	if (con_sock_closed(con))
- 		goto fault;
--	}
- 
- 	if (test_and_clear_bit(CON_FLAG_BACKOFF, &con->flags)) {
- 		dout("con_work %p backing off\n", con);
-@@ -2356,12 +2362,12 @@ fault:
- static void ceph_fault(struct ceph_connection *con)
- 	__releases(con->mutex)
- {
--	pr_err("%s%lld %s %s\n", ENTITY_NAME(con->peer_name),
-+	pr_warning("%s%lld %s %s\n", ENTITY_NAME(con->peer_name),
- 	       ceph_pr_addr(&con->peer_addr.in_addr), con->error_msg);
- 	dout("fault %p state %lu to peer %s\n",
- 	     con, con->state, ceph_pr_addr(&con->peer_addr.in_addr));
- 
--	BUG_ON(con->state != CON_STATE_CONNECTING &&
-+	WARN_ON(con->state != CON_STATE_CONNECTING &&
- 	       con->state != CON_STATE_NEGOTIATING &&
- 	       con->state != CON_STATE_OPEN);
- 
-diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
-index f7b56e2..eb9a444 100644
---- a/net/ceph/osd_client.c
-+++ b/net/ceph/osd_client.c
-@@ -221,7 +221,7 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,
- 	kref_init(&req->r_kref);
- 	init_completion(&req->r_completion);
- 	init_completion(&req->r_safe_completion);
--	rb_init_node(&req->r_node);
-+	RB_CLEAR_NODE(&req->r_node);
- 	INIT_LIST_HEAD(&req->r_unsafe_item);
- 	INIT_LIST_HEAD(&req->r_linger_item);
- 	INIT_LIST_HEAD(&req->r_linger_osd);
-@@ -464,6 +464,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
- {
- 	struct ceph_osd_req_op ops[3];
- 	struct ceph_osd_request *req;
-+	int r;
- 
- 	ops[0].op = opcode;
- 	ops[0].extent.truncate_seq = truncate_seq;
-@@ -482,10 +483,12 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
- 					 use_mempool,
- 					 GFP_NOFS, NULL, NULL);
- 	if (!req)
--		return NULL;
-+		return ERR_PTR(-ENOMEM);
- 
- 	/* calculate max write size */
--	calc_layout(osdc, vino, layout, off, plen, req, ops);
-+	r = calc_layout(osdc, vino, layout, off, plen, req, ops);
-+	if (r < 0)
-+		return ERR_PTR(r);
- 	req->r_file_layout = *layout;  /* keep a copy */
- 
- 	/* in case it differs from natural (file) alignment that
-@@ -578,7 +581,7 @@ static void __kick_osd_requests(struct ceph_osd_client *osdc,
- 
- 	dout("__kick_osd_requests osd%d\n", osd->o_osd);
- 	err = __reset_osd(osdc, osd);
--	if (err == -EAGAIN)
-+	if (err)
- 		return;
- 
- 	list_for_each_entry(req, &osd->o_requests, r_osd_item) {
-@@ -605,14 +608,6 @@ static void __kick_osd_requests(struct ceph_osd_client *osdc,
- 	}
- }
- 
--static void kick_osd_requests(struct ceph_osd_client *osdc,
--			      struct ceph_osd *kickosd)
--{
--	mutex_lock(&osdc->request_mutex);
--	__kick_osd_requests(osdc, kickosd);
--	mutex_unlock(&osdc->request_mutex);
--}
--
- /*
-  * If the osd connection drops, we need to resubmit all requests.
-  */
-@@ -626,7 +621,9 @@ static void osd_reset(struct ceph_connection *con)
- 	dout("osd_reset osd%d\n", osd->o_osd);
- 	osdc = osd->o_osdc;
- 	down_read(&osdc->map_sem);
--	kick_osd_requests(osdc, osd);
-+	mutex_lock(&osdc->request_mutex);
-+	__kick_osd_requests(osdc, osd);
-+	mutex_unlock(&osdc->request_mutex);
- 	send_queued(osdc);
- 	up_read(&osdc->map_sem);
- }
-@@ -645,6 +642,7 @@ static struct ceph_osd *create_osd(struct ceph_osd_client *osdc, int onum)
- 	atomic_set(&osd->o_ref, 1);
- 	osd->o_osdc = osdc;
- 	osd->o_osd = onum;
-+	RB_CLEAR_NODE(&osd->o_node);
- 	INIT_LIST_HEAD(&osd->o_requests);
- 	INIT_LIST_HEAD(&osd->o_linger_requests);
- 	INIT_LIST_HEAD(&osd->o_osd_lru);
-@@ -748,6 +746,7 @@ static int __reset_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd)
- 	if (list_empty(&osd->o_requests) &&
- 	    list_empty(&osd->o_linger_requests)) {
- 		__remove_osd(osdc, osd);
-+		ret = -ENODEV;
- 	} else if (memcmp(&osdc->osdmap->osd_addr[osd->o_osd],
- 			  &osd->o_con.peer_addr,
- 			  sizeof(osd->o_con.peer_addr)) == 0 &&
-@@ -874,9 +873,9 @@ static void __unregister_request(struct ceph_osd_client *osdc,
- 			req->r_osd = NULL;
- 	}
- 
-+	list_del_init(&req->r_req_lru_item);
- 	ceph_osdc_put_request(req);
- 
--	list_del_init(&req->r_req_lru_item);
- 	if (osdc->num_requests == 0) {
- 		dout(" no requests, canceling timeout\n");
- 		__cancel_osd_timeout(osdc);
-@@ -908,8 +907,8 @@ static void __unregister_linger_request(struct ceph_osd_client *osdc,
- 					struct ceph_osd_request *req)
- {
- 	dout("__unregister_linger_request %p\n", req);
-+	list_del_init(&req->r_linger_item);
- 	if (req->r_osd) {
--		list_del_init(&req->r_linger_item);
- 		list_del_init(&req->r_linger_osd);
- 
- 		if (list_empty(&req->r_osd->o_requests) &&
-@@ -1088,12 +1087,10 @@ static void handle_timeout(struct work_struct *work)
- {
- 	struct ceph_osd_client *osdc =
- 		container_of(work, struct ceph_osd_client, timeout_work.work);
--	struct ceph_osd_request *req, *last_req = NULL;
-+	struct ceph_osd_request *req;
- 	struct ceph_osd *osd;
--	unsigned long timeout = osdc->client->options->osd_timeout * HZ;
- 	unsigned long keepalive =
- 		osdc->client->options->osd_keepalive_timeout * HZ;
--	unsigned long last_stamp = 0;
- 	struct list_head slow_osds;
- 	dout("timeout\n");
- 	down_read(&osdc->map_sem);
-@@ -1103,37 +1100,6 @@ static void handle_timeout(struct work_struct *work)
- 	mutex_lock(&osdc->request_mutex);
- 
- 	/*
--	 * reset osds that appear to be _really_ unresponsive.  this
--	 * is a failsafe measure.. we really shouldn't be getting to
--	 * this point if the system is working properly.  the monitors
--	 * should mark the osd as failed and we should find out about
--	 * it from an updated osd map.
--	 */
--	while (timeout && !list_empty(&osdc->req_lru)) {
--		req = list_entry(osdc->req_lru.next, struct ceph_osd_request,
--				 r_req_lru_item);
--
--		/* hasn't been long enough since we sent it? */
--		if (time_before(jiffies, req->r_stamp + timeout))
--			break;
--
--		/* hasn't been long enough since it was acked? */
--		if (req->r_request->ack_stamp == 0 ||
--		    time_before(jiffies, req->r_request->ack_stamp + timeout))
--			break;
--
--		BUG_ON(req == last_req && req->r_stamp == last_stamp);
--		last_req = req;
--		last_stamp = req->r_stamp;
--
--		osd = req->r_osd;
--		BUG_ON(!osd);
--		pr_warning(" tid %llu timed out on osd%d, will reset osd\n",
--			   req->r_tid, osd->o_osd);
--		__kick_osd_requests(osdc, osd);
--	}
--
--	/*
- 	 * ping osds that are a bit slow.  this ensures that if there
- 	 * is a break in the TCP connection we will notice, and reopen
- 	 * a connection with that osd (from the fault callback).
-@@ -1304,7 +1270,7 @@ static void reset_changed_osds(struct ceph_osd_client *osdc)
-  * Requeue requests whose mapping to an OSD has changed.  If requests map to
-  * no osd, request a new map.
-  *
-- * Caller should hold map_sem for read and request_mutex.
-+ * Caller should hold map_sem for read.
-  */
- static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
- {
-@@ -1318,6 +1284,24 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
- 	for (p = rb_first(&osdc->requests); p; ) {
- 		req = rb_entry(p, struct ceph_osd_request, r_node);
- 		p = rb_next(p);
-+
-+		/*
-+		 * For linger requests that have not yet been
-+		 * registered, move them to the linger list; they'll
-+		 * be sent to the osd in the loop below.  Unregister
-+		 * the request before re-registering it as a linger
-+		 * request to ensure the __map_request() below
-+		 * will decide it needs to be sent.
-+		 */
-+		if (req->r_linger && list_empty(&req->r_linger_item)) {
-+			dout("%p tid %llu restart on osd%d\n",
-+			     req, req->r_tid,
-+			     req->r_osd ? req->r_osd->o_osd : -1);
-+			__unregister_request(osdc, req);
-+			__register_linger_request(osdc, req);
-+			continue;
-+		}
-+
- 		err = __map_request(osdc, req, force_resend);
- 		if (err < 0)
- 			continue;  /* error */
-@@ -1332,17 +1316,6 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
- 				req->r_flags |= CEPH_OSD_FLAG_RETRY;
- 			}
- 		}
--		if (req->r_linger && list_empty(&req->r_linger_item)) {
--			/*
--			 * register as a linger so that we will
--			 * re-submit below and get a new tid
--			 */
--			dout("%p tid %llu restart on osd%d\n",
--			     req, req->r_tid,
--			     req->r_osd ? req->r_osd->o_osd : -1);
--			__register_linger_request(osdc, req);
--			__unregister_request(osdc, req);
--		}
- 	}
- 
- 	list_for_each_entry_safe(req, nreq, &osdc->req_linger,
-@@ -1350,6 +1323,7 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
- 		dout("linger req=%p req->r_osd=%p\n", req, req->r_osd);
- 
- 		err = __map_request(osdc, req, force_resend);
-+		dout("__map_request returned %d\n", err);
- 		if (err == 0)
- 			continue;  /* no change and no osd was specified */
- 		if (err < 0)
-@@ -1362,8 +1336,8 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
- 
- 		dout("kicking lingering %p tid %llu osd%d\n", req, req->r_tid,
- 		     req->r_osd ? req->r_osd->o_osd : -1);
--		__unregister_linger_request(osdc, req);
- 		__register_request(osdc, req);
-+		__unregister_linger_request(osdc, req);
- 	}
- 	mutex_unlock(&osdc->request_mutex);
- 
-@@ -1371,6 +1345,7 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend)
- 		dout("%d requests for down osds, need new map\n", needmap);
- 		ceph_monc_request_next_osdmap(&osdc->client->monc);
- 	}
-+	reset_changed_osds(osdc);
- }
- 
- 
-@@ -1427,7 +1402,6 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg)
- 				osdc->osdmap = newmap;
- 			}
- 			kick_requests(osdc, 0);
--			reset_changed_osds(osdc);
- 		} else {
- 			dout("ignoring incremental map %u len %d\n",
- 			     epoch, maplen);
-@@ -1597,6 +1571,7 @@ int ceph_osdc_create_event(struct ceph_osd_client *osdc,
- 	event->data = data;
- 	event->osdc = osdc;
- 	INIT_LIST_HEAD(&event->osd_node);
-+	RB_CLEAR_NODE(&event->node);
- 	kref_init(&event->kref);   /* one ref for us */
- 	kref_get(&event->kref);    /* one ref for the caller */
- 	init_completion(&event->completion);
-@@ -1928,8 +1903,8 @@ int ceph_osdc_readpages(struct ceph_osd_client *osdc,
- 				    CEPH_OSD_OP_READ, CEPH_OSD_FLAG_READ,
- 				    NULL, 0, truncate_seq, truncate_size, NULL,
- 				    false, 1, page_align);
--	if (!req)
--		return -ENOMEM;
-+	if (IS_ERR(req))
-+		return PTR_ERR(req);
- 
- 	/* it may be a short read due to an object boundary */
- 	req->r_pages = pages;
-@@ -1971,8 +1946,8 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino,
- 				    snapc, do_sync,
- 				    truncate_seq, truncate_size, mtime,
- 				    nofail, 1, page_align);
--	if (!req)
--		return -ENOMEM;
-+	if (IS_ERR(req))
-+		return PTR_ERR(req);
- 
- 	/* it may be a short write due to an object boundary */
- 	req->r_pages = pages;
-diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
-index 5433fb0..f552aa4 100644
---- a/net/ceph/osdmap.c
-+++ b/net/ceph/osdmap.c
-@@ -645,10 +645,12 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end)
- 	ceph_decode_32_safe(p, end, max, bad);
- 	while (max--) {
- 		ceph_decode_need(p, end, 4 + 1 + sizeof(pi->v), bad);
-+		err = -ENOMEM;
- 		pi = kzalloc(sizeof(*pi), GFP_NOFS);
- 		if (!pi)
- 			goto bad;
- 		pi->id = ceph_decode_32(p);
-+		err = -EINVAL;
- 		ev = ceph_decode_8(p); /* encoding version */
- 		if (ev > CEPH_PG_POOL_VERSION) {
- 			pr_warning("got unknown v %d > %d of ceph_pg_pool\n",
-@@ -664,8 +666,13 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end)
- 		__insert_pg_pool(&map->pg_pools, pi);
- 	}
- 
--	if (version >= 5 && __decode_pool_names(p, end, map) < 0)
--		goto bad;
-+	if (version >= 5) {
-+		err = __decode_pool_names(p, end, map);
-+		if (err < 0) {
-+			dout("fail to decode pool names");
-+			goto bad;
-+		}
-+	}
- 
- 	ceph_decode_32_safe(p, end, map->pool_max, bad);
- 
-@@ -745,7 +752,7 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end)
- 	return map;
- 
- bad:
--	dout("osdmap_decode fail\n");
-+	dout("osdmap_decode fail err %d\n", err);
- 	ceph_osdmap_destroy(map);
- 	return ERR_PTR(err);
- }
-@@ -839,6 +846,7 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
- 		if (ev > CEPH_PG_POOL_VERSION) {
- 			pr_warning("got unknown v %d > %d of ceph_pg_pool\n",
- 				   ev, CEPH_PG_POOL_VERSION);
-+			err = -EINVAL;
- 			goto bad;
- 		}
- 		pi = __lookup_pg_pool(&map->pg_pools, pool);
-@@ -855,8 +863,11 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
- 		if (err < 0)
- 			goto bad;
- 	}
--	if (version >= 5 && __decode_pool_names(p, end, map) < 0)
--		goto bad;
-+	if (version >= 5) {
-+		err = __decode_pool_names(p, end, map);
-+		if (err < 0)
-+			goto bad;
-+	}
- 
- 	/* old_pool */
- 	ceph_decode_32_safe(p, end, len, bad);
-@@ -932,15 +943,13 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
- 			(void) __remove_pg_mapping(&map->pg_temp, pgid);
- 
- 			/* insert */
--			if (pglen > (UINT_MAX - sizeof(*pg)) / sizeof(u32)) {
--				err = -EINVAL;
-+			err = -EINVAL;
-+			if (pglen > (UINT_MAX - sizeof(*pg)) / sizeof(u32))
- 				goto bad;
--			}
-+			err = -ENOMEM;
- 			pg = kmalloc(sizeof(*pg) + sizeof(u32)*pglen, GFP_NOFS);
--			if (!pg) {
--				err = -ENOMEM;
-+			if (!pg)
- 				goto bad;
--			}
- 			pg->pgid = pgid;
- 			pg->len = pglen;
- 			for (j = 0; j < pglen; j++)
-diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
-index 176ecdb..4f9f5eb 100644
---- a/net/dccp/ipv4.c
-+++ b/net/dccp/ipv4.c
-@@ -439,8 +439,8 @@ exit:
- 	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
- 	return NULL;
- put_and_exit:
--	bh_unlock_sock(newsk);
--	sock_put(newsk);
-+	inet_csk_prepare_forced_close(newsk);
-+	dccp_done(newsk);
- 	goto exit;
- }
- 
-diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
-index 56840b2..6e05981 100644
---- a/net/dccp/ipv6.c
-+++ b/net/dccp/ipv6.c
-@@ -585,7 +585,8 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
- 	newinet->inet_rcv_saddr = LOOPBACK4_IPV6;
- 
- 	if (__inet_inherit_port(sk, newsk) < 0) {
--		sock_put(newsk);
-+		inet_csk_prepare_forced_close(newsk);
-+		dccp_done(newsk);
- 		goto out;
- 	}
- 	__inet6_hash(newsk, NULL);
-diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
-index 0405cc8..567c31f 100644
---- a/net/ipv4/inet_connection_sock.c
-+++ b/net/ipv4/inet_connection_sock.c
-@@ -679,6 +679,22 @@ void inet_csk_destroy_sock(struct sock *sk)
- }
- EXPORT_SYMBOL(inet_csk_destroy_sock);
- 
-+/* This function allows to force a closure of a socket after the call to
-+ * tcp/dccp_create_openreq_child().
-+ */
-+void inet_csk_prepare_forced_close(struct sock *sk)
-+{
-+	/* sk_clone_lock locked the socket and set refcnt to 2 */
-+	bh_unlock_sock(sk);
-+	sock_put(sk);
-+
-+	/* The below has to be done to allow calling inet_csk_destroy_sock */
-+	sock_set_flag(sk, SOCK_DEAD);
-+	percpu_counter_inc(sk->sk_prot->orphan_count);
-+	inet_sk(sk)->inet_num = 0;
-+}
-+EXPORT_SYMBOL(inet_csk_prepare_forced_close);
-+
- int inet_csk_listen_start(struct sock *sk, const int nr_table_entries)
- {
- 	struct inet_sock *inet = inet_sk(sk);
-diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index c92c4da..4b3f448 100644
---- a/net/ipv4/tcp_input.c
-+++ b/net/ipv4/tcp_input.c
-@@ -3579,6 +3579,24 @@ static bool tcp_process_frto(struct sock *sk, int flag)
- 	return false;
- }
- 
-+/* RFC 5961 7 [ACK Throttling] */
-+static void tcp_send_challenge_ack(struct sock *sk)
-+{
-+	/* unprotected vars, we dont care of overwrites */
-+	static u32 challenge_timestamp;
-+	static unsigned int challenge_count;
-+	u32 now = jiffies / HZ;
-+
-+	if (now != challenge_timestamp) {
-+		challenge_timestamp = now;
-+		challenge_count = 0;
-+	}
-+	if (++challenge_count <= sysctl_tcp_challenge_ack_limit) {
-+		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPCHALLENGEACK);
-+		tcp_send_ack(sk);
-+	}
-+}
-+
- /* This routine deals with incoming acks, but not outgoing ones. */
- static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
- {
-@@ -3598,8 +3616,14 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
- 	/* If the ack is older than previous acks
- 	 * then we can probably ignore it.
- 	 */
--	if (before(ack, prior_snd_una))
-+	if (before(ack, prior_snd_una)) {
-+		/* RFC 5961 5.2 [Blind Data Injection Attack].[Mitigation] */
-+		if (before(ack, prior_snd_una - tp->max_window)) {
-+			tcp_send_challenge_ack(sk);
-+			return -1;
-+		}
- 		goto old_ack;
-+	}
- 
- 	/* If the ack includes data we haven't sent yet, discard
- 	 * this segment (RFC793 Section 3.9).
-@@ -5271,23 +5295,6 @@ out:
- }
- #endif /* CONFIG_NET_DMA */
- 
--static void tcp_send_challenge_ack(struct sock *sk)
--{
--	/* unprotected vars, we dont care of overwrites */
--	static u32 challenge_timestamp;
--	static unsigned int challenge_count;
--	u32 now = jiffies / HZ;
--
--	if (now != challenge_timestamp) {
--		challenge_timestamp = now;
--		challenge_count = 0;
--	}
--	if (++challenge_count <= sysctl_tcp_challenge_ack_limit) {
--		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPCHALLENGEACK);
--		tcp_send_ack(sk);
--	}
--}
--
- /* Does PAWS and seqno based validation of an incoming segment, flags will
-  * play significant role here.
-  */
-@@ -5340,11 +5347,6 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb,
- 		goto discard;
- 	}
- 
--	/* ts_recent update must be made after we are sure that the packet
--	 * is in window.
--	 */
--	tcp_replace_ts_recent(tp, TCP_SKB_CB(skb)->seq);
--
- 	/* step 3: check security and precedence [ignored] */
- 
- 	/* step 4: Check for a SYN
-@@ -5579,6 +5581,11 @@ step5:
- 	if (th->ack && tcp_ack(sk, skb, FLAG_SLOWPATH) < 0)
- 		goto discard;
- 
-+	/* ts_recent update must be made after we are sure that the packet
-+	 * is in window.
-+	 */
-+	tcp_replace_ts_recent(tp, TCP_SKB_CB(skb)->seq);
-+
- 	tcp_rcv_rtt_measure_ts(sk, skb);
- 
- 	/* Process urgent data. */
-@@ -6106,6 +6113,11 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
- 	} else
- 		goto discard;
- 
-+	/* ts_recent update must be made after we are sure that the packet
-+	 * is in window.
-+	 */
-+	tcp_replace_ts_recent(tp, TCP_SKB_CB(skb)->seq);
-+
- 	/* step 6: check the URG bit */
- 	tcp_urg(sk, skb, th);
- 
-diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
-index db7bfad..4705caf 100644
---- a/net/ipv4/tcp_ipv4.c
-+++ b/net/ipv4/tcp_ipv4.c
-@@ -1537,10 +1537,8 @@ exit:
- 	NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
- 	return NULL;
- put_and_exit:
--	tcp_clear_xmit_timers(newsk);
--	tcp_cleanup_congestion_control(newsk);
--	bh_unlock_sock(newsk);
--	sock_put(newsk);
-+	inet_csk_prepare_forced_close(newsk);
-+	tcp_done(newsk);
- 	goto exit;
- }
- EXPORT_SYMBOL(tcp_v4_syn_recv_sock);
-diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
-index 7e32d42..8b45fb4 100644
---- a/net/ipv6/tcp_ipv6.c
-+++ b/net/ipv6/tcp_ipv6.c
-@@ -1371,7 +1371,8 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
- #endif
- 
- 	if (__inet_inherit_port(sk, newsk) < 0) {
--		sock_put(newsk);
-+		inet_csk_prepare_forced_close(newsk);
-+		tcp_done(newsk);
- 		goto out;
- 	}
- 	__inet6_hash(newsk, NULL);
-diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
-index a5894dd..c55eacc 100644
---- a/net/mac80211/ibss.c
-+++ b/net/mac80211/ibss.c
-@@ -647,8 +647,8 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
- 	sdata_info(sdata,
- 		   "No active IBSS STAs - trying to scan for other IBSS networks with same SSID (merge)\n");
- 
--	ieee80211_request_internal_scan(sdata,
--			ifibss->ssid, ifibss->ssid_len, NULL);
-+	ieee80211_request_ibss_scan(sdata, ifibss->ssid, ifibss->ssid_len,
-+				    NULL);
- }
- 
- static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
-@@ -746,9 +746,8 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
- 					IEEE80211_SCAN_INTERVAL)) {
- 		sdata_info(sdata, "Trigger new scan to find an IBSS to join\n");
- 
--		ieee80211_request_internal_scan(sdata,
--				ifibss->ssid, ifibss->ssid_len,
--				ifibss->fixed_channel ? ifibss->channel : NULL);
-+		ieee80211_request_ibss_scan(sdata, ifibss->ssid,
-+					    ifibss->ssid_len, chan);
- 	} else {
- 		int interval = IEEE80211_SCAN_INTERVAL;
- 
-diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
-index 642a2a3..19d4ec3 100644
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -1239,9 +1239,9 @@ void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
- 
- /* scan/BSS handling */
- void ieee80211_scan_work(struct work_struct *work);
--int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
--				    const u8 *ssid, u8 ssid_len,
--				    struct ieee80211_channel *chan);
-+int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata,
-+				const u8 *ssid, u8 ssid_len,
-+				struct ieee80211_channel *chan);
- int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata,
- 			   struct cfg80211_scan_request *req);
- void ieee80211_scan_cancel(struct ieee80211_local *local);
-diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
-index 839dd97..09fc38d 100644
---- a/net/mac80211/scan.c
-+++ b/net/mac80211/scan.c
-@@ -819,9 +819,9 @@ int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata,
- 	return res;
- }
- 
--int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
--				    const u8 *ssid, u8 ssid_len,
--				    struct ieee80211_channel *chan)
-+int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata,
-+				const u8 *ssid, u8 ssid_len,
-+				struct ieee80211_channel *chan)
- {
- 	struct ieee80211_local *local = sdata->local;
- 	int ret = -EBUSY;
-@@ -835,22 +835,36 @@ int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
- 
- 	/* fill internal scan request */
- 	if (!chan) {
--		int i, nchan = 0;
-+		int i, max_n;
-+		int n_ch = 0;
- 
- 		for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
- 			if (!local->hw.wiphy->bands[band])
- 				continue;
--			for (i = 0;
--			     i < local->hw.wiphy->bands[band]->n_channels;
--			     i++) {
--				local->int_scan_req->channels[nchan] =
-+
-+			max_n = local->hw.wiphy->bands[band]->n_channels;
-+			for (i = 0; i < max_n; i++) {
-+				struct ieee80211_channel *tmp_ch =
- 				    &local->hw.wiphy->bands[band]->channels[i];
--				nchan++;
-+
-+				if (tmp_ch->flags & (IEEE80211_CHAN_NO_IBSS |
-+						     IEEE80211_CHAN_DISABLED))
-+					continue;
-+
-+				local->int_scan_req->channels[n_ch] = tmp_ch;
-+				n_ch++;
- 			}
- 		}
- 
--		local->int_scan_req->n_channels = nchan;
-+		if (WARN_ON_ONCE(n_ch == 0))
-+			goto unlock;
-+
-+		local->int_scan_req->n_channels = n_ch;
- 	} else {
-+		if (WARN_ON_ONCE(chan->flags & (IEEE80211_CHAN_NO_IBSS |
-+						IEEE80211_CHAN_DISABLED)))
-+			goto unlock;
-+
- 		local->int_scan_req->channels[0] = chan;
- 		local->int_scan_req->n_channels = 1;
- 	}
-diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
-index 31aa8b8..cd7ca8d 100644
---- a/net/mac80211/sta_info.c
-+++ b/net/mac80211/sta_info.c
-@@ -835,7 +835,7 @@ void sta_info_init(struct ieee80211_local *local)
- 
- void sta_info_stop(struct ieee80211_local *local)
- {
--	del_timer(&local->sta_cleanup);
-+	del_timer_sync(&local->sta_cleanup);
- 	sta_info_flush(local, NULL);
- }
- 
-diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
-index 9d75b77..e9ea2f3 100644
---- a/net/sched/sch_htb.c
-+++ b/net/sched/sch_htb.c
-@@ -874,7 +874,7 @@ ok:
- 	q->now = psched_get_time();
- 	start_at = jiffies;
- 
--	next_event = q->now + 5 * PSCHED_TICKS_PER_SEC;
-+	next_event = q->now + 5LLU * PSCHED_TICKS_PER_SEC;
- 
- 	for (level = 0; level < TC_HTB_MAXDEPTH; level++) {
- 		/* common case optimization - skip event handler quickly */
-diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
-index fa48c60..346c387 100644
---- a/net/sunrpc/clnt.c
-+++ b/net/sunrpc/clnt.c
-@@ -234,7 +234,7 @@ static struct rpc_clnt *rpc_get_client_for_event(struct net *net, int event)
- 	spin_lock(&sn->rpc_client_lock);
- 	list_for_each_entry(clnt, &sn->all_clients, cl_clients) {
- 		if (clnt->cl_program->pipe_dir_name == NULL)
--			break;
-+			continue;
- 		if (rpc_clnt_skip_event(clnt, event))
- 			continue;
- 		if (atomic_inc_not_zero(&clnt->cl_count) == 0)
-diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
-index 21fde99..2a419f1 100644
---- a/net/sunrpc/rpc_pipe.c
-+++ b/net/sunrpc/rpc_pipe.c
-@@ -1152,14 +1152,19 @@ static void rpc_kill_sb(struct super_block *sb)
- 	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
- 
- 	mutex_lock(&sn->pipefs_sb_lock);
-+	if (sn->pipefs_sb != sb) {
-+		mutex_unlock(&sn->pipefs_sb_lock);
-+		goto out;
-+	}
- 	sn->pipefs_sb = NULL;
- 	mutex_unlock(&sn->pipefs_sb_lock);
--	put_net(net);
- 	dprintk("RPC:	sending pipefs UMOUNT notification for net %p%s\n", net,
- 								NET_NAME(net));
- 	blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
- 					   RPC_PIPEFS_UMOUNT,
- 					   sb);
-+	put_net(net);
-+out:
- 	kill_litter_super(sb);
- }
- 
-diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
-index 128494e..7fc5846 100644
---- a/net/sunrpc/sched.c
-+++ b/net/sunrpc/sched.c
-@@ -919,16 +919,35 @@ struct rpc_task *rpc_new_task(const struct rpc_task_setup *setup_data)
- 	return task;
- }
- 
-+/*
-+ * rpc_free_task - release rpc task and perform cleanups
-+ *
-+ * Note that we free up the rpc_task _after_ rpc_release_calldata()
-+ * in order to work around a workqueue dependency issue.
-+ *
-+ * Tejun Heo states:
-+ * "Workqueue currently considers two work items to be the same if they're
-+ * on the same address and won't execute them concurrently - ie. it
-+ * makes a work item which is queued again while being executed wait
-+ * for the previous execution to complete.
-+ *
-+ * If a work function frees the work item, and then waits for an event
-+ * which should be performed by another work item and *that* work item
-+ * recycles the freed work item, it can create a false dependency loop.
-+ * There really is no reliable way to detect this short of verifying
-+ * every memory free."
-+ *
-+ */
- static void rpc_free_task(struct rpc_task *task)
- {
--	const struct rpc_call_ops *tk_ops = task->tk_ops;
--	void *calldata = task->tk_calldata;
-+	unsigned short tk_flags = task->tk_flags;
-+
-+	rpc_release_calldata(task->tk_ops, task->tk_calldata);
- 
--	if (task->tk_flags & RPC_TASK_DYNAMIC) {
-+	if (tk_flags & RPC_TASK_DYNAMIC) {
- 		dprintk("RPC: %5u freeing task\n", task->tk_pid);
- 		mempool_free(task, rpc_task_mempool);
- 	}
--	rpc_release_calldata(tk_ops, calldata);
- }
- 
- static void rpc_async_release(struct work_struct *work)
-@@ -938,8 +957,7 @@ static void rpc_async_release(struct work_struct *work)
- 
- static void rpc_release_resources_task(struct rpc_task *task)
- {
--	if (task->tk_rqstp)
--		xprt_release(task);
-+	xprt_release(task);
- 	if (task->tk_msg.rpc_cred) {
- 		put_rpccred(task->tk_msg.rpc_cred);
- 		task->tk_msg.rpc_cred = NULL;
-diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
-index 5d7f61d..2480c01 100644
---- a/net/sunrpc/xprt.c
-+++ b/net/sunrpc/xprt.c
-@@ -1139,10 +1139,18 @@ static void xprt_request_init(struct rpc_task *task, struct rpc_xprt *xprt)
- void xprt_release(struct rpc_task *task)
- {
- 	struct rpc_xprt	*xprt;
--	struct rpc_rqst	*req;
-+	struct rpc_rqst	*req = task->tk_rqstp;
- 
--	if (!(req = task->tk_rqstp))
-+	if (req == NULL) {
-+		if (task->tk_client) {
-+			rcu_read_lock();
-+			xprt = rcu_dereference(task->tk_client->cl_xprt);
-+			if (xprt->snd_task == task)
-+				xprt_release_write(xprt, task);
-+			rcu_read_unlock();
-+		}
- 		return;
-+	}
- 
- 	xprt = req->rq_xprt;
- 	if (task->tk_ops->rpc_count_stats != NULL)
-diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
-index 49a464f..62fa2c5 100644
---- a/security/integrity/evm/evm_crypto.c
-+++ b/security/integrity/evm/evm_crypto.c
-@@ -205,9 +205,9 @@ int evm_update_evmxattr(struct dentry *dentry, const char *xattr_name,
- 		rc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM,
- 					   &xattr_data,
- 					   sizeof(xattr_data), 0);
--	}
--	else if (rc == -ENODATA)
-+	} else if (rc == -ENODATA && inode->i_op->removexattr) {
- 		rc = inode->i_op->removexattr(dentry, XATTR_NAME_EVM);
-+	}
- 	return rc;
- }
- 
-diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
-index 48d7c0a..bd3ba88 100644
---- a/sound/arm/pxa2xx-ac97-lib.c
-+++ b/sound/arm/pxa2xx-ac97-lib.c
-@@ -18,6 +18,7 @@
- #include <linux/delay.h>
- #include <linux/module.h>
- #include <linux/io.h>
-+#include <linux/gpio.h>
- 
- #include <sound/ac97_codec.h>
- #include <sound/pxa2xx-lib.h>
-@@ -148,6 +149,8 @@ static inline void pxa_ac97_warm_pxa27x(void)
- 
- static inline void pxa_ac97_cold_pxa27x(void)
- {
-+	unsigned int timeout;
-+
- 	GCR &=  GCR_COLD_RST;  /* clear everything but nCRST */
- 	GCR &= ~GCR_COLD_RST;  /* then assert nCRST */
- 
-@@ -157,8 +160,10 @@ static inline void pxa_ac97_cold_pxa27x(void)
- 	clk_enable(ac97conf_clk);
- 	udelay(5);
- 	clk_disable(ac97conf_clk);
--	GCR = GCR_COLD_RST;
--	udelay(50);
-+	GCR = GCR_COLD_RST | GCR_WARM_RST;
-+	timeout = 100;     /* wait for the codec-ready bit to be set */
-+	while (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR)) && timeout--)
-+		mdelay(1);
- }
- #endif
- 
-@@ -340,8 +345,21 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
- 	}
- 
- 	if (cpu_is_pxa27x()) {
--		/* Use GPIO 113 as AC97 Reset on Bulverde */
-+		/*
-+		 * This gpio is needed for a work-around to a bug in the ac97
-+		 * controller during warm reset.  The direction and level is set
-+		 * here so that it is an output driven high when switching from
-+		 * AC97_nRESET alt function to generic gpio.
-+		 */
-+		ret = gpio_request_one(reset_gpio, GPIOF_OUT_INIT_HIGH,
-+				       "pxa27x ac97 reset");
-+		if (ret < 0) {
-+			pr_err("%s: gpio_request_one() failed: %d\n",
-+			       __func__, ret);
-+			goto err_conf;
-+		}
- 		pxa27x_assert_ac97reset(reset_gpio, 0);
-+
- 		ac97conf_clk = clk_get(&dev->dev, "AC97CONFCLK");
- 		if (IS_ERR(ac97conf_clk)) {
- 			ret = PTR_ERR(ac97conf_clk);
-@@ -384,6 +402,8 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_probe);
- 
- void pxa2xx_ac97_hw_remove(struct platform_device *dev)
- {
-+	if (cpu_is_pxa27x())
-+		gpio_free(reset_gpio);
- 	GCR |= GCR_ACLINK_OFF;
- 	free_irq(IRQ_AC97, NULL);
- 	if (ac97conf_clk) {
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index e1b7061..31ac338 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -6562,8 +6562,8 @@ static void alc861vd_fixup_dallas(struct hda_codec *codec,
- 				  const struct alc_fixup *fix, int action)
- {
- 	if (action == ALC_FIXUP_ACT_PRE_PROBE) {
--		snd_hda_override_pin_caps(codec, 0x18, 0x00001714);
--		snd_hda_override_pin_caps(codec, 0x19, 0x0000171c);
-+		snd_hda_override_pin_caps(codec, 0x18, 0x00000734);
-+		snd_hda_override_pin_caps(codec, 0x19, 0x0000073c);
- 	}
- }
- 
-diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
-index 3d4722f..f206117 100644
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -1698,7 +1698,7 @@ static const struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
- 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1658,
- 			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
- 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1659,
--			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
-+			  "HP Pavilion dv7", STAC_HP_DV7_4000),
- 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x165A,
- 			  "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD),
- 	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x165B,
-diff --git a/sound/soc/codecs/sigmadsp.c b/sound/soc/codecs/sigmadsp.c
-index 5be42bf..4068f24 100644
---- a/sound/soc/codecs/sigmadsp.c
-+++ b/sound/soc/codecs/sigmadsp.c
-@@ -225,7 +225,7 @@ EXPORT_SYMBOL(process_sigma_firmware);
- static int sigma_action_write_regmap(void *control_data,
- 	const struct sigma_action *sa, size_t len)
- {
--	return regmap_raw_write(control_data, le16_to_cpu(sa->addr),
-+	return regmap_raw_write(control_data, be16_to_cpu(sa->addr),
- 		sa->payload, len - 2);
- }
- 
-diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
-index a3acb7a..6275a2b 100644
---- a/sound/soc/codecs/wm2000.c
-+++ b/sound/soc/codecs/wm2000.c
-@@ -188,9 +188,9 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue)
- 
- 	ret = wm2000_read(i2c, WM2000_REG_SPEECH_CLARITY);
- 	if (wm2000->speech_clarity)
--		ret &= ~WM2000_SPEECH_CLARITY;
--	else
- 		ret |= WM2000_SPEECH_CLARITY;
-+	else
-+		ret &= ~WM2000_SPEECH_CLARITY;
- 	wm2000_write(i2c, WM2000_REG_SPEECH_CLARITY, ret);
- 
- 	wm2000_write(i2c, WM2000_REG_SYS_START0, 0x33);
-diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
-index c8bff6d..86b84a1 100644
---- a/sound/soc/codecs/wm2200.c
-+++ b/sound/soc/codecs/wm2200.c
-@@ -1380,15 +1380,9 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
- 	case SND_SOC_DAIFMT_DSP_A:
- 		fmt_val = 0;
- 		break;
--	case SND_SOC_DAIFMT_DSP_B:
--		fmt_val = 1;
--		break;
- 	case SND_SOC_DAIFMT_I2S:
- 		fmt_val = 2;
- 		break;
--	case SND_SOC_DAIFMT_LEFT_J:
--		fmt_val = 3;
--		break;
- 	default:
- 		dev_err(codec->dev, "Unsupported DAI format %d\n",
- 			fmt & SND_SOC_DAIFMT_FORMAT_MASK);
-@@ -1440,7 +1434,7 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
- 			    WM2200_AIF1TX_LRCLK_MSTR | WM2200_AIF1TX_LRCLK_INV,
- 			    lrclk);
- 	snd_soc_update_bits(codec, WM2200_AUDIO_IF_1_5,
--			    WM2200_AIF1_FMT_MASK << 1, fmt_val << 1);
-+			    WM2200_AIF1_FMT_MASK, fmt_val);
- 
- 	return 0;
- }
-diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
-index f481729..10d48cd 100644
---- a/sound/soc/codecs/wm5100.c
-+++ b/sound/soc/codecs/wm5100.c
-@@ -1279,15 +1279,9 @@ static int wm5100_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
- 	case SND_SOC_DAIFMT_DSP_A:
- 		mask = 0;
- 		break;
--	case SND_SOC_DAIFMT_DSP_B:
--		mask = 1;
--		break;
- 	case SND_SOC_DAIFMT_I2S:
- 		mask = 2;
- 		break;
--	case SND_SOC_DAIFMT_LEFT_J:
--		mask = 3;
--		break;
- 	default:
- 		dev_err(codec->dev, "Unsupported DAI format %d\n",
- 			fmt & SND_SOC_DAIFMT_FORMAT_MASK);
-diff --git a/sound/usb/midi.c b/sound/usb/midi.c
-index eeefbce..34b9bb7 100644
---- a/sound/usb/midi.c
-+++ b/sound/usb/midi.c
-@@ -116,6 +116,7 @@ struct snd_usb_midi {
- 	struct list_head list;
- 	struct timer_list error_timer;
- 	spinlock_t disc_lock;
-+	struct rw_semaphore disc_rwsem;
- 	struct mutex mutex;
- 	u32 usb_id;
- 	int next_midi_device;
-@@ -125,8 +126,10 @@ struct snd_usb_midi {
- 		struct snd_usb_midi_in_endpoint *in;
- 	} endpoints[MIDI_MAX_ENDPOINTS];
- 	unsigned long input_triggered;
--	unsigned int opened;
-+	bool autopm_reference;
-+	unsigned int opened[2];
- 	unsigned char disconnected;
-+	unsigned char input_running;
- 
- 	struct snd_kcontrol *roland_load_ctl;
- };
-@@ -148,7 +151,6 @@ struct snd_usb_midi_out_endpoint {
- 		struct snd_usb_midi_out_endpoint* ep;
- 		struct snd_rawmidi_substream *substream;
- 		int active;
--		bool autopm_reference;
- 		uint8_t cable;		/* cable number << 4 */
- 		uint8_t state;
- #define STATE_UNKNOWN	0
-@@ -1033,29 +1035,58 @@ static void update_roland_altsetting(struct snd_usb_midi* umidi)
- 	snd_usbmidi_input_start(&umidi->list);
- }
- 
--static void substream_open(struct snd_rawmidi_substream *substream, int open)
-+static int substream_open(struct snd_rawmidi_substream *substream, int dir,
-+			  int open)
- {
- 	struct snd_usb_midi* umidi = substream->rmidi->private_data;
- 	struct snd_kcontrol *ctl;
-+	int err;
-+
-+	down_read(&umidi->disc_rwsem);
-+	if (umidi->disconnected) {
-+		up_read(&umidi->disc_rwsem);
-+		return open ? -ENODEV : 0;
-+	}
- 
- 	mutex_lock(&umidi->mutex);
- 	if (open) {
--		if (umidi->opened++ == 0 && umidi->roland_load_ctl) {
--			ctl = umidi->roland_load_ctl;
--			ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
--			snd_ctl_notify(umidi->card,
-+		if (!umidi->opened[0] && !umidi->opened[1]) {
-+			err = usb_autopm_get_interface(umidi->iface);
-+			umidi->autopm_reference = err >= 0;
-+			if (err < 0 && err != -EACCES) {
-+				mutex_unlock(&umidi->mutex);
-+				up_read(&umidi->disc_rwsem);
-+				return -EIO;
-+			}
-+			if (umidi->roland_load_ctl) {
-+				ctl = umidi->roland_load_ctl;
-+				ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-+				snd_ctl_notify(umidi->card,
- 				       SNDRV_CTL_EVENT_MASK_INFO, &ctl->id);
--			update_roland_altsetting(umidi);
-+				update_roland_altsetting(umidi);
-+			}
- 		}
-+		umidi->opened[dir]++;
-+		if (umidi->opened[1])
-+			snd_usbmidi_input_start(&umidi->list);
- 	} else {
--		if (--umidi->opened == 0 && umidi->roland_load_ctl) {
--			ctl = umidi->roland_load_ctl;
--			ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
--			snd_ctl_notify(umidi->card,
-+		umidi->opened[dir]--;
-+		if (!umidi->opened[1])
-+			snd_usbmidi_input_stop(&umidi->list);
-+		if (!umidi->opened[0] && !umidi->opened[1]) {
-+			if (umidi->roland_load_ctl) {
-+				ctl = umidi->roland_load_ctl;
-+				ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-+				snd_ctl_notify(umidi->card,
- 				       SNDRV_CTL_EVENT_MASK_INFO, &ctl->id);
-+			}
-+			if (umidi->autopm_reference)
-+				usb_autopm_put_interface(umidi->iface);
- 		}
- 	}
- 	mutex_unlock(&umidi->mutex);
-+	up_read(&umidi->disc_rwsem);
-+	return 0;
- }
- 
- static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
-@@ -1063,7 +1094,6 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
- 	struct snd_usb_midi* umidi = substream->rmidi->private_data;
- 	struct usbmidi_out_port* port = NULL;
- 	int i, j;
--	int err;
- 
- 	for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i)
- 		if (umidi->endpoints[i].out)
-@@ -1076,25 +1106,15 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
- 		snd_BUG();
- 		return -ENXIO;
- 	}
--	err = usb_autopm_get_interface(umidi->iface);
--	port->autopm_reference = err >= 0;
--	if (err < 0 && err != -EACCES)
--		return -EIO;
-+
- 	substream->runtime->private_data = port;
- 	port->state = STATE_UNKNOWN;
--	substream_open(substream, 1);
--	return 0;
-+	return substream_open(substream, 0, 1);
- }
- 
- static int snd_usbmidi_output_close(struct snd_rawmidi_substream *substream)
- {
--	struct snd_usb_midi* umidi = substream->rmidi->private_data;
--	struct usbmidi_out_port *port = substream->runtime->private_data;
--
--	substream_open(substream, 0);
--	if (port->autopm_reference)
--		usb_autopm_put_interface(umidi->iface);
--	return 0;
-+	return substream_open(substream, 0, 0);
- }
- 
- static void snd_usbmidi_output_trigger(struct snd_rawmidi_substream *substream, int up)
-@@ -1147,14 +1167,12 @@ static void snd_usbmidi_output_drain(struct snd_rawmidi_substream *substream)
- 
- static int snd_usbmidi_input_open(struct snd_rawmidi_substream *substream)
- {
--	substream_open(substream, 1);
--	return 0;
-+	return substream_open(substream, 1, 1);
- }
- 
- static int snd_usbmidi_input_close(struct snd_rawmidi_substream *substream)
- {
--	substream_open(substream, 0);
--	return 0;
-+	return substream_open(substream, 1, 0);
- }
- 
- static void snd_usbmidi_input_trigger(struct snd_rawmidi_substream *substream, int up)
-@@ -1403,9 +1421,12 @@ void snd_usbmidi_disconnect(struct list_head* p)
- 	 * a timer may submit an URB. To reliably break the cycle
- 	 * a flag under lock must be used
- 	 */
-+	down_write(&umidi->disc_rwsem);
- 	spin_lock_irq(&umidi->disc_lock);
- 	umidi->disconnected = 1;
- 	spin_unlock_irq(&umidi->disc_lock);
-+	up_write(&umidi->disc_rwsem);
-+
- 	for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) {
- 		struct snd_usb_midi_endpoint* ep = &umidi->endpoints[i];
- 		if (ep->out)
-@@ -2060,12 +2081,15 @@ void snd_usbmidi_input_stop(struct list_head* p)
- 	unsigned int i, j;
- 
- 	umidi = list_entry(p, struct snd_usb_midi, list);
-+	if (!umidi->input_running)
-+		return;
- 	for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) {
- 		struct snd_usb_midi_endpoint* ep = &umidi->endpoints[i];
- 		if (ep->in)
- 			for (j = 0; j < INPUT_URBS; ++j)
- 				usb_kill_urb(ep->in->urbs[j]);
- 	}
-+	umidi->input_running = 0;
- }
- 
- static void snd_usbmidi_input_start_ep(struct snd_usb_midi_in_endpoint* ep)
-@@ -2090,8 +2114,11 @@ void snd_usbmidi_input_start(struct list_head* p)
- 	int i;
- 
- 	umidi = list_entry(p, struct snd_usb_midi, list);
-+	if (umidi->input_running || !umidi->opened[1])
-+		return;
- 	for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i)
- 		snd_usbmidi_input_start_ep(umidi->endpoints[i].in);
-+	umidi->input_running = 1;
- }
- 
- /*
-@@ -2117,6 +2144,7 @@ int snd_usbmidi_create(struct snd_card *card,
- 	umidi->usb_protocol_ops = &snd_usbmidi_standard_ops;
- 	init_timer(&umidi->error_timer);
- 	spin_lock_init(&umidi->disc_lock);
-+	init_rwsem(&umidi->disc_rwsem);
- 	mutex_init(&umidi->mutex);
- 	umidi->usb_id = USB_ID(le16_to_cpu(umidi->dev->descriptor.idVendor),
- 			       le16_to_cpu(umidi->dev->descriptor.idProduct));
-@@ -2229,9 +2257,6 @@ int snd_usbmidi_create(struct snd_card *card,
- 	}
- 
- 	list_add_tail(&umidi->list, midi_list);
--
--	for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i)
--		snd_usbmidi_input_start_ep(umidi->endpoints[i].in);
- 	return 0;
- }
- 
-diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
-index 0f58b4b..b8d1ad1 100644
---- a/sound/usb/quirks.c
-+++ b/sound/usb/quirks.c
-@@ -387,11 +387,13 @@ static int snd_usb_fasttrackpro_boot_quirk(struct usb_device *dev)
- 		 * rules
- 		 */
- 		err = usb_driver_set_configuration(dev, 2);
--		if (err < 0) {
-+		if (err < 0)
- 			snd_printdd("error usb_driver_set_configuration: %d\n",
- 				    err);
--			return -ENODEV;
--		}
-+		/* Always return an error, so that we stop creating a device
-+		   that will just be destroyed and recreated with a new
-+		   configuration */
-+		return -ENODEV;
- 	} else
- 		snd_printk(KERN_INFO "usb-audio: Fast Track Pro config OK\n");
- 
-diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index d617f69..cd197be 100644
---- a/virt/kvm/kvm_main.c
-+++ b/virt/kvm/kvm_main.c
-@@ -701,8 +701,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
- 	int r;
- 	gfn_t base_gfn;
- 	unsigned long npages;
--	unsigned long i;
--	struct kvm_memory_slot *memslot;
-+	struct kvm_memory_slot *memslot, *slot;
- 	struct kvm_memory_slot old, new;
- 	struct kvm_memslots *slots, *old_memslots;
- 
-@@ -749,13 +748,11 @@ int __kvm_set_memory_region(struct kvm *kvm,
- 
- 	/* Check for overlaps */
- 	r = -EEXIST;
--	for (i = 0; i < KVM_MEMORY_SLOTS; ++i) {
--		struct kvm_memory_slot *s = &kvm->memslots->memslots[i];
--
--		if (s == memslot || !s->npages)
-+	kvm_for_each_memslot(slot, kvm->memslots) {
-+		if (slot->id >= KVM_MEMORY_SLOTS || slot == memslot)
- 			continue;
--		if (!((base_gfn + npages <= s->base_gfn) ||
--		      (base_gfn >= s->base_gfn + s->npages)))
-+		if (!((base_gfn + npages <= slot->base_gfn) ||
-+		      (base_gfn >= slot->base_gfn + slot->npages)))
- 			goto out_free;
- 	}
-