commit:     c8e9d3a5dad902df8b112db8fc873e883f821bcd
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 11 18:25:42 2018 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sun Mar 11 18:25:42 2018 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=c8e9d3a5

Linux patch 4.4.121

 0000_README              |    4 +
 1120_linux-4.4.121.patch | 1085 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1089 insertions(+)

diff --git a/0000_README b/0000_README
index 39de3c4..617be60 100644
--- a/0000_README
+++ b/0000_README
@@ -523,6 +523,10 @@ Patch:  1119_linux-4.4.120.patch
 From:   http://www.kernel.org
 Desc:   Linux 4.4.120
 
+Patch:  1120_linux-4.4.121.patch
+From:   http://www.kernel.org
+Desc:   Linux 4.4.121
+
 Patch:  1500_XATTR_USER_PREFIX.patch
 From:   https://bugs.gentoo.org/show_bug.cgi?id=470644
 Desc:   Support for namespace user.pax.* on tmpfs.

diff --git a/1120_linux-4.4.121.patch b/1120_linux-4.4.121.patch
new file mode 100644
index 0000000..74f4e56
--- /dev/null
+++ b/1120_linux-4.4.121.patch
@@ -0,0 +1,1085 @@
+diff --git a/Makefile b/Makefile
+index d874d7de0cde..0e22e4eb85cc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ VERSION = 4
+ PATCHLEVEL = 4
+-SUBLEVEL = 120
++SUBLEVEL = 121
+ EXTRAVERSION =
+ NAME = Blurry Fish Butt
+ 
+diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi 
b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+index 80f6c786a37e..5562c5feb0be 100644
+--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
++++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+@@ -90,6 +90,8 @@
+ };
+ 
+ &i2c1 {
++      pinctrl-names = "default";
++      pinctrl-0 = <&i2c1_pins>;
+       clock-frequency = <2600000>;
+ 
+       twl: twl@48 {
+@@ -146,6 +148,12 @@
+                       OMAP3630_CORE2_IOPAD(0x25da, PIN_INPUT_PULLUP | 
MUX_MODE2)   /* etk_ctl.sdmmc3_cmd */
+               >;
+       };
++      i2c1_pins: pinmux_i2c1_pins {
++              pinctrl-single,pins = <
++                      OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0)        
/* i2c1_scl.i2c1_scl */
++                      OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)        
/* i2c1_sda.i2c1_sda */
++              >;
++      };
+ };
+ 
+ #include "twl4030.dtsi"
+diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
+index e20fc4178b15..1c8a6098a2ca 100644
+--- a/arch/arm/mach-mvebu/Kconfig
++++ b/arch/arm/mach-mvebu/Kconfig
+@@ -37,7 +37,7 @@ config MACH_ARMADA_370
+ config MACH_ARMADA_375
+       bool "Marvell Armada 375 boards" if ARCH_MULTI_V7
+       select ARM_ERRATA_720789
+-      select ARM_ERRATA_753970
++      select PL310_ERRATA_753970
+       select ARM_GIC
+       select ARMADA_375_CLK
+       select HAVE_ARM_SCU
+@@ -52,7 +52,7 @@ config MACH_ARMADA_375
+ config MACH_ARMADA_38X
+       bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7
+       select ARM_ERRATA_720789
+-      select ARM_ERRATA_753970
++      select PL310_ERRATA_753970
+       select ARM_GIC
+       select ARMADA_38X_CLK
+       select HAVE_ARM_SCU
+diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
+index a03b22c615d9..59a4e1604a36 100644
+--- a/arch/x86/entry/entry_64.S
++++ b/arch/x86/entry/entry_64.S
+@@ -178,12 +178,14 @@ GLOBAL(entry_SYSCALL_64_after_swapgs)
+       jnz     tracesys
+ entry_SYSCALL_64_fastpath:
+ #if __SYSCALL_MASK == ~0
+-      cmpq    $__NR_syscall_max, %rax
++      cmpq    $NR_syscalls, %rax
+ #else
+       andl    $__SYSCALL_MASK, %eax
+-      cmpl    $__NR_syscall_max, %eax
++      cmpl    $NR_syscalls, %eax
+ #endif
+-      ja      1f                              /* return -ENOSYS (already in 
pt_regs->ax) */
++      jae     1f                              /* return -ENOSYS (already in 
pt_regs->ax) */
++      sbb     %rcx, %rcx                      /* array_index_mask_nospec() */
++      and     %rcx, %rax
+       movq    %r10, %rcx
+ #ifdef CONFIG_RETPOLINE
+       movq    sys_call_table(, %rax, 8), %rax
+@@ -276,12 +278,14 @@ tracesys_phase2:
+       RESTORE_C_REGS_EXCEPT_RAX
+       RESTORE_EXTRA_REGS
+ #if __SYSCALL_MASK == ~0
+-      cmpq    $__NR_syscall_max, %rax
++      cmpq    $NR_syscalls, %rax
+ #else
+       andl    $__SYSCALL_MASK, %eax
+-      cmpl    $__NR_syscall_max, %eax
++      cmpl    $NR_syscalls, %eax
+ #endif
+-      ja      1f                              /* return -ENOSYS (already in 
pt_regs->ax) */
++      jae     1f                              /* return -ENOSYS (already in 
pt_regs->ax) */
++      sbb     %rcx, %rcx                      /* array_index_mask_nospec() */
++      and     %rcx, %rax
+       movq    %r10, %rcx                      /* fixup for C */
+ #ifdef CONFIG_RETPOLINE
+       movq    sys_call_table(, %rax, 8), %rax
+diff --git a/arch/x86/include/asm/nospec-branch.h 
b/arch/x86/include/asm/nospec-branch.h
+index 66094a0473a8..249f1c769f21 100644
+--- a/arch/x86/include/asm/nospec-branch.h
++++ b/arch/x86/include/asm/nospec-branch.h
+@@ -195,4 +195,41 @@ static inline void vmexit_fill_RSB(void)
+ }
+ 
+ #endif /* __ASSEMBLY__ */
++
++/*
++ * Below is used in the eBPF JIT compiler and emits the byte sequence
++ * for the following assembly:
++ *
++ * With retpolines configured:
++ *
++ *    callq do_rop
++ *  spec_trap:
++ *    pause
++ *    lfence
++ *    jmp spec_trap
++ *  do_rop:
++ *    mov %rax,(%rsp)
++ *    retq
++ *
++ * Without retpolines configured:
++ *
++ *    jmp *%rax
++ */
++#ifdef CONFIG_RETPOLINE
++# define RETPOLINE_RAX_BPF_JIT_SIZE   17
++# define RETPOLINE_RAX_BPF_JIT()                              \
++      EMIT1_off32(0xE8, 7);    /* callq do_rop */             \
++      /* spec_trap: */                                        \
++      EMIT2(0xF3, 0x90);       /* pause */                    \
++      EMIT3(0x0F, 0xAE, 0xE8); /* lfence */                   \
++      EMIT2(0xEB, 0xF9);       /* jmp spec_trap */            \
++      /* do_rop: */                                           \
++      EMIT4(0x48, 0x89, 0x04, 0x24); /* mov %rax,(%rsp) */    \
++      EMIT1(0xC3);             /* retq */
++#else
++# define RETPOLINE_RAX_BPF_JIT_SIZE   2
++# define RETPOLINE_RAX_BPF_JIT()                              \
++      EMIT2(0xFF, 0xE0);       /* jmp *%rax */
++#endif
++
+ #endif /* _ASM_X86_NOSPEC_BRANCH_H_ */
+diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
+index a41e523536a2..592e260ba05b 100644
+--- a/arch/x86/kernel/apic/vector.c
++++ b/arch/x86/kernel/apic/vector.c
+@@ -91,8 +91,12 @@ out_data:
+       return NULL;
+ }
+ 
+-static void free_apic_chip_data(struct apic_chip_data *data)
++static void free_apic_chip_data(unsigned int virq, struct apic_chip_data 
*data)
+ {
++#ifdef        CONFIG_X86_IO_APIC
++      if (virq  < nr_legacy_irqs())
++              legacy_irq_data[virq] = NULL;
++#endif
+       if (data) {
+               free_cpumask_var(data->domain);
+               free_cpumask_var(data->old_domain);
+@@ -316,11 +320,7 @@ static void x86_vector_free_irqs(struct irq_domain 
*domain,
+                       apic_data = irq_data->chip_data;
+                       irq_domain_reset_irq_data(irq_data);
+                       raw_spin_unlock_irqrestore(&vector_lock, flags);
+-                      free_apic_chip_data(apic_data);
+-#ifdef        CONFIG_X86_IO_APIC
+-                      if (virq + i < nr_legacy_irqs())
+-                              legacy_irq_data[virq + i] = NULL;
+-#endif
++                      free_apic_chip_data(virq + i, apic_data);
+               }
+       }
+ }
+@@ -361,7 +361,7 @@ static int x86_vector_alloc_irqs(struct irq_domain 
*domain, unsigned int virq,
+               err = assign_irq_vector_policy(virq + i, node, data, info);
+               if (err) {
+                       irq_data->chip_data = NULL;
+-                      free_apic_chip_data(data);
++                      free_apic_chip_data(virq + i, data);
+                       goto error;
+               }
+       }
+diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
+index ecaf7c9baf75..2bbc74f8a4a8 100644
+--- a/arch/x86/kernel/cpu/bugs.c
++++ b/arch/x86/kernel/cpu/bugs.c
+@@ -175,8 +175,7 @@ static enum spectre_v2_mitigation_cmd __init 
spectre_v2_parse_cmdline(void)
+               }
+ 
+               if (i >= ARRAY_SIZE(mitigation_options)) {
+-                      pr_err("unknown option (%s). Switching to AUTO 
select\n",
+-                             mitigation_options[i].option);
++                      pr_err("unknown option (%s). Switching to AUTO 
select\n", arg);
+                       return SPECTRE_V2_CMD_AUTO;
+               }
+       }
+diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
+index 33c42b826791..a889211e21c5 100644
+--- a/arch/x86/net/bpf_jit_comp.c
++++ b/arch/x86/net/bpf_jit_comp.c
+@@ -12,6 +12,7 @@
+ #include <linux/filter.h>
+ #include <linux/if_vlan.h>
+ #include <asm/cacheflush.h>
++#include <asm/nospec-branch.h>
+ #include <linux/bpf.h>
+ 
+ int bpf_jit_enable __read_mostly;
+@@ -269,7 +270,7 @@ static void emit_bpf_tail_call(u8 **pprog)
+       EMIT2(0x89, 0xD2);                        /* mov edx, edx */
+       EMIT3(0x39, 0x56,                         /* cmp dword ptr [rsi + 16], 
edx */
+             offsetof(struct bpf_array, map.max_entries));
+-#define OFFSET1 43 /* number of bytes to jump */
++#define OFFSET1 (41 + RETPOLINE_RAX_BPF_JIT_SIZE) /* number of bytes to jump 
*/
+       EMIT2(X86_JBE, OFFSET1);                  /* jbe out */
+       label1 = cnt;
+ 
+@@ -278,7 +279,7 @@ static void emit_bpf_tail_call(u8 **pprog)
+        */
+       EMIT2_off32(0x8B, 0x85, -STACKSIZE + 36); /* mov eax, dword ptr [rbp - 
516] */
+       EMIT3(0x83, 0xF8, MAX_TAIL_CALL_CNT);     /* cmp eax, MAX_TAIL_CALL_CNT 
*/
+-#define OFFSET2 32
++#define OFFSET2 (30 + RETPOLINE_RAX_BPF_JIT_SIZE)
+       EMIT2(X86_JA, OFFSET2);                   /* ja out */
+       label2 = cnt;
+       EMIT3(0x83, 0xC0, 0x01);                  /* add eax, 1 */
+@@ -292,7 +293,7 @@ static void emit_bpf_tail_call(u8 **pprog)
+        *   goto out;
+        */
+       EMIT3(0x48, 0x85, 0xC0);                  /* test rax,rax */
+-#define OFFSET3 10
++#define OFFSET3 (8 + RETPOLINE_RAX_BPF_JIT_SIZE)
+       EMIT2(X86_JE, OFFSET3);                   /* je out */
+       label3 = cnt;
+ 
+@@ -305,7 +306,7 @@ static void emit_bpf_tail_call(u8 **pprog)
+        * rdi == ctx (1st arg)
+        * rax == prog->bpf_func + prologue_size
+        */
+-      EMIT2(0xFF, 0xE0);                        /* jmp rax */
++      RETPOLINE_RAX_BPF_JIT();
+ 
+       /* out: */
+       BUILD_BUG_ON(cnt - label1 != OFFSET1);
+diff --git a/drivers/char/tpm/st33zp24/st33zp24.c 
b/drivers/char/tpm/st33zp24/st33zp24.c
+index 8d626784cd8d..49e4040eeb55 100644
+--- a/drivers/char/tpm/st33zp24/st33zp24.c
++++ b/drivers/char/tpm/st33zp24/st33zp24.c
+@@ -485,7 +485,7 @@ static int st33zp24_recv(struct tpm_chip *chip, unsigned 
char *buf,
+                           size_t count)
+ {
+       int size = 0;
+-      int expected;
++      u32 expected;
+ 
+       if (!chip)
+               return -EBUSY;
+@@ -502,7 +502,7 @@ static int st33zp24_recv(struct tpm_chip *chip, unsigned 
char *buf,
+       }
+ 
+       expected = be32_to_cpu(*(__be32 *)(buf + 2));
+-      if (expected > count) {
++      if (expected > count || expected < TPM_HEADER_SIZE) {
+               size = -EIO;
+               goto out;
+       }
+diff --git a/drivers/char/tpm/tpm_i2c_infineon.c 
b/drivers/char/tpm/tpm_i2c_infineon.c
+index f2aa99e34b4b..9f12ad74a09b 100644
+--- a/drivers/char/tpm/tpm_i2c_infineon.c
++++ b/drivers/char/tpm/tpm_i2c_infineon.c
+@@ -436,7 +436,8 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, 
size_t count)
+ static int tpm_tis_i2c_recv(struct tpm_chip *chip, u8 *buf, size_t count)
+ {
+       int size = 0;
+-      int expected, status;
++      int status;
++      u32 expected;
+ 
+       if (count < TPM_HEADER_SIZE) {
+               size = -EIO;
+@@ -451,7 +452,7 @@ static int tpm_tis_i2c_recv(struct tpm_chip *chip, u8 
*buf, size_t count)
+       }
+ 
+       expected = be32_to_cpu(*(__be32 *)(buf + 2));
+-      if ((size_t) expected > count) {
++      if (((size_t) expected > count) || (expected < TPM_HEADER_SIZE)) {
+               size = -EIO;
+               goto out;
+       }
+diff --git a/drivers/char/tpm/tpm_i2c_nuvoton.c 
b/drivers/char/tpm/tpm_i2c_nuvoton.c
+index a1e1474dda30..aedf726cbab6 100644
+--- a/drivers/char/tpm/tpm_i2c_nuvoton.c
++++ b/drivers/char/tpm/tpm_i2c_nuvoton.c
+@@ -267,7 +267,11 @@ static int i2c_nuvoton_recv(struct tpm_chip *chip, u8 
*buf, size_t count)
+       struct device *dev = chip->dev.parent;
+       struct i2c_client *client = to_i2c_client(dev);
+       s32 rc;
+-      int expected, status, burst_count, retries, size = 0;
++      int status;
++      int burst_count;
++      int retries;
++      int size = 0;
++      u32 expected;
+ 
+       if (count < TPM_HEADER_SIZE) {
+               i2c_nuvoton_ready(chip);    /* return to idle */
+@@ -309,7 +313,7 @@ static int i2c_nuvoton_recv(struct tpm_chip *chip, u8 
*buf, size_t count)
+                * to machine native
+                */
+               expected = be32_to_cpu(*(__be32 *) (buf + 2));
+-              if (expected > count) {
++              if (expected > count || expected < size) {
+                       dev_err(dev, "%s() expected > count\n", __func__);
+                       size = -EIO;
+                       continue;
+diff --git a/drivers/cpufreq/s3c24xx-cpufreq.c 
b/drivers/cpufreq/s3c24xx-cpufreq.c
+index 68ef8fd9482f..f5c4e009113c 100644
+--- a/drivers/cpufreq/s3c24xx-cpufreq.c
++++ b/drivers/cpufreq/s3c24xx-cpufreq.c
+@@ -364,7 +364,13 @@ struct clk *s3c_cpufreq_clk_get(struct device *dev, const 
char *name)
+ static int s3c_cpufreq_init(struct cpufreq_policy *policy)
+ {
+       policy->clk = clk_arm;
+-      return cpufreq_generic_init(policy, ftab, cpu_cur.info->latency);
++
++      policy->cpuinfo.transition_latency = cpu_cur.info->latency;
++
++      if (ftab)
++              return cpufreq_table_validate_and_show(policy, ftab);
++
++      return 0;
+ }
+ 
+ static int __init s3c_cpufreq_initclks(void)
+diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
+index 92b6798ef5b3..c1c3af089634 100644
+--- a/drivers/leds/led-core.c
++++ b/drivers/leds/led-core.c
+@@ -149,7 +149,7 @@ void led_blink_set(struct led_classdev *led_cdev,
+                  unsigned long *delay_on,
+                  unsigned long *delay_off)
+ {
+-      led_stop_software_blink(led_cdev);
++      del_timer_sync(&led_cdev->blink_timer);
+ 
+       led_cdev->flags &= ~LED_BLINK_ONESHOT;
+       led_cdev->flags &= ~LED_BLINK_ONESHOT_STOP;
+diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
+index e8b1120f486d..eef3e64ca0a8 100644
+--- a/drivers/leds/led-triggers.c
++++ b/drivers/leds/led-triggers.c
+@@ -88,21 +88,23 @@ ssize_t led_trigger_show(struct device *dev, struct 
device_attribute *attr,
+       down_read(&led_cdev->trigger_lock);
+ 
+       if (!led_cdev->trigger)
+-              len += sprintf(buf+len, "[none] ");
++              len += scnprintf(buf+len, PAGE_SIZE - len, "[none] ");
+       else
+-              len += sprintf(buf+len, "none ");
++              len += scnprintf(buf+len, PAGE_SIZE - len, "none ");
+ 
+       list_for_each_entry(trig, &trigger_list, next_trig) {
+               if (led_cdev->trigger && !strcmp(led_cdev->trigger->name,
+                                                       trig->name))
+-                      len += sprintf(buf+len, "[%s] ", trig->name);
++                      len += scnprintf(buf+len, PAGE_SIZE - len, "[%s] ",
++                                       trig->name);
+               else
+-                      len += sprintf(buf+len, "%s ", trig->name);
++                      len += scnprintf(buf+len, PAGE_SIZE - len, "%s ",
++                                       trig->name);
+       }
+       up_read(&led_cdev->trigger_lock);
+       up_read(&triggers_list_lock);
+ 
+-      len += sprintf(len+buf, "\n");
++      len += scnprintf(len+buf, PAGE_SIZE - len, "\n");
+       return len;
+ }
+ EXPORT_SYMBOL_GPL(led_trigger_show);
+diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
+index 81c5e1a1f363..1b84d2890fbf 100644
+--- a/drivers/md/dm-io.c
++++ b/drivers/md/dm-io.c
+@@ -300,6 +300,7 @@ static void do_region(int rw, unsigned region, struct 
dm_io_region *where,
+       else if (rw & REQ_WRITE_SAME)
+               special_cmd_max_sectors = q->limits.max_write_same_sectors;
+       if ((rw & (REQ_DISCARD | REQ_WRITE_SAME)) && special_cmd_max_sectors == 
0) {
++              atomic_inc(&io->count);
+               dec_count(io, region, -EOPNOTSUPP);
+               return;
+       }
+diff --git a/drivers/media/dvb-frontends/m88ds3103.c 
b/drivers/media/dvb-frontends/m88ds3103.c
+index feeeb70d841e..d14d075ab1d6 100644
+--- a/drivers/media/dvb-frontends/m88ds3103.c
++++ b/drivers/media/dvb-frontends/m88ds3103.c
+@@ -1281,11 +1281,12 @@ static int m88ds3103_select(struct i2c_adapter *adap, 
void *mux_priv, u32 chan)
+  * New users must use I2C client binding directly!
+  */
+ struct dvb_frontend *m88ds3103_attach(const struct m88ds3103_config *cfg,
+-              struct i2c_adapter *i2c, struct i2c_adapter **tuner_i2c_adapter)
++                                    struct i2c_adapter *i2c,
++                                    struct i2c_adapter **tuner_i2c_adapter)
+ {
+       struct i2c_client *client;
+       struct i2c_board_info board_info;
+-      struct m88ds3103_platform_data pdata;
++      struct m88ds3103_platform_data pdata = {};
+ 
+       pdata.clk = cfg->clock;
+       pdata.i2c_wr_max = cfg->i2c_wr_max;
+@@ -1428,6 +1429,8 @@ static int m88ds3103_probe(struct i2c_client *client,
+       case M88DS3103_CHIP_ID:
+               break;
+       default:
++              ret = -ENODEV;
++              dev_err(&client->dev, "Unknown device. Chip_id=%02x\n", 
dev->chip_id);
+               goto err_kfree;
+       }
+ 
+diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
+index e2decf71c6d1..46448d7e3290 100644
+--- a/drivers/net/ppp/ppp_generic.c
++++ b/drivers/net/ppp/ppp_generic.c
+@@ -2952,6 +2952,15 @@ ppp_connect_channel(struct channel *pch, int unit)
+               goto outl;
+ 
+       ppp_lock(ppp);
++      spin_lock_bh(&pch->downl);
++      if (!pch->chan) {
++              /* Don't connect unregistered channels */
++              spin_unlock_bh(&pch->downl);
++              ppp_unlock(ppp);
++              ret = -ENOTCONN;
++              goto outl;
++      }
++      spin_unlock_bh(&pch->downl);
+       if (pch->file.hdrlen > ppp->file.hdrlen)
+               ppp->file.hdrlen = pch->file.hdrlen;
+       hdrlen = pch->file.hdrlen + 2;  /* for protocol bytes */
+diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
+index 0d7645581f91..4842344a96f1 100644
+--- a/drivers/net/wan/hdlc_ppp.c
++++ b/drivers/net/wan/hdlc_ppp.c
+@@ -574,7 +574,10 @@ static void ppp_timer(unsigned long arg)
+                       ppp_cp_event(proto->dev, proto->pid, TO_GOOD, 0, 0,
+                                    0, NULL);
+                       proto->restart_counter--;
+-              } else
++              } else if (netif_carrier_ok(proto->dev))
++                      ppp_cp_event(proto->dev, proto->pid, TO_GOOD, 0, 0,
++                                   0, NULL);
++              else
+                       ppp_cp_event(proto->dev, proto->pid, TO_BAD, 0, 0,
+                                    0, NULL);
+               break;
+diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
+index 5006cb6ce62d..50030cdf91fb 100644
+--- a/drivers/s390/net/qeth_core.h
++++ b/drivers/s390/net/qeth_core.h
+@@ -591,6 +591,11 @@ struct qeth_cmd_buffer {
+       void (*callback) (struct qeth_channel *, struct qeth_cmd_buffer *);
+ };
+ 
++static inline struct qeth_ipa_cmd *__ipa_cmd(struct qeth_cmd_buffer *iob)
++{
++      return (struct qeth_ipa_cmd *)(iob->data + IPA_PDU_HEADER_SIZE);
++}
++
+ /**
+  * definition of a qeth channel, used for read and write
+  */
+diff --git a/drivers/s390/net/qeth_core_main.c 
b/drivers/s390/net/qeth_core_main.c
+index e5b9506698b1..75d37148c8cd 100644
+--- a/drivers/s390/net/qeth_core_main.c
++++ b/drivers/s390/net/qeth_core_main.c
+@@ -2054,7 +2054,7 @@ int qeth_send_control_data(struct qeth_card *card, int 
len,
+       unsigned long flags;
+       struct qeth_reply *reply = NULL;
+       unsigned long timeout, event_timeout;
+-      struct qeth_ipa_cmd *cmd;
++      struct qeth_ipa_cmd *cmd = NULL;
+ 
+       QETH_CARD_TEXT(card, 2, "sendctl");
+ 
+@@ -2068,23 +2068,27 @@ int qeth_send_control_data(struct qeth_card *card, int 
len,
+       }
+       reply->callback = reply_cb;
+       reply->param = reply_param;
+-      if (card->state == CARD_STATE_DOWN)
+-              reply->seqno = QETH_IDX_COMMAND_SEQNO;
+-      else
+-              reply->seqno = card->seqno.ipa++;
++
+       init_waitqueue_head(&reply->wait_q);
+-      spin_lock_irqsave(&card->lock, flags);
+-      list_add_tail(&reply->list, &card->cmd_waiter_list);
+-      spin_unlock_irqrestore(&card->lock, flags);
+       QETH_DBF_HEX(CTRL, 2, iob->data, QETH_DBF_CTRL_LEN);
+ 
+       while (atomic_cmpxchg(&card->write.irq_pending, 0, 1)) ;
+-      qeth_prepare_control_data(card, len, iob);
+ 
+-      if (IS_IPA(iob->data))
++      if (IS_IPA(iob->data)) {
++              cmd = __ipa_cmd(iob);
++              cmd->hdr.seqno = card->seqno.ipa++;
++              reply->seqno = cmd->hdr.seqno;
+               event_timeout = QETH_IPA_TIMEOUT;
+-      else
++      } else {
++              reply->seqno = QETH_IDX_COMMAND_SEQNO;
+               event_timeout = QETH_TIMEOUT;
++      }
++      qeth_prepare_control_data(card, len, iob);
++
++      spin_lock_irqsave(&card->lock, flags);
++      list_add_tail(&reply->list, &card->cmd_waiter_list);
++      spin_unlock_irqrestore(&card->lock, flags);
++
+       timeout = jiffies + event_timeout;
+ 
+       QETH_CARD_TEXT(card, 6, "noirqpnd");
+@@ -2109,9 +2113,8 @@ int qeth_send_control_data(struct qeth_card *card, int 
len,
+ 
+       /* we have only one long running ipassist, since we can ensure
+          process context of this command we can sleep */
+-      cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
+-      if ((cmd->hdr.command == IPA_CMD_SETIP) &&
+-          (cmd->hdr.prot_version == QETH_PROT_IPV4)) {
++      if (cmd && cmd->hdr.command == IPA_CMD_SETIP &&
++          cmd->hdr.prot_version == QETH_PROT_IPV4) {
+               if (!wait_event_timeout(reply->wait_q,
+                   atomic_read(&reply->received), event_timeout))
+                       goto time_err;
+@@ -2877,7 +2880,7 @@ static void qeth_fill_ipacmd_header(struct qeth_card 
*card,
+       memset(cmd, 0, sizeof(struct qeth_ipa_cmd));
+       cmd->hdr.command = command;
+       cmd->hdr.initiator = IPA_CMD_INITIATOR_HOST;
+-      cmd->hdr.seqno = card->seqno.ipa;
++      /* cmd->hdr.seqno is set by qeth_send_control_data() */
+       cmd->hdr.adapter_type = qeth_get_ipa_adp_type(card->info.link_type);
+       cmd->hdr.rel_adapter_no = (__u8) card->info.portno;
+       if (card->options.layer2)
+diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
+index fb3e64d37cb4..6b16b8653d98 100644
+--- a/fs/btrfs/acl.c
++++ b/fs/btrfs/acl.c
+@@ -82,12 +82,6 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
+       switch (type) {
+       case ACL_TYPE_ACCESS:
+               name = POSIX_ACL_XATTR_ACCESS;
+-              if (acl) {
+-                      ret = posix_acl_update_mode(inode, &inode->i_mode, 
&acl);
+-                      if (ret)
+-                              return ret;
+-              }
+-              ret = 0;
+               break;
+       case ACL_TYPE_DEFAULT:
+               if (!S_ISDIR(inode->i_mode))
+@@ -123,7 +117,18 @@ out:
+ 
+ int btrfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
+ {
+-      return __btrfs_set_acl(NULL, inode, acl, type);
++      int ret;
++      umode_t old_mode = inode->i_mode;
++
++      if (type == ACL_TYPE_ACCESS && acl) {
++              ret = posix_acl_update_mode(inode, &inode->i_mode, &acl);
++              if (ret)
++                      return ret;
++      }
++      ret = __btrfs_set_acl(NULL, inode, acl, type);
++      if (ret)
++              inode->i_mode = old_mode;
++      return ret;
+ }
+ 
+ /*
+diff --git a/include/linux/nospec.h b/include/linux/nospec.h
+index b99bced39ac2..4a040862f4bf 100644
+--- a/include/linux/nospec.h
++++ b/include/linux/nospec.h
+@@ -66,7 +66,6 @@ static inline unsigned long array_index_mask_nospec(unsigned 
long index,
+       BUILD_BUG_ON(sizeof(_i) > sizeof(long));                        \
+       BUILD_BUG_ON(sizeof(_s) > sizeof(long));                        \
+                                                                       \
+-      _i &= _mask;                                                    \
+-      _i;                                                             \
++      (typeof(_i)) (_i & _mask);                                      \
+ })
+ #endif /* _LINUX_NOSPEC_H */
+diff --git a/include/net/udplite.h b/include/net/udplite.h
+index 80761938b9a7..8228155b305e 100644
+--- a/include/net/udplite.h
++++ b/include/net/udplite.h
+@@ -62,6 +62,7 @@ static inline int udplite_checksum_init(struct sk_buff *skb, 
struct udphdr *uh)
+               UDP_SKB_CB(skb)->cscov = cscov;
+               if (skb->ip_summed == CHECKSUM_COMPLETE)
+                       skb->ip_summed = CHECKSUM_NONE;
++              skb->csum_valid = 0;
+         }
+ 
+       return 0;
+diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
+index efe415ad842a..83bb695f9645 100644
+--- a/net/bridge/br_sysfs_if.c
++++ b/net/bridge/br_sysfs_if.c
+@@ -229,6 +229,9 @@ static ssize_t brport_show(struct kobject *kobj,
+       struct brport_attribute *brport_attr = to_brport_attr(attr);
+       struct net_bridge_port *p = to_brport(kobj);
+ 
++      if (!brport_attr->show)
++              return -EINVAL;
++
+       return brport_attr->show(p, buf);
+ }
+ 
+diff --git a/net/core/dev.c b/net/core/dev.c
+index 389807c1c36f..b2f589012c6b 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2183,8 +2183,11 @@ EXPORT_SYMBOL(netif_set_xps_queue);
+  */
+ int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)
+ {
++      bool disabling;
+       int rc;
+ 
++      disabling = txq < dev->real_num_tx_queues;
++
+       if (txq < 1 || txq > dev->num_tx_queues)
+               return -EINVAL;
+ 
+@@ -2200,15 +2203,19 @@ int netif_set_real_num_tx_queues(struct net_device 
*dev, unsigned int txq)
+               if (dev->num_tc)
+                       netif_setup_tc(dev, txq);
+ 
+-              if (txq < dev->real_num_tx_queues) {
++              dev->real_num_tx_queues = txq;
++
++              if (disabling) {
++                      synchronize_net();
+                       qdisc_reset_all_tx_gt(dev, txq);
+ #ifdef CONFIG_XPS
+                       netif_reset_xps_queues_gt(dev, txq);
+ #endif
+               }
++      } else {
++              dev->real_num_tx_queues = txq;
+       }
+ 
+-      dev->real_num_tx_queues = txq;
+       return 0;
+ }
+ EXPORT_SYMBOL(netif_set_real_num_tx_queues);
+diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
+index 313e3c11a15a..44abc52bae13 100644
+--- a/net/ipv4/fib_semantics.c
++++ b/net/ipv4/fib_semantics.c
+@@ -640,6 +640,11 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info 
*fi)
+                                           fi->fib_nh, cfg))
+                           return 1;
+               }
++#ifdef CONFIG_IP_ROUTE_CLASSID
++              if (cfg->fc_flow &&
++                  cfg->fc_flow != fi->fib_nh->nh_tclassid)
++                      return 1;
++#endif
+               if ((!cfg->fc_oif || cfg->fc_oif == fi->fib_nh->nh_oif) &&
+                   (!cfg->fc_gw  || cfg->fc_gw == fi->fib_nh->nh_gw))
+                       return 0;
+diff --git a/net/ipv4/route.c b/net/ipv4/route.c
+index 52d718e3f077..f0020260b0d4 100644
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -126,10 +126,13 @@ static int ip_rt_redirect_silence __read_mostly  = ((HZ 
/ 50) << (9 + 1));
+ static int ip_rt_error_cost __read_mostly     = HZ;
+ static int ip_rt_error_burst __read_mostly    = 5 * HZ;
+ static int ip_rt_mtu_expires __read_mostly    = 10 * 60 * HZ;
+-static int ip_rt_min_pmtu __read_mostly               = 512 + 20 + 20;
++static u32 ip_rt_min_pmtu __read_mostly               = 512 + 20 + 20;
+ static int ip_rt_min_advmss __read_mostly     = 256;
+ 
+ static int ip_rt_gc_timeout __read_mostly     = RT_GC_TIMEOUT;
++
++static int ip_min_valid_pmtu __read_mostly    = IPV4_MIN_MTU;
++
+ /*
+  *    Interface to generic destination cache.
+  */
+@@ -2765,7 +2768,8 @@ static struct ctl_table ipv4_route_table[] = {
+               .data           = &ip_rt_min_pmtu,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+-              .proc_handler   = proc_dointvec,
++              .proc_handler   = proc_dointvec_minmax,
++              .extra1         = &ip_min_valid_pmtu,
+       },
+       {
+               .procname       = "min_adv_mss",
+diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
+index 301e60829c7e..a98ae890adb9 100644
+--- a/net/ipv4/udp.c
++++ b/net/ipv4/udp.c
+@@ -1744,6 +1744,11 @@ static inline int udp4_csum_init(struct sk_buff *skb, 
struct udphdr *uh,
+               err = udplite_checksum_init(skb, uh);
+               if (err)
+                       return err;
++
++              if (UDP_SKB_CB(skb)->partial_cov) {
++                      skb->csum = inet_compute_pseudo(skb, proto);
++                      return 0;
++              }
+       }
+ 
+       return skb_checksum_init_zero_check(skb, proto, uh->check,
+diff --git a/net/ipv6/ip6_checksum.c b/net/ipv6/ip6_checksum.c
+index 9a4d7322fb22..391a8fedb27e 100644
+--- a/net/ipv6/ip6_checksum.c
++++ b/net/ipv6/ip6_checksum.c
+@@ -73,6 +73,11 @@ int udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, 
int proto)
+               err = udplite_checksum_init(skb, uh);
+               if (err)
+                       return err;
++
++              if (UDP_SKB_CB(skb)->partial_cov) {
++                      skb->csum = ip6_compute_pseudo(skb, proto);
++                      return 0;
++              }
+       }
+ 
+       /* To support RFC 6936 (allow zero checksum in UDP/IPV6 for tunnels)
+diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
+index d17d64edb718..bbba435d0639 100644
+--- a/net/ipv6/sit.c
++++ b/net/ipv6/sit.c
+@@ -176,7 +176,7 @@ static void ipip6_tunnel_clone_6rd(struct net_device *dev, 
struct sit_net *sitn)
+ #ifdef CONFIG_IPV6_SIT_6RD
+       struct ip_tunnel *t = netdev_priv(dev);
+ 
+-      if (t->dev == sitn->fb_tunnel_dev) {
++      if (dev == sitn->fb_tunnel_dev) {
+               ipv6_addr_set(&t->ip6rd.prefix, htonl(0x20020000), 0, 0, 0);
+               t->ip6rd.relay_prefix = 0;
+               t->ip6rd.prefixlen = 16;
+diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
+index 52cfc4478511..c2ce7dec5198 100644
+--- a/net/mpls/af_mpls.c
++++ b/net/mpls/af_mpls.c
+@@ -7,6 +7,7 @@
+ #include <linux/if_arp.h>
+ #include <linux/ipv6.h>
+ #include <linux/mpls.h>
++#include <linux/nospec.h>
+ #include <linux/vmalloc.h>
+ #include <net/ip.h>
+ #include <net/dst.h>
+@@ -714,6 +715,22 @@ errout:
+       return err;
+ }
+ 
++static bool mpls_label_ok(struct net *net, unsigned int *index)
++{
++      bool is_ok = true;
++
++      /* Reserved labels may not be set */
++      if (*index < MPLS_LABEL_FIRST_UNRESERVED)
++              is_ok = false;
++
++      /* The full 20 bit range may not be supported. */
++      if (is_ok && *index >= net->mpls.platform_labels)
++              is_ok = false;
++
++      *index = array_index_nospec(*index, net->mpls.platform_labels);
++      return is_ok;
++}
++
+ static int mpls_route_add(struct mpls_route_config *cfg)
+ {
+       struct mpls_route __rcu **platform_label;
+@@ -732,12 +749,7 @@ static int mpls_route_add(struct mpls_route_config *cfg)
+               index = find_free_label(net);
+       }
+ 
+-      /* Reserved labels may not be set */
+-      if (index < MPLS_LABEL_FIRST_UNRESERVED)
+-              goto errout;
+-
+-      /* The full 20 bit range may not be supported. */
+-      if (index >= net->mpls.platform_labels)
++      if (!mpls_label_ok(net, &index))
+               goto errout;
+ 
+       /* Append makes no sense with mpls */
+@@ -798,12 +810,7 @@ static int mpls_route_del(struct mpls_route_config *cfg)
+ 
+       index = cfg->rc_label;
+ 
+-      /* Reserved labels may not be removed */
+-      if (index < MPLS_LABEL_FIRST_UNRESERVED)
+-              goto errout;
+-
+-      /* The full 20 bit range may not be supported */
+-      if (index >= net->mpls.platform_labels)
++      if (!mpls_label_ok(net, &index))
+               goto errout;
+ 
+       mpls_route_update(net, index, NULL, &cfg->rc_nlinfo);
+@@ -1162,10 +1169,9 @@ static int rtm_to_route_config(struct sk_buff *skb,  
struct nlmsghdr *nlh,
+                                          &cfg->rc_label))
+                               goto errout;
+ 
+-                      /* Reserved labels may not be set */
+-                      if (cfg->rc_label < MPLS_LABEL_FIRST_UNRESERVED)
++                      if (!mpls_label_ok(cfg->rc_nlinfo.nl_net,
++                                         &cfg->rc_label))
+                               goto errout;
+-
+                       break;
+               }
+               case RTA_VIA:
+diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
+index 8e63662c6fb0..30c46aaf4575 100644
+--- a/net/netlink/genetlink.c
++++ b/net/netlink/genetlink.c
+@@ -1118,6 +1118,7 @@ static int genlmsg_mcast(struct sk_buff *skb, u32 
portid, unsigned long group,
+ {
+       struct sk_buff *tmp;
+       struct net *net, *prev = NULL;
++      bool delivered = false;
+       int err;
+ 
+       for_each_net_rcu(net) {
+@@ -1129,14 +1130,21 @@ static int genlmsg_mcast(struct sk_buff *skb, u32 
portid, unsigned long group,
+                       }
+                       err = nlmsg_multicast(prev->genl_sock, tmp,
+                                             portid, group, flags);
+-                      if (err)
++                      if (!err)
++                              delivered = true;
++                      else if (err != -ESRCH)
+                               goto error;
+               }
+ 
+               prev = net;
+       }
+ 
+-      return nlmsg_multicast(prev->genl_sock, skb, portid, group, flags);
++      err = nlmsg_multicast(prev->genl_sock, skb, portid, group, flags);
++      if (!err)
++              delivered = true;
++      else if (err != -ESRCH)
++              goto error;
++      return delivered ? 0 : -ESRCH;
+  error:
+       kfree_skb(skb);
+       return err;
+diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
+index 8a61ccc37e12..481806b43de8 100644
+--- a/net/sctp/ipv6.c
++++ b/net/sctp/ipv6.c
+@@ -323,8 +323,10 @@ static void sctp_v6_get_dst(struct sctp_transport *t, 
union sctp_addr *saddr,
+               final_p = fl6_update_dst(fl6, rcu_dereference(np->opt), &final);
+               bdst = ip6_dst_lookup_flow(sk, fl6, final_p);
+ 
+-              if (!IS_ERR(bdst) &&
+-                  ipv6_chk_addr(dev_net(bdst->dev),
++              if (IS_ERR(bdst))
++                      continue;
++
++              if (ipv6_chk_addr(dev_net(bdst->dev),
+                                 &laddr->a.v6.sin6_addr, bdst->dev, 1)) {
+                       if (!IS_ERR_OR_NULL(dst))
+                               dst_release(dst);
+@@ -333,8 +335,10 @@ static void sctp_v6_get_dst(struct sctp_transport *t, 
union sctp_addr *saddr,
+               }
+ 
+               bmatchlen = sctp_v6_addr_match_len(daddr, &laddr->a);
+-              if (matchlen > bmatchlen)
++              if (matchlen > bmatchlen) {
++                      dst_release(bdst);
+                       continue;
++              }
+ 
+               if (!IS_ERR_OR_NULL(dst))
+                       dst_release(dst);
+diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
+index 8b4ff315695e..dc030efa4447 100644
+--- a/net/sctp/protocol.c
++++ b/net/sctp/protocol.c
+@@ -508,22 +508,20 @@ static void sctp_v4_get_dst(struct sctp_transport *t, 
union sctp_addr *saddr,
+               if (IS_ERR(rt))
+                       continue;
+ 
+-              if (!dst)
+-                      dst = &rt->dst;
+-
+               /* Ensure the src address belongs to the output
+                * interface.
+                */
+               odev = __ip_dev_find(sock_net(sk), laddr->a.v4.sin_addr.s_addr,
+                                    false);
+               if (!odev || odev->ifindex != fl4->flowi4_oif) {
+-                      if (&rt->dst != dst)
++                      if (!dst)
++                              dst = &rt->dst;
++                      else
+                               dst_release(&rt->dst);
+                       continue;
+               }
+ 
+-              if (dst != &rt->dst)
+-                      dst_release(dst);
++              dst_release(dst);
+               dst = &rt->dst;
+               break;
+       }
+diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
+index 5d6a03fad378..4ca31e052dd8 100644
+--- a/net/sctp/sm_make_chunk.c
++++ b/net/sctp/sm_make_chunk.c
+@@ -1367,10 +1367,14 @@ static struct sctp_chunk *_sctp_make_chunk(const 
struct sctp_association *asoc,
+       sctp_chunkhdr_t *chunk_hdr;
+       struct sk_buff *skb;
+       struct sock *sk;
++      int chunklen;
++
++      chunklen = sizeof(*chunk_hdr) + paylen;
++      if (chunklen > SCTP_MAX_CHUNK_LEN)
++              goto nodata;
+ 
+       /* No need to allocate LL here, as this is only a chunk. */
+-      skb = alloc_skb(WORD_ROUND(sizeof(sctp_chunkhdr_t) + paylen),
+-                      GFP_ATOMIC);
++      skb = alloc_skb(chunklen, GFP_ATOMIC);
+       if (!skb)
+               goto nodata;
+ 
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+index 20512fe32a97..e2212830df0c 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -179,7 +179,7 @@ static const struct kernel_param_ops param_ops_xint = {
+ };
+ #define param_check_xint param_check_int
+ 
+-static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
++static int power_save = -1;
+ module_param(power_save, xint, 0644);
+ MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "
+                "(in second, 0 = disable).");
+@@ -2055,6 +2055,24 @@ out_free:
+       return err;
+ }
+ 
++#ifdef CONFIG_PM
++/* On some boards setting power_save to a non 0 value leads to clicking /
++ * popping sounds when ever we enter/leave powersaving mode. Ideally we would
++ * figure out how to avoid these sounds, but that is not always feasible.
++ * So we keep a list of devices where we disable powersaving as its known
++ * to causes problems on these devices.
++ */
++static struct snd_pci_quirk power_save_blacklist[] = {
++      /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
++      SND_PCI_QUIRK(0x1849, 0x0c0c, "Asrock B85M-ITX", 0),
++      /* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
++      SND_PCI_QUIRK(0x1043, 0x8733, "Asus Prime X370-Pro", 0),
++      /* https://bugzilla.kernel.org/show_bug.cgi?id=198611 */
++      SND_PCI_QUIRK(0x17aa, 0x2227, "Lenovo X1 Carbon 3rd Gen", 0),
++      {}
++};
++#endif /* CONFIG_PM */
++
+ /* number of codec slots for each chipset: 0 = default slots (i.e. 4) */
+ static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] = {
+       [AZX_DRIVER_NVIDIA] = 8,
+@@ -2067,6 +2085,7 @@ static int azx_probe_continue(struct azx *chip)
+       struct hdac_bus *bus = azx_bus(chip);
+       struct pci_dev *pci = chip->pci;
+       int dev = chip->dev_index;
++      int val;
+       int err;
+ 
+       hda->probe_continued = 1;
+@@ -2142,7 +2161,22 @@ static int azx_probe_continue(struct azx *chip)
+ 
+       chip->running = 1;
+       azx_add_card_list(chip);
+-      snd_hda_set_power_save(&chip->bus, power_save * 1000);
++
++      val = power_save;
++#ifdef CONFIG_PM
++      if (val == -1) {
++              const struct snd_pci_quirk *q;
++
++              val = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;
++              q = snd_pci_quirk_lookup(chip->pci, power_save_blacklist);
++              if (q && val) {
++                      dev_info(chip->card->dev, "device %04x:%04x is on the 
power_save blacklist, forcing power_save to 0\n",
++                               q->subvendor, q->subdevice);
++                      val = 0;
++              }
++      }
++#endif /* CONFIG_PM */
++      snd_hda_set_power_save(&chip->bus, val * 1000);
+       if (azx_has_pm_runtime(chip) || hda->use_vga_switcheroo)
+               pm_runtime_put_noidle(&pci->dev);
+ 
+diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
+index 8a59d4782a0f..69bf5cf1e91e 100644
+--- a/sound/usb/quirks-table.h
++++ b/sound/usb/quirks-table.h
+@@ -3277,4 +3277,51 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"),
+       }
+ },
+ 
++{
++      /*
++       * Bower's & Wilkins PX headphones only support the 48 kHz sample rate
++       * even though it advertises more. The capture interface doesn't work
++       * even on windows.
++       */
++      USB_DEVICE(0x19b5, 0x0021),
++      .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
++              .ifnum = QUIRK_ANY_INTERFACE,
++              .type = QUIRK_COMPOSITE,
++              .data = (const struct snd_usb_audio_quirk[]) {
++                      {
++                              .ifnum = 0,
++                              .type = QUIRK_AUDIO_STANDARD_MIXER,
++                      },
++                      /* Capture */
++                      {
++                              .ifnum = 1,
++                              .type = QUIRK_IGNORE_INTERFACE,
++                      },
++                      /* Playback */
++                      {
++                              .ifnum = 2,
++                              .type = QUIRK_AUDIO_FIXED_ENDPOINT,
++                              .data = &(const struct audioformat) {
++                                      .formats = SNDRV_PCM_FMTBIT_S16_LE,
++                                      .channels = 2,
++                                      .iface = 2,
++                                      .altsetting = 1,
++                                      .altset_idx = 1,
++                                      .attributes = UAC_EP_CS_ATTR_FILL_MAX |
++                                              UAC_EP_CS_ATTR_SAMPLE_RATE,
++                                      .endpoint = 0x03,
++                                      .ep_attr = USB_ENDPOINT_XFER_ISOC,
++                                      .rates = SNDRV_PCM_RATE_48000,
++                                      .rate_min = 48000,
++                                      .rate_max = 48000,
++                                      .nr_rates = 1,
++                                      .rate_table = (unsigned int[]) {
++                                              48000
++                                      }
++                              }
++                      },
++              }
++      }
++},
++
+ #undef USB_DEVICE_VENDOR_SPEC
+diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
+index d080f06fd8d9..b814ae6822b6 100644
+--- a/virt/kvm/kvm_main.c
++++ b/virt/kvm/kvm_main.c
+@@ -902,8 +902,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
+               /* Check for overlaps */
+               r = -EEXIST;
+               kvm_for_each_memslot(slot, __kvm_memslots(kvm, as_id)) {
+-                      if ((slot->id >= KVM_USER_MEM_SLOTS) ||
+-                          (slot->id == id))
++                      if (slot->id == id)
+                               continue;
+                       if (!((base_gfn + npages <= slot->base_gfn) ||
+                             (base_gfn >= slot->base_gfn + slot->npages)))

Reply via email to