[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [linux-linus bisection] complete test-armhf-armhf-xl



branch xen-unstable
xen branch xen-unstable
job test-armhf-armhf-xl
test xen-boot

Tree: linux git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Tree: linuxfirmware git://xenbits.xen.org/osstest/linux-firmware.git
Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git
Tree: xen git://xenbits.xen.org/xen.git

*** Found and reproduced problem changeset ***

  Bug is in tree:  linux 
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
  Bug introduced:  f0897f4cc0fcdd2410ba0ff0bc1bc64e6e72672a
  Bug not present: 6c310bc1acdd02110182a2ec6efa3e7571a3b80c


  commit f0897f4cc0fcdd2410ba0ff0bc1bc64e6e72672a
  Merge: fc8c540 4de5167
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu May 14 18:40:16 2015 -0700

      Merge tag 'pm+acpi-4.1-rc4' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

      Pull ACPI fixes from Rafael Wysocki:
       "Two fixes here, one revert of a recent ACPICA commit that broke audio
        support on one Dell machine and a fix for a long-standing issue that
        may cause systems to break randomly during boot.

        Specifics:

         - The recent ACPICA commit that set the ACPI _REV return value to 2
           (which is the value always used by Windows and now mandated by the
           spec too) in order to prevent the firmware people from using it to
           play tricks with us caused a serious audio regression to happen on
           Dell XPS 13 (the AML on that machine uses the _REV return value to
           decide how to expose audio to the OS and does that to hide the lack
           of proper support for its I2S audio in Linux), so revert that
           commit for now and we'll revisit the issue in the next cycle.

         - Ensure that the ordering of acpi_reserve_resources() with respect
           to the rest of the ACPI initialization sequence will always be the
           same, or the IO or memory region occupied by the ACPI fixed
           registers may be assigned to a PCI host bridge as a result of a
           race and random breakage ensues going forward"

      * tag 'pm+acpi-4.1-rc4' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        Revert "ACPICA: Permanently set _REV to the value '2'."
        ACPI / init: Fix the ordering of acpi_reserve_resources()

  commit fc8c540b1d66fe5f44da916338423ec62946e8b5
  Merge: 3c25a75 4801ba3
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu May 14 18:35:33 2015 -0700

      Merge tag 'arm64-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

      Pull arm64 fixes from Will Deacon:

       - fix potential memory leak in perf PMU probing

       - BPF sign extension fix for 64-bit immediates

       - fix build failure with unusual configuration

       - revert unused and broken branch patching from alternative code

      * tag 'arm64-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: perf: fix memory leak when probing PMU PPIs
        arm64: bpf: fix signedness bug in loading 64-bit immediate
        arm64: mm: Fix build error with CONFIG_SPARSEMEM_VMEMMAP disabled
        Revert "arm64: alternative: Allow immediate branch as alternative 
instruction"

  commit 3c25a75ee047c3393cc5b995c6c68c8cbdaf02fa
  Merge: 110bc76 5c1ac56
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu May 14 18:02:15 2015 -0700

      Merge branch 'dmi-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

      Pull dmi fixes from Jean Delvare.

      * 'dmi-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        firmware: dmi_scan: Fix ordering of product_uuid
        firmware: dmi_scan: Simplified displayed version

  commit 4de5167ee07f7a9b66d999e40f2c3193d1a08add
  Merge: b9a5e5e ff284f3
  Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
  Date:   Fri May 15 00:31:23 2015 +0200

      Merge branches 'acpi-init' and 'acpica'

      * acpi-init:
        ACPI / init: Fix the ordering of acpi_reserve_resources()

      * acpica:
        Revert "ACPICA: Permanently set _REV to the value '2'."

  commit 5c1ac56b51b9d222ab202dec1ac2f4215346129d
  Author: Jean Delvare <jdelvare@xxxxxxx>
  Date:   Thu May 14 14:40:50 2015 +0200

      firmware: dmi_scan: Fix ordering of product_uuid

      In function dmi_present(), dmi_walk_early() calls dmi_table(), which
      calls dmi_decode(), which ultimately calls dmi_save_uuid(). This last
      function makes a decision based on the value of global variable
      dmi_ver. The problem is that this variable is set right _after_
      dmi_walk_early() returns. So dmi_save_uuid() always sees dmi_ver == 0
      regardless of the actual version implemented.

      This causes /sys/class/dmi/id/product_uuid to always use the old
      ordering even on systems implementing DMI/SMBIOS 2.6 or later, which
      should use the new ordering.

      This is broken since kernel v3.8 for legacy DMI implementations and
      since kernel v3.10 for SMBIOS 2 implementations. SMBIOS 3
      implementations with the 64-bit entry point are not affected.

      The first breakage does not matter much as in practice legacy DMI
      implementations are always for versions older than 2.6, which is when
      the UUID ordering changed. The second breakage is more problematic as
      it affects the vast majority of x86 systems manufactured since 2009.

      Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
      Fixes: 9f9c9cbb6057 ("drivers/firmware/dmi_scan.c: fetch dmi version from 
SMBIOS if it exists")
      Fixes: 79bae42d51a5 ("dmi_scan: refactor dmi_scan_machine(), 
{smbios,dmi}_present()")
      Acked-by: Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx>
      Cc: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
      Cc: Artem Savkov <artem.savkov@xxxxxxxxx>
      Cc: Ivan Khoronzhuk <ivan.khoronzhuk@xxxxxxxxxx>
      Cc: Matt Fleming <matt.fleming@xxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx [v3.10+]

  commit c24930457d4b06903aa5dada50e04a83513e3b6b
  Author: Jean Delvare <jdelvare@xxxxxxx>
  Date:   Thu May 14 14:40:50 2015 +0200

      firmware: dmi_scan: Simplified displayed version

      The trailing .x adds no information for the reader, and if anyone
      tries to parse that line, this is more work as they have 3 different
      formats to handle instead of 2. Plus, this makes backporting fixes
      harder.

      Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
      Fixes: 95be58df74a5 ("firmware: dmi_scan: Use full dmi version for 
SMBIOS3")
      Cc: Ivan Khoronzhuk <ivan.khoronzhuk@xxxxxxxxxx>

  commit 110bc76729d448fdbcb5cdb63b83d9fd65ce5e26
  Merge: 6c9d370 01d460d
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue May 12 21:10:38 2015 -0700

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

      Pull networking fixes from David Miller:

       1) Handle max TX power properly wrt VIFs and the MAC in iwlwifi, from
          Avri Altman.

       2) Use the correct FW API for scan completions in iwlwifi, from Avraham
          Stern.

       3) FW monitor in iwlwifi accidently uses unmapped memory, fix from Liad
          Kaufman.

       4) rhashtable conversion of mac80211 station table was buggy, the
          virtual interface was not taken into account.  Fix from Johannes
          Berg.

       5) Fix deadlock in rtlwifi by not using a zero timeout for
          usb_control_msg(), from Larry Finger.

       6) Update reordering state before calculating loss detection, from
          Yuchung Cheng.

       7) Fix off by one in bluetooth firmward parsing, from Dan Carpenter.

       8) Fix extended frame handling in xiling_can driver, from Jeppe
          Ledet-Pedersen.

       9) Fix CODEL packet scheduler behavior in the presence of TSO packets,
          from Eric Dumazet.

      10) Fix NAPI budget testing in fm10k driver, from Alexander Duyck.

      11) macvlan needs to propagate promisc settings down the the lower
          device, from Vlad Yasevich.

      12) igb driver can oops when changing number of rings, from Toshiaki
          Makita.

      13) Source specific default routes not handled properly in ipv6, from
          Markus Stenberg.

      14) Use after free in tc_ctl_tfilter(), from WANG Cong.

      15) Use softirq spinlocking in netxen driver, from Tony Camuso.

      16) Two ARM bpf JIT fixes from Nicolas Schichan.

      17) Handle MSG_DONTWAIT properly in ring based AF_PACKET sends, from
          Mathias Kretschmer.

      18) Fix x86 bpf JIT implementation of FROM_{BE16,LE16,LE32}, from Alexei
          Starovoitov.

      19) ll_temac driver DMA maps TX packet header with incorrect length, fix
          from Michal Simek.

      20) We removed pm_qos bits from netdevice.h, but some indirect
          references remained.  Kill them.  From David Ahern.

      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (90 commits)
        net: Remove remaining remnants of pm_qos from netdevice.h
        e1000e: Add pm_qos header
        net: phy: micrel: Fix regression in kszphy_probe
        net: ll_temac: Fix DMA map size bug
        x86: bpf_jit: fix FROM_BE16 and FROM_LE16/32 instructions
        netns: return RTM_NEWNSID instead of RTM_GETNSID on a get
        Update be2net maintainers' email addresses
        net_sched: gred: use correct backlog value in WRED mode
        pppoe: drop pppoe device in pppoe_unbind_sock_work
        net: qca_spi: Fix possible race during probe
        net: mdio-gpio: Allow for unspecified bus id
        af_packet / TX_RING not fully non-blocking (w/ MSG_DONTWAIT).
        bnx2x: limit fw delay in kdump to 5s after boot
        ARM: net: delegate filter to kernel interpreter when imm_offset() 
return value can't fit into 12bits.
        ARM: net fix emit_udiv() for BPF_ALU | BPF_DIV | BPF_K intruction.
        mpls: Change reserved label names to be consistent with netbsd
        usbnet: avoid integer overflow in start_xmit
        netxen_nic: use spin_[un]lock_bh around tx_clean_lock (2)
        net: xgene_enet: Set hardware dependency
        net: amd-xgbe: Add hardware dependency
        ...

  commit 01d460dd70adc858e15307332832183c622bee50
  Author: David Ahern <dsahern@xxxxxxxxx>
  Date:   Tue May 12 09:37:00 2015 -0600

      net: Remove remaining remnants of pm_qos from netdevice.h

      Commit e2c6544829f removed pm_qos from struct net_device but left the
      comment and header file. Remove those.

      Signed-off-by: David Ahern <dsahern@xxxxxxxxx>
      Cc: Thomas Graf <tgraf@xxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 5684044f8062617dcc45ed8b2fb3ec6e02f14370
  Author: David Ahern <dsahern@xxxxxxxxx>
  Date:   Tue May 12 09:36:59 2015 -0600

      e1000e: Add pm_qos header

      Commit e2c6544829f moved pm_qos_req to e1000_adapter. Add the header file
      that defines the struct.

      Signed-off-by: David Ahern <dsahern@xxxxxxxxx>
      Cc: Thomas Graf <tgraf@xxxxxxx>
      Cc: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit bced870152161435cc59a53e77f3699f8e8f22ca
  Author: Niklas Cassel <niklas.cassel@xxxxxxxx>
  Date:   Tue May 12 09:43:14 2015 +0200

      net: phy: micrel: Fix regression in kszphy_probe

      Don't do clock-mode-select if clk == NULL,
      since when building without CONFIG_HAVE_CLK,
      clk_get returns NULL and clk_get_rate returns 0.

      Doing clock-mode-select in this cause causes kszphy_probe to
      return -EINVAL and thus prevents the device from being probed.

      The original code (before regression) would return 0
      when building without CONFIG_HAVE_CLK.

      Cc: stable <stable@xxxxxxxxxxxxxxx> # 3.18+
      Fixes: 1fadee0c3645 ("net/phy: micrel: Add clock support for
      KSZ8021/KSZ8031")
      Reviewed-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
      Reviewed-by: Johan Hovold <johan@xxxxxxxxxx>
      Signed-off-by: Niklas Cassel <niklass@xxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 44d4f8d74e1dd07f248f35d74419f07d44f326e6
  Author: Michal Simek <michal.simek@xxxxxxxxxx>
  Date:   Tue May 12 08:06:15 2015 +0200

      net: ll_temac: Fix DMA map size bug

      DMA allocates skb->len instead of headlen
      which is used for DMA.

      Signed-off-by: Michal Simek <michal.simek@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 343f845b375989f1753f605902931fa939aa2223
  Author: Alexei Starovoitov <ast@xxxxxxxxxxxx>
  Date:   Mon May 11 23:25:16 2015 -0700

      x86: bpf_jit: fix FROM_BE16 and FROM_LE16/32 instructions

      FROM_BE16:
      'ror %reg, 8' doesn't clear upper bits of the register,
      so use additional 'movzwl' insn to zero extend 16 bits into 64

      FROM_LE16:
      should zero extend lower 16 bits into 64 bit

      FROM_LE32:
      should zero extend lower 32 bits into 64 bit

      Fixes: 89aa075832b0 ("net: sock: allow eBPF programs to be attached to 
sockets")
      Signed-off-by: Alexei Starovoitov <ast@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 6c9d370c16aad97cfc6de68666634eaabac2b048
  Merge: 03906ca 620b155
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue May 12 16:02:06 2015 -0700

      Merge branch 'upstream' of 
git://git.linux-mips.org/pub/scm/ralf/upstream-linus

      Pull MIPS fixes from Ralf Baechle:
       "One build fix for build breakage of all MIPS SMP kernels caused by
        Rusty's fix of obsolete use of cpu mask helpers, another to fix the FP
        ABI selection when loading an ELF binary"

      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: fix FP mode selection in lieu of .MIPS.abiflags data
        MIPS: SMP: Fix build error.

  commit 03906ca389211e167e0d8e9e5ec330e9be467936
  Merge: cc49e8c f4f01b5
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue May 12 15:54:54 2015 -0700

      Merge tag 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

      Pull rdma fixes from Doug Ledford:
       - update MAINTAINERS git repo pointer
       - printk garbage fix
       - fix for qib and iw_cxgb4 bugs introduced in 4.1 window
       - fix for an older iWARP netlink bug
       - fix a memcpy issue in ehca driver

      * tag 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
        infiniband: Remove duplicated KERN_<LEVEL> from pr_<level> uses
        IB/qib: fix test of unsigned variable
        RDMA/core: Fix for parsing netlink string attribute
        MAINTAINERS: update the official rdma git repo
        iw_cxgb4: use wildcard mapping for getting remote addr info
        IB/ehca: use correct destination for memcpy

  commit e3d8ecb70e16412b14fb11c1b68ecb533bd4ea64
  Author: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
  Date:   Mon May 11 15:57:31 2015 +0200

      netns: return RTM_NEWNSID instead of RTM_GETNSID on a get

      Usually, RTM_NEWxxx is returned on a get (same as a dump).

      Fixes: 0c7aecd4bde4 ("netns: add rtnl cmd to add and get peer netns ids")
      Signed-off-by: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit cc49e8c9e66d4c52b121de0da666393c4140c0f2
  Merge: 4cfceaf 8ebb7e9
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue May 12 15:49:29 2015 -0700

      Merge tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6

      Pull power supply and reset fixes from Sebastian Reichel:
       "misc fixes"

      * tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6:
        power: bq27x00_battery: Add missing MODULE_ALIAS
        power: reset: Add MFD_SYSCON depends for brcmstb
        power: reset: ltc2952: Remove bogus hrtimer_start() return value checks
        power_supply: fix oops in collie_battery driver
        power/reset: at91: fix return value check in at91_reset_platform_probe()
        MAINTAINERS: Add me as maintainer of Nokia N900 power supply drivers
        axp288_fuel_gauge: Add original author details

  commit ff284f37fc0e6f3b51ede85c5944d571b640ac0f
  Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
  Date:   Wed May 13 00:44:14 2015 +0200

      Revert "ACPICA: Permanently set _REV to the value '2'."

      Revert commit b1ef29725865 (ACPICA: Permanently set _REV to the value
      '2'.) as it causes a sound regression to happen on Dell XPS 13 (2015).

      Reported-by: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit f4f01b542c027b0df57109140c3ee48321705c88
  Author: Joe Perches <joe@xxxxxxxxxxx>
  Date:   Fri May 8 15:58:07 2015 -0700

      infiniband: Remove duplicated KERN_<LEVEL> from pr_<level> uses

      These KERN_<LEVEL> uses are unnecessary with pr_<level> and cause
      bad logging output so remove them.

      Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
      Acked-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit ec40f925e0151e3c130fce2b5a1c6389c5b5e4dd
  Author: Mike Marciniszyn <mike.marciniszyn@xxxxxxxxx>
  Date:   Tue May 12 13:42:42 2015 -0400

      IB/qib: fix test of unsigned variable

      Commit d4988623cc60 ("IB/qib: use arch_phys_wc_add()")
      adjusted mtrr inititialization to use the new interface.

      Unfortunately, the new interface returns a signed
      value and the patch tested the unsigned wc_cookie.

      Fix the issue by changing the type of wc_cookie to int.  For
      the success case the ret left at zero to avoid
      a warning from the caller.  For failure wc_cookie
      is used as the ret.

      Signed-off-by: Mike Marciniszyn <mike.marciniszyn@xxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit ec04847c0c5b471bab2dacceadfdb803a9d1a2ea
  Author: Tatyana Nikolova <Tatyana.E.Nikolova@xxxxxxxxx>
  Date:   Fri May 8 16:36:33 2015 -0500

      RDMA/core: Fix for parsing netlink string attribute

      The string iwpm_ulib_name is recorded in a nlmsg as a netlink attribute.
      Without this fix parsing of the nlmsg by the userspace port mapper 
service fails
      because of unknown attribute length, causing the port mapper service not 
to
      register the client, which has sent the nlmsg.

      Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@xxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx> #v3.16
      Reviewed-By: Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 620b155034570f577470cf5309f741bac6a6e32b
  Author: Paul Burton <paul.burton@xxxxxxxxxx>
  Date:   Wed May 6 11:52:32 2015 +0100

      MIPS: fix FP mode selection in lieu of .MIPS.abiflags data

      Commit 46490b572544 ("MIPS: kernel: elf: Improve the overall ABI and FPU
      mode checks") reworked the ELF FP ABI mode selection logic, but when
      CONFIG_MIPS_O32_FP64_SUPPORT is enabled it breaks the use of binaries
      which have no PT_MIPS_ABIFLAGS program header & associated
      .MIPS.abiflags section.

      A default mode is selected based upon whether the ELF contains MIPS32 or
      MIPS64 code, but that selection is made in arch_elf_pt_proc.
      arch_elf_pt_proc only executes when a PT_MIPS_ABIFLAGS program header is
      found. If one is not found then arch_elf_pt_proc is never called, and no
      default overall_fp_mode value is selected. When arch_check_elf is
      called, both abi0 & abi1 are MIPS_ABI_FP_UNKNOWN which leads to both
      prog_req & interp_req being set to none_req. none_req matches none of
      the conditions for mode selection at the end of arch_check_elf, so
      overall_fp_mode is left untouched. Finally once mips_set_personality_fp
      is called the BUG() in the default case is then hit & the kernel likely
      panics.

      Fix this by moving the selection of a default overall mode to the start
      of arch_check_elf, which runs once per ELF executed regardless of
      whether it has a PT_MIPS_ABIFLAGS program header.

      Signed-off-by: Paul Burton <paul.burton@xxxxxxxxxx>
      Cc: Markos Chandras <markos.chandras@xxxxxxxxxx>
      Cc: Matthew Fortune <matthew.fortune@xxxxxxxxxx>
      Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
      Cc: linux-mips@xxxxxxxxxxxxxx
      Cc: stable@xxxxxxxxxxxxxxx # v4.0+
      Patchwork: http://patchwork.linux-mips.org/patch/9978/
      Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>

  commit 4801ba338acad2e69e905e0c537e8ba2682c4e65
  Author: Will Deacon <will.deacon@xxxxxxx>
  Date:   Fri May 1 17:15:23 2015 +0100

      arm64: perf: fix memory leak when probing PMU PPIs

      Commit d795ef9aa831 ("arm64: perf: don't warn about missing
      interrupt-affinity property for PPIs") added a check for PPIs so that
      we avoid parsing the interrupt-affinity property for these naturally
      affine interrupts.

      Unfortunately, this check can trigger an early (successful) return and
      we will leak the irqs array. This patch fixes the issue by reordering
      the code so that the check is performed before any independent
      allocation.

      Reported-by: David Binderman <dcb314@xxxxxxxxxxx>
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>

  commit 6938f8558167fd1d30233018976ebe310fa6f69b
  Author: Sathya Perla <sathya.perla@xxxxxxxxxxxxx>
  Date:   Tue May 12 02:13:50 2015 -0400

      Update be2net maintainers' email addresses

      Emulex developers' email addresses are now "@avagotech" instead of
      "@emulex". I'm also replacing Subbu with Padmanabh and Sriharsha in the
      maintainers list. The driver's heading was outdated and did not include
      some of the chip types (BE3, Lancer and Skyhawk) that the driver has
      been supporting for a longtime. I've updated this too.

      Signed-off-by: Sathya Perla <sathya.perla@xxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit cafb45b2562baa57cb58bef0636c073705954cc4
  Author: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
  Date:   Tue May 12 06:43:04 2015 +0200

      MIPS: SMP: Fix build error.

        CC      arch/mips/kernel/smp.o
      arch/mips/kernel/smp.c: In function â??start_secondaryâ??:
      arch/mips/kernel/smp.c:149:2: error: passing argument 2 of 
â??cpumask_set_cpuâ?? discards â??volatileâ?? qualifier from pointer target 
type [-Werror]
        cpumask_set_cpu(cpu, &cpu_callin_map);
        ^
      In file included from ./arch/mips/include/asm/processor.h:14:0,
                       from ./arch/mips/include/asm/thread_info.h:15,
                       from include/linux/thread_info.h:54,
                       from include/asm-generic/preempt.h:4,
                       from arch/mips/include/generated/asm/preempt.h:1,
                       from include/linux/preempt.h:18,
                       from include/linux/interrupt.h:8,
                       from arch/mips/kernel/smp.c:24:
      include/linux/cpumask.h:272:91: note: expected â??struct cpumask *â?? but 
argument is of type â??volatile struct cpumask_t *â??
       static inline void cpumask_set_cpu(unsigned int cpu, struct cpumask 
*dstp)
                                                                                
                 ^
      arch/mips/kernel/smp.c: In function â??smp_prepare_boot_cpuâ??:
      arch/mips/kernel/smp.c:211:2: error: passing argument 2 of 
â??cpumask_set_cpuâ?? discards â??volatileâ?? qualifier from pointer target 
type [-Werror]
        cpumask_set_cpu(0, &cpu_callin_map);
        ^
      In file included from ./arch/mips/include/asm/processor.h:14:0,
                       from ./arch/mips/include/asm/thread_info.h:15,
                       from include/linux/thread_info.h:54,
                       from include/asm-generic/preempt.h:4,
                       from arch/mips/include/generated/asm/preempt.h:1,
                       from include/linux/preempt.h:18,
                       from include/linux/interrupt.h:8,
                       from arch/mips/kernel/smp.c:24:
      include/linux/cpumask.h:272:91: note: expected â??struct cpumask *â?? but 
argument is of type â??volatile struct cpumask_t *â??
       static inline void cpumask_set_cpu(unsigned int cpu, struct cpumask 
*dstp)
                                                                                
                 ^
      arch/mips/kernel/smp.c: In function â??__cpu_upâ??:
      arch/mips/kernel/smp.c:221:10: error: passing argument 2 of 
â??cpumask_test_cpuâ?? discards â??volatileâ?? qualifier from pointer target 
type [-Werror]
        while (!cpumask_test_cpu(cpu, &cpu_callin_map))
                ^
      In file included from ./arch/mips/include/asm/processor.h:14:0,
                       from ./arch/mips/include/asm/thread_info.h:15,
                       from include/linux/thread_info.h:54,
                       from include/asm-generic/preempt.h:4,
                       from arch/mips/include/generated/asm/preempt.h:1,
                       from include/linux/preempt.h:18,
                       from include/linux/interrupt.h:8,
                       from arch/mips/kernel/smp.c:24:
      include/linux/cpumask.h:294:90: note: expected â??const struct cpumask 
*â?? but argument is of type â??volatile struct cpumask_t *â??
       static inline int cpumask_test_cpu(int cpu, const struct cpumask 
*cpumask)
                                                                                
                ^
      cc1: all warnings being treated as errors
      make[2]: *** [arch/mips/kernel/smp.o] Error 1
      make[1]: *** [arch/mips/kernel] Error 2
      make: *** [arch/mips] Error 2

      Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>

  commit 2936ae04aa5d7ebfd9921e363a8e8686f8bb5936
  Author: Doug Ledford <dledford@xxxxxxxxxx>
  Date:   Mon May 11 21:03:36 2015 -0400

      MAINTAINERS: update the official rdma git repo

      Linus prefers kernel.org repos to github repos for security.

      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 4cfceaf0c087f47033f5e61a801f4136d6fb68c6
  Merge: ef20816 4bd9e9b
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon May 11 14:42:52 2015 -0700

      Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux

      Pull nfsd bugfixes from Bruce Fields:
       "Mainly pnfs fixes (and for problems with generic callback code made
        more obvious by pnfs)"

      * 'for-4.1' of git://linux-nfs.org/~bfields/linux:
        nfsd: skip CB_NULL probes for 4.1 or later
        nfsd: fix callback restarts
        nfsd: split transport vs operation errors for callbacks
        svcrpc: fix potential GSSX_ACCEPT_SEC_CONTEXT decoding failures
        nfsd: fix pNFS return on close semantics
        nfsd: fix the check for confirmed openowner in 
nfs4_preprocess_stateid_op
        nfsd/blocklayout: pretend we can send deviceid notifications

  commit 940fd304d233534038365f56d30c29ed7fd7416b
  Author: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
  Date:   Thu May 7 16:34:23 2015 -0500

      iw_cxgb4: use wildcard mapping for getting remote addr info

      For listening endpoints bound to the wildcard address, we need to pass
      the wildcard address mapping to iwpm_get_remote_info() instead of the
      mapped address of the new child connection.

      Without this fix, and with iwarp port mapping enabled, each iw_cxgb4
      connection that is spawned from a listening endpoint bound to the wildcard
      address, will generate an annoying dmesg entry about failing to find
      the remote address mapping info, and the connection state displayed in
      debugfs under /sys/kernel/debug/iw_cxgb4/<pci-slot-no>/eps  will not have
      the peer's address/port mapping info.  The connection still works though.

      Fixes: 5b6b8fe ("RDMA/cxgb4: Report the actual address of the remote 
connecting peer")

      Signed-off-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
      Reviewed-by: Tatyana Nikolova <Tatyana.E.Nikolova@xxxxxxxxx>
      Reviewed-by: Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 94634e9861abbc3036d7041773971c8e31ec2680
  Author: Nicholas Mc Guire <hofrat@xxxxxxxxx>
  Date:   Mon May 11 16:38:02 2015 +0200

      IB/ehca: use correct destination for memcpy

      Using an element of a struct as the address for the memcpy of the whole
      struct may introduce a buffer overflow and does not help readability 
either
      simply pass the real thing as first argument to memcpy.

      Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
      Signed-off-by: Nicholas Mc Guire <hofrat@xxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit ef208162b7b4c40de1825a61677e167c081f5fee
  Merge: a156e06 c8b3504
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon May 11 13:57:47 2015 -0700

      Merge tag 'spi-fix-v4.1-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

      Pull spi fixes from Mark Brown:
       "A number of driver specific fixes (including several missing
        dependencies for randconfig type cases) plus two core fixes.

        One makes the setup_transfer() callback optional which unbreaks some
        drivers which had been merged with it omitted due to local versions of
        this patch and another ensures that we don't corrupt data by leaking
        internal dummy buffers to callers, causing the callers to think they
        allocated those buffers"

      * tag 'spi-fix-v4.1-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: fsl-espi: fix behaviour for full-duplex xfers
        spi: fsl-spi: fix devm_ioremap_resource() error case
        spi: Kconfig: Add SOC_LS1021A to SPI_FSL_DSPI dependence
        spi/omap2-mcpsi: Always call spi_finalize_current_message()
        spi: fsl-spi: use devm_ioremap_resource() to map parameter ram on CPM1
        spi: bitbang: Make setup_transfer() callback optional
        spi: check tx_buf and rx_buf in spi_unmap_msg
        spi: bcm2835: change timeout of polling driver to 1s
        spi: bcm2835: Add GPIOLIB dependency

  commit a156e0682f5b328094c273435a46e32e100ba898
  Merge: 9c922a5 5dc5616
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon May 11 11:09:54 2015 -0700

      Merge tag 'iommu-fixes-v4.1-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

      Pull iommu fixes from Joerg Roedel:
       "Three fixes have queued up:

         - reference count fix in the AMD IOMMUv2 driver

         - sign extension fix in the ARM-SMMU driver

         - build fix for rockchip driver with device tree"

      * tag 'iommu-fixes-v4.1-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/arm-smmu: Fix sign-extension of upstream bus addresses at stage 1
        iommu/rockchip: Fix build without CONFIG_OF
        iommu/amd: Fix bug in put_pasid_state_wait

  commit 9c922a55dbfff812e8becbcfd90d1ce856adb0d9
  Merge: b3e5838 ec59a65
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon May 11 11:05:13 2015 -0700

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

      Pull crypto fixes from Herbert Xu:
       "This fixes a the implementation of CRC32 on arm64 where it incorrectly
        applied negation on the result.

        It also fixes the arm64 implementations of SHA/SHA256 where in some
        cases it may end up finalising the result twice"

      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: arm64/sha2-ce - prevent asm code finalization in final() path
        crypto: arm64/sha1-ce - prevent asm code finalization in final() path
        crypto: arm64/crc32 - bring in line with generic CRC32

  commit b3e5838ac01c6815fc3d15fd00c8eb23889e5962
  Merge: c91aa67 dbfe8ef
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon May 11 10:54:20 2015 -0700

      Merge branch 'for-4.1-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

      Pull libata fixes from Tejun Heo:
       "Rather big for fixes pull.

         - SCC controllers never lived to see the light of the day.  Both
           libata and ide drivers removed.

         - In some configurations, link power management policy changes
           sometimes cause delayed spurious PHY events which can develop into
           noticeable failures.  This has been reported several times over the
           years.  Gabriele's patches suppress PHY events for a while after
           LPM policy changes which should help most of these failures without
           causing too much problem for hotplug use cases.

         - A few controller specific fixes"

      [ Hmm.  I don't think removing SSC support is really a "fix", but hey, it
        removes a lot of lines of code.  Which I like.  So ...  good riddance ]

      * 'for-4.1-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        ahci: avoton port-disable reset-quirk
        ata: select DW_DMAC in case of SATA_DWC
        libata: Blacklist queued TRIM on all Samsung 800-series
        libata: Ignore spurious PHY event on LPM policy change
        libata: Add helper to determine when PHY events should be ignored
        ata: ahci_st: fixup layering violations / drvdata errors
        Remove celleb-only SCC PATA drivers

  commit c91aa67eede4cdee97844854bdf5b695ab26893e
  Merge: 030bbdb bb27051
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon May 11 10:33:31 2015 -0700

      Merge tag 'md/4.1-rc3-fixes' of git://neil.brown.name/md

      Pull md bugfixes from Neil Brown:
       "A few fixes for md.

        Most of these are related to the new "batched stripe writeout", but
        there are a few others"

      * tag 'md/4.1-rc3-fixes' of git://neil.brown.name/md:
        md/raid5: fix handling of degraded stripes in batches.
        md/raid5: fix allocation of 'scribble' array.
        md/raid5: don't record new size if resize_stripes fails.
        md/raid5: avoid reading parity blocks for full-stripe write to degraded 
array
        md/raid5: more incorrect BUG_ON in handle_stripe_fill.
        md/raid5: new alloc_stripe() to allocate an initialize a stripe.
        md-raid0: conditional mddev->queue access to suit dm-raid

  commit 145a42b3a964c6647464f05bd58aa33787de7f75
  Author: David Ward <david.ward@xxxxxxxxxx>
  Date:   Sat May 9 22:01:47 2015 -0400

      net_sched: gred: use correct backlog value in WRED mode

      In WRED mode, the backlog for a single virtual queue (VQ) should not be
      used to determine queue behavior; instead the backlog is summed across
      all VQs. This sum is currently used when calculating the average queue
      lengths. It also needs to be used when determining if the queue's hard
      limit has been reached, or when reporting each VQ's backlog via netlink.
      q->backlog will only be used if the queue switches out of WRED mode.

      Signed-off-by: David Ward <david.ward@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 665a6cd809f43eec2b51413816a4178a3390a870
  Author: Felix Fietkau <nbd@xxxxxxxxxxx>
  Date:   Sat May 9 23:08:38 2015 +0200

      pppoe: drop pppoe device in pppoe_unbind_sock_work

      After receiving a PADT and the socket is closed, user space will no
      longer drop the reference to the pppoe device.
      This leads to errors like this:

      [  488.570000] unregister_netdevice: waiting for eth0.2 to become free. 
Usage count = 2

      Fixes: 287f3a943fe ("pppoe: Use workqueue to die properly when a PADT is 
received")
      Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 5dc5616ee850eaba055bb469a6c4a471d489140e
  Author: Will Deacon <will.deacon@xxxxxxx>
  Date:   Fri May 8 17:44:22 2015 +0100

      iommu/arm-smmu: Fix sign-extension of upstream bus addresses at stage 1

      Stage 1 translation is controlled by two sets of page tables (TTBR0 and
      TTBR1) which grow up and down from zero respectively in the ARMv8
      translation regime. For the SMMU, we only care about TTBR0 and, in the
      case of a 48-bit virtual space, we expect to map virtual addresses 0x0
      through to 0xffff_ffff_ffff.

      Given that some masters may be incapable of emitting virtual addresses
      targetting TTBR1 (e.g. because they sit on a 48-bit bus), the SMMU
      architecture allows bit 47 to be sign-extended, halving the virtual
      range of TTBR0 but allowing TTBR1 to be used. This is controlled by the
      SEP field in TTBCR2.

      The SMMU driver incorrectly enables this sign-extension feature, which
      causes problems when userspace addresses are programmed into a master
      device with the SMMU expecting to map the incoming transactions via
      TTBR0; if the top bit of address is set, we will instead get a
      translation fault since TTBR1 walks are disabled in the TTBCR.

      This patch fixes the issue by disabling sign-extension of a fixed
      virtual address bit and instead basing the behaviour on the upstream bus
      size: the incoming address is zero extended unless the upstream bus is
      only 49 bits wide, in which case bit 48 is used as the sign bit and is
      replicated to the upper bits.

      Cc: <stable@xxxxxxxxxxxxxxx> # v4.0+
      Reported-by: Varun Sethi <varun.sethi@xxxxxxxxxxxxx>
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
      Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>

  commit c8b350424d1862619c311204290cd42bae4ebaa3
  Merge: bed5e4d 73ee39a 50574dd 2000058
  Author: Mark Brown <broonie@xxxxxxxxxx>
  Date:   Mon May 11 17:29:49 2015 +0100

      Merge remote-tracking branches 'spi/fix/fsl-cpm', 'spi/fix/fsl-dspi' and 
'spi/fix/fsl-espi' into spi-linus

  commit bed5e4d8294249ea1f05dade879a51733484be42
  Merge: 030bbdb 5a1b11c
  Author: Mark Brown <broonie@xxxxxxxxxx>
  Date:   Mon May 11 17:29:46 2015 +0100

      Merge tag 'spi-v4.1-rc1' into spi-linus

      spi: Fixes for v4.1

      A few driver fixes plus two changes for the core, one to make the
      setup_transfer() callback optional which fixes crashes in some drivers
      which were updated to use new interfaces without apparent testing and
      one to ensure we don't expose the data buffers we use for dummy
      transfers to drivers which avoids potential issues with multiple
      accesses to them or reuse.

      # gpg: Signature made Sat 25 Apr 2015 10:59:47 BST using RSA key ID 
5D5487D0
      # gpg: key CD7BEEBC: no public key for trusted key - skipped
      # gpg: key CD7BEEBC marked as ultimately trusted
      # gpg: key AF88CD16: no public key for trusted key - skipped
      # gpg: key AF88CD16 marked as ultimately trusted
      # gpg: key 16005C11: no public key for trusted key - skipped
      # gpg: key 16005C11 marked as ultimately trusted
      # gpg: key 5621E907: no public key for trusted key - skipped
      # gpg: key 5621E907 marked as ultimately trusted
      # gpg: key 5C6153AD: no public key for trusted key - skipped
      # gpg: key 5C6153AD marked as ultimately trusted
      # gpg: Good signature from "Mark Brown <broonie@xxxxxxxxxxxxx>"
      # gpg:                 aka "Mark Brown <broonie@xxxxxxxxxx>"
      # gpg:                 aka "Mark Brown <broonie@xxxxxxxxxx>"
      # gpg:                 aka "Mark Brown <broonie@xxxxxxxxxxxxxxx>"
      # gpg:                 aka "Mark Brown <broonie@xxxxxxxxxx>"
      # gpg:                 aka "Mark Brown <Mark.Brown@xxxxxxxxxx>"

  commit 268be0f7a7d9b3644bcb99568efba13cb208b627
  Author: Stefan Wahren <stefan.wahren@xxxxxxxx>
  Date:   Sat May 9 07:58:09 2015 +0000

      net: qca_spi: Fix possible race during probe

      Registering the netdev before setting the priv data is unsafe.
      So fix this possible race by setting the priv data first.

      Signed-off-by: Stefan Wahren <stefan.wahren@xxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx> # v3.18+
      Fixes: 291ab06e (net: qualcomm: new Ethernet over SPI driver for QCA7000)
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 7c0c82682873354490a5b67c77331bd65a356236
  Author: Bert Vermeulen <bert@xxxxxxxx>
  Date:   Fri May 8 16:18:49 2015 +0200

      net: mdio-gpio: Allow for unspecified bus id

      When the bus id was supplied via a struct platform_device, the driver 
wasn't
      handling -1 to mean an unspecified id of the only instance of this driver,
      as the platform spec requires.

      Signed-off-by: Bert Vermeulen <bert@xxxxxxxx>
      Reviewed-by: Andrew Lunn <andrew@xxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit fbf33a2802f71dba06faa948af805884ff16a2ab
  Author: Kretschmer, Mathias <mathias.kretschmer@xxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 8 15:44:37 2015 +0200

      af_packet / TX_RING not fully non-blocking (w/ MSG_DONTWAIT).

      This patch fixes an issue where the send(MSG_DONTWAIT) call
      on a TX_RING is not fully non-blocking in cases where the device's sndBuf 
is
      full. We pass nonblock=true to sock_alloc_send_skb() and return any 
possibly
      occuring error code (most likely EGAIN) to the caller. As the fast-path 
stays
      as it is, we keep the unlikely() around skb == NULL.

      Signed-off-by: Mathias Kretschmer <mathias.kretschmer@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit cd9c39977754d9602b5783a44f4af09530a58254
  Author: Michal Schmidt <mschmidt@xxxxxxxxxx>
  Date:   Thu May 7 20:37:10 2015 +0200

      bnx2x: limit fw delay in kdump to 5s after boot

      Commit 12a8541d5c82 "bnx2x: Delay during kdump load" added a 5 seconds
      delay to bnx2x's probe function in the kdump case to let the firmware
      realize the old driver is gone.

      The problem with the delay is that it is per-device, so if you have
      several bnx2x NICs in NPAR mode, the delays can accumulate to minutes.

      Fix it by adjusting the delay so that we do not wait more than
      necessary, i.e. no more delaying after 5 seconds of kernel boot time.

      Signed-off-by: Michal Schmidt <mschmidt@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 0b59d8806a31bb0267b3a461e8fef20c727bdbf6
  Author: Nicolas Schichan <nschichan@xxxxxxxxxx>
  Date:   Thu May 7 17:14:21 2015 +0200

      ARM: net: delegate filter to kernel interpreter when imm_offset() return 
value can't fit into 12bits.

      The ARM JIT code emits "ldr rX, [pc, #offset]" to access the literal
      pool. #offset maximum value is 4095 and if the generated code is too
      large, the #offset value can overflow and not point to the expected
      slot in the literal pool. Additionally, when overflow occurs, bits of
      the overflow can end up changing the destination register of the ldr
      instruction.

      Fix that by detecting the overflow in imm_offset() and setting a flag
      that is checked for each BPF instructions converted in
      build_body(). As of now it can only be detected in the second pass. As
      a result the second build_body() call can now fail, so add the
      corresponding cleanup code in that case.

      Using multiple literal pools in the JITed code is going to require
      lots of intrusive changes to the JIT code (which would better be done
      as a feature instead of fix), just delegating to the kernel BPF
      interpreter in that case is a more straight forward, minimal fix and
      easy to backport.

      Fixes: ddecdfcea0ae ("ARM: 7259/3: net: JIT compiler for packet filters")
      Signed-off-by: Nicolas Schichan <nschichan@xxxxxxxxxx>
      Acked-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 19fc99d0c6ba7d9b65456496b5bb2169d5f74cd0
  Author: Nicolas Schichan <nschichan@xxxxxxxxxx>
  Date:   Wed May 6 18:31:56 2015 +0200

      ARM: net fix emit_udiv() for BPF_ALU | BPF_DIV | BPF_K intruction.

      In that case, emit_udiv() will be called with rn == ARM_R0 (r_scratch)
      and loading rm first into ARM_R0 will result in jit_udiv() function
      being called the same dividend and divisor. Fix that by loading rn
      first into ARM_R1 and then rm into ARM_R0.

      Signed-off-by: Nicolas Schichan <nschichan@xxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx> # v3.13+
      Fixes: aee636c4809f (bpf: do not use reciprocal divide)
      Acked-by: Mircea Gherzan <mgherzan@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 030bbdbf4c833bc69f502eae58498bc5572db736
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun May 10 15:12:29 2015 -0700

      Linux 4.1-rc3

  commit 01d07351f272888f55f0101338e2c60605f17846
  Merge: 41f2a93 332545b
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun May 10 14:58:53 2015 -0700

      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

      Pull drm fixes from Dave Airlie:
       "I really need to get back to sending these on my Friday, instead of my
        Monday morning, but nothing too amazing in here: a few amdkfd fixes, a
        few radeon fixes, i915 fixes, one tegra fix and one core fix"

      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm: Zero out invalid vblank timestamp in drm_update_vblank_count.
        drm/tegra: Don't use vblank_disable_immediate on incapable driver.
        drm/radeon: stop trying to suspend UVD sessions
        drm/radeon: more strictly validate the UVD codec
        drm/radeon: make UVD handle checking more strict
        drm/radeon: make VCE handle check more strict
        drm/radeon: fix userptr lockup
        drm/radeon: fix userptr BO unpin bug v3
        drm/amdkfd: Initialize sdma vm when creating sdma queue
        drm/amdkfd: Don't report local memory size
        drm/amdkfd: allow unregister process with queues
        drm/i915: Drop PIPE-A quirk for 945GSE HP Mini
        drm/i915: Sink rate read should be saved in deca-kHz
        drm/i915/dp: there is no audio on port A
        drm/i915: Add missing MacBook Pro models with dual channel LVDS
        drm/i915: Assume dual channel LVDS if pixel clock necessitates it
        drm/radeon: don't setup audio on asics that don't support it
        drm/radeon: disable semaphores for UVD V1 (v2)

  commit 332545b3016cbff066c17037d32ec8aae8e4cfb5
  Merge: fdb68e0 736a69c
  Author: Dave Airlie <airlied@xxxxxxxxxx>
  Date:   Mon May 11 06:06:22 2015 +1000

      Merge tag 'drm-intel-fixes-2015-05-08' of 
git://anongit.freedesktop.org/drm-intel into drm-fixes

      misc i915 fixes.

      * tag 'drm-intel-fixes-2015-05-08' of 
git://anongit.freedesktop.org/drm-intel:
        drm/i915: Drop PIPE-A quirk for 945GSE HP Mini
        drm/i915: Sink rate read should be saved in deca-kHz
        drm/i915/dp: there is no audio on port A
        drm/i915: Add missing MacBook Pro models with dual channel LVDS
        drm/i915: Assume dual channel LVDS if pixel clock necessitates it

  commit fdb68e09bbb1c981f24608d7022c7d93cc47b326
  Author: Mario Kleiner <mario.kleiner.de@xxxxxxxxx>
  Date:   Tue Apr 7 06:31:09 2015 +0200

      drm: Zero out invalid vblank timestamp in drm_update_vblank_count.

      Since commit 844b03f27739135fe1fed2fef06da0ffc4c7a081 we make
      sure that after vblank irq off, we return the last valid
      (vblank count, vblank timestamp) pair to clients, e.g., during
      modesets, which is good.

      An overlooked side effect of that commit for kms drivers without
      support for precise vblank timestamping is that at vblank irq
      enable, when we update the vblank counter from the hw counter, we
      can't update the corresponding vblank timestamp, so now we have a
      totally mismatched timestamp for the new count to confuse clients.

      Restore old client visible behaviour from before Linux 3.17, but
      zero out the timestamp at vblank counter update (instead of disable
      as in original implementation) if we can't generate a meaningful
      timestamp immediately for the new vblank counter. This will fix
      this regression, so callers know they need to retry again later
      if they need a valid timestamp, but at the same time preserves
      the improvements made in the commit mentioned above.

      Signed-off-by: Mario Kleiner <mario.kleiner.de@xxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx> #v3.17+

      Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
      Cc: Daniel Vetter <daniel@xxxxxxxx>
      Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>

  commit 41f2a93cc6d13fa1c82db1281162500fcc57ba3e
  Merge: 8425ac7 3b8786f
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun May 10 11:16:48 2015 -0700

      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

      Pull ARM fixes from Russell King:
       "A set of ARM fixes:

         - fix an off-by-one error in the iommu DMA ops, which caused errors
           with a 4GiB size.

         - remove comments mentioning the non-existent 
CONFIG_CPU_ARM1020_CPU_IDLE
           macro.

         - remove useless CONFIG_CPU_ICACHE_STREAMING_DISABLE blocks, where
           this symbol never appeared in any Kconfig.

         - fix Feroceon code to cope with a previous change correctly (it
           incorrectly left an additional word in an assembly structure
           definition)

         - avoid a misleading IRQ affinity warning in the ARM PMU code for
           IRQs which are already affine to their CPUs.

         - fix the node name printed in the IRQ affinity warning"

      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8352/1: perf: Fix the pmu node name in warning message
        ARM: 8351/1: perf: don't warn about missing interrupt-affinity property 
for PPIs
        ARM: 8350/1: proc-feroceon: Fix feroceon_proc_info macro
        ARM: 8349/1: arch/arm/mm/proc-arm925.S: remove dead #ifdef block
        ARM: 8348/1: remove comments on CPU_ARM1020_CPU_IDLE
        ARM: 8347/1: dma-mapping: fix off-by-one check in 
arm_setup_iommu_dma_ops

  commit 8425ac7a0d56731df5455c3015c59484f39eab6d
  Merge: 8f59ae0 8cf5e6d
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun May 10 11:13:19 2015 -0700

      Merge tag 'samsung-fixes-1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

      Pull samsung fixes from Kukjin Kim:
       "Here is Samsung fixes for v4.1.  Since I've missed to send this via
        arm-soc tree before v4.1-rc3, so I'm sending this to you directly

         - fix commit ea08de16eb1b ("ARM: dts: Add DISP1 power domain for
           exynos5420") which causes 'unhandled fault: imprecise external
           abort' error when PD turned off.  ("make DP a consumer of DISP1
           power domain")

         - fix 's3c-rtc' probe failure on Odriod-X2/U2/U3 boards ("add
           'rtc_src' clock to rtc node for source clock of rtc")

         - fix typo for 'cpu-crit-0' trip point on exynos5420/5440

         - fix S2R failure on exynos5250-snow due to card power of Marvell
           WiFi driver (suspend/resume) ("add keep-power-in-susped to WiFi
           SDIO node")"

      * tag 'samsung-fixes-1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: dts: Add keep-power-in-suspend to WiFi SDIO node for 
exynos5250-snow
        ARM: dts: Fix typo in trip point temperature for exynos5420/5440
        ARM: dts: add 'rtc_src' clock to rtc node for exynos4412-odroid boards
        ARM: dts: Make DP a consumer of DISP1 power domain on Exynos5420

  commit dbfe8ef5599a5370abc441fcdbb382b656563eb4
  Author: Dan Williams <dan.j.williams@xxxxxxxxx>
  Date:   Fri May 8 15:23:55 2015 -0400

      ahci: avoton port-disable reset-quirk

      Avoton AHCI occasionally sees drive probe timeouts at driver load time.
      When this happens SCR_STATUS indicates device detected, but no D2H FIS
      reception.  Reset the internal link state machines by bouncing
      port-enable in the PCS register when this occurs.

      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
      Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>

  commit 78f5b899195019f71f7593c604d75ca61658eae3
  Author: Tom Herbert <tom@xxxxxxxxxxxxxxx>
  Date:   Thu May 7 08:08:51 2015 -0700

      mpls: Change reserved label names to be consistent with netbsd

      Since these are now visible to userspace it is nice to be consistent
      with BSD (sys/netmpls/mpls.h in netBSD).

      Signed-off-by: Tom Herbert <tom@xxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 7c0004d3960a3ebffc68c372dfd98c09d1c680eb
  Merge: 3e4336a 2439fc4
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Sat May 9 22:23:59 2015 -0400

      Merge branch 'master' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue

      Jeff Kirsher says:

      ====================
      Intel Wired LAN Driver Updates 2015-05-07

      This series contains updates to igb only.

      Toshiaki provides two fixes for igb, first fixes an issue when changing
      the number of rings by ethtool which causes oops because of uninitialized
      pointers.  The second fix resolves a typo where tx_ring was used instead
      of the desired rx_ring.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 8f59ae0643b2057ad996ab23488e9be1ba2564f4
  Merge: 51dfcb0 c9d862c
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat May 9 16:13:38 2015 -0700

      Merge tag 'fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

      Pull ARM SoC fixes from Arnd Bergmann:
       "A few patches have come up since the merge window.  The largest one is
        a rewrite of the PXA lubbock/mainstone IRQ handling.  This was already
        broken in 2011 by a change to the GPIO code and only noticed now.

        The other changes contained here are:

        MAINTAINERS file updates:

         - Ray Jui and Scott Branden are now co-maintainers for some of the
           mach-bcm chips, while Christian Daudt and Marc Carino have stepped
           down.

         - Andrew Victor is no longer maintaining at91.  Instead, Alexandre
           Belloni now becomes an official maintainer, after having done a
           bulk of the work for a while.

         - Baruch Siach, who added the mach-digicolor platform in 4.1 is now
           listed as maintainer

         - The git URL for mach-socfpga has changed

        Bug fixes:

         - Three bug fixes for new rockchip rk3288 code

         - A regression fix to make SD card support work on certain ux500
           boards

         - multiple smaller dts fixes for imx, omap, mvebu, and shmobile

         - a regression �ix for omap3 power consumption

         - a fix for regression in the ARM CCI bus driver

        Configuration changes:

         - more imx platforms are now enabled in multi_v7_defconfig"

      * tag 'fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
        MAINTAINERS: add Conexant Digicolor machines entry
        MAINTAINERS: socfpga: update the git repo for SoCFPGA
        ARM: multi_v7_defconfig: Select more FSL SoCs
        MAINTAINERS: replace an AT91 maintainer
        drivers: CCI: fix used_mask init in validate_group()
        bus: omap_l3_noc: Fix master id address decoding for OMAP5
        bus: omap_l3_noc: Fix offset for DRA7 CLK1_HOST_CLK1_2 instance
        ARM: dts: dra7: Fix efuse register size for ABB
        ARM: dts: am57xx-beagle-x15: Switch GPIO fan number
        ARM: dts: am57xx-beagle-x15: Switch UART mux pins
        ARM: dts: am437x-sk: reduce col-scan-delay-us
        ARM: dts: am437x-sk: fix for new newhaven display module revision
        ARM: dts: am57xx-beagle-x15: Fix RTC aliases
        ARM: dts: am57xx-beagle-x15: Fix IRQ type for mcp7941x
        ARM: dts: omap3: Add #iommu-cells to isp and iva iommu
        ARM: omap2plus_defconfig: Enable EXTCON_USB_GPIO
        ARM: dts: OMAP3-N900: Add microphone bias voltages
        ARM: OMAP2+: Fix omap off idle power consumption creeping up
        MAINTAINERS: Update brcmstb entry
        MAINTAINERS: Remove Christian Daudt for mach-bcm
        ...

  commit 51dfcb076d1e1ce7006aa272cb7c4514740c7e47
  Merge: 9d88f22 7e96c1b
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat May 9 16:07:14 2015 -0700

      Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

      Pull user-namespace fix from Eric Biederman:
       "Eric Windish recently reported a really bug that allows mounting fresh
        copies of proc and sysfs when it really should not be allowed.  The
        code attempted to verify that proc and sysfs were fully visible but
        there is a test missing to ensure that the root of the filesystem is
        visible.  Doh!

        The following patch fixes that.

        This fixes a containment issue that the docker folks are seeing"

      * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        mnt: Fix fs_fully_visible to verify the root directory is visible

  commit 9d88f22a819db8a9ff78496edf5553e90d88179c
  Merge: 95f3b1f 1dcc73d
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat May 9 14:59:05 2015 -0700

      Merge branch 'irq-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

      Pull irq updates from Thomas Gleixner:
       "Two patches from the irq departement:

         - a simple fix to make dummy_irq_chip usable for wakeup scenarios

         - removal of the gic arch_extn hackery.  Now that all users are
           converted we really want to get rid of the interface so people wont
           come up with new use cases"

      * 'irq-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip: gic: Drop support for gic_arch_extn
        genirq: Set IRQCHIP_SKIP_SET_WAKE flag for dummy_irq_chip

  commit 95f3b1f4b1df4716ce2db8aa2243b7e288eeb9a7
  Merge: 1a9f064 149aabc
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat May 9 14:57:49 2015 -0700

      Merge branch 'timers-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

      Pull timer fix from Thomas Gleixner:
       "A simple fix to actually shut down a detached device instead of
        keeping it active"

      * 'timers-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        clockevents: Shutdown detached clockevent device

  commit 3e4336a65ab6b45cbac10b8347c8f8951fec515d
  Author: Jason A. Donenfeld <Jason@xxxxxxxxx>
  Date:   Wed May 6 15:09:40 2015 +0200

      usbnet: avoid integer overflow in start_xmit

      transfer_buffer_length is of type u32. It's therefore wrong to assign it
      to a signed integer. This patch avoids the overflow.

      It's worth noting that entry->length here is a long; perhaps it would be
      beneficial at somepoint to change this to be unsigned as well, if
      nothing else relies on its signedness for error conditions or the like.

      Signed-off-by: Jason A. Donenfeld <Jason@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 240b23c4269777abba4eba43acd1f53ec530bb7d
  Author: Tony Camuso <tcamuso@xxxxxxxxxx>
  Date:   Wed May 6 09:09:18 2015 -0400

      netxen_nic: use spin_[un]lock_bh around tx_clean_lock (2)

      This patch should have been part of the previous patch having the
      same summary. See  http://marc.info/?l=linux-kernel&m=143039470103795&w=2
      Unfortunately, I didn't check to see where else this lock was used before
      submitting that patch. This should take care of it for netxen_nic, as I
      did a thorough search this time.

      To recap from the original patch; although testing this driver with
      DEBUG_LOCKDEP and DEBUG_SPINLOCK enabled did not produce any traces,
      it would be more prudent in the case of tx_clean_lock to use _bh
      versions of spin_[un]lock, since this lock is manipulated in both
      the process and softirq contexts.

      This patch was tested for functionality and regressions with netperf
      and DEBUG_LOCKDEP and DEBUG_SPINLOCK enabled.

      Signed-off-by: Tony Camuso <tcamuso@xxxxxxxxxx>
      Acked-By: Neil Horman <nhorman@xxxxxxxxxxxxx>
      Acked-By: Manish Chopra <manish.chopra@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit ccad725ccb068851fbce2022b2a51fa458d1eac1
  Author: Jean Delvare <jdelvare@xxxxxxx>
  Date:   Wed May 6 09:14:34 2015 +0200

      net: xgene_enet: Set hardware dependency

      The xgene_enet driver is only useful on X-Gene SoC.

      Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
      Cc: Iyappan Subramanian <isubramanian@xxxxxxx>
      Cc: Keyur Chudgar <kchudgar@xxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 74a78b15e6e3dd909a39e0d99dfa0268c126e2c6
  Author: Jean Delvare <jdelvare@xxxxxxx>
  Date:   Wed May 6 09:04:40 2015 +0200

      net: amd-xgbe: Add hardware dependency

      The amd-xgbe driver currently only works with the Seattle SoC, which
      is ARM64 architecture, so there is no point in building this driver on
      other architectures except for build testing purpose. The dependency
      list can be updated later if the driver ever supports other
      architectures.

      Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
      Cc: Tom Lendacky <thomas.lendacky@xxxxxxx>
      Cc: Florian Fainelli <f.fainelli@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit d744318574090c3b796915d9d710bdb17db191a1
  Author: WANG Cong <xiyou.wangcong@xxxxxxxxx>
  Date:   Tue May 5 15:22:02 2015 -0700

      net_sched: fix a use-after-free in tc_ctl_tfilter()

      When tcf_destroy() returns true, tp could be already destroyed,
      we should not use tp->next after that.

      For long term, we probably should move tp list to list_head.

      Fixes: 1e052be69d04 ("net_sched: destroy proto tp when all filters are 
gone")
      Cc: Jamal Hadi Salim <jhs@xxxxxxxxxxxx>
      Signed-off-by: Cong Wang <xiyou.wangcong@xxxxxxxxx>
      Acked-by: Jamal Hadi Salim <jhs@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 1006da19ea6603135773a79f09e4e931be460429
  Author: Vasily Titskiy <qehgt0@xxxxxxxxx>
  Date:   Wed May 6 10:31:21 2015 -0400

      drivers/net/usb: Add support for 'Lenovo OneLink Pro Dock'

      This device is sold as 'Lenovo OneLink Pro Dock'.
      Chipset is RTL8153 and works with r8152.

      Signed-off-by: Vasily Titskiy <qehgt0@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit bfbb92c446700da645e4834fb01439097846ce1e
  Author: Nathan Sullivan <nathan.sullivan@xxxxxx>
  Date:   Tue May 5 15:00:25 2015 -0500

      net: macb: Handle the RXUBR interrupt on all devices

      The same hardware issue the at91 must work around applies to at least the
      Zynq ethernet, and possibly more devices.  The driver also needs to handle
      the RXUBR interrupt since it turns it on with MACB_RX_INT_FLAGS anyway.

      Signed-off-by: Nathan Sullivan <nathan.sullivan@xxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit d3196a2468895c219a47f3c370713a4ca59c9f54
  Merge: e16e888 c82ac7e
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Sat May 9 16:03:28 2015 -0400

      Merge branch 'rds'

      Sowmini Varadhan says:

      ====================
      net/rds: RDS-TCP robustness fixes

      This patch-set contains bug fixes for state-recovery at the RDS
      layer when the underlying transport is TCP and the TCP state at one
      of the endpoints is reset

      V2 changes: DaveM comments to reduce memory footprint, follow
                  NFS/RPC model where possible. Added test-case #3

      Without the changes in this set, when one of the endpoints is reset,
      the existing code does not correctly clean up RDS socket state for stale
      connections, resulting in some unstable, timing-dependant behavior on
      the wire, including an infinite exchange of 3WHs back-and-forth, and a
      resulting potential to never converge RDS state.

      Test cases used to verify the changes in this set are:

      1. Start rds client/server applications on two participating nodes,
         node1 and node2. After at least one packet has been sent (to establish
         the TCP connection), restart the rds_tcp module on the client, and
         now resend packets. Tcpdump should show server sending a FIN for the
         "old" client port, and clean connection establishment/exchange for
         the new client port.

      2. At the end of step 1, restart rds srever on node2, and start client on
         node1, make sure using tcpdump, 'netstat -an|grep 16385' that
         packets flow correctly.

      3. start RDS client/server application on two participating nodes, and
         repeat steps 1 and 2, but this time, simulate node failure by doing
         "ifconfig <intf> down", so no FIN is sent.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit c82ac7e69efe6dbe370d6ba84e2666d7692ef1c2
  Author: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
  Date:   Tue May 5 15:20:52 2015 -0400

      net/rds: RDS-TCP: only initiate reconnect attempt on outgoing TCP socket.

      When the peer of an RDS-TCP connection restarts, a reconnect
      attempt should only be made from the active side  of the TCP
      connection, i.e. the side that has a transient TCP port
      number. Do not add the passive side of the TCP connection
      to the c_hash_node and thus avoid triggering rds_queue_reconnect()
      for passive rds connections.

      Signed-off-by: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit f711a6ae062caeee46067b2f2f12ffda319ae73c
  Author: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
  Date:   Tue May 5 15:20:51 2015 -0400

      net/rds: RDS-TCP: Always create a new rds_sock for an incoming connection.

      When running RDS over TCP, the active (client) side connects to the
      listening ("passive") side at the RDS_TCP_PORT.  After the connection
      is established, if the client side reboots (potentially without even
      sending a FIN) the server still has a TCP socket in the esablished
      state.  If the server-side now gets a new SYN comes from the client
      with a different client port, TCP will create a new socket-pair, but
      the RDS layer will incorrectly pull up the old rds_connection (which
      is still associated with the stale t_sock and RDS socket state).

      This patch corrects this behavior by having rds_tcp_accept_one()
      always create a new connection for an incoming TCP SYN.
      The rds and tcp state associated with the old socket-pair is cleaned
      up via the rds_tcp_state_change() callback which would typically be
      invoked in most cases when the client-TCP sends a FIN on TCP restart,
      triggering a transition to CLOSE_WAIT state. In the rarer event of client
      death without a FIN, TCP_KEEPALIVE probes on the socket will detect
      the stale socket, and the TCP transition to CLOSE state will trigger
      the RDS state cleanup.

      Signed-off-by: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit e16e888b525503be05b3aea64190e8b3bdef44d0
  Author: Markus Stenberg <markus.stenberg@xxxxxx>
  Date:   Tue May 5 13:36:59 2015 +0300

      ipv6: Fixed source specific default route handling.

      If there are only IPv6 source specific default routes present, the
      host gets -ENETUNREACH on e.g. connect() because ip6_dst_lookup_tail
      calls ip6_route_output first, and given source address any, it fails,
      and ip6_route_get_saddr is never called.

      The change is to use the ip6_route_get_saddr, even if the initial
      ip6_route_output fails, and then doing ip6_route_output _again_ after
      we have appropriate source address available.

      Note that this is '99% fix' to the problem; a correct fix would be to
      do route lookups only within addrconf.c when picking a source address,
      and never call ip6_route_output before source address has been
      populated.

      Signed-off-by: Markus Stenberg <markus.stenberg@xxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 0a801445db4cb00bc900fd89b1e5eb7d7b581d7e
  Merge: 31ccd0e 89eb6d0
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Sat May 9 15:51:00 2015 -0400

      Merge branch 'for-upstream' of 
git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

      Johan Hedberg says:

      ====================
      Here are a couple of important Bluetooth & mac802154 fixes for 4.1:

       - mac802154 fix for crypto algorithm allocation failure checking
       - mac802154 wpan phy leak fix for error code path
       - Fix for not calling Bluetooth shutdown() if interface is not up

      Let me know if there are any issues pulling. Thanks.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 1a9f064f516c36d018754407b41921c996439ecf
  Author: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
  Date:   Sat May 9 03:39:52 2015 +0930

      m32r: make flush_cpumask non-volatile.

      We cast away the volatile, but really, why make it volatile at all?
      We already do a mb() inside the cpumask_empty() loop.

      Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 7e96c1b0e0f495c5a7450dc4aa7c9a24ba4305bd
  Author: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
  Date:   Fri May 8 16:36:50 2015 -0500

      mnt: Fix fs_fully_visible to verify the root directory is visible

      This fixes a dumb bug in fs_fully_visible that allows proc or sys to
      be mounted if there is a bind mount of part of /proc/ or /sys/ visible.

      Cc: stable@xxxxxxxxxxxxxxx
      Reported-by: Eric Windisch <ewindisch@xxxxxxxxxx>
      Signed-off-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>

  commit 95c607d93f477bd4d079c0529c5f7becad4efffb
  Merge: af64728 f15133d
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 8 21:39:12 2015 -0700

      Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

      Pull vfs fixes from Al Viro:
       "A couple of fixes for bugs caught while digging in fs/namei.c.  The
        first one is this cycle regression, the second is 3.11 and later"

      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        path_openat(): fix double fput()
        namei: d_is_negative() should be checked before ->d_seq validation

  commit f15133df088ecadd141ea1907f2c96df67c729f0
  Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
  Date:   Fri May 8 22:53:15 2015 -0400

      path_openat(): fix double fput()

      path_openat() jumps to the wrong place after do_tmpfile() - it has
      already done path_cleanup() (as part of path_lookupat() called by
      do_tmpfile()), so doing that again can lead to double fput().

      Cc: stable@xxxxxxxxxxxxxxx        # v3.11+
      Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

  commit 766c4cbfacd8634d7580bac6a1b8456e63de3e84
  Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
  Date:   Thu May 7 19:24:57 2015 -0400

      namei: d_is_negative() should be checked before ->d_seq validation

      Fetching ->d_inode, verifying ->d_seq and finding d_is_negative() to
      be true does *not* mean that inode we'd fetched had been NULL - that
      holds only while ->d_seq is still unchanged.

      Shift d_is_negative() checks into lookup_fast() prior to ->d_seq
      verification.

      Reported-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
      Tested-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
      Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

  commit af6472881a6127ad075adf64e459d2905fbc8a5c
  Merge: 5d5df5e 1d3c61c
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 8 20:59:02 2015 -0700

      Merge branch 'for-linus-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

      Pull btrfs fix from Chris Mason:
       "When an arm user reported crashes near page_address(page) in my new
        code, it became clear that I can't be trusted with GFP masks.  Filipe
        beat me to the patch, and I'll just be in the corner with my dunce cap
        on"

      * 'for-linus-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: fix wrong mapping flags for free space inode

  commit 5d5df5ee7cdb77bfdac3703fd7a6bae5e3e4ab36
  Merge: 1daac19 cb31ef4
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 8 20:38:21 2015 -0700

      Merge tag 'dm-4.1-fixes-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

      Pull device mapper fixes from Mike Snitzer:
       "Two additional fixes for changes introduced via DM during the 4.1
        merge window.

        The first reverts a dm-crypt change that wasn't correct.  The second
        fixes a device format regression that impacted userspace"

      * tag 'dm-4.1-fixes-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        init: fix regression by supporting devices with major:minor:offset 
format
        Revert "dm crypt: fix deadlock when async crypto algorithm returns 
-EBUSY"

  commit 1daac193f21d6e3d0adc528a06a7e11522d4254d
  Merge: 41c64bb 0ff28d9
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 8 19:49:35 2015 -0700

      Merge branch 'for-linus' of git://git.kernel.dk/linux-block

      Pull block fixes from Jens Axboe:
       "A collection of fixes since the merge window;

         - fix for a double elevator module release, from Chao Yu.  Ancient bug.

         - the splice() MORE flag fix from Christophe Leroy.

         - a fix for NVMe, fixing a patch that went in in the merge window.
           From Keith.

         - two fixes for blk-mq CPU hotplug handling, from Ming Lei.

         - bdi vs blockdev lifetime fix from Neil Brown, fixing and oops in md.

         - two blk-mq fixes from Shaohua, fixing a race on queue stop and a
           bad merge issue with FUA writes.

         - division-by-zero fix for writeback from Tejun.

         - a block bounce page accounting fix, making sure we inc/dec after
           bouncing so that pre/post IO pages match up.  From Wang YanQing"

      * 'for-linus' of git://git.kernel.dk/linux-block:
        splice: sendfile() at once fails for big files
        blk-mq: don't lose requests if a stopped queue restarts
        blk-mq: fix FUA request hang
        block: destroy bdi before blockdev is unregistered.
        block:bounce: fix call inc_|dec_zone_page_state on different pages 
confuse value of NR_BOUNCE
        elevator: fix double release of elevator module
        writeback: use |1 instead of +1 to protect against div by zero
        blk-mq: fix CPU hotplug handling
        blk-mq: fix race between timeout and CPU hotplug
        NVMe: Fix VPD B0 max sectors translation

  commit 41c64bb19c740b5433f768032ecaf05375c955ee
  Merge: a8a0811 d2d05c6
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 8 19:42:59 2015 -0700

      Merge tag 'gpio-v4.1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

      Pull GPIO fixes from Linus Walleij:
       "Here is a bunch of GPIO fixes that I collected since -rc1, nothing
        controversial, nothing special:

         - fix a memory leak for GPIO hotplug.

         - fix a signedness bug in the ACPI GPIO pin validation.

         - driver fixes: Qualcomm SPMI and OMAP MPUIO IRQ issues"

      * tag 'gpio-v4.1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: omap: Fix regression for MPUIO interrupts
        gpio: sysfs: fix memory leaks and device hotplug
        pinctrl: qcom-spmi-gpio: Fix input value report
        pinctrl: qcom-spmi-gpio: Fix output type configuration
        gpiolib: change gpio pin from unsigned to signed in acpi callback

  commit a8a0811314db714ae23ab9f0ea707711a076bf18
  Merge: 26b293e 4de3bf6
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 8 19:34:35 2015 -0700

      Merge tag 'mmc-4.1-rc2' of git://git.linaro.org/people/ulf.hansson/mmc

      Pull MMC fixes from Ulf Hansson:
       "MMC core:
         - Don't access RPMB partitions for normal read/write
         - Fix hibernation restore sequence

        MMC host:
         - dw_mmc: Fix card detection for non removable cards
         - dw_mmc: Fix sglist issue in 32-bit mode
         - sh_mmcif: Fix timeout value for command request"

      * tag 'mmc-4.1-rc2' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: dw_mmc: dw_mci_get_cd check MMC_CAP_NONREMOVABLE
        mmc: dw_mmc: init desc in dw_mci_idmac_init
        mmc: card: Don't access RPMB partitions for normal read/write
        mmc: sh_mmcif: Fix timeout value for command request
        mmc: core: add missing pm event in mmc_pm_notify to fix hib restore

  commit 26b293e854406ea4276b566cef75426adc3a9688
  Merge: 3e0283a ac01ce1
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 8 18:22:05 2015 -0700

      Merge tag 'trace-fixes-v4.1-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

      Pull tracing fix from Steven Rostedt:
       "The newly added ftrace_print_array_seq() function had a bug in it.
        Luckily, the only user of it didn't make the 4.1 merge window.

        But the helper function should be fixed before 4.2 when the users
        start coming in"

      * tag 'trace-fixes-v4.1-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Make ftrace_print_array_seq compute buf_len

  commit 8cf5e6dc8dd55d0f1ad46ab4046c3a8a51d2136d
  Author: Javier Martinez Canillas <javier.martinez@xxxxxxxxxxxxxxx>
  Date:   Sat May 9 03:15:16 2015 +0900

      ARM: dts: Add keep-power-in-suspend to WiFi SDIO node for exynos5250-snow

      The Marvell mwifiex driver prevents the system to enter into a suspend
      state if the card power is not preserved during a suspend/resume cycle.

      So Suspend-to-RAM and Suspend-to-idle are failing on Exynos5250 Snow.

      Add the keep-power-in-suspend Power Management property to the SDIO/MMC
      node so the mwifiex suspend handler doesn't fail and the system is able
      to enter into a suspend state.

      Signed-off-by: Javier Martinez Canillas <javier.martinez@xxxxxxxxxxxxxxx>
      Reviewed-by: Doug Anderson <dianders@xxxxxxxxxxxx>
      Signed-off-by: Kukjin Kim <kgene@xxxxxxxxxx>

  commit cb0f7c8b40c52124fdb73b5e5a1b28202efbb43b
  Author: Abhilash Kesavan <a.kesavan@xxxxxxxxxxx>
  Date:   Sat May 9 03:11:21 2015 +0900

      ARM: dts: Fix typo in trip point temperature for exynos5420/5440

      Remove the extra zero in the "cpu-crit-0" trip point for exynos5420
      and exynos5440.

      Signed-off-by: Abhilash Kesavan <a.kesavan@xxxxxxxxxxx>
      Signed-off-by: Kukjin Kim <kgene@xxxxxxxxxx>

  commit ee2020a4ca847e2cde4d5ee73572388061730809
  Author: Markus Reichl <m.reichl@xxxxxxxxxxxxx>
  Date:   Sat May 9 03:05:51 2015 +0900

      ARM: dts: add 'rtc_src' clock to rtc node for exynos4412-odroid boards

      The Exynos4412 SoC has a s3c6410 RTC where the source clock
      is now a mandatory property.
      This patch fixes probe failure of s3c-rtc on Odroid-X2/U2/U3 boards.

      Signed-off-by: Markus Reichl <m.reichl@xxxxxxxxxxxxx>
      Tested-by: Tobias Jakobi <tjakobi@xxxxxxxxxxxxxxxxxxxxx>
      Reviewed-by: Chanwoo Choi <cw00.choi@xxxxxxxxxxx>
      Reviewed-by: Javier Martinez Canillas <javier.martinez@xxxxxxxxxxxxxxx>
      Tested-by: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
      Signed-off-by: Kukjin Kim <kgene@xxxxxxxxxx>

  commit 0d747762966e47e3660cbd1b7806791c83e04f91
  Author: Javier Martinez Canillas <javier.martinez@xxxxxxxxxxxxxxx>
  Date:   Sat May 9 02:33:42 2015 +0900

      ARM: dts: Make DP a consumer of DISP1 power domain on Exynos5420

      Commit ea08de16eb1b ("ARM: dts: Add DISP1 power domain for exynos5420")
      added a device node for the Exynos5420 DISP1 power domain but dit not
      make the DP controller a consumer of that power domain.

      This causes an "Unhandled fault: imprecise external abort" error if the
      exynos-dp driver tries to access the DP controller registers and the PD
      was turned off. This lead to a kernel panic and a complete system hang.

      Make the DP controller device node a consumer of the DISP1 power domain
      to ensure that the PD is turned on when the exynos-dp driver is probed.

      Fixes: ea08de16eb1b ("ARM: dts: Add DISP1 power domain for exynos5420")
      Signed-off-by: Javier Martinez Canillas <javier.martinez@xxxxxxxxxxxxxxx>
      Signed-off-by: Kukjin Kim <kgene@xxxxxxxxxx>

  commit c9d862c48c48883a4327ae82f4a6de1eef928d60
  Author: Baruch Siach <baruch@xxxxxxxxxx>
  Date:   Tue Apr 28 13:59:43 2015 +0300

      MAINTAINERS: add Conexant Digicolor machines entry

      This adds Baruch as the maintainer for the Digicolor platform.

      Signed-off-by: Baruch Siach <baruch@xxxxxxxxxx>
      Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

  commit efadb751692f3c10e72cf96c8409e40e60852ff2
  Author: Dinh Nguyen <dinguyen@xxxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 14:13:12 2015 -0500

      MAINTAINERS: socfpga: update the git repo for SoCFPGA

      The git tree at rocketboards.org is going away. Update the entry to 
reflect
      the address of the new location. Also add an entry for all the socfpga_*
      dts files.

      Signed-off-by: Dinh Nguyen <dinguyen@xxxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

  commit 1e4df6b7208140f3c49f316d33a409d3a161f350
  Author: Xi Wang <xi.wang@xxxxxxxxx>
  Date:   Fri May 8 06:39:51 2015 +0100

      arm64: bpf: fix signedness bug in loading 64-bit immediate

      Consider "(u64)insn1.imm << 32 | imm" in the arm64 JIT.  Since imm is
      signed 32-bit, it is sign-extended to 64-bit, losing the high 32 bits.
      The fix is to convert imm to u32 first, which will be zero-extended to
      u64 implicitly.

      Cc: Zi Shen Lim <zlim.lnx@xxxxxxxxx>
      Cc: Alexei Starovoitov <ast@xxxxxxxxxxxx>
      Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Fixes: 30d3d94cc3d5 ("arm64: bpf: add 'load 64-bit immediate' 
instruction")
      Signed-off-by: Xi Wang <xi.wang@xxxxxxxxx>
      [will: removed non-arm64 bits and redundant casting]
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>

  commit 3790e395b8f4b66fe4e53629f304505c110a2be7
  Author: Mario Kleiner <mario.kleiner.de@xxxxxxxxx>
  Date:   Mon May 4 06:29:44 2015 +0200

      drm/tegra: Don't use vblank_disable_immediate on incapable driver.

      Tegra would not only need a hardware vblank counter that
      increments at leading edge of vblank, but also support
      for instantaneous high precision vblank timestamp queries, ie.
      a proper implementation of dev->driver->get_vblank_timestamp().

      Without these, there can be off-by-one errors during vblank
      disable/enable if the scanout is inside vblank at en/disable
      time, and additionally clients will never see any useable
      vblank timestamps when querying via drmWaitVblank ioctl. This
      would negatively affect swap scheduling under X11 and Wayland.

      Signed-off-by: Mario Kleiner <mario.kleiner.de@xxxxxxxxx>
      Acked-by: Thierry Reding <treding@xxxxxxxxxx>
      Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>

  commit 94754c183ada2143f03f3e16827904aab9e09f8e
  Merge: 7122e50 79b066b
  Author: Dave Airlie <airlied@xxxxxxxxxx>
  Date:   Fri May 8 20:52:51 2015 +1000

      Merge tag 'drm-amdkfd-fixes-2015-05-07' of 
git://people.freedesktop.org/~gabbayo/linux into drm-fixes

      - Add missing initialization of SDMA vm register when creating an SDMA 
queue
      - Don't report local memory size, as we don't support local memory 
allocation
        yet.
      - Allow to unregister process with exisiting queues. Until now we blocked
        it with BUG_ON, which was also an error by itself.

      * tag 'drm-amdkfd-fixes-2015-05-07' of 
git://people.freedesktop.org/~gabbayo/linux:
        drm/amdkfd: Initialize sdma vm when creating sdma queue
        drm/amdkfd: Don't report local memory size
        drm/amdkfd: allow unregister process with queues

  commit 7122e505a52a2b1b8a21101cce04bcdf7c28deab
  Merge: 5ebe6af 12e49fe
  Author: Dave Airlie <airlied@xxxxxxxxxx>
  Date:   Fri May 8 20:52:21 2015 +1000

      Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux 
into drm-fixes

      Mostly stability fixes for UVD and VCE, plus a few other bug and 
regression
      fixes.

      * 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: stop trying to suspend UVD sessions
        drm/radeon: more strictly validate the UVD codec
        drm/radeon: make UVD handle checking more strict
        drm/radeon: make VCE handle check more strict
        drm/radeon: fix userptr lockup
        drm/radeon: fix userptr BO unpin bug v3
        drm/radeon: don't setup audio on asics that don't support it
        drm/radeon: disable semaphores for UVD V1 (v2)

  commit bb27051f9fd7643f05d8f0babce3337f0b9b3087
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Fri May 8 18:19:40 2015 +1000

      md/raid5: fix handling of degraded stripes in batches.

      There is no need for special handling of stripe-batches when the array
      is degraded.

      There may be if there is a failure in the batch, but STRIPE_DEGRADED
      does not imply an error.

      So don't set STRIPE_BATCH_ERR in ops_run_io just because the array is
      degraded.
      This actually causes a bug: the STRIPE_DEGRADED flag gets cleared in
      check_break_stripe_batch_list() and so the bitmap bit gets cleared
      when it shouldn't.

      So in check_break_stripe_batch_list(), split the batch up completely -
      again STRIPE_DEGRADED isn't meaningful.

      Also don't set STRIPE_BATCH_ERR when there is a write error to a
      replacement device.  This simply removes the replacement device and
      requires no extra handling.

      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 738a273806ee0568369c9bb19ef3b102f54beef4
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Fri May 8 18:19:39 2015 +1000

      md/raid5: fix allocation of 'scribble' array.

      As the new 'scribble' array is sized based on chunk size,
      we need to make sure the size matches the largest of 'old'
      and 'new' chunk sizes when the array is undergoing reshape.

      We also potentially need to resize it even when not resizing
      the stripe cache, as chunk size can change without changing
      number of devices.

      So move the 'resize' code into a separate function, and
      consider old and new sizes when allocating.

      Signed-off-by: NeilBrown <neilb@xxxxxxx>
      Fixes: 46d5b785621a ("raid5: use flex_array for scribble data")

  commit 6e9eac2dcee5e19f125967dd2be3e36558c42fff
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Fri May 8 18:19:34 2015 +1000

      md/raid5: don't record new size if resize_stripes fails.

      If any memory allocation in resize_stripes fails we will return
      -ENOMEM, but in some cases we update conf->pool_size anyway.

      This means that if we try again, the allocations will be assumed
      to be larger than they are, and badness results.

      So only update pool_size if there is no error.

      This bug was introduced in 2.6.17 and the patch is suitable for
      -stable.

      Fixes: ad01c9e3752f ("[PATCH] md: Allow stripes to be expanded in 
preparation for expanding an array")
      Cc: stable@xxxxxxxxxxxxxxx (v2.6.17+)
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 10d82c5f0d167ef75a2d8d7d4eed9ee43d3369c9
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Fri May 8 18:19:33 2015 +1000

      md/raid5: avoid reading parity blocks for full-stripe write to degraded 
array

      When performing a reconstruct write, we need to read all blocks
      that are not being over-written .. except the parity (P and Q) blocks.

      The code currently reads these (as they are not being over-written!)
      unnecessarily.

      Signed-off-by: NeilBrown <neilb@xxxxxxx>
      Fixes: ea664c8245f3 ("md/raid5: need_this_block: tidy/fix last 
condition.")

  commit b0c783b32318bef29d64086fa812e8c659cb5b37
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Fri May 8 18:19:32 2015 +1000

      md/raid5: more incorrect BUG_ON in handle_stripe_fill.

      It is not incorrect to call handle_stripe_fill() when
      a batch of full-stripe writes is active.
      It is, however, a BUG if fetch_block() then decides
      it needs to actually fetch anything.

      So move the 'BUG_ON' to where it belongs.

      Signed-off-by: NeilBrown  <neilb@xxxxxxx>
      Fixes: 59fc630b8b5f ("RAID5: batch adjacent full stripe write")

  commit f18c1a35f62caccb527e8b0990c8801596e7c662
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Fri May 8 18:19:04 2015 +1000

      md/raid5: new alloc_stripe() to allocate an initialize a stripe.

      The new batch_lock and batch_list fields are being initialized in
      grow_one_stripe() but not in resize_stripes().  This causes a crash
      on resize.

      So separate the core initialization into a new function and call it
      from both allocation sites.

      Signed-off-by: NeilBrown <neilb@xxxxxxx>
      Fixes: 59fc630b8b5f ("RAID5: batch adjacent full stripe write")

  commit b6538fe32966e63ef38897860ef220980d904974
  Author: Heinz Mauelshagen <heinzm@xxxxxxxxxx>
  Date:   Fri May 8 18:19:03 2015 +1000

      md-raid0: conditional mddev->queue access to suit dm-raid

      This patch is a prerequisite for dm-raid "raid0" support to allow
      dm-raid to access the MD RAID0 personality doing unconditional
      accesses to mddev->queue, which is NULL in case of dm-raid stacked on
      top of MD.

      Most of the conditional mddev->queue accesses made it to upstream but
      this missing one, which prohibits md raid0 to set disk stack limits
      (being done in dm core in case of md underneath dm).

      Signed-off-by: Heinz Mauelshagen <heinzm@xxxxxxxxxx>
      Tested-by: Heinz Mauelshagen <heinzm@xxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 4de3bf66c61ef708d8f22d7f990339668a858e7d
  Author: Zhangfei Gao <zhangfei.gao@xxxxxxxxxx>
  Date:   Tue May 5 16:54:49 2015 +0800

      mmc: dw_mmc: dw_mci_get_cd check MMC_CAP_NONREMOVABLE

      When non-removable is used for emmc,  MMC_CAP_NONREMOVABLE should
      also be checked, otherwise detection fail since present=0

      Signed-off-by: Zhangfei Gao <zhangfei.gao@xxxxxxxxxx>
      Signed-off-by: Jaehoon Chung <jh80.chung@xxxxxxxxxxx>
      Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>

  commit 4b2447248325ac7b1654d362c0e9f050f79e0ffe
  Author: Zhangfei Gao <zhangfei.gao@xxxxxxxxxx>
  Date:   Thu Apr 30 22:16:28 2015 +0800

      mmc: dw_mmc: init desc in dw_mci_idmac_init

      Set 0 to des1 in 32bit case.
      Otherwise the random value of des1 will be used in
      dw_mci_translate_sglist: IDMAC_SET_BUFFER1_SIZE(desc, length)

      Signed-off-by: Fei Wang <w.f@xxxxxxxxxx>
      Signed-off-by: Zhangfei Gao <zhangfei.gao@xxxxxxxxxx>
      Signed-off-by: Jaehoon Chung <jh80.chung@xxxxxxxxxxx>
      Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>

  commit 3e0283a53f7d2f2dae7bc4aa7f3104cb5988018f
  Merge: 68c2f356 9a5d931
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu May 7 15:58:00 2015 -0700

      Merge tag 'pm+acpi-4.1-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

      Pull power management and ACPI fixes from Rafael Wysocki:
       "These include three regression fixes (PCI resources management,
        ACPI/PNP device enumeration, ACPI SBS on MacBook) and two ACPI
        documentation fixes related to GPIO.

        Specifics:

         - Fix for a PCI resources management regression introduced during the
           4.0 cycle and related to the handling of ACPI resources'
           Producer/Consumer flags that turn out to be useless (Jiang Liu)

         - Fix for a MacBook regression related to the Smart Battery Subsystem
           (SBS) driver causing various problems (stalls on boot, failure to
           detect or report battery) to happen and introduced during the 3.18
           cycle (Chris Bainbridge)

         - Fix for an ACPI/PNP device enumeration regression introduced during
           the 3.16 cycle caused by failing to include two PNP device IDs into
           the list of IDs that PNP device objects need to be created for
           (Witold Szczeponik)

         - Fixes for two minor mistakes in the ACPI GPIO properties
           documentation (Antonio Ospite, Rafael J Wysocki)"

      * tag 'pm+acpi-4.1-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / PNP: add two IDs to list for PNPACPI device enumeration
        ACPI / documentation: Fix ambiguity in the GPIO properties document
        ACPI / documentation: fix a sentence about GPIO resources
        ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook
        x86/PCI/ACPI: Make all resources except [io 0xcf8-0xcff] available on 
PCI bus

  commit 9a5d9315e41cc0dfc97a3b0a8e222d30566cf3fe
  Merge: 2c62e84 3349fb6 a00212e 622532b
  Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
  Date:   Thu May 7 21:24:34 2015 +0200

      Merge branches 'acpi-resources', 'acpi-battery', 'acpi-doc' and 'acpi-pnp'

      * acpi-resources:
        x86/PCI/ACPI: Make all resources except [io 0xcf8-0xcff] available on 
PCI bus

      * acpi-battery:
        ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook

      * acpi-doc:
        ACPI / documentation: Fix ambiguity in the GPIO properties document
        ACPI / documentation: fix a sentence about GPIO resources

      * acpi-pnp:
        ACPI / PNP: add two IDs to list for PNPACPI device enumeration

  commit b9a5e5e18fbf223502c0b2264c15024e393da928
  Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
  Date:   Thu May 7 21:19:39 2015 +0200

      ACPI / init: Fix the ordering of acpi_reserve_resources()

      Since acpi_reserve_resources() is defined as a device_initcall(),
      there's no guarantee that it will be executed in the right order
      with respect to the rest of the ACPI initialization code.  On some
      systems this leads to breakage if, for example, the address range
      that should be reserved for the ACPI fixed registers is given to
      the PCI host bridge instead if the race is won by the wrong code
      path.

      Fix this by turning acpi_reserve_resources() into a void function
      and calling it directly from within the ACPI initialization sequence.

      Reported-and-tested-by: George McCollister <george.mccollister@xxxxxxxxx>
      Link: http://marc.info/?t=143092384600002&r=1&w=2
      Cc: All applicable <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit 68c2f356c9ec65e1eb50c31690b095673dbd8010
  Merge: fbb7b92 7263b1b
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu May 7 11:18:34 2015 -0700

      Merge tag 'for-f2fs-4.1-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs

      Pull f2fs fixes from Jaegeuk Kim:
       "Fix a performance regression and a bug"

      * tag 'for-f2fs-4.1-rc3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs:
        f2fs: fix wrong error hanlder in f2fs_follow_link
        Revert "f2fs: enhance multi-threads performance"

  commit dc0e3db4ec7c1e73e3283ad39b68eff32b7dc8a1
  Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
  Date:   Tue May 5 14:35:49 2015 -0300

      ARM: multi_v7_defconfig: Select more FSL SoCs

      Select IMX50, IMX6SX and LS1021A SoC support.

      Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
      Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

  commit d68b35f845cc56472fa0d782449ff1549f00ec47
  Author: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
  Date:   Wed Apr 29 11:57:18 2015 +0200

      MAINTAINERS: replace an AT91 maintainer

      As some help is needed from an active maintainer, replace Andrew Victor
      by Alexandre Belloni in the ARM/Atmel MAINTAINERS' entry (aka AT91).
      Add an entry to the CREDITS file.

      Thanks Andrew for the great role you played during the early days of this
      product family.

      Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
      Acked-by: Andrew Victor <linux@xxxxxxxxxxxx>
      Acked-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

  commit 454be2af5b49612e7f20ceb6683d5809ce848bee
  Author: Mark Salter <msalter@xxxxxxxxxx>
  Date:   Tue Apr 28 13:09:32 2015 -0400

      drivers: CCI: fix used_mask init in validate_group()

      Currently in validate_group(), there is a static initializer
      for fake_pmu.used_mask which is based on CPU_BITS_NONE but
      the used_mask array size is based on CCI_PMU_MAX_HW_EVENTS.
      CCI_PMU_MAX_HW_EVENTS is not based on NR_CPUS, so CPU_BITS_NONE
      is not correct and will cause a build failure if NR_CPUS
      is set high enough to make CPU_BITS_NONE larger than used_mask.

      Reviewed-by: Mark Rutland <mark.rutland@xxxxxxx>
      Signed-off-by: Mark Salter <msalter@xxxxxxxxxx>
      Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

  commit bd1a6e7b47246dd91c02d46f9a373822a1d972cc
  Merge: 1e5f9ed 11133db
  Author: Arnd Bergmann <arnd@xxxxxxxx>
  Date:   Thu May 7 18:28:04 2015 +0200

      Merge tag 'stericsson-fixes-v4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes

      Merge "Ux500 fixes" from Linus Walleij:

      This fixes an MMC/SD configuration issue present for some time
      in the Ux500 DT but triggered by proper error handling in v4.1-rc1.

      * tag 'stericsson-fixes-v4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
        ARM: ux500: Enable GPIO regulator for SD-card for snowball
        ARM: ux500: Enable GPIO regulator for SD-card for HREF boards
        ARM: ux500: Move GPIO regulator for SD-card into board DTSs

  commit 1e5f9ed00d72c60f68d8cb75fd7d10abfb5947cd
  Merge: 443318e0 12392f5
  Author: Arnd Bergmann <arnd@xxxxxxxx>
  Date:   Thu May 7 18:26:48 2015 +0200

      Merge tag 'renesas-fixes-for-v4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

      Merge "Renesas ARM Based SoC Fixes for v4.1" from Simon Horman:

      * Fix adv7511 IRQ sensing on koelsch board

      * tag 'renesas-fixes-for-v4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: koelsch: Fix adv7511 IRQ sensing

  commit 443318e0b776562593f4d4fd770055a9d31add54
  Merge: d6ad446 e7309c2
  Author: Arnd Bergmann <arnd@xxxxxxxx>
  Date:   Thu May 7 18:25:38 2015 +0200

      Merge tag 'omap-for-v4.1/fixes-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

      Merge "omap fixes against v4.1-rc1" from Tony Lindgren:

      Fixes for omaps, mostly a fix for power power consumption
      creeping up during idle, and two l3-noc device fixes:

      - Fix power consumption creeping up with I2C4 staying on
      - Fix n900 microphone bias voltages
      - Fix dra7 l3-noc for host clock
      - Fix omap5 l3-noc id address decoding

      The rest are all just minor dts fixes:

      - Fix changed EXTCON_USB_GPIO_USB in defconfig
      - Fix missing isp and iva #iommu-cells property
      - Various beagle x15 dts fixes for pre-production changes
      - Fix am437x-sk display dts entries

      * tag 'omap-for-v4.1/fixes-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        bus: omap_l3_noc: Fix master id address decoding for OMAP5
        bus: omap_l3_noc: Fix offset for DRA7 CLK1_HOST_CLK1_2 instance
        ARM: dts: dra7: Fix efuse register size for ABB
        ARM: dts: am57xx-beagle-x15: Switch GPIO fan number
        ARM: dts: am57xx-beagle-x15: Switch UART mux pins
        ARM: dts: am437x-sk: reduce col-scan-delay-us
        ARM: dts: am437x-sk: fix for new newhaven display module revision
        ARM: dts: am57xx-beagle-x15: Fix RTC aliases
        ARM: dts: am57xx-beagle-x15: Fix IRQ type for mcp7941x
        ARM: dts: omap3: Add #iommu-cells to isp and iva iommu
        ARM: omap2plus_defconfig: Enable EXTCON_USB_GPIO
        ARM: dts: OMAP3-N900: Add microphone bias voltages
        ARM: OMAP2+: Fix omap off idle power consumption creeping up

  commit d6ad446dd75ef58bd383987e35ffd90d564f8080
  Merge: 654758a 1de2a66
  Author: Arnd Bergmann <arnd@xxxxxxxx>
  Date:   Thu May 7 18:24:32 2015 +0200

      Merge tag 'arm-soc/for-4.1/maintainers' of 
http://github.com/broadcom/stblinux into fixes

      Merge "MAINTAINERS update for Broadcom SoCs for 4.1 #2" from Florian 
Fainelli:

      This pull request contains 3 changes to the MAINTAINERS file for Broadcom 
SoCs:

      - add Ray and Scott for mach-bcm
      - remove Christian for mach-bcm
      - remove Marc for brcmstb

      * tag 'arm-soc/for-4.1/maintainers' of 
http://github.com/broadcom/stblinux:
        MAINTAINERS: Update brcmstb entry
        MAINTAINERS: Remove Christian Daudt for mach-bcm
        MAINTAINERS: Update mach-bcm maintainers list

  commit 654758ae09b4257f2f79c46ade01f973990d63f0
  Merge: 1be518b 750e30d
  Author: Arnd Bergmann <arnd@xxxxxxxx>
  Date:   Thu May 7 18:23:49 2015 +0200

      Merge tag 'mvebu-fixes-4.1' of git://git.infradead.org/linux-mvebu into 
fixes

      Pull "mvebu fix for 4.1" from Gregory CLEMENT:

      Disable the unused internal RTC in the dts of the OpenBlock AX3

      * tag 'mvebu-fixes-4.1' of git://git.infradead.org/linux-mvebu:
        ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC

  commit 1be518bd0bf77eedf9bbda5d5b25466f615813b2
  Merge: c92b83a fc9e38c
  Author: Arnd Bergmann <arnd@xxxxxxxx>
  Date:   Thu May 7 18:23:00 2015 +0200

      Merge tag 'fixes-for-v4.1-rc2' of https://github.com/rjarzmik/linux into 
fixes

      Merged "ARM: pxa: fixes for v4.1-rc2" from Robert Jarzmik:

      These fixes reenable the lubbock(pxa25x) and mainstone(pxa27x)
      platforms, which were broken since the gpio handling was
      converted to a driver, and the interrupt ordering broke the
      external interrupts of these systems.

      * tag 'fixes-for-v4.1-rc2' of https://github.com/rjarzmik/linux:
        ARM: pxa: lubbock: use new pxa_cplds driver
        ARM: pxa: mainstone: use new pxa_cplds driver
        ARM: pxa: pxa_cplds: add lubbock and mainstone IO

  commit c92b83a81ad09267619ccd077ddd2a5e321d8a61
  Merge: d6bcc80 68ce9a1
  Author: Arnd Bergmann <arnd@xxxxxxxx>
  Date:   Thu May 7 18:21:57 2015 +0200

      Merge tag 'imx-fixes-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

      Pull "The i.MX fixes for 4.1" from Shawn Guo:

       - A couple of imx23-olinuxino device tree fixes regarding to LED GPIO
         polarity and USB dr_mode setting
       - One i.MX28 device tree fix on AUART4 TX-DMA interrupt name
       - Add missing pwm-cells to PWM4 for i.MX25 device tree
       - Fix imx6q-phytec device tree to get correct USB VBUS control
       - Drop invalid pinctrl-assert-gpios property from imx6qdl-sabreauto
         device tree, which was sneaked in from vendor device tree
       - One fix on Wolfram's broken email address

      * tag 'imx-fixes-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
        ARM: dts: imx6qdl-sabreauto: remove pinctrl-assert-gpios
        ARM: dts: imx28: Fix AUART4 TX-DMA interrupt name
        ARM: dts: imx25: Add #pwm-cells to pwm4
        ARM: dts: imx6: phyFLEX: USB VBUS control is active-high
        ARM: mach-imx: devices: platform-sdhci-esdhc-imx: fix broken email 
address
        ARM: dts: imx23-olinuxino: Fix dr_mode of usb0
        ARM: dts: imx23-olinuxino: Fix polarity of LED GPIO

  commit d6bcc8069b27090f7e5bbe0521774f11c68a7001
  Merge: 5ebe6af 2a9fe3c
  Author: Arnd Bergmann <arnd@xxxxxxxx>
  Date:   Thu May 7 18:19:27 2015 +0200

      Merge tag 'v4.1-rockchip-socfixes1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

      Merge "ARM: rockchip: some soc-level fixes for 4.1" from Heiko Stübner:

      Two fixes from Chris Zhong, fixing some suspend oddities.
      And I've given up on the timer7 issue. While I initially thought
      devices would either have both the grave mmu issue requiring a uboot
      update and the timer7 issue or none, it looks like in all units in the
      field the mmu issue got fixed while the timer7 issue stayed on.
      So instead of making everybody wanting to use mainline jump through a
      hoop just make sure timer7 is on on boot before we init the arch-timer.

      * tag 'v4.1-rockchip-socfixes1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
        rockchip: make sure timer7 is enabled on rk3288 platforms
        ARM: rockchip: fix undefined instruction of reset_ctrl_regs
        ARM: rockchip: disable dapswjdp during suspend

  commit fbb7b92f16710a3848db25d0a4a2bb6fb7199061
  Merge: 7bbcd1b c5272a2
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu May 7 08:27:38 2015 -0700

      Merge tag 'pinctrl-v4.1-3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

      Pull pin control fixes from Linus Walleij:
       "Here is a smallish set of pin control fixes for the v4.1 cycle,
        collected the last two weeks:

         - fix a real nasty legacy bug that has screwed up the protection of
           adding pinctrl maps dynamically.  Normally this didn't happen so
           much but Dough Anderson ran into it and fixed it, kudos!

        - minor driver fixes for Qualcomm spmi, mediatek and Marvell drivers"

      * tag 'pinctrl-v4.1-3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: Don't just pretend to protect pinctrl_maps, do it for real
        pinctrl: mediatek: mtk-common: initialize unmask
        pinctrl: qcom-spmi-mpp: Fix input value report
        pinctrl: qcom-spmi: Fix pin direction configuration
        pinctrl: mvebu: Fix mapping of pin 63 (gpo -> gpio)

  commit 7bbcd1b86dcec982d2d3abec8db5da208b075f52
  Merge: 8cb7c15 db7d4d7
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu May 7 08:18:01 2015 -0700

      Merge tag 'vfio-v4.1-rc3' of git://github.com/awilliam/linux-vfio

      Pull vfio fixes from Alex Williamson:
       "Fix some undesirable behavior with the vfio device request interface:

         - increase verbosity of device request channel (Alex Williamson)

         - fix runaway interruptible timeout (Alex Williamson)"

      * tag 'vfio-v4.1-rc3' of git://github.com/awilliam/linux-vfio:
        vfio: Fix runaway interruptible timeout
        vfio-pci: Log device requests more verbosely

  commit 12e49feadff6d7b7ebbe852b36943a71524d8d34
  Author: Christian König <christian.koenig@xxxxxxx>
  Date:   Thu May 7 15:19:25 2015 +0200

      drm/radeon: stop trying to suspend UVD sessions

      Saving the current UVD state on suspend and restoring it on resume
      just doesn't work reliable. Just close cleanup all sessions on suspend.

      Signed-off-by: Christian König <christian.koenig@xxxxxxx>
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit d52cdfa4a0c6406bbfb33206341eaf1fb1555994
  Author: Christian König <christian.koenig@xxxxxxx>
  Date:   Thu May 7 15:19:24 2015 +0200

      drm/radeon: more strictly validate the UVD codec

      MPEG 2/4 are only supported since UVD3.

      Signed-off-by: Christian König <christian.koenig@xxxxxxx>
      CC: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit a1b403da70e038ca6c6c6fe434d1d873546873a3
  Author: Christian König <christian.koenig@xxxxxxx>
  Date:   Thu May 7 15:19:23 2015 +0200

      drm/radeon: make UVD handle checking more strict

      Invalid messages can crash the hw otherwise.

      Signed-off-by: Christian König <christian.koenig@xxxxxxx>
      CC: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit 29c63fe22a17c64e54016040cd882481bd45ee5a
  Author: Christian König <christian.koenig@xxxxxxx>
  Date:   Thu May 7 15:19:22 2015 +0200

      drm/radeon: make VCE handle check more strict

      Invalid handles can crash the hw.

      Signed-off-by: Christian König <christian.koenig@xxxxxxx>
      CC: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit 247c405098ab731ad9b58971e2cfbab116b54b45
  Author: Christian König <christian.koenig@xxxxxxx>
  Date:   Tue May 5 09:52:12 2015 +0200

      drm/radeon: fix userptr lockup

      We shouldn't try to reserve and wait for a BO that isn't bound. Otherwise
      we can run into a deadlock if we have a fault during binding the BO.

      Signed-off-by: Christian König <christian.koenig@xxxxxxx>
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit db12973cd581d4e79f4aadd0960948f268d15af7
  Author: monk.liu <monk.liu@xxxxxxx>
  Date:   Tue May 5 09:24:17 2015 +0200

      drm/radeon: fix userptr BO unpin bug v3

      Fixing a memory leak with userptrs.

      v2: clean up the loop, use an iterator instead
      v3: remove unused variable

      Signed-off-by: monk.liu <monk.liu@xxxxxxx>
      Signed-off-by: Christian König <christian.koenig@xxxxxxx>
      CC: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit 79b066bd76d501cfe8328142153da301f5ca11d1
  Author: Xihan Zhang <xihan.zhang@xxxxxxx>
  Date:   Tue Apr 28 23:48:40 2015 +0800

      drm/amdkfd: Initialize sdma vm when creating sdma queue

      This patch fixes a bug where sdma vm wasn't initialized when
      an sdma queue was created in HWS mode.

      This caused GPUVM faults to appear on dmesg and it is one of the
      causes that SDMA queues are not working.

      Signed-off-by: Xihan Zhang <xihan.zhang@xxxxxxx>
      Reviewed-by: Ben Goz <ben.goz@xxxxxxxx>
      Signed-off-by: Oded Gabbay <oded.gabbay@xxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit 42e08c78360e58516b6ac8af18a75a494f2967a2
  Author: Oded Gabbay <oded.gabbay@xxxxxxxxx>
  Date:   Tue May 5 11:15:07 2015 +0300

      drm/amdkfd: Don't report local memory size

      This patch sets the local memory size that is reported to userspace to 0.
      This is done to make sure that userspace won't try to allocate local 
memory
      for HSA.

      As long as amdkfd doesn't support allocating local memory for HSA,
      we need this patch.

      Signed-off-by: Oded Gabbay <oded.gabbay@xxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit 1e5ec956a057585adaa1365615c82810b2f5356f
  Author: Oded Gabbay <oded.gabbay@xxxxxxxxx>
  Date:   Tue Apr 14 14:13:18 2015 +0300

      drm/amdkfd: allow unregister process with queues

      Sometimes we might unregister process that have queues, because we 
couldn't
      preempt the queues. Until now we blocked it with BUG_ON but instead just
      print it as debug.

      Reviewed-by: Ben Goz <ben.goz@xxxxxxx>
      Signed-off-by: Oded Gabbay <oded.gabbay@xxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit 8cb7c15b32545f9e7c4f72ffa357353109967a7a
  Merge: 0e1dc42 b6b2bbe
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu May 7 07:04:33 2015 -0700

      Merge tag 'for-linus' of git://github.com/dledford/linux

      Pull infiniband updates from Doug Ledford:
       "Minor updates for 4.1-rc

        Most of the changes are fairly small and well confined.  The iWARP
        address reporting changes are the only ones that are a medium size.  I
        had these queued up prior to rc1, but due to the shuffle in
        maintainers, they did not get submitted when I expected.  My apologies
        for that.  I feel comfortable with them however due to the testing
        they've received, so I left them in this submission"

      * tag 'for-linus' of git://github.com/dledford/linux:
        MAINTAINERS: Update InfiniBand subsystem maintainer
        MAINTAINERS: add include/rdma/ to InfiniBand subsystem
        IPoIB/CM: Fix indentation level
        iw_cxgb4: Remove negative advice dmesg warnings
        IB/core: Fix unaligned accesses
        IB/core: change rdma_gid2ip into void function as it always return zero
        IB/qib: use arch_phys_wc_add()
        IB/qib: add acounting for MTRR
        IB/core: dma unmap optimizations
        IB/core: dma map/unmap locking optimizations
        RDMA/cxgb4: Report the actual address of the remote connecting peer
        RDMA/nes: Report the actual address of the remote connecting peer
        RDMA/core: Enable the iWarp Port Mapper to provide the actual address 
of the connecting peer to its clients
        iw_cxgb4: enforce qp/cq id requirements
        iw_cxgb4: use BAR2 GTS register for T5 kernel mode CQs
        iw_cxgb4: 32b platform fixes
        iw_cxgb4: Cleanup register defines/MACROS
        RDMA/CMA: Canonize IPv4 on IPV6 sockets properly

  commit 736a69ca8c99a595a523d2fece66491b89168da6
  Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
  Date:   Thu May 7 11:16:26 2015 +0100

      drm/i915: Drop PIPE-A quirk for 945GSE HP Mini

      Since the introduction of BIOS fb preservation, circa 3.17, we began
      encountering a failure during boot when trying to use force-detect
      before GEM was initialised. That bug is from

      commit 7fad798e16fecddd41c6a91728a09f0b9507e40c
      Author: Daniel Vetter <daniel.vetter@xxxxxxxx>
      Date:   Wed Jul 4 17:51:47 2012 +0200

          drm/i915: ensure the force pipe A quirk is actually followed

      but investigation of the affected machine revealed that it was using a
      PIPE-A quirk even though it was a 945GSE and the quirk is only supposed
      to be used to workaround a hardware issue on 830/845. That quirk was
      added for this HP Mini in

      commit 6b93afc564a5e74b0eaaa46c95f557449951b3b9
      Author: Bryce Harrington <bryce@xxxxxxxxxxxxxxxxxxx>
      Date:   Wed May 27 03:40:52 2009 -0700

          add pipe a force quirk for Dell mini

      in order to workaround an issue with the BIOS behaving strangely during
      lid-close. Since then we have a much larger hammer to thwart the BIOS
      after opening the lid and the PIPE-A quirk is no longer required.

      Reported-and-tested-by: Apostolos B. <barz621@xxxxxxxxx>
      References: https://bugs.freedesktop.org/show_bug.cgi?id=21960
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=87521
      Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>

  commit 2439fc4d71f71b47c8ace1f42eb46039222282a0
  Author: Toshiaki Makita <makita.toshiaki@xxxxxxxxxxxxx>
  Date:   Mon Apr 13 18:15:11 2015 +0900

      igb: Fix NULL assignment to incorrect variable in igb_reset_q_vector

      adapter->tx_ring is set to NULL where rx_ring should be.

      Fixes: 5536d2102a2d ("igb: Combine q_vector and ring allocation into a 
single function")
      Signed-off-by: Toshiaki Makita <makita.toshiaki@xxxxxxxxxxxxx>
      Tested-by: Aaron Brown <aaron.f.brown@xxxxxxxxx>
      Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

  commit c0a06ee185f2b785c7bd44c4fb6fcae80f7d1a54
  Author: Toshiaki Makita <makita.toshiaki@xxxxxxxxxxxxx>
  Date:   Mon Apr 13 18:15:10 2015 +0900

      igb: Fix oops on changing number of rings

      When changing the number of rings by ethtool -L, q_vectors are reused,
      which causes oops because of uninitialized pointers.

      - When an rx is reused as a tx, q_vector->rx.ring is not set to NULL, 
which
        misleads igb_poll() to determine that it has an rx ring although it
        actually points to the tx ring.
      - When a tx is reused as an rx, q_vector->rx.ring->skb
        (q_vector->ring[0].skb) has a value that was used as tx_stats before.

      Fix these problems by zeroing it out on reuseing it.

      Fixes: 02ef6e1d0b00 ("igb: Fix queue allocation method to accommodate 
changing during runtime")
      Signed-off-by: Toshiaki Makita <makita.toshiaki@xxxxxxxxxxxxx>
      Tested-by: Aaron Brown <aaron.f.brown@xxxxxxxxx>
      Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

  commit af77b9741300616e7d04264d0ee7ac9f8abb448f
  Author: Sonika Jindal <sonika.jindal@xxxxxxxxx>
  Date:   Thu May 7 13:59:28 2015 +0530

      drm/i915: Sink rate read should be saved in deca-kHz

      The sink rate read from supported link rate table is in KHz as per spec
      while in drm, the saved clock is in deca-KHz. So divide the link rate by
      10 before storing.

      Reading of rates was added by:
      commit fc0f8e25318f ("drm/i915/skl: Read sink supported rates from edp
      panel")

      Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
      Signed-off-by: Sonika Jindal <sonika.jindal@xxxxxxxxx>
      Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
      Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>

  commit ec59a65d694e5fd99d76565b93468c99ae8dff79
  Author: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
  Date:   Wed May 6 15:54:32 2015 +0200

      crypto: arm64/sha2-ce - prevent asm code finalization in final() path

      Ensure that the asm code finalization path is not triggered when
      invoked via final(), since it already takes care of that itself.

      Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
      Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>

  commit bf7883ebcb9c0880b8f5d22c1435a3de15283f0a
  Author: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
  Date:   Wed May 6 15:54:31 2015 +0200

      crypto: arm64/sha1-ce - prevent asm code finalization in final() path

      Ensure that the asm code finalization path is not triggered when
      invoked via final(), since it already takes care of that itself.

      Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
      Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>

  commit ac02c6ea6b404461829697792cd2b67f6a14d28a
  Author: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
  Date:   Mon May 4 11:00:16 2015 +0200

      crypto: arm64/crc32 - bring in line with generic CRC32

      The arm64 CRC32 (not CRC32c) implementation was not quite doing
      the same thing as the generic one. Fix that.

      Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
      Acked-by: Steve Capper <steve.capper@xxxxxxxxxx>
      Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>

  commit ac01ce1410fc2c7b5f3af5e9c972e6a412eee54f
  Author: Alex Bennée <alex.bennee@xxxxxxxxxx>
  Date:   Wed Apr 29 16:18:46 2015 +0100

      tracing: Make ftrace_print_array_seq compute buf_len

      The only caller to this function (__print_array) was getting it wrong by
      passing the array length instead of buffer length. As the element size
      was already being passed for other reasons it seems reasonable to push
      the calculation of buffer length into the function.

      Link: 
http://lkml.kernel.org/r/1430320727-14582-1-git-send-email-alex.bennee@xxxxxxxxxx

      Signed-off-by: Alex Bennée <alex.bennee@xxxxxxxxxx>
      Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>

  commit 1d3c61c2eb3fe4f96d3192212f1bdcee49ea55aa
  Author: Filipe Manana <fdmanana@xxxxxxxx>
  Date:   Wed May 6 11:17:01 2015 +0100

      Btrfs: fix wrong mapping flags for free space inode

      We were passing a flags value that differed from the intention in commit
      2b108268006e ("Btrfs: don't use highmem for free space cache pages").

      This caused problems in a ARM machine, leaving btrfs unusable there.

      Reported-by: Merlijn Wajer <merlijn@xxxxxxxxxx>
      Tested-by: Merlijn Wajer <merlijn@xxxxxxxxxx>
      Signed-off-by: Filipe Manana <fdmanana@xxxxxxxx>
      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit 0e1dc4274828f64fcb56fc7b950acdc5ff7a395f
  Merge: 3d54ac9 8746515
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed May 6 15:58:06 2015 -0700

      Merge tag 'for-linus-4.1b-rc2-tag' of 
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

      Pull xen bug fixes from David Vrabel:

       - fix blkback regression if using persistent grants

       - fix various event channel related suspend/resume bugs

       - fix AMD x86 regression with X86_BUG_SYSRET_SS_ATTRS

       - SWIOTLB on ARM now uses frames <4 GiB (if available) so device only
         capable of 32-bit DMA work.

      * tag 'for-linus-4.1b-rc2-tag' of 
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen: Add __GFP_DMA flag when xen_swiotlb_init gets free pages on ARM
        hypervisor/x86/xen: Unset X86_BUG_SYSRET_SS_ATTRS on Xen PV guests
        xen/events: Set irq_info->evtchn before binding the channel to CPU in 
__startup_pirq()
        xen/console: Update console event channel on resume
        xen/xenbus: Update xenbus event channel on resume
        xen/events: Clear cpu_evtchn_mask before resuming
        xen-pciback: Add name prefix to global 'permissive' variable
        xen: Suspend ticks on all CPUs during suspend
        xen/grant: introduce func gnttab_unmap_refs_sync()
        xen/blkback: safely unmap purge persistent grants

  commit 3d54ac9e35a69d19381420bb2fa1702d5bf73846
  Merge: d8fce2d c88d474
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed May 6 10:57:37 2015 -0700

      Merge branch 'x86-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

      Pull x86 fixes from Ingo Molnar:
       "EFI fixes, and FPU fix, a ticket spinlock boundary condition fix and
        two build fixes"

      * 'x86-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/fpu: Always restore_xinit_state() when use_eager_cpu()
        x86: Make cpu_tss available to external modules
        efi: Fix error handling in add_sysfs_runtime_map_entry()
        x86/spinlocks: Fix regression in spinlock contention detection
        x86/mm: Clean up types in xlate_dev_mem_ptr()
        x86/efi: Store upper bits of command line buffer address in 
ext_cmd_line_ptr
        efivarfs: Ensure VariableName is NUL-terminated

  commit d8fce2db7220fc46067c825fc417fb295eac7d0a
  Merge: 02f0f57 74f40c1
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed May 6 10:47:25 2015 -0700

      Merge branch 'perf-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

      Pull perf fixes from Ingo Molnar:
       "Mostly tooling fixes, but also an uncore PMU driver fix and an uncore
        PMU driver hardware-enablement addition"

      * 'perf-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf probe: Fix segfault if passed with ''.
        perf report: Fix -T/--threads option to work again
        perf bench numa: Fix immediate meeting of convergence condition
        perf bench numa: Fixes of --quiet argument
        perf bench futex: Fix hung wakeup tasks after requeueing
        perf probe: Fix bug with global variables handling
        perf top: Fix a segfault when kernel map is restricted.
        tools lib traceevent: Fix build failure on 32-bit arch
        perf kmem: Fix compiles on RHEL6/OL6
        tools lib api: Undefine _FORTIFY_SOURCE before setting it
        perf kmem: Consistently use PRIu64 for printing u64 values
        perf trace: Disable events and drain events when forked workload ends
        perf trace: Enable events when doing system wide tracing and starting a 
workload
        perf/x86/intel/uncore: Move PCI IDs for IMC to uncore driver
        perf/x86/intel/uncore: Add support for Intel Haswell ULT (lower power 
Mobile Processor) IMC uncore PMUs
        perf/x86/intel: Add cpu_(prepare|starting|dying) for core_pmu

  commit 02f0f5721e2c2791f57767c18a8ab94cdf48849d
  Merge: 5198b443 cb0f3f3
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed May 6 10:26:37 2015 -0700

      Merge branch 'core-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

      Pull RCU fix from Ingo Molnar:
       "An RCU Kconfig fix that eliminates an annoying interactive kconfig
        question for CONFIG_RCU_TORTURE_TEST_SLOW_INIT"

      * 'core-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        rcu: Control grace-period delays directly from value

  commit 0ff28d9f4674d781e492bcff6f32f0fe48cf0fed
  Author: Christophe Leroy <christophe.leroy@xxxxxx>
  Date:   Wed May 6 17:26:47 2015 +0200

      splice: sendfile() at once fails for big files

      Using sendfile with below small program to get MD5 sums of some files,
      it appear that big files (over 64kbytes with 4k pages system) get a
      wrong MD5 sum while small files get the correct sum.
      This program uses sendfile() to send a file to an AF_ALG socket
      for hashing.

      /* md5sum2.c */
      #include <stdio.h>
      #include <stdlib.h>
      #include <unistd.h>
      #include <string.h>
      #include <fcntl.h>
      #include <sys/socket.h>
      #include <sys/stat.h>
      #include <sys/types.h>
      #include <linux/if_alg.h>

      int main(int argc, char **argv)
      {
        int sk = socket(AF_ALG, SOCK_SEQPACKET, 0);
        struct stat st;
        struct sockaddr_alg sa = {
                .salg_family = AF_ALG,
                .salg_type = "hash",
                .salg_name = "md5",
        };
        int n;

        bind(sk, (struct sockaddr*)&sa, sizeof(sa));

        for (n = 1; n < argc; n++) {
                int size;
                int offset = 0;
                char buf[4096];
                int fd;
                int sko;
                int i;

                fd = open(argv[n], O_RDONLY);
                sko = accept(sk, NULL, 0);
                fstat(fd, &st);
                size = st.st_size;
                sendfile(sko, fd, &offset, size);
                size = read(sko, buf, sizeof(buf));
                for (i = 0; i < size; i++)
                        printf("%2.2x", buf[i]);
                printf("  %s\n", argv[n]);
                close(fd);
                close(sko);
        }
        exit(0);
      }

      Test below is done using official linux patch files. First result is
      with a software based md5sum. Second result is with the program above.

      root@vgoip:~# ls -l patch-3.6.*
      -rw-r--r--    1 root     root         64011 Aug 24 12:01 patch-3.6.2.gz
      -rw-r--r--    1 root     root         94131 Aug 24 12:01 patch-3.6.3.gz

      root@vgoip:~# md5sum patch-3.6.*
      b3ffb9848196846f31b2ff133d2d6443  patch-3.6.2.gz
      c5e8f687878457db77cb7158c38a7e43  patch-3.6.3.gz

      root@vgoip:~# ./md5sum2 patch-3.6.*
      b3ffb9848196846f31b2ff133d2d6443  patch-3.6.2.gz
      5fd77b24e68bb24dcc72d6e57c64790e  patch-3.6.3.gz

      After investivation, it appears that sendfile() sends the files by blocks
      of 64kbytes (16 times PAGE_SIZE). The problem is that at the end of each
      block, the SPLICE_F_MORE flag is missing, therefore the hashing operation
      is reset as if it was the end of the file.

      This patch adds SPLICE_F_MORE to the flags when more data is pending.

      With the patch applied, we get the correct sums:

      root@vgoip:~# md5sum patch-3.6.*
      b3ffb9848196846f31b2ff133d2d6443  patch-3.6.2.gz
      c5e8f687878457db77cb7158c38a7e43  patch-3.6.3.gz

      root@vgoip:~# ./md5sum2 patch-3.6.*
      b3ffb9848196846f31b2ff133d2d6443  patch-3.6.2.gz
      c5e8f687878457db77cb7158c38a7e43  patch-3.6.3.gz

      Signed-off-by: Christophe Leroy <christophe.leroy@xxxxxx>
      Signed-off-by: Jens Axboe <axboe@xxxxxx>

  commit c5272a28566b00cce79127ad382406e0a8650690
  Author: Doug Anderson <dianders@xxxxxxxxxxxx>
  Date:   Fri May 1 09:01:27 2015 -0700

      pinctrl: Don't just pretend to protect pinctrl_maps, do it for real

      Way back, when the world was a simpler place and there was no war, no
      evil, and no kernel bugs, there was just a single pinctrl lock.  That
      was how the world was when (57291ce pinctrl: core device tree mapping
      table parsing support) was written.  In that case, there were
      instances where the pinctrl mutex was already held when
      pinctrl_register_map() was called, hence a "locked" parameter was
      passed to the function to indicate that the mutex was already locked
      (so we shouldn't lock it again).

      A few years ago in (42fed7b pinctrl: move subsystem mutex to
      pinctrl_dev struct), we switched to a separate pinctrl_maps_mutex.
      ...but (oops) we forgot to re-think about the whole "locked" parameter
      for pinctrl_register_map().  Basically the "locked" parameter appears
      to still refer to whether the bigger pinctrl_dev mutex is locked, but
      we're using it to skip locks of our (now separate) pinctrl_maps_mutex.

      That's kind of a bad thing(TM).  Probably nobody noticed because most
      of the calls to pinctrl_register_map happen at boot time and we've got
      synchronous device probing.  ...and even cases where we're
      asynchronous don't end up actually hitting the race too often.  ...but
      after banging my head against the wall for a bug that reproduced 1 out
      of 1000 reboots and lots of looking through kgdb, I finally noticed
      this.

      Anyway, we can now safely remove the "locked" parameter and go back to
      a war-free, evil-free, and kernel-bug-free world.

      Fixes: 42fed7ba44e4 ("pinctrl: move subsystem mutex to pinctrl_dev 
struct")
      Signed-off-by: Doug Anderson <dianders@xxxxxxxxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit 8746515d7f04c9ea94cf43e2db1fd2cfca93276d
  Author: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
  Date:   Fri Apr 24 10:16:40 2015 +0100

      xen: Add __GFP_DMA flag when xen_swiotlb_init gets free pages on ARM

      Make sure that xen_swiotlb_init allocates buffers that are DMA capable
      when at least one memblock is available below 4G. Otherwise we assume
      that all devices on the SoC can cope with >4G addresses. We do this on
      ARM and ARM64, where dom0 is mapped 1:1, so pfn == mfn in this case.

      No functional changes on x86.

      From: Chen Baozi <baozich@xxxxxxxxx>

      Signed-off-by: Chen Baozi <baozich@xxxxxxxxx>
      Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
      Tested-by: Chen Baozi <baozich@xxxxxxxxx>
      Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
      Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>

  commit d2d05c65c40e067ca5898399069053f095c67d6f
  Author: Tony Lindgren <tony@xxxxxxxxxxx>
  Date:   Thu Apr 23 16:54:17 2015 -0700

      gpio: omap: Fix regression for MPUIO interrupts

      At some point with all the GPIO clean-up we've broken the
      MPUIO interrupts. Those are just a little bit different from
      the GPIO interrupts, so we can fix it up just by setting
      different irqchip functions for it. And then we can just
      remove all old code trying to do the same.

      Cc: Aaro Koskinen <aaro.koskinen@xxxxxx>
      Cc: Javier Martinez Canillas <javier@xxxxxxxxxxxx>
      Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
      Cc: Nishanth Menon <nm@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
      Reviewed-by: Grygorii Strashko <grygorii.strashko@xxxxxxxxxx>
      Acked-by: Santosh Shilimkar <ssantosh@xxxxxxxxxx>
      Reviewed-by: Felipe Balbi <balbi@xxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit 4e93b9a6abc0d028daf3c8a00cb77b679d8a4df4
  Author: Chuanxiao Dong <chuanxiao.dong@xxxxxxxxx>
  Date:   Tue Aug 12 12:01:30 2014 +0800

      mmc: card: Don't access RPMB partitions for normal read/write

      During kernel boot, it will try to read some logical sectors
      of each block device node for the possible partition table.

      But since RPMB partition is special and can not be accessed
      by normal eMMC read / write CMDs, it will cause below error
      messages during kernel boot:
      ...
       mmc0: Got data interrupt 0x00000002 even though no data operation was in 
progress.
       mmcblk0rpmb: error -110 transferring data, sector 0, nr 32, cmd response 
0x900, card status 0xb00
       mmcblk0rpmb: retrying using single block read
       mmcblk0rpmb: timed out sending r/w cmd command, card status 0x400900
       mmcblk0rpmb: timed out sending r/w cmd command, card status 0x400900
       mmcblk0rpmb: timed out sending r/w cmd command, card status 0x400900
       mmcblk0rpmb: timed out sending r/w cmd command, card status 0x400900
       mmcblk0rpmb: timed out sending r/w cmd command, card status 0x400900
       mmcblk0rpmb: timed out sending r/w cmd command, card status 0x400900
       end_request: I/O error, dev mmcblk0rpmb, sector 0
       Buffer I/O error on device mmcblk0rpmb, logical block 0
       end_request: I/O error, dev mmcblk0rpmb, sector 8
       Buffer I/O error on device mmcblk0rpmb, logical block 1
       end_request: I/O error, dev mmcblk0rpmb, sector 16
       Buffer I/O error on device mmcblk0rpmb, logical block 2
       end_request: I/O error, dev mmcblk0rpmb, sector 24
       Buffer I/O error on device mmcblk0rpmb, logical block 3
      ...

      This patch will discard the access request in eMMC queue if
      it is RPMB partition access request. By this way, it avoids
      trigger above error messages.

      Fixes: 090d25fe224c ("mmc: core: Expose access to RPMB partition")
      Signed-off-by: Yunpeng Gao <yunpeng.gao@xxxxxxxxx>
      Signed-off-by: Chuanxiao Dong <chuanxiao.dong@xxxxxxxxx>
      Tested-by: Michael Shigorin <mike@xxxxxxxxxxxx>
      Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>

  commit bad4371d87d1d1ed1aecd9c9cc21c41ac3f289c8
  Author: Takeshi Kihara <takeshi.kihara.df@xxxxxxxxxxx>
  Date:   Thu Apr 30 02:03:51 2015 +0900

      mmc: sh_mmcif: Fix timeout value for command request

      f9fd54f22e ("mmc: sh_mmcif: Use msecs_to_jiffies() for host->timeout")
      changed the timeout value from 1000 jiffies to 1s. In the case where
      HZ is 1000 the values are the same. However, for smaller HZ values the
      timeout is now smaller, 1s instead of 10s in the case of HZ=100.

      Since the timeout occurs in spite of a normal data transfer a timeout of
      10s seems more appropriate. This restores the previous timeout in the
      case where HZ=100 and results in an increase over the previous timeout
      for larger values of HZ.

      Fixes: f9fd54f22e ("mmc: sh_mmcif: Use msecs_to_jiffies() for 
host->timeout")
      Signed-off-by: Takeshi Kihara <takeshi.kihara.df@xxxxxxxxxxx>
      [horms: rewrote changelog to refer to HZ]
      Signed-off-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>
      Signed-off-by: Yoshihiro Kaneko <ykaneko0929@xxxxxxxxx>
      Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>

  commit c88d47480d300eaad80c213d50c9bf6077fc49bc
  Author: Bobby Powers <bobbypowers@xxxxxxxxx>
  Date:   Mon Apr 27 08:10:41 2015 -0700

      x86/fpu: Always restore_xinit_state() when use_eager_cpu()

      The following commit:

        f893959b0898 ("x86/fpu: Don't abuse drop_init_fpu() in flush_thread()")

      removed drop_init_fpu() usage from flush_thread(). This seems to break
      things for me - the Go 1.4 test suite fails all over the place with
      floating point comparision errors (offending commit found through
      bisection).

      The functional change was that flush_thread() after this commit
      only calls restore_init_xstate() when both use_eager_fpu() and
      !used_math() are true. drop_init_fpu() (now fpu_reset_state()) calls
      restore_init_xstate() regardless of whether current used_math() - apply
      the same logic here.

      Switch used_math() -> tsk_used_math(tsk) to consistently use the grabbed
      tsk instead of current, like in the rest of flush_thread().

      Tested-by: Dave Hansen <dave.hansen@xxxxxxxxx>
      Signed-off-by: Bobby Powers <bobbypowers@xxxxxxxxx>
      Signed-off-by: Borislav Petkov <bp@xxxxxxx>
      Acked-by: Oleg Nesterov <oleg@xxxxxxxxxx>
      Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
      Cc: Borislav Petkov <bp@xxxxxxxxx>
      Cc: Fenghua Yu <fenghua.yu@xxxxxxxxx>
      Cc: H. Peter Anvin <hpa@xxxxxxxxx>
      Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
      Cc: Pekka Riikonen <priikone@xxxxxx>
      Cc: Quentin Casasnovas <quentin.casasnovas@xxxxxxxxxx>
      Cc: Rik van Riel <riel@xxxxxxxxxx>
      Cc: Suresh Siddha <sbsiddha@xxxxxxxxx>
      Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
      Fixes: f893959b ("x86/fpu: Don't abuse drop_init_fpu() in flush_thread()")
      Link: 
http://lkml.kernel.org/r/1430147441-9820-1-git-send-email-bobbypowers@xxxxxxxxx
      Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>

  commit 9fcb1704d1d51b12e2f03c78bca013d0cbbb7c98
  Author: Jani Nikula <jani.nikula@xxxxxxxxx>
  Date:   Tue May 5 16:32:12 2015 +0300

      drm/i915/dp: there is no audio on port A

      The eDP port A register on PCH split platforms has a slightly different
      register layout from the other ports, with bit 6 being either alternate
      scrambler reset or reserved, depending on the generation. Our
      misinterpretation of the bit as audio has lead to warning.

      Fix this by not enabling audio on port A, since none of our platforms
      support audio on port A anyway.

      v2: DDI doesn't have audio on port A either (Sivakumar Thulasimani)

      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89958
      Reported-and-tested-by: Chris Bainbridge <chris.bainbridge@xxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@xxxxxxxxx>
      Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>

  commit c102cb097d9371c2c60049d041ab1f8bdca5ccc2
  Merge: de71ad2 d67e199
  Author: Ingo Molnar <mingo@xxxxxxxxxx>
  Date:   Wed May 6 08:29:37 2015 +0200

      Merge tag 'efi-urgent' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent

      Pull EFI fixes from Matt Fleming:

       * Avoid garbage names in efivarfs due to buggy firmware by zeroing
         EFI variable name. (Ross Lagerwall)

       * Stop erroneously dropping upper 32 bits of boot command line pointer
         in EFI boot stub and stash them in ext_cmd_line_ptr. (Roy Franz)

       * Fix double-free bug in error handling code path of EFI runtime map
         code. (Dan Carpenter)

      Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>

  commit 74f40c1f437674f5ab4a3977f1894ea6db535dee
  Merge: 8cc67c3 e59d29e
  Author: Ingo Molnar <mingo@xxxxxxxxxx>
  Date:   Wed May 6 04:54:11 2015 +0200

      Merge tag 'perf-urgent-for-mingo' of 
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

      Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

        - Fix 'perf probe -a' segfault if passed with '' (Wang Nan)

        - Fix report -T/--threads option (Namhyung Kim)

      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
      Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>

  commit 5198b44374adb3f6143459a03c37f103f8a09548
  Merge: 2a171aa 3d69d43
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue May 5 19:42:01 2015 -0700

      Merge tag 'for-linus-4.1-1' of git://git.code.sf.net/p/openipmi/linux-ipmi

      Pull IPMI fixes from Corey Minyard:
       "Lots of minor IPMI fixes, especially ones that have have come up since
        the SSIF driver has been in the main kernel for a while"

      * tag 'for-linus-4.1-1' of git://git.code.sf.net/p/openipmi/linux-ipmi:
        ipmi: Fix multi-part message handling
        ipmi: Add alert handling to SSIF
        ipmi: Fix a problem that messages are not issued in run_to_completion 
mode
        ipmi: Report an error if ACPI _IFT doesn't exist
        ipmi: Remove unused including <linux/version.h>
        ipmi: Don't report err in the SI driver for SSIF devices
        ipmi: Remove incorrect use of seq_has_overflowed
        ipmi:ssif: Ignore spaces when comparing I2C adapter names
        ipmi_ssif: Fix the logic on user-supplied addresses

  commit 2a171aa21afcd43f6cee574154d8c8db905351e5
  Merge: 3ce05a4 489405f
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue May 5 18:52:13 2015 -0700

      Merge branch 'akpm' (patches from Andrew)

      Merge misc fixes from Andrew Morton:
       "16 patches

        This includes a new rtc driver for the Abracon AB x80x and isn't very
        appropriate for -rc2.  It was still being fiddled with a bit during
        the merge window and I fell asleep during -rc1"

      [ So I took the new driver, it seems small and won't regress anything.
        I'm a softy.   - Linus ]

      * emailed patches from Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>:
        rtc: armada38x: fix concurrency access in armada38x_rtc_set_time
        ocfs2: dlm: fix race between purge and get lock resource
        nilfs2: fix sanity check of btree level in nilfs_btree_root_broken()
        util_macros.h: have array pointer point to array of constants
        configfs: init configfs module earlier at boot time
        mm/hwpoison-inject: check PageLRU of hpage
        mm/hwpoison-inject: fix refcounting in no-injection case
        mm: soft-offline: fix num_poisoned_pages counting on concurrent events
        rtc: add rtc-abx80x, a driver for the Abracon AB x80x i2c rtc
        Documentation: bindings: add abracon,abx80x
        kasan: show gcc version requirements in Kconfig and Documentation
        mm/memory-failure: call shake_page() when error hits thp tail page
        lib: delete lib/find_last_bit.c
        MAINTAINERS: add co-maintainer for LED subsystem
        zram: add Designated Reviewer for zram in MAINTAINERS
        revert "zram: move compact_store() to sysfs functions area"

  commit 3ce05a4e740539a3e9d48456e2b046b7240df3ff
  Merge: d9cee5d df6dd1b
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue May 5 18:14:04 2015 -0700

      Merge tag 'platform-drivers-x86-v4.1-2' of 
git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

      Pull x86 platform driver fixes from Darren Hart:
       "This includes a trivial warning and adding a Lenovo laptop to an
        existing quirk.

        I've held off on things like the latter in the past, but I didn't feel
        it was risky enough to push out to 4.2.

         - thinkpad_acpi:
              Fix warning for static not at beginning

         - ideapad_laptop:
              Add Lenovo G40-30 to devices without radio switch"

      * tag 'platform-drivers-x86-v4.1-2' of 
git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        thinkpad_acpi: Fix warning for static not at beginning
        ideapad_laptop: Add Lenovo G40-30 to devices without radio switch

  commit 3d69d43baa2749c3d187ce70940d7aebe609e149
  Author: Corey Minyard <cminyard@xxxxxxxxxx>
  Date:   Wed Apr 29 17:59:21 2015 -0500

      ipmi: Fix multi-part message handling

      Lots of little fixes for multi-part messages:

      The values was not being re-initialized, if something went wrong
      handling a multi-part message and it got left in a bad state, it
      might be an issue.

      The commands were not correct when issuing multi-part reads, the
      code was not passing in the proper value for commands.  Also clean
      up some minor formatting issues.

      Get the block number from the right location, limit the maximum send
      message size to 63 bytes and explain why, and fix some minor sylistic
      issues.

      Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx>

  commit 9162052173d2381e2bbabc224c3c1457acb4c54c
  Author: Corey Minyard <cminyard@xxxxxxxxxx>
  Date:   Fri Apr 24 07:46:06 2015 -0500

      ipmi: Add alert handling to SSIF

      The SSIF interface can optionally have an SMBus alert come in when
      data is ready.  Unfortunately, the IPMI spec gives wiggle room to
      the implementer to allow them to always have the alert enabled,
      even if the driver doesn't enable it.  So implement alerts.
      If you don't in this situation, the SMBus alert handling will
      constantly complain.

      Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx>

  commit 9f8127048ab8b47b43f8aeaaec9fec2da44be9a1
  Author: Hidehiro Kawai <hidehiro.kawai.ez@xxxxxxxxxxx>
  Date:   Thu Apr 23 11:16:44 2015 +0900

      ipmi: Fix a problem that messages are not issued in run_to_completion mode

      start_next_msg() issues a message placed in smi_info->waiting_msg
      if it is non-NULL.  However, sender() sets a message to
      smi_info->curr_msg and NULL to smi_info->waiting_msg in the context
      of run_to_completion mode.  As the result, it leads an infinite
      loop by waiting the completion of unissued message when leaving
      dying message after kernel panic.

      sender() should set the message to smi_info->waiting_msg not
      curr_msg.

      Signed-off-by: Hidehiro Kawai <hidehiro.kawai.ez@xxxxxxxxxxx>
      Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx>

  commit a182a4b2b3e85a559ea2cd3545f4311db41325f2
  Author: Corey Minyard <cminyard@xxxxxxxxxx>
  Date:   Wed Apr 22 13:25:40 2015 -0500

      ipmi: Report an error if ACPI _IFT doesn't exist

      When probing an ACPI table, report a specific error, instead of just
      returning an error, if _IFT doesn't exist.

      Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx>

  commit 15c5725e6b86cb8dfc4ca655a22005cc678a6f6f
  Author: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 16 21:09:53 2015 +0800

      ipmi: Remove unused including <linux/version.h>

      Remove including <linux/version.h> that don't need it.

      Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
      Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx>

  commit 489405fe5ed38e65f6f82f131a39c67f3bae6045
  Author: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
  Date:   Tue May 5 16:24:05 2015 -0700

      rtc: armada38x: fix concurrency access in armada38x_rtc_set_time

      While setting the time, the RTC TIME register should not be accessed.
      However due to hardware constraints, setting the RTC time involves
      sleeping during 100ms.  This sleep was done outside the critical section
      protected by the spinlock, so it was possible to read the RTC TIME
      register and get an incorrect value.  This patch introduces a mutex for
      protecting the RTC TIME access, unlike the spinlock it is allowed to
      sleep in a critical section protected by a mutex.

      The RTC STATUS register can still be used from the interrupt handler but
      it has no effect on setting the time.

      Signed-off-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
      Acked-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
      Acked-by: Andrew Lunn <andrew@xxxxxxx>
      Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>      [4.0]
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit b1432a2a35565f538586774a03bf277c27fc267d
  Author: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
  Date:   Tue May 5 16:24:02 2015 -0700

      ocfs2: dlm: fix race between purge and get lock resource

      There is a race window in dlm_get_lock_resource(), which may return a
      lock resource which has been purged.  This will cause the process to
      hang forever in dlmlock() as the ast msg can't be handled due to its
      lock resource not existing.

          dlm_get_lock_resource {
              ...
              spin_lock(&dlm->spinlock);
              tmpres = __dlm_lookup_lockres_full(dlm, lockid, namelen, hash);
              if (tmpres) {
                   spin_unlock(&dlm->spinlock);
                   >>>>>>>> race window, dlm_run_purge_list() may run and purge
                                    the lock resource
                   spin_lock(&tmpres->spinlock);
                   ...
                   spin_unlock(&tmpres->spinlock);
              }
          }

      Signed-off-by: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
      Cc: Joseph Qi <joseph.qi@xxxxxxxxxx>
      Cc: Mark Fasheh <mfasheh@xxxxxxxx>
      Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit d8fd150fe3935e1692bf57c66691e17409ebb9c1
  Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
  Date:   Tue May 5 16:24:00 2015 -0700

      nilfs2: fix sanity check of btree level in nilfs_btree_root_broken()

      The range check for b-tree level parameter in nilfs_btree_root_broken()
      is wrong; it accepts the case of "level == NILFS_BTREE_LEVEL_MAX" even
      though the level is limited to values in the range of 0 to
      (NILFS_BTREE_LEVEL_MAX - 1).

      Since the level parameter is read from storage device and used to index
      nilfs_btree_path array whose element count is NILFS_BTREE_LEVEL_MAX, it
      can cause memory overrun during btree operations if the boundary value
      is set to the level parameter on device.

      This fixes the broken sanity check and adds a comment to clarify that
      the upper bound NILFS_BTREE_LEVEL_MAX is exclusive.

      Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 05836c378c7af9527b98a83746f32c7289a5f3c8
  Author: Guenter Roeck <linux@xxxxxxxxxxxx>
  Date:   Tue May 5 16:23:57 2015 -0700

      util_macros.h: have array pointer point to array of constants

      Using the new find_closest() macro can result in the following sparse
      warnings.

        drivers/hwmon/lm85.c:194:16: warning:
                        incorrect type in initializer (different modifiers)
        drivers/hwmon/lm85.c:194:16:    expected int *__fc_a
        drivers/hwmon/lm85.c:194:16:    got int static const [toplevel] 
*<noident>
        drivers/hwmon/lm85.c:210:16: warning:
                        incorrect type in initializer (different modifiers)
        drivers/hwmon/lm85.c:210:16:    expected int *__fc_a
        drivers/hwmon/lm85.c:210:16:    got int const *map

      This is because the array passed to find_closest() will typically be
      declared as array of constants, but the macro declares a non-constant
      pointer to it.

      Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Cc: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>

      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit f5b697700c86d7d01489202bfd37d86665754afd
  Author: Daniel Baluta <daniel.baluta@xxxxxxxxx>
  Date:   Tue May 5 16:23:54 2015 -0700

      configfs: init configfs module earlier at boot time

      We need this earlier in the boot process to allow various subsystems to
      use configfs (e.g Industrial IIO).

      Also, debugfs is at core_initcall level and configfs should be on the same
      level from infrastructure point of view.

      Signed-off-by: Daniel Baluta <daniel.baluta@xxxxxxxxx>
      Suggested-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
      Reviewed-by: Christoph Hellwig <hch@xxxxxx>
      Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
      Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit e386eed89c764f102fcc3c0d4c78c65a357f7399
  Author: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
  Date:   Tue May 5 16:23:52 2015 -0700

      mm/hwpoison-inject: check PageLRU of hpage

      Hwpoison injector checks PageLRU of the raw target page to find out
      whether the page is an appropriate target, but current code now filters
      out thp tail pages, which prevents us from testing for such cases via this
      interface.  So let's check hpage instead of p.

      Signed-off-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
      Acked-by: Dean Nelson <dnelson@xxxxxxxxxx>
      Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
      Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
      Cc: Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 7ea434a4eb49db83d17cc076f2267704c52938ae
  Author: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
  Date:   Tue May 5 16:23:49 2015 -0700

      mm/hwpoison-inject: fix refcounting in no-injection case

      Hwpoison injection via debugfs:hwpoison/corrupt-pfn takes a refcount of
      the target page.  But current code doesn't release it if the target page
      is not supposed to be injected, which results in memory leak.  This patch
      simply adds the refcount releasing code.

      Signed-off-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
      Acked-by: Dean Nelson <dnelson@xxxxxxxxxx>
      Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
      Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
      Cc: Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 602498f9aa43d4951eece3fd6ad95a6d0a78d537
  Author: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
  Date:   Tue May 5 16:23:46 2015 -0700

      mm: soft-offline: fix num_poisoned_pages counting on concurrent events

      If multiple soft offline events hit one free page/hugepage concurrently,
      soft_offline_page() can handle the free page/hugepage multiple times,
      which makes num_poisoned_pages counter increased more than once.  This
      patch fixes this wrong counting by checking TestSetPageHWPoison for normal
      papes and by checking the return value of dequeue_hwpoisoned_huge_page()
      for hugepages.

      Signed-off-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
      Acked-by: Dean Nelson <dnelson@xxxxxxxxxx>
      Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>      [3.14+]
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 4d61ff6b9960cb00cf2c12abd5769aa2dd475415
  Author: Philippe De Muyter <phdm@xxxxxxxxx>
  Date:   Tue May 5 16:23:44 2015 -0700

      rtc: add rtc-abx80x, a driver for the Abracon AB x80x i2c rtc

      This is a basic driver for the ultra-low-power Abracon AB x80x series of 
RTC
      chips. It supports in particular, the supersets AB0805 and AB1805.
      It allows reading and writing the time, and enables the supercapacitor/
      battery charger.

      [arnd@xxxxxxxx: abx805 depends on i2c]
      [alexandre.belloni@xxxxxxxxxxxxxxxxxx: renam buffer from date to buf in 
abx80x_rtc_read_time()]
      Signed-off-by: Philippe De Muyter <phdm@xxxxxxxxx>
      Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
      Signed-off-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
      Cc: Paul Bolle <pebolle@xxxxxxxxxx>
      Cc: Arnd Bergmann <arnd@xxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit c71f1e05e62f3eb843b6458eeb7298f269b34b1e
  Author: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
  Date:   Tue May 5 16:23:41 2015 -0700

      Documentation: bindings: add abracon,abx80x

      Document the bindings for abracon,abx80x and related compatibles.

      Signed-off-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
      Cc: Philippe De Muyter <phdm@xxxxxxxxx>
      Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
      Cc: Arnd Bergmann <arnd@xxxxxxxx>
      Cc: Paul Bolle <pebolle@xxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 01e76903f655a4d88c2e09d3182436c65f6e1213
  Author: Joe Perches <joe@xxxxxxxxxxx>
  Date:   Tue May 5 16:23:38 2015 -0700

      kasan: show gcc version requirements in Kconfig and Documentation

      The documentation shows a need for gcc > 4.9.2, but it's really >=.  The
      Kconfig entries don't show require versions so add them.  Correct a
      latter/later typo too.  Also mention that gcc 5 required to catch out of
      bounds accesses to global and stack variables.

      Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
      Signed-off-by: Andrey Ryabinin <a.ryabinin@xxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 09789e5de18e4e442870b2d700831f5cb802eb05
  Author: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
  Date:   Tue May 5 16:23:35 2015 -0700

      mm/memory-failure: call shake_page() when error hits thp tail page

      Currently memory_failure() calls shake_page() to sweep pages out from
      pcplists only when the victim page is 4kB LRU page or thp head page.
      But we should do this for a thp tail page too.

      Consider that a memory error hits a thp tail page whose head page is on
      a pcplist when memory_failure() runs.  Then, the current kernel skips
      shake_pages() part, so hwpoison_user_mappings() returns without calling
      split_huge_page() nor try_to_unmap() because PageLRU of the thp head is
      still cleared due to the skip of shake_page().

      As a result, me_huge_page() runs for the thp, which is broken behavior.

      One effect is a leak of the thp.  And another is to fail to isolate the
      memory error, so later access to the error address causes another MCE,
      which kills the processes which used the thp.

      This patch fixes this problem by calling shake_page() for thp tail case.

      Fixes: 385de35722c9 ("thp: allow a hwpoisoned head page to be put back to 
LRU")
      Signed-off-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
      Reviewed-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
      Acked-by: Dean Nelson <dnelson@xxxxxxxxxx>
      Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
      Cc: Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx>
      Cc: Jin Dongming <jin.dongming@xxxxxxxxxxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>      [3.4+]
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 7d616e4ddb9c0754ed6245a43332d5b867e4db11
  Author: Yury Norov <yury.norov@xxxxxxxxx>
  Date:   Tue May 5 16:23:33 2015 -0700

      lib: delete lib/find_last_bit.c

      The file lib/find_last_bit.c was no longer used and supposed to be
      deleted by commit 8f6f19dd51 ("lib: move find_last_bit to
      lib/find_next_bit.c") but that delete didn't happen.  This gets rid of
      it.

      Signed-off-by: Yury Norov <yury.norov@xxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 48b945a19cf6e7e548b2ce545ec88f93284ab276
  Author: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue May 5 16:23:30 2015 -0700

      MAINTAINERS: add co-maintainer for LED subsystem

      Add myself (Jacek Anaszewski) as a co-maintainer for the LED subsystem.

      Signed-off-by: Jacek Anaszewski <j.anaszewski@xxxxxxxxxxx>
      Acked-by: Bryan Wu <cooloney@xxxxxxxxx>
      Cc: Richard Purdie <rpurdie@xxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 74f3037c4015f3a440dc4cb4e31477875fa9791c
  Author: Minchan Kim <minchan@xxxxxxxxxx>
  Date:   Tue May 5 16:23:28 2015 -0700

      zram: add Designated Reviewer for zram in MAINTAINERS

      Sergey Senozhatsky has contributed/reviewed to zram for a long time.  He
      is really helpful for maintaining zram so I want for him to continue
      helping me as Designated Reviewer unless he hates it.

      Signed-off-by: Minchan Kim <minchan@xxxxxxxxxx>
      Cc: Sergey Senozhatsky <sergey.senozhatsky.work@xxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 99ebbd30e3640f6addb37f222b4d6ad4b807d9ea
  Author: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue May 5 16:23:25 2015 -0700

      revert "zram: move compact_store() to sysfs functions area"

      Revert commit c72c6160d967ed26a0b136dbab337f821d233509

      It was intended to be a cosmetic change that w/o any functional change
      and was part of a bigger change:

        http://lkml.iu.edu/hypermail/linux/kernel/1503.1/01818.html

      Sergey Senozhatsky <sergey.senozhatsky.work@xxxxxxxxx>
      Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
      Cc: Minchan Kim <minchan@xxxxxxxxxx>
      Cc: Nitin Gupta <ngupta@xxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 31ccd0e66d41f73cfc21a8de976e713455205228
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Wed Apr 29 16:20:58 2015 -0700

      tcp_westwood: fix tcp_westwood_info()

      I forgot to update tcp_westwood when changing get_info() behavior,
      this patch should fix this.

      Fixes: 64f40ff5bbdb ("tcp: prepare CC get_info() access from 
getsockopt()")
      Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx>
      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Acked-by: Neal Cardwell <ncardwell@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 53ee1033ac1693d72f8c52e28f957697b021f6b4
  Merge: c967a08 f673821
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Tue May 5 19:41:33 2015 -0400

      Merge tag 'wireless-drivers-for-davem-2015-05-05' of 
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers

      Kalle Valo says:

      ====================
      iwlwifi:

      * fix firmware API for -13.ucode
      * fix RSSI handling that avoid bad roaming decision
      * fix firmware debug
      * fix MFUART operation
      * fix ASSERT while restart the hardware (because of another ASSERT e.g)

      ath9k:

      * fix per-packet tx power configuration

      rtlwifi:

      * rtl8192cu: Fix kernel deadlock
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit c967a0873a7836c7a77bf611f1c7d3f47c554c45
  Author: Tom Herbert <tom@xxxxxxxxxxxxxxx>
  Date:   Tue May 5 09:06:30 2015 -0700

      mpls: Move reserved label definitions

      Move to include/uapi/linux/mpls.h to be externally visibile.

      Signed-off-by: Tom Herbert <tom@xxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit bc321ed2db8ee03b2f2ba809286d3bf4eef1e5e0
  Merge: 7aab515 2d3c739
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Tue May 5 19:39:13 2015 -0400

      Merge branch 'mlx4'

      Or Gerlitz says:

      ====================
      mlx4 fixes for 4.1-rc2

      Eran's fix is for a small off-by-one introduces on 4.1-rc1.

      Yisahi fixes an issue with comes into play only on VMs with
      many (> 256) vCPUs.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 2d3c739739e64619f4846746a06ff0a6adf8a155
  Author: Yishai Hadas <yishaih@xxxxxxxxxxxx>
  Date:   Tue May 5 17:07:12 2015 +0300

      net/mlx4_core: Work properly with EQ numbers > 256 in SRIOV

      The Firmware uses dynamic EQs allocation based on number of VFs and
      max EQs that can be allocated. As a result, VF can have EQ numbers
      that are larger than 256.

      According to the firmware spec, the max value is limited to be 1024
      (10 bits), adapt the relevant code accordingly. This bug was impossible
      to hit prior to commit 7ae0e400cd93 ("net/mlx4_core: Flexible (asymmetric)
      allocation of EQs and MSI-X vectors for PF/VFs") which actually enables
      large number of EQs for VFs.

      Signed-off-by: Yishai Hadas <yishaih@xxxxxxxxxxxx>
      Signed-off-by: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit cae0633872fc8b0c34930dd2862856563bce58ec
  Author: Eran Ben Elisha <eranbe@xxxxxxxxxxxx>
  Date:   Tue May 5 17:07:11 2015 +0300

      net/mlx4_en: Fix off-by-one in counters manipulation

      This caused the en_stats_adder helper to accumulate a field which is
      not related to the counter, fix that.

      Fixes: a3333b35da16 ('net/mlx4_en: Moderate ethtool callback to show 
[..]')
      Signed-off-by: Eran Ben Elisha <eranbe@xxxxxxxxxxxx>
      Signed-off-by: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 7aab5159fa0100ee3f80d1b0f55cd7e9b5823270
  Author: Jerry Snitselaar <jsnitsel@xxxxxxxxxx>
  Date:   Mon May 4 10:57:16 2015 -0700

      hv_netvsc: remove unused variable in netvsc_send()

      With commit b56fc3c53654 ("hv_netvsc: Fix a bug in netvsc_start_xmit()"),
      skb variable is no longer used in netvsc_send. Remove variable and dead
      code that depended on it.

      Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
      Cc: K. Y. Srinivasan <kys@xxxxxxxxxxxxx>
      Signed-off-by: Jerry Snitselaar <jsnitsel@xxxxxxxxxx>
      Signed-off-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit df6dd1b35b0ec0ac6a5298378ceaf487091f448c
  Author: Jean Delvare <jdelvare@xxxxxxx>
  Date:   Mon Apr 27 09:45:06 2015 +0200

      thinkpad_acpi: Fix warning for static not at beginning

      Fix the following warning:

      warning: "static" is not at beginning of declaration
       void static hotkey_mask_warn_incomplete_mask(void)
       ^

      Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
      Cc: Henrique de Moraes Holschuh <ibm-acpi@xxxxxxxxxx>
      Cc: Darren Hart <dvhart@xxxxxxxxxxxxx>
      Signed-off-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx>

  commit b1e65e71535aa128089d4cb1b6d90db7551fcb05
  Author: Corey Minyard <cminyard@xxxxxxxxxx>
  Date:   Fri Apr 10 20:19:18 2015 -0500

      ipmi: Don't report err in the SI driver for SSIF devices

      Really ignore them by returning -ENODEV from the probe, but not
      doing anything.

      Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx>

  commit 5e33cd0c5a299772b5ec1a493f0a77548664ae06
  Author: Joe Perches <joe@xxxxxxxxxxx>
  Date:   Sun Feb 22 10:21:07 2015 -0800

      ipmi: Remove incorrect use of seq_has_overflowed

      commit d6c5dc18d863 ("ipmi: Remove uses of return value of seq_printf")
      incorrectly changed the return value of various proc_show functions
      to use seq_has_overflowed().

      These functions should return 0 on completion rather than 1/true
      on overflow.  1 is the same as #define SEQ_SKIP which would cause
      the output to not be emitted (skipped) instead.

      This is a logical defect only as the length of these outputs are
      all smaller than the initial allocation done by the seq filesystem.

      Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
      Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx>

  commit b0e9aaa99dfb3036829e91d4f0aae449639e221a
  Author: Corey Minyard <cminyard@xxxxxxxxxx>
  Date:   Tue Mar 31 12:48:53 2015 -0500

      ipmi:ssif: Ignore spaces when comparing I2C adapter names

      Some of the adapters have spaces in their names, but that's really
      hard to pass in as a module or kernel parameters.  So ignore the
      spaces.

      Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx>

  commit d467f7a405cf0e7f06ed8d3175607ebb4ed06671
  Author: Corey Minyard <cminyard@xxxxxxxxxx>
  Date:   Thu Mar 26 13:35:18 2015 -0500

      ipmi_ssif: Fix the logic on user-supplied addresses

      Returning zero is success.

      Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx>

  commit de71ad2c97862eae1516aa36528cc3b317c17b2f
  Author: Marc Dionne <marc.c.dionne@xxxxxxxxx>
  Date:   Mon May 4 15:16:44 2015 -0300

      x86: Make cpu_tss available to external modules

      Commit 75182b1632 ("x86/asm/entry: Switch all C consumers of
      kernel_stack to this_cpu_sp0()") changed current_thread_info
      to use this_cpu_sp0, and indirectly made it rely on init_tss
      which was exported with EXPORT_PER_CPU_SYMBOL_GPL.
      As a result some macros and inline functions such as set/get_fs,
      test_thread_flag and variants have been made unusable for
      external modules.

      Make cpu_tss exported with EXPORT_PER_CPU_SYMBOL so that these
      functions are accessible again, as they were previously.

      Signed-off-by: Marc Dionne <marc.dionne@xxxxxxxxxxxxxxxxxxxx>
      Acked-by: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
      Link: 
http://lkml.kernel.org/r/1430763404-21221-1-git-send-email-marc.dionne@xxxxxxxxxxxxxxxxxxxx
      Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

  commit a71dbdaa8ca2933391b08e0ae5567083e3af0892
  Author: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
  Date:   Mon May 4 11:02:15 2015 -0400

      hypervisor/x86/xen: Unset X86_BUG_SYSRET_SS_ATTRS on Xen PV guests

      Commit 61f01dd941ba ("x86_64, asm: Work around AMD SYSRET SS descriptor
      attribute issue") makes AMD processors set SS to __KERNEL_DS in
      __switch_to() to deal with cases when SS is NULL.

      This breaks Xen PV guests who do not want to load SS with__KERNEL_DS.

      Since the problem that the commit is trying to address would have to be
      fixed in the hypervisor (if it in fact exists under Xen) there is no
      reason to set X86_BUG_SYSRET_SS_ATTRS flag for PV VPCUs here.

      This can be easily achieved by adding x86_hyper_xen_hvm.set_cpu_features
      op which will clear this flag. (And since this structure is no longer
      HVM-specific we should do some renaming).

      Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
      Reported-by: Sander Eikelenboom <linux@xxxxxxxxxxxxxx>
      Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>

  commit 16e6bd5970c88a2ac018b84a5f1dd5c2ff1fdf2c
  Author: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
  Date:   Wed Apr 29 17:10:15 2015 -0400

      xen/events: Set irq_info->evtchn before binding the channel to CPU in 
__startup_pirq()

      .. because bind_evtchn_to_cpu(evtchn, cpu) will map evtchn to
      'info' and pass 'info' down to xen_evtchn_port_bind_to_cpu().

      Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
      Tested-by: Annie Li <annie.li@xxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>

  commit b9d934f27c91b878c4b2e64299d6e419a4022f8d
  Author: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
  Date:   Wed Apr 29 17:10:14 2015 -0400

      xen/console: Update console event channel on resume

      After a resume the hypervisor/tools may change console event
      channel number. We should re-query it.

      Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>

  commit 16f1cf3ba7303228372d3756677bf7d10e79cf9f
  Author: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
  Date:   Wed Apr 29 17:10:13 2015 -0400

      xen/xenbus: Update xenbus event channel on resume

      After a resume the hypervisor/tools may change xenbus event
      channel number. We should re-query it.

      Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>

  commit 5cec98834989a014a9560b1841649eaca95cf00e
  Author: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
  Date:   Wed Apr 29 17:10:12 2015 -0400

      xen/events: Clear cpu_evtchn_mask before resuming

      When a guest is resumed, the hypervisor may change event channel
      assignments. If this happens and the guest uses 2-level events it
      is possible for the interrupt to be claimed by wrong VCPU since
      cpu_evtchn_mask bits may be stale. This can happen even though
      evtchn_2l_bind_to_cpu() attempts to clear old bits: irq_info that
      is passed in is not necessarily the original one (from pre-migration
      times) but instead is freshly allocated during resume and so any
      information about which CPU the channel was bound to is lost.

      Thus we should clear the mask during resume.

      We also need to make sure that bits for xenstore and console channels
      are set when these two subsystems are resumed. While rebind_evtchn_irq()
      (which is invoked for both of them on a resume) calls irq_set_affinity(),
      the latter will in fact postpone setting affinity until handling the
      interrupt. But because cpu_evtchn_mask will have bits for these two
      cleared we won't be able to take the interrupt.

      With that in mind, we need to bind those two channels explicitly in
      rebind_evtchn_irq(). We will keep irq_set_affinity() so that we have a
      pass through generic irq affinity code later, in case something needs
      to be updated there as well.

      (Also replace cpumask_of(0) with cpumask_of(info->cpu) in
      rebind_evtchn_irq(): it should be set to zero in preceding
      xen_irq_info_evtchn_setup().)

      Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
      Reported-by: Annie Li <annie.li@xxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx> # 3.14+
      Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>

  commit b6b2bbe65b2117afd9766faa7cffea4d8f681455
  Author: Doug Ledford <dledford@xxxxxxxxxx>
  Date:   Tue May 5 12:57:09 2015 -0400

      MAINTAINERS: Update InfiniBand subsystem maintainer

      Since Roland stepped down, the community asked me to take his place, and
      the nomination was followed by sufficient votes and no dissensions that
      we can move forward with the change.

      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 954138dc25dca0263f315c5a3450059df05a4ea1
  Author: Yann Droneaud <ydroneaud@xxxxxxxxxx>
  Date:   Mon May 4 14:31:03 2015 +0200

      MAINTAINERS: add include/rdma/ to InfiniBand subsystem

      Most headers for InfiniBand/RDMA are located under
      include/rdma/ and include/uapi/rdma.

      Signed-off-by: Yann Droneaud <ydroneaud@xxxxxxxxxx>
      Reviewed-by: Ira Weiny <ira.weiny@xxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 8f71c1a27b84948720be17fffba71a67a1f0942d
  Author: Bart Van Assche <bart.vanassche@xxxxxxxxxxx>
  Date:   Tue May 5 13:01:39 2015 +0200

      IPoIB/CM: Fix indentation level

      See also patch "IPoIB/cm: Add connected mode support for devices
      without SRQs" (commit ID 68e995a29572). Detected by smatch.

      Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxxxxxx>
      Cc: Pradeep Satyanarayana <pradeeps@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 179d03bbfd2ebc63934753a696467d28bf9f5b64
  Author: Hariprasad S <hariprasad@xxxxxxxxxxx>
  Date:   Tue May 5 03:55:24 2015 +0530

      iw_cxgb4: Remove negative advice dmesg warnings

      Remove these log messages in favor of per-endpoint counters as well as
      device-global counters that can be inspected via debugfs.

      Signed-off-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Hariprasad Shenai <hariprasad@xxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 0d0f738f6a11856a704dcd8fd3a008b200f17625
  Author: David Ahern <david.ahern@xxxxxxxxxx>
  Date:   Sun May 3 09:48:26 2015 -0400

      IB/core: Fix unaligned accesses

      Addresses the following kernel logs seen during boot of sparc systems:

      Kernel unaligned access at TPC[103bce50] cm_find_listen+0x34/0xf8 [ib_cm]
      Kernel unaligned access at TPC[103bce50] cm_find_listen+0x34/0xf8 [ib_cm]
      Kernel unaligned access at TPC[103bce50] cm_find_listen+0x34/0xf8 [ib_cm]
      Kernel unaligned access at TPC[103bce50] cm_find_listen+0x34/0xf8 [ib_cm]
      Kernel unaligned access at TPC[103bce50] cm_find_listen+0x34/0xf8 [ib_cm]

      Signed-off-by: David Ahern <david.ahern@xxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 471e70583217728955436a3fa6e5201e5c8c296a
  Author: Honggang LI <honli@xxxxxxxxxx>
  Date:   Wed Apr 29 17:40:44 2015 +0800

      IB/core: change rdma_gid2ip into void function as it always return zero

      Signed-off-by: Honggang Li <honli@xxxxxxxxxx>
      Acked-by: Sean Hefty <sean.hefty@xxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit cb31ef485dd4c6a205d1064b42027f82076d00c8
  Author: Chen Yu <yu.c.chen@xxxxxxxxx>
  Date:   Sun May 3 22:35:05 2015 +0800

      init: fix regression by supporting devices with major:minor:offset format

      Commit 283e7ad02 ("init: stricter checking of major:minor root=
      values") was so strict that it exposed the fact that a previously
      unknown device format was being used.

      Distributions like Ubuntu uses klibc (rather than uswsusp) to resume
      system from hibernation.  klibc expressed the swap partition/file in
      the form of major:minor:offset.  For example, 8:3:0 represents a swap
      partition in klibc, and klibc's resume process in initrd will finally
      echo 8:3:0 to /sys/power/resume for manually resuming.  However, due
      to commit 283e7ad02's stricter checking, 8:3:0 will be treated as an
      invalid device format, and manual resuming from hibernation will fail.

      Fix this by adding support for devices with major:minor:offset format
      when resuming from hibernation.

      Reported-by: Prigent, Christophe <christophe.prigent@xxxxxxxxx>
      Signed-off-by: Chen Yu <yu.c.chen@xxxxxxxxx>
      Acked-by: Rafael J. Wysocki <rjw@xxxxxxxxxxxxx>
      Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>

  commit c0403ec0bb5a8c5b267fb7e16021bec0b17e4964
  Author: Rabin Vincent <rabin.vincent@xxxxxxxx>
  Date:   Tue May 5 15:15:56 2015 +0200

      Revert "dm crypt: fix deadlock when async crypto algorithm returns -EBUSY"

      This reverts Linux 4.1-rc1 commit 
0618764cb25f6fa9fb31152995de42a8a0496475.

      The problem which that commit attempts to fix actually lies in the
      Freescale CAAM crypto driver not dm-crypt.

      dm-crypt uses CRYPTO_TFM_REQ_MAY_BACKLOG.  This means the the crypto
      driver should internally backlog requests which arrive when the queue is
      full and process them later.  Until the crypto hw's queue becomes full,
      the driver returns -EINPROGRESS.  When the crypto hw's queue if full,
      the driver returns -EBUSY, and if CRYPTO_TFM_REQ_MAY_BACKLOG is set, is
      expected to backlog the request and process it when the hardware has
      queue space.  At the point when the driver takes the request from the
      backlog and starts processing it, it calls the completion function with
      a status of -EINPROGRESS.  The completion function is called (for a
      second time, in the case of backlogged requests) with a status/err of 0
      when a request is done.

      Crypto drivers for hardware without hardware queueing use the helpers,
      crypto_init_queue(), crypto_enqueue_request(), crypto_dequeue_request()
      and crypto_get_backlog() helpers to implement this behaviour correctly,
      while others implement this behaviour without these helpers (ccp, for
      example).

      dm-crypt (before the patch that needs reverting) uses this API
      correctly.  It queues up as many requests as the hw queues will allow
      (i.e. as long as it gets back -EINPROGRESS from the request function).
      Then, when it sees at least one backlogged request (gets -EBUSY), it
      waits till that backlogged request is handled (completion gets called
      with -EINPROGRESS), and then continues.  The references to
      af_alg_wait_for_completion() and af_alg_complete() in that commit's
      commit message are irrelevant because those functions only handle one
      request at a time, unlink dm-crypt.

      The problem is that the Freescale CAAM driver, which that commit
      describes as having being tested with, fails to implement the
      backlogging behaviour correctly.  In cam_jr_enqueue(), if the hardware
      queue is full, it simply returns -EBUSY without backlogging the request.
      What the observed deadlock was is not described in the commit message
      but it is obviously the wait_for_completion() in crypto_convert() where
      dm-crypto would wait for the completion being called with -EINPROGRESS
      in the case of backlogged requests.  This completion will never be
      completed due to the bug in the CAAM driver.

      Commit 0618764cb25 incorrectly made dm-crypt wait for every request,
      even when the driver/hardware queues are not full, which means that
      dm-crypt will never see -EBUSY.  This means that that commit will cause
      a performance regression on all crypto drivers which implement the API
      correctly.

      Revert it.  Correct backlog handling should be implemented in the CAAM
      driver instead.

      Cc'ing stable purely because commit 0618764cb25 did.  If for some reason
      a stable@ kernel did pick up commit 0618764cb25 it should get reverted.

      Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxx>
      Reviewed-by: Horia Geanta <horia.geanta@xxxxxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>

  commit d9cee5d4f66ef36f69b0108dedbad7f7009bb6a8
  Merge: c02d7da f440c4e
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue May 5 09:03:52 2015 -0700

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

      Pull crypto fixes from Herbert Xu:
       "This fixes a build problem with bcm63xx and yet another fix to the
        memzero_explicit function to ensure that the memset is not elided"

      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        hwrng: bcm63xx - Fix driver compilation
        lib: make memzero_explicit more robust against dead store elimination

  commit c02d7da3dd00cb32b58d9c87240456e19eebcc42
  Merge: 5ebe6af fefad2d
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue May 5 08:42:06 2015 -0700

      Merge tag 'media/v4.1-3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

      Pull media fixes from Mauro Carvalho Chehab:
       "Three driver fixes:

         - fix for omap4, fixing a regression due to a subsystem API that got
           removed for 4.1 (commit efde234674d9);

         - fix for one of the formats supported by Marvel ccic driver;

         - fix rcar_vin driver that, when stopping abnormally, the driver
           can't return from wait_for_completion"

      * tag 'media/v4.1-3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] v4l: omap4iss: Replace outdated OMAP4 control pad API with 
syscon
        [media] media: soc_camera: rcar_vin: Fix wait_for_completion
        [media] marvell-ccic: fix Y'CbCr ordering

  commit e59d29e88f7b7e3d1231202b0203d0af6f15a440
  Author: Wang Nan <wangnan0@xxxxxxxxxx>
  Date:   Tue Apr 28 08:46:09 2015 +0000

      perf probe: Fix segfault if passed with ''.

      Since parse_perf_probe_point() deals with a user passed argument, we
      should not assume it to be a valid string.

      Without this patch, if pass '' to perf probe, a segfault raises:

       $ perf probe -a ''
       Segmentation fault

      This patch checks argument of parse_perf_probe_point() before
      string processing.

      After this patch:

       $ perf probe -a ''

        usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
           or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
           ...

      Signed-off-by: Wang Nan <wangnan0@xxxxxxxxxx>
      Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
      Tested-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
      Cc: David Ahern <dsahern@xxxxxxxxx>
      Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
      Cc: Paul Mackerras <paulus@xxxxxxxxx>
      Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
      Cc: Zefan Li <lizefan@xxxxxxxxxx>
      Link: 
http://lkml.kernel.org/r/1430210769-94177-1-git-send-email-wangnan0@xxxxxxxxxx
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit d67e199611b986b345ea3087ee2e4a15da1c98b3
  Author: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
  Date:   Tue Apr 21 16:46:28 2015 +0300

      efi: Fix error handling in add_sysfs_runtime_map_entry()

      I spotted two (difficult to hit) bugs while reviewing this.

      1)  There is a double free bug because we unregister "map_kset" in
          add_sysfs_runtime_map_entry() and also efi_runtime_map_init().
      2)  If we fail to allocate "entry" then we should return
          ERR_PTR(-ENOMEM) instead of NULL.

      Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
      Cc: Dave Young <dyoung@xxxxxxxxxx>
      Cc: Guangyu Sun <guangyu.sun@xxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx>

  commit 3916e3fd81021fb795bfbdb17f375b6b3685bced
  Author: Lukas Wunner <lukas@xxxxxxxxx>
  Date:   Mon May 4 15:06:49 2015 +0200

      drm/i915: Add missing MacBook Pro models with dual channel LVDS

      Single channel LVDS maxes out at 112 MHz. The 15" pre-retina models
      shipped with 1440x900 (106 MHz) by default or 1680x1050 (119 MHz)
      as a BTO option, both versions used dual channel LVDS even though
      the smaller one would have fit into a single channel.

      Notes:
        Bug report showing that the MacBookPro8,2 with 1440x900 uses dual
        channel LVDS (this lead to it being hardcoded in intel_lvds.c by
        Daniel Vetter with commit 618563e3945b9d0864154bab3c607865b557cecc):
          https://bugzilla.kernel.org/show_bug.cgi?id=42842

        If i915.lvds_channel_mode=2 is missing even though the machine needs
        it, every other vertical line is white and consequently, only the left
        half of the screen is visible (verified by myself on a MacBookPro9,1).

        Forum posting concerning a MacBookPro6,2 with 1440x900, author is
        using i915.lvds_channel_mode=2 on the kernel command line, proving
        that the machine uses dual channels:
          https://bbs.archlinux.org/viewtopic.php?id=185770

        Chi Mei N154C6-L04 with 1440x900 is a replacement panel for all
        MacBook Pro "A1286" models, and that model number encompasses the
        MacBookPro6,2 / 8,2 / 9,1. Page 17 of the panel's datasheet shows it's
        driven with dual channel LVDS:
          http://www.ebay.com/itm/-/400690878560
          http://www.everymac.com/ultimate-mac-lookup/?search_keywords=A1286
          http://www.taopanel.com/chimei/datasheet/N154C6-L04.pdf

        Those three 15" models, MacBookPro6,2 / 8,2 / 9,1, are the only ones
        with i915 graphics and dual channel LVDS, so that list should be
        complete. And the 8,2 is already in intel_lvds.c.

        Possible motivation to use dual channel LVDS even on the 1440x900
        models: Reduce the number of different parts, i.e. use identical logic
        boards and display cabling on both versions and the only differing
        component is the panel.

      Signed-off-by: Lukas Wunner <lukas@xxxxxxxxx>
      Acked-by: Jani Nikula <jani.nikula@xxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      [Jani: included notes in the commit message for posterity]
      Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>

  commit 6f317cfe42c9d8a7c9c1a327d2f1bcc517a3cd91
  Author: Lukas Wunner <lukas@xxxxxxxxx>
  Date:   Sun Apr 12 21:10:35 2015 +0200

      drm/i915: Assume dual channel LVDS if pixel clock necessitates it

      Single channel LVDS maxes out at 112 MHz, anything above must be dual
      channel. This avoids the need to specify i915.lvds_channel_mode=2 on
      all 17" MacBook Pro models with i915 graphics since they had 1920x1200
      (193 MHz), plus those 15" pre-retina models which had a resolution
      of 1680x1050 (119 MHz) as a BTO option.

      Source for 112 MHz limit of single channel LVDS is section 2.3 of:
      
https://01.org/linuxgraphics/sites/default/files/documentation/ivb_ihd_os_vol3_part4.pdf

      v2: Avoid hardcoding 17" models by assuming dual channel LVDS if the
      resolution necessitates it, suggested by Jani Nikula.

      v3: Fix typo, thanks Joonas Lahtinen.

      v4: Split commit in two, suggested by Ville Syrjälä.

      Signed-off-by: Lukas Wunner <lukas@xxxxxxxxx>
      Tested-by: Lukas Wunner <lukas@xxxxxxxxx>
      Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      [Jani: included spec reference into the commit message]
      Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>

  commit 11fa7df1e12f19571bdce4580cbc63a8cb3e9e85
  Author: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
  Date:   Tue May 5 12:14:03 2015 +0300

      ata: select DW_DMAC in case of SATA_DWC

      Since sata_dwc_460ex.c was moved to generic DMA driver we have to ensure 
that
      user can still compile it.

      Fixes: 8b3444852a2b (sata_dwc_460ex: move to generic DMA driver)
      Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
      Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>

  commit d73a824acc705571c0f47596326d7967fba9a1d9
  Author: Alex Deucher <alexander.deucher@xxxxxxx>
  Date:   Mon May 4 14:35:01 2015 -0400

      drm/radeon: don't setup audio on asics that don't support it

      bug: https://bugzilla.kernel.org/show_bug.cgi?id=97701

      Reported-by: Mikael Pettersson <mikpelinux@xxxxxxxxx>
      Tested-by: Mikael Pettersson <mikpelinux@xxxxxxxxx>
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit d9e7eb152bb24f06028a0d10b054e39ebdf14f9c
  Author: Arnd Bergmann <arnd@xxxxxxxx>
  Date:   Fri Apr 10 23:58:24 2015 +0200

      iommu/rockchip: Fix build without CONFIG_OF

      The rockchip iommu driver references its of_device_id table
      from the init function, which fails to build when the table
      is undefined:

      iommu/rockchip-iommu.c: In function 'rk_iommu_init':
      iommu/rockchip-iommu.c:1029:35: error: 'rk_iommu_dt_ids' undeclared 
(first use in this function)
        np = of_find_matching_node(NULL, rk_iommu_dt_ids);

      This removes the #ifdef and the corresponding of_match_ptr wrapper
      to make it build both with CONFIG_OF enabled or disabled.

      Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
      Fixes: 425061b0f5074 ("iommu/rockchip: Play nice in multi-platform 
builds")
      Reviewed-by: Thierry Reding <treding@xxxxxxxxxx>
      Reviewed-by: Heiko Stuebner <heiko@xxxxxxxxx>
      Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>

  commit d4988623cc605131bed8c77f007082c3555c39ee
  Author: Luis R. Rodriguez <mcgrof@xxxxxxxx>
  Date:   Wed Apr 22 11:38:24 2015 -0700

      IB/qib: use arch_phys_wc_add()

      This driver already makes use of ioremap_wc() on PIO buffers,
      so convert it to use arch_phys_wc_add().

      The qib driver uses a mmap() special case for when PAT is
      not used, this behaviour used to be determined with a
      module parameter but since we have been asked to just
      remove that module parameter this checks for the WC cookie,
      if not set we can assume PAT was used. If its set we do
      what we used to do for the mmap for when MTRR was enabled.

      The removal of the module parameter is OK given that Andy
      notes that even if users of module parameter are still around
      it will not prevent loading of the module on recent kernels.

      Cc: Doug Ledford <dledford@xxxxxxxxxx>
      Cc: Toshi Kani <toshi.kani@xxxxxx>
      Cc: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
      Cc: Mike Marciniszyn <mike.marciniszyn@xxxxxxxxx>
      Cc: Roland Dreier <roland@xxxxxxxxxxxxxxx>
      Cc: Sean Hefty <sean.hefty@xxxxxxxxx>
      Cc: Hal Rosenstock <hal.rosenstock@xxxxxxxxx>
      Cc: Dennis Dalessandro <dennis.dalessandro@xxxxxxxxx>
      Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
      Cc: Suresh Siddha <sbsiddha@xxxxxxxxx>
      Cc: Ingo Molnar <mingo@xxxxxxx>
      Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
      Cc: Juergen Gross <jgross@xxxxxxxx>
      Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
      Cc: Dave Airlie <airlied@xxxxxxxxxx>
      Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
      Cc: Antonino Daplas <adaplas@xxxxxxxxx>
      Cc: Jean-Christophe Plagniol-Villard <plagnioj@xxxxxxxxxxxx>
      Cc: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
      Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
      Cc: Arnd Bergmann <arnd@xxxxxxxx>
      Cc: Michael S. Tsirkin <mst@xxxxxxxxxx>
      Cc: Stefan Bader <stefan.bader@xxxxxxxxxxxxx>
      Cc: konrad.wilk@xxxxxxxxxx
      Cc: ville.syrjala@xxxxxxxxxxxxxxx
      Cc: david.vrabel@xxxxxxxxxx
      Cc: jbeulich@xxxxxxxx
      Cc: Roger Pau Monné <roger.pau@xxxxxxxxxx>
      Cc: infinipath@xxxxxxxxx
      Cc: linux-rdma@xxxxxxxxxxxxxxx
      Cc: linux-fbdev@xxxxxxxxxxxxxxx
      Cc: linux-kernel@xxxxxxxxxxxxxxx
      Cc: xen-devel@xxxxxxxxxxxxxxxxxxx
      Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 87a26e976cb93e26742224bdd39f51f7861aa9b7
  Author: Luis R. Rodriguez <mcgrof@xxxxxxxx>
  Date:   Tue Apr 21 14:50:34 2015 -0700

      IB/qib: add acounting for MTRR

      There is no good reason not to, we eventually delete it as well.

      Cc: Toshi Kani <toshi.kani@xxxxxx>
      Cc: Suresh Siddha <sbsiddha@xxxxxxxxx>
      Cc: Ingo Molnar <mingo@xxxxxxx>
      Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
      Cc: Juergen Gross <jgross@xxxxxxxx>
      Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
      Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
      Cc: Dave Airlie <airlied@xxxxxxxxxx>
      Cc: Antonino Daplas <adaplas@xxxxxxxxx>
      Cc: Jean-Christophe Plagniol-Villard <plagnioj@xxxxxxxxxxxx>
      Cc: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
      Cc: Mike Marciniszyn <infinipath@xxxxxxxxx>
      Cc: Roland Dreier <roland@xxxxxxxxxx>
      Cc: Sean Hefty <sean.hefty@xxxxxxxxx>
      Cc: Hal Rosenstock <hal.rosenstock@xxxxxxxxx>
      Cc: linux-rdma@xxxxxxxxxxxxxxx
      Cc: linux-fbdev@xxxxxxxxxxxxxxx
      Cc: linux-kernel@xxxxxxxxxxxxxxx
      Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 325ad0617adaf163e32dd2d857b90baf65a25b5b
  Author: Guy Shapiro <guysh@xxxxxxxxxxxx>
  Date:   Wed Apr 15 18:17:57 2015 +0300

      IB/core: dma unmap optimizations

      While unmapping an ODP writable page, the dirty bit of the page is set. In
      order to do so, the head of the compound page is found.
      Currently, the compound head is found even on non-writable pages, where 
it is
      never used, leading to unnecessary cpu barrier that impacts performance.

      This patch moves the search for the compound head to be done only when 
needed.

      Signed-off-by: Guy Shapiro <guysh@xxxxxxxxxxxx>
      Acked-by: Shachar Raindel <raindel@xxxxxxxxxxxx>
      Reviewed-by: Sagi Grimberg <sagig@xxxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit c1d383b5785b1e0fb5fb862864712a7208219e6a
  Author: Guy Shapiro <guysh@xxxxxxxxxxxx>
  Date:   Wed Apr 15 18:17:56 2015 +0300

      IB/core: dma map/unmap locking optimizations

      Currently, while mapping or unmapping pages for ODP, the umem mutex is 
locked
      and unlocked once for each page. Such lock/unlock operation take few tens 
to
      hundreds of nsecs. This makes a significant impact when mapping or 
unmapping few
      MBs of memory.

      To avoid this, the mutex should be locked only once per operation, and 
not per
      page.

      Signed-off-by: Guy Shapiro <guysh@xxxxxxxxxxxx>
      Acked-by: Shachar Raindel <raindel@xxxxxxxxxxxx>
      Reviewed-by: Sagi Grimberg <sagig@xxxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 5b6b8fe64053b2649660ded2f3c5be25ebddbfdb
  Author: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 16:28:41 2015 -0400

      RDMA/cxgb4: Report the actual address of the remote connecting peer

      Get the actual (non-mapped) ip/tcp address of the connecting peer from
      the port mapper

      Also setup the passive side endpoint to correctly display the actual
      and mapped addresses for the new connection.

      Signed-off-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 230da36ae919e690dbcc44d1be8a2154214c6e36
  Author: Tatyana Nikolova <Tatyana.E.Nikolova@xxxxxxxxx>
  Date:   Tue Apr 21 16:28:25 2015 -0400

      RDMA/nes: Report the actual address of the remote connecting peer

      Get the actual (non-mapped) ip/tcp address of the connecting peer from
      the port mapper and report the address info to the user space application
      at the time of connection establishment

      Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@xxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 6eec177461751f0fe191cf9977cde692b9481d0a
  Author: Tatyana Nikolova <Tatyana.E.Nikolova@xxxxxxxxx>
  Date:   Tue Apr 21 16:28:10 2015 -0400

      RDMA/core: Enable the iWarp Port Mapper to provide the actual address of 
the connecting peer to its clients

      Add functionality to enable the port mapper on the passive side to 
provide to its
      clients the actual (non-mapped) ip/tcp address information of the 
connecting peer

      1) Adding remote_info_cb() to process the address info of the connecting 
peer
         The address info is provided by the user space port mapper service when
         the connection is initiated by the peer
      2) Adding a hash list to store the remote address info
      3) Adding functionality to add/remove the remote address info
         After the info has been provided to the port mapper client,
         it is removed from the hash list

      Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@xxxxxxxxx>
      Reviewed-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 4a75a86c8d04390f268d7237cc49fe9a8e36efe7
  Author: Hariprasad S <hariprasad@xxxxxxxxxxx>
  Date:   Wed Apr 22 01:45:01 2015 +0530

      iw_cxgb4: enforce qp/cq id requirements

      Currently the iw_cxgb4 implementation requires the qp and cq qid densities
      to match as well as the qp and cq id ranges.  So fail a device open if
      the device configuration doesn't meet the requirements.

      The reason for these restictions has to do with the fact that IQ qid X
      has a UGTS register in the same bar2 page as EQ qid X.  Thus both qids
      need to be allocated to the same user process for security reasons.
      The logic that does this (the qpid allocator in iw_cxgb4/resource.c)
      handles this but requires the above restrictions.

      Signed-off-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Hariprasad Shenai <hariprasad@xxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 09ece8b9e983fe858de6eab7a386d58d194227b6
  Author: Hariprasad S <hariprasad@xxxxxxxxxxx>
  Date:   Wed Apr 22 01:45:00 2015 +0530

      iw_cxgb4: use BAR2 GTS register for T5 kernel mode CQs

      For T5, we must not use the kdb/kgts registers, in order avoid db drops
      under extreme loads.

      Signed-off-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Hariprasad Shenai <hariprasad@xxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 6198dd8d7a6a7f40dc4599cb0676101d9cb82776
  Author: Hariprasad S <hariprasad@xxxxxxxxxxx>
  Date:   Wed Apr 22 01:44:59 2015 +0530

      iw_cxgb4: 32b platform fixes

      - get_dma_mr() was using ~0UL which is should be ~0ULL.  This causes the
      DMA MR to get setup incorrectly in hardware.

      - wr_log_show() needed a 64b divide function div64_u64() instead of
        doing
      division directly.

      - fixed warnings about recasting a pointer to a u64

      Signed-off-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Hariprasad Shenai <hariprasad@xxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 0b7410471d59ce2ea30453e68c03bdb941d5951e
  Author: Hariprasad S <hariprasad@xxxxxxxxxxx>
  Date:   Wed Apr 22 01:44:58 2015 +0530

      iw_cxgb4: Cleanup register defines/MACROS

      Cleanup macros and register defines for consistency

      Signed-off-by: Hariprasad Shenai <hariprasad@xxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 285214409a9e5fceba2215461b4682b6069d8e77
  Author: Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 14:01:11 2015 -0600

      RDMA/CMA: Canonize IPv4 on IPV6 sockets properly

      When accepting a new IPv4 connect to an IPv6 socket, the CMA tries to
      canonize the address family to IPv4, but does not properly process
      the listening sockaddr to get the listening port, and does not properly
      set the address family of the canonized sockaddr.

      Fixes: e51060f08a61 ("IB: IP address based RDMA connection manager")

      Cc: <stable@xxxxxxxxxxxxxxx>
      Reported-By: Yotam Kenneth <yotamke@xxxxxxxxxxxx>
      Signed-off-by: Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx>
      Tested-by: Haggai Eran <haggaie@xxxxxxxxxxxx>
      Signed-off-by: Doug Ledford <dledford@xxxxxxxxxx>

  commit 326a780317d572711f70d53054502e86a1ff5317
  Author: Jungseung Lee <js07.lee@xxxxxxxxx>
  Date:   Mon May 4 11:33:48 2015 +0100

      arm64: mm: Fix build error with CONFIG_SPARSEMEM_VMEMMAP disabled

      This fix the below build error:

      arch/arm64/mm/dump.c: In function â??ptdump_initâ??:
      arch/arm64/mm/dump.c:331:18: error: â??VMEMMAP_START_NRâ?? undeclared 
(first use in this function)
        address_markers[VMEMMAP_START_NR].start_address =
                        ^
      arch/arm64/mm/dump.c:331:18: note: each undeclared identifier is reported 
only once for each
      function it appears in
      arch/arm64/mm/dump.c:333:18: error: â??VMEMMAP_END_NRâ?? undeclared 
(first use in this function)
        address_markers[VMEMMAP_END_NR].start_address =
                        ^
      Acked-by: Laura Abbott <labbott@xxxxxxxxxx>
      Signed-off-by: Jungseung Lee <js07.lee@xxxxxxxxx>
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>

  commit b9a95e85bbc56f168f078885f414f305b4589c4b
  Author: Will Deacon <will.deacon@xxxxxxx>
  Date:   Fri May 1 13:48:17 2015 +0100

      Revert "arm64: alternative: Allow immediate branch as alternative 
instruction"

      This reverts most of commit fef7f2b2010381c795ae43743ad31931cc58f5ad.

      It turns out that there are a couple of problems with the way we're
      fixing up branch instructions used as part of alternative instruction
      sequences:

        (1) If the branch target is also in the alternative sequence, we'll
            generate a branch into the .altinstructions section which actually
            gets freed.

        (2) The calls to aarch64_insn_{read,write} bring an awful lot more
            code into the patching path (e.g. taking locks, poking the fixmap,
            invalidating the TLB) which isn't actually needed for the early
            patching run under stop_machine, but makes the use of alternative
            sequences extremely fragile (as we can't patch code that could be
            used by the patching code).

      Given that no code actually requires alternative patching of immediate
      branches, let's remove this support for now and revisit it when we've
      got a user. We leave the updated size check, since we really do require
      the sequences to be the same length.

      Acked-by: Marc Zyngier <marc.zyngier@xxxxxxx>
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>

  commit e8a4a2696fecb398b0288c43c0e0dbb91e265bb2
  Author: Tahsin Erdogan <tahsin@xxxxxxxxxx>
  Date:   Mon May 4 21:15:31 2015 -0700

      x86/spinlocks: Fix regression in spinlock contention detection

      A spinlock is regarded as contended when there is at least one waiter.
      Currently, the code that checks whether there are any waiters rely on
      tail value being greater than head. However, this is not true if tail
      reaches the max value and wraps back to zero, so arch_spin_is_contended()
      incorrectly returns 0 (not contended) when tail is smaller than head.

      The original code (before regression) handled this case by casting the
      (tail - head) to an unsigned value. This change simply restores that
      behavior.

      Fixes: d6abfdb20223 ("x86/spinlocks/paravirt: Fix memory corruption on 
unlock")
      Signed-off-by: Tahsin Erdogan <tahsin@xxxxxxxxxx>
      Cc: peterz@xxxxxxxxxxxxx
      Cc: Waiman.Long@xxxxxx
      Cc: borntraeger@xxxxxxxxxx
      Cc: oleg@xxxxxxxxxx
      Cc: raghavendra.kt@xxxxxxxxxxxxxxxxxx
      Cc: stable@xxxxxxxxxxxxxxx
      Link: 
http://lkml.kernel.org/r/1430799331-20445-1-git-send-email-tahsin@xxxxxxxxxx
      Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

  commit 7263b1bd0490fca68ee7eedb0b6973cb86d4701c
  Author: Jaegeuk Kim <jaegeuk@xxxxxxxxxx>
  Date:   Wed Apr 22 11:03:48 2015 -0700

      f2fs: fix wrong error hanlder in f2fs_follow_link

      The page_follow_link_light returns NULL and its error pointer was remained
      in nd->path.

      Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
      Reviewed-by: Chao Yu <chao2.yu@xxxxxxxxxxx>
      Signed-off-by: Jaegeuk Kim <jaegeuk@xxxxxxxxxx>

  commit 5463e7c18e51152104aba9614e6abfc039a8b710
  Author: Jaegeuk Kim <jaegeuk@xxxxxxxxxx>
  Date:   Tue Apr 21 10:40:54 2015 -0700

      Revert "f2fs: enhance multi-threads performance"

      This reports performance regression by Yuanhan Liu.
      The basic idea was to reduce one-point mutex, but it turns out this causes
      another contention like context swithes.

      https://lkml.org/lkml/2015/4/21/11

      Until finishing the analysis on this issue, I'd like to revert this for a 
while.

      This reverts commit 78373b7319abdf15050af5b1632c4c8b8b398f33.

  commit 9ba52e5812e53f20f23600d79449a3ec05a0254f
  Author: Shaohua Li <shli@xxxxxx>
  Date:   Mon May 4 14:32:48 2015 -0600

      blk-mq: don't lose requests if a stopped queue restarts

      Normally if driver is busy to dispatch a request the logic is like below:
      block layer:                                      driver:
        __blk_mq_run_hw_queue
      a.                                                blk_mq_stop_hw_queue
      b.        rq add to ctx->dispatch

      later:
      1.                                                blk_mq_start_hw_queue
      2.        __blk_mq_run_hw_queue

      But it's possible step 1-2 runs between a and b. And since rq isn't in
      ctx->dispatch yet, step 2 will not run rq. The rq might get lost if
      there are no subsequent requests kick in.

      Signed-off-by: Shaohua Li <shli@xxxxxx>
      Signed-off-by: Jens Axboe <axboe@xxxxxx>

  commit b7ba7b469a4ffc2907c355a3c0873173567d9038
  Merge: 0650c0b ff419b3
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Mon May 4 16:00:55 2015 -0400

      Merge tag 'mac80211-for-davem-2015-05-04' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

      Johannes Berg says:

      ====================
      We have only a few fixes right now:
       * a fix for an issue with hash collision handling in the
         rhashtable conversion
       * a merge issue - rhashtable removed default shrinking
         just before mac80211 was converted, so enable it now
       * remove an invalid WARN that can trigger with legitimate
         userspace behaviour
       * add a struct member missing from kernel-doc that caused
         a lot of warnings
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 0650c0b8d9efe5b1205116a2febcb984c6c98472
  Author: Yuval Mintz <Yuval.Mintz@xxxxxxxxxx>
  Date:   Mon May 4 12:34:12 2015 +0300

      bnx2x: Fix to prevent inner-reload

      Submit 909d9faae2a44 ("bnx2x: Prevent inner-reload while VFs exist")
      contained a bug - MTU change was not prevented by it; Instead, it
      `randomally' prevented bnx2x_resume() from running [harmless yet wrong].

      This moves the check to its correct spot.

      Signed-off-by: Yuval Mintz <Yuval.Mintz@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 73e84313ee4178cac628009103a901af9dfe8920
  Merge: e278371 1add156
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Mon May 4 15:36:07 2015 -0400

      Merge branch 'for-upstream' of 
git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

      Johan Hedberg says:

      ====================
      pull request: bluetooth-next 2015-05-04

      Here's the first bluetooth-next pull request for 4.2:

       - Various fixes for at86rf230 driver
       - ieee802154: trace events support for rdev->ops
       - HCI UART driver refactoring
       - New Realtek IDs added to btusb driver
       - Off-by-one fix for rtl8723b in btusb driver
       - Refactoring of btbcm driver for both UART & USB use

      Please let me know if there are any issues pulling. Thanks.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit e2783717a71e9babfdd7c36c7e35b790d2c01022
  Author: David Ahern <david.ahern@xxxxxxxxxx>
  Date:   Mon May 4 11:51:38 2015 -0400

      net/rds: Fix new sparse warning

      c0adf54a109 introduced new sparse warnings:
        CHECK   /home/dahern/kernels/linux.git/net/rds/ib_cm.c
      net/rds/ib_cm.c:191:34: warning: incorrect type in initializer (different 
base types)
      net/rds/ib_cm.c:191:34:    expected unsigned long long [unsigned] 
[usertype] dp_ack_seq
      net/rds/ib_cm.c:191:34:    got restricted __be64 <noident>
      net/rds/ib_cm.c:194:51: warning: cast to restricted __be64

      The temporary variable for sequence number should have been declared as 
__be64
      rather than u64. Make it so.

      Signed-off-by: David Ahern <david.ahern@xxxxxxxxxx>
      Cc: shamir rabinovitch <shamir.rabinovitch@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit a2d4fcb8043402fd24aaef7e00d4c24b1151cda4
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Mon May 4 15:12:33 2015 -0400

      Revert "Revert "smc91x: retrieve IRQ and trigger flags in a modern way""

      This reverts commit 8d7d9cca4390062ccd09ffd9fdb37d1c4eeea9ac.

      Now that the necessary infrastructure is really all there
      in the tree, we can put this change back in.

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 965b2aa78fbcb831acf4f669f494da201f4bcace
  Author: Kamlakant Patel <kamlakant.patel@xxxxxxxxxxxx>
  Date:   Mon May 4 14:39:49 2015 +0530

      net/smsc911x: fix irq resource allocation failure

      When smsc911x uses GPIO as the interrupt controller, and if both are
      loaded as modules, we get following error:

      "smsc911x: Could not allocate irq resource"

      This issue is because of smsc911x using platform_get_resource to get
      device tree based irq resource.

      commit "9ec36ca (of/irq: do irq resolution in platform_get_irq)" and
      commit "7085a7 (drivers: platform: parse IRQ flags from resources)" add
      support in platform_get_irq to resolve irq and irq_flags respectively
      for both modern device tree and legacy static platform data platforms.

      Modify smsc911x driver to use platform_get_irq to pick up irq resource
      correctly and use irq_get_trigger_type to get the IRQ trigger flags.

      Signed-off-by: Kamlakant Patel <kamlakant.patel@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit b2387ddcced8de3e6471a2fb16a409577063016f
  Author: Shaohua Li <shli@xxxxxx>
  Date:   Fri May 1 09:59:44 2015 -0700

      blk-mq: fix FUA request hang

      When a FUA request enters its DATA stage of flush pipeline, the
      request is added to mq requeue list, the request will then be added to
      ctx->rq_list. blk_mq_attempt_merge() might merge the request with a bio.
      Later when the request is finished the flush pipeline, the
      request->__data_len is 0. Then I only saw the bio gets endio called, the
      original request never finish.

      Adding REQ_FLUSH_SEQ into REQ_NOMERGE_FLAGS looks an easy fix.

      stable: 3.15+

      Signed-off-by: Shaohua Li <shli@xxxxxx>
      Signed-off-by: Jens Axboe <axboe@xxxxxx>

  commit 013ead48a843442e63b9426e3bd5df18ca5d054a
  Author: Christian König <christian.koenig@xxxxxxx>
  Date:   Fri May 1 12:34:12 2015 +0200

      drm/radeon: disable semaphores for UVD V1 (v2)

      Hardware doesn't seem to work correctly, just block userspace in this 
case.

      v2: add missing defines

      Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=85320

      Signed-off-by: Christian König <christian.koenig@xxxxxxx>
      CC: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit d66bf7dd27573ee5ea90484899ee952c19ccb194
  Author: Vlad Yasevich <vyasevich@xxxxxxxxx>
  Date:   Sat May 2 21:33:44 2015 -0400

      net: core: Correct an over-stringent device loop detection.

      The code in __netdev_upper_dev_link() has an over-stringent
      loop detection logic that actually prevents valid configurations
      from working correctly.

      In particular, the logic returns an error if an upper device
      is already in the list of all upper devices for a given dev.
      This particular check seems to be a overzealous as it disallows
      perfectly valid configurations.  For example:
        # ip l a link eth0 name eth0.10 type vlan id 10
        # ip l a dev br0 typ bridge
        # ip l s eth0.10 master br0
        # ip l s eth0 master br0  <--- Will fail

      If you switch the last two commands (add eth0 first), then both
      will succeed.  If after that, you remove eth0 and try to re-add
      it, it will fail!

      It appears to be enough to simply check adj_list to keeps things
      safe.

      I've tried stacking multiple devices multiple times in all different
      combinations, and either rx_handler registration prevented the stacking
      of the device linking cought the error.

      Signed-off-by: Vladislav Yasevich <vyasevic@xxxxxxxxxx>
      Acked-by: Jiri Pirko <jiri@xxxxxxxxxxx>
      Acked-by: Veaceslav Falico <vfalico@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 6b096fded15bbf0cd4b39fdab3dfe306210ad3f6
  Author: Tilman Schmidt <tilman@xxxxxxx>
  Date:   Sat May 2 19:23:22 2015 +0200

      isdn/gigaset: cede maintainership

      As German phone operators are discontinuing ISDN service, neither
      Hansjörg nor I will be able to maintain the Gigaset ISDN drivers
      any longer. Paul Bolle offered to step into the breach for odd
      fixes.

      Signed-off-by: Tilman Schmidt <tilman@xxxxxxx>
      Acked-by: Paul Bolle <pebolle@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit e7309c2673a389a495fcfad70376d3bae8b9bc89
  Author: Suman Anna <s-anna@xxxxxx>
  Date:   Fri Apr 24 12:54:20 2015 -0500

      bus: omap_l3_noc: Fix master id address decoding for OMAP5

      The L3 Error handling on OMAP5 for the most part is very similar
      to that of OMAP4, and had leveraged common data structures and
      register layout definitions so far. Upon closer inspection, there
      are a few minor differences causing an incorrect decoding and
      reporting of the master NIU upon an error:

        1. The L3_TARG_STDERRLOG_MSTADDR.STDERRLOG_MSTADDR occupies
           11 bits on OMAP5 as against 8 bits on OMAP4, with the master
           NIU connID encoded in the 6 MSBs of the STDERRLOG_MSTADDR
           field.
        2. The CLK3 FlagMux component has 1 input source on OMAP4 and 3
           input sources on OMAP5. The common DEBUGSS source is at a
           different input on each SoC.

      Fix the above issues by using a OMAP5-specific compatible property
      and using SoC-specific data where there are differences.

      Signed-off-by: Suman Anna <s-anna@xxxxxx>
      Acked-by: Nishanth Menon <nm@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit 4adf82c35572c69e96997641612fc88463b08f6f
  Author: Illia Smyrnov <illia.smyrnov@xxxxxxxxxxxxxxx>
  Date:   Thu Apr 16 17:42:30 2015 -0500

      bus: omap_l3_noc: Fix offset for DRA7 CLK1_HOST_CLK1_2 instance

      The base address for DRA7 CLK1_HOST_CLK1_2 host instance is
      0x44800000, so correct offset is 0x800000. DRA7 TRM rev X(fewb 2015)
      has updates for this information.

      With wrong offset these errors are not correctly cleared by the L3
      IRQ handler and cause an continuous interrupt scenario and system lockup.

      Signed-off-by: Illia Smyrnov <illia.smyrnov@xxxxxxxxxxxxxxx>
      Signed-off-by: Nishanth Menon <nm@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit 9a9324d3969678d44b330e1230ad2c8ae67acf81
  Author: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
  Date:   Mon May 4 12:20:29 2015 -0400

      libata: Blacklist queued TRIM on all Samsung 800-series

      The queued TRIM problems appear to be generic to Samsung's firmware and
      not tied to a particular model. A recent update to the 840 EVO firmware
      introduced the same issue as we saw on 850 Pro.

      Blacklist queued TRIM on all 800-series drives while we work this issue
      with Samsung.

      Reported-by: Günter Waller <g.wal@xxxxxx>
      Reported-by: Sven Köhler <sven.koehler@xxxxxxxxx>
      Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>

  commit 1822734677d95888d18e3c0e0743727effa62f8e
  Author: Nishanth Menon <nm@xxxxxx>
  Date:   Thu Apr 16 16:56:33 2015 -0500

      ARM: dts: dra7: Fix efuse register size for ABB

      Fix a typo in DRA7 dtsi where 12 bytes are needed for register
      description of ABB efuse registers, however only 8 bytes are provided
      to map. For some weird reason, this does not generate abort at offset
      0x8, probably due to default maps already provided in io.c for the bus
      register ranges.

      Reported-by: Matt Gessner <Matt.Gessner@xxxxxxxxxxxxx>
      Reported-by: Suman Anna <s-anna@xxxxxx>
      Signed-off-by: Nishanth Menon <nm@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit ed12f102ba9f55d2617fc6b5e4fbecbf9a132ba7
  Author: Nishanth Menon <nm@xxxxxx>
  Date:   Thu Apr 9 17:33:17 2015 -0500

      ARM: dts: am57xx-beagle-x15: Switch GPIO fan number

      BeagleBoard-X15 pre-production change includes switching the GPIO fan
      gpio over from 1 to 2 to allow for a potential fix at a later point in
      time for USB client VBUS detection using PMIC VBUS detect capability.

      Signed-off-by: Nishanth Menon <nm@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit 5eb6719816faad8e915d4f46ad61a440d641d183
  Author: Nishanth Menon <nm@xxxxxx>
  Date:   Wed Apr 8 17:40:59 2015 -0500

      ARM: dts: am57xx-beagle-x15: Switch UART mux pins

      BeagleBoard-X15 pre-production change includes switching over to UART
      pins that now allow for UART download capability. All original boards
      should either have been returned for modifications or already modified
      for the required change and maintaining compatibility for older boards
      are no longer needed.

      Signed-off-by: Nishanth Menon <nm@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit f6b957fdce50ddbd1899948ab109cca64e571eba
  Author: Felipe Balbi <balbi@xxxxxx>
  Date:   Thu Apr 9 10:59:27 2015 -0500

      ARM: dts: am437x-sk: reduce col-scan-delay-us

      The new AM437x SK Beta boards have removed the
      large capacitors on the gpio-matrix column lines
      which means we can reduce col-scan-delay-us to 5us
      without loosing functionality.

      Signed-off-by: Felipe Balbi <balbi@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit faa4ec1eedbe6d352dc22c945540a64b5c896a95
  Author: Felipe Balbi <balbi@xxxxxx>
  Date:   Thu Apr 9 10:59:26 2015 -0500

      ARM: dts: am437x-sk: fix for new newhaven display module revision

      AM437x Starter Kit uses a NewHaven Display module with
      a 4.3" display and EDT FT5306 touchscreen

      On that module's new revision, NewHave decided to change
      the pinout on the 6 pin flat-pcb touchscreen connector so
      that instead of having WAKE pin, we now have RESETn.

      The new display module is available on AM437x SK Beta and
      all new revisions while the older revision is only available
      on AM437x SK Alpha which, unfortunately, can't be supported
      anymore in mainline without a revert of this patch.

      Signed-off-by: Felipe Balbi <balbi@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit 00edd3170c757772f74c533e61298be249447a11
  Author: Nishanth Menon <nm@xxxxxx>
  Date:   Wed Apr 8 18:56:27 2015 -0500

      ARM: dts: am57xx-beagle-x15: Fix RTC aliases

      With commit bc078316d86c ("ARM: dts: DRA7: Add node for RTC"), we now
      have AM57xx RTC register itself as alias 0 even before DS1307 or TPS
      rtc drivers are loaded up. However, since neither TPS, nor AM57xx RTC
      are capable of being backedup by battery, we would like to maintain
      the "primary" rtc as mcp79410 rtc device.

      This also generates the following warnings in the bootlog highlighting
      the issue:
      [    5.895445] rtc-ds1307 2-006f: /aliases ID 0 not available
      ...
      [    6.476285] palmas-rtc 48070000.i2c:tps659038@58:tps659038_rtc: 
/aliases ID 1 not available

      So, add proper aliases to ensure that RTC order is always consistent
      to userspace immaterial of probe order.

      Signed-off-by: Nishanth Menon <nm@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit e7a7357341664148cabf98a3ab50b5d449afca0b
  Author: Grygorii Strashko <Grygorii.Strashko@xxxxxxxxxx>
  Date:   Wed Apr 8 18:56:26 2015 -0500

      ARM: dts: am57xx-beagle-x15: Fix IRQ type for mcp7941x

      The interrupt polarity provided in devicetree is used to configure
      the interrupt controller(ARM GIC), however, it seems that we have an
      inverter at the GIC boundary inside AM57xx which inverts the signal
      input from sys_irq external interrupt source.

      Further, as per GIC distributor TRM,
      
http://infocenter.arm.com/help/topic/com.arm.doc.ddi0438d/BGBHIACJ.html#BABJFCFB
      ARM GIC distributor does not support IRQ trigger type
      IRQ_TYPE_LEVEL_LOW, and only rising or level high signals.

      However, for some reason, the current configuration(which gets ignored
      by GIC driver) functions on some platforms, however, on few platforms
      results in infinite interrupts hogging the system down.

      Switch over to rising edge for GIC configuration which is also aligned
      with trigger point from the RTC chip and the internal inversion.

      Fixes: 5a0f93c6576a ("ARM: dts: Add am57xx-beagle-x15")
      Signed-off-by: Grygorii Strashko <Grygorii.Strashko@xxxxxxxxxx>
      Signed-off-by: Nishanth Menon <nm@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit 2055088b5e17b450fcfb536568aee00eccd0ced5
  Author: Sebastian Reichel <sre@xxxxxxxxxx>
  Date:   Tue Mar 31 03:28:10 2015 +0200

      ARM: dts: omap3: Add #iommu-cells to isp and iva iommu

      Add missing #iommu-cells property to the isp and iva iommu nodes. This
      fixes the binding (property is required according to the generic iommu
      binding) and removes the following kernel warning triggered once the
      iommu nodes are referenced:

      [    0.647521] /ocp/isp@480bc000: could not get #iommu-cells for 
/ocp/mmu@480bd400

      Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx>
      Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
      Acked-by: Sakari Ailus <sakari.ailus@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit 67defd5c0ee5270948104784c8fc8f6d4a99682b
  Author: Roger Quadros <rogerq@xxxxxx>
  Date:   Tue Mar 24 12:19:19 2015 +0200

      ARM: omap2plus_defconfig: Enable EXTCON_USB_GPIO

      We need to enable EXTCON_USB_GPIO_USB and not
      EXTCON_GPIO_USB.

      Fixes: c08a54c0ebeb ("ARM: omap2plus_defconfig: Enable EXTCON_GPIO_USB")

      Reported-by: Nishant Menon <nm@xxxxxx>
      Signed-off-by: Roger Quadros <rogerq@xxxxxx>
      Acked-by-by: Nishanth Menon <nm@xxxxxx
      Tested-by: Nishanth Menon <nm@xxxxxx
      Reviewed-by: Felipe Balbi <balbi@xxxxxx>
      Acked-by: Felipe Balbi <balbi@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit 1819e3034ee26ffadc71880064ed8b8e7d74f52c
  Author: Pavel Machek <pavel@xxxxxx>
  Date:   Sun Mar 1 21:07:08 2015 +0200

      ARM: dts: OMAP3-N900: Add microphone bias voltages

      N900 audio recording needs that codec provides bias voltage for integrated
      digital microphone and headset microphone depending which one is used.
      Digital microphone uses 2 V bias and it comes from the codec A part. Codec
      B part drives the headset microphone bias and that is set to 2.5 V.

      Cc: stable@xxxxxxxxxxxxxxx # v3.16+
      Signed-off-by: Pavel Machek <pavel@xxxxxx>
      [Jarkko: Headset mic bias changed to 2 (2.5 V) as it was before commit
      e2e8bfdf6157 ("ASoC: tlv320aic3x: Convert mic bias to a supply widget")]
      Signed-off-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit 4bd9e9b77fc6787c45b8bb439f6511aa3478606c
  Author: Christoph Hellwig <hch@xxxxxx>
  Date:   Thu Apr 30 11:49:25 2015 +0200

      nfsd: skip CB_NULL probes for 4.1 or later

      With sessions in v4.1 or later we don't need to manually probe the 
backchannel
      connection, so we can declare it up instantly after setting up the RPC 
client.

      Note that we really should split nfsd4_run_cb_work in the long run, this 
is
      just the least intrusive fix for now.

      Signed-off-by: Christoph Hellwig <hch@xxxxxx>
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit cba5f62b1830c1919b47544789bc993e6e617dc6
  Author: Christoph Hellwig <hch@xxxxxx>
  Date:   Thu Apr 30 11:49:24 2015 +0200

      nfsd: fix callback restarts

      Checking the rpc_client pointer is not a reliable way to detect
      backchannel changes: cl_cb_client is changed only after shutting down
      the rpc client, so the condition cl_cb_client = tk_client will always be
      true.

      Check the RPC_TASK_KILLED flag instead, and rewrite the code to avoid
      the buggy cl_callbacks list and fix the lifetime rules due to double
      calls of the ->prepare callback operations method for this retry case.

      Signed-off-by: Christoph Hellwig <hch@xxxxxx>
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit ef2a1b3e1067195f1d6b89d8329454775c87f033
  Author: Christoph Hellwig <hch@xxxxxx>
  Date:   Thu Apr 30 11:49:23 2015 +0200

      nfsd: split transport vs operation errors for callbacks

      We must only increment the sequence id if the client has seen and 
responded
      to a request.  If we failed to deliver it to the client we must resend 
with
      the same sequence id.  So just like the client track errors at the 
transport
      level differently from those returned in the XDR.

      Signed-off-by: Christoph Hellwig <hch@xxxxxx>
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit 9507271d960a1911a51683888837d75c171cd91f
  Author: Scott Mayhew <smayhew@xxxxxxxxxx>
  Date:   Tue Apr 28 16:29:53 2015 -0400

      svcrpc: fix potential GSSX_ACCEPT_SEC_CONTEXT decoding failures

      In an environment where the KDC is running Active Directory, the
      exported composite name field returned in the context could be large
      enough to span a page boundary.  Attaching a scratch buffer to the
      decoding xdr_stream helps deal with those cases.

      The case where we saw this was actually due to behavior that's been
      fixed in newer gss-proxy versions, but we're fixing it here too.

      Signed-off-by: Scott Mayhew <smayhew@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Reviewed-by: Simo Sorce <simo@xxxxxxxxxx>
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit 8287f009bd95a5e548059dba62a67727bb9549cd
  Author: Sachin Bhamare <sachin.bhamare@xxxxxxxxxxxxxxx>
  Date:   Mon Apr 27 14:50:14 2015 +0200

      nfsd: fix pNFS return on close semantics

      For the sake of forgetful clients, the server should return the layouts
      to the file system on 'last close' of a file (assuming that there are no
      delegations outstanding to that particular client) or on delegreturn
      (assuming that there are no opens on a file from that particular
      client).

      In theory the information is all there in current data structures, but
      it's not efficiently available; nfs4_file->fi_ref includes references on
      the file across all clients, but we need a per-(client, file) count.
      Walking through lots of stateid's to calculate this on each close or
      delegreturn would be painful.

      This patch introduces infrastructure to maintain per-client opens and
      delegation counters on a per-file basis.

      [hch: ported to the mainline pNFS support, merged various fixes from Jeff]
      Signed-off-by: Sachin Bhamare <sachin.bhamare@xxxxxxxxxxxxxxx>
      Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
      Signed-off-by: Christoph Hellwig <hch@xxxxxx>
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit ebe9cb3bb13e7b9b281969cd279ce70834f7500f
  Author: Christoph Hellwig <hch@xxxxxx>
  Date:   Tue Apr 28 15:41:15 2015 +0200

      nfsd: fix the check for confirmed openowner in nfs4_preprocess_stateid_op

      If we find a non-confirmed openowner we jump to exit the function, but do
      not set an error value.  Fix this by factoring out a helper to do the
      check and properly set the error from nfsd4_validate_stateid.

      Cc: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Christoph Hellwig <hch@xxxxxx>
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit 40cdc7a530c7a075557651a071354bb42b99df08
  Author: Christoph Hellwig <hch@xxxxxx>
  Date:   Mon Apr 27 14:50:13 2015 +0200

      nfsd/blocklayout: pretend we can send deviceid notifications

      Commit df52699e4fcef ("NFSv4.1: Don't cache deviceids that have no
      notifications") causes the Linux NFS client to stop caching deviceid's
      unless a server pretends to support deviceid notifications.  While this
      behavior is stupid and the language around this area in rfc5661 is a
      mess carified by an errata that I submittted, Trond insists on this
      behavior.  Not caching deviceids degrades block layout performance
      massively as a GETDEVICEINFO is fairly expensive.

      So add this hack to make the Linux client happy again.

      Cc: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Christoph Hellwig <hch@xxxxxx>
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit 102bcb6ed2d1c3ffcc7269afc957c2df11942085
  Author: Tony Lindgren <tony@xxxxxxxxxxx>
  Date:   Mon May 4 08:54:41 2015 -0700

      ARM: OMAP2+: Fix omap off idle power consumption creeping up

      If we use a combination of VMODE and I2C4 for retention modes,
      eventually the off idle power consumption will creep up by about
      23mW, even during off mode with I2C4 always staying enabled.

      Turns out this is because of erratum i531 "Extra Power Consumed
      When Repeated Start Operation Mode Is Enabled on I2C Interface
      Dedicated for Smart Reflex (I2C4)" as pointed out by Nishanth
      Menon <nm@xxxxxx>.

      Let's fix the issue by adding i2c_cfg_clear_mask for the bits
      to clear when initializing the I2C4 adapter so we can clear
      SREN bit that drives the I2C4 lines low otherwise when there
      is no traffic.

      Fixes: 3b8c4ebb7630 ("ARM: OMAP3: Fix idle mode signaling for
      Cc: stable@xxxxxxxxxxxxxxx # v3.16+
      sys_clkreq and sys_off_mode")
      Cc: Kevin Hilman <khilman@xxxxxxxxxx>
      Cc: Tero Kristo <t-kristo@xxxxxx>
      Reviewed-by: Nishanth Menon <nm@xxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit 622532bb2fad8fe342fb685727ae0be566f6be5d
  Author: Witold Szczeponik <Witold.Szczeponik@xxxxxxx>
  Date:   Fri May 1 19:05:20 2015 +0200

      ACPI / PNP: add two IDs to list for PNPACPI device enumeration

      Commit eec15edbb0e1 (ACPI / PNP: use device ID list for PNPACPI device
      enumeration) changed the way how ACPI devices are enumerated and when
      they are added to the PNP bus.

      However, it broke the sound card support on (at least) a vintage
      IBM ThinkPad 600E: with said commit applied, two of the necessary
      "CSC01xx" devices are not added to the PNP bus and hence can not be
      found during the initialization of the "snd-cs4236" module.  As a
      consequence, loading "snd-cs4236" causes null pointer exceptions.
      The attached patch fixes the problem end re-enables sound on the
      IBM ThinkPad 600E.

      Fixes: eec15edbb0e1 (ACPI / PNP: use device ID list for PNPACPI device 
enumeration)
      Signed-off-by: Witold Szczeponik <Witold.Szczeponik@xxxxxxx>
      Cc: 3.16+ <stable@xxxxxxxxxxxxxxx> # 3.16+
      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit 74d77e50f23123938fbb7987eba71310864e6a7c
  Author: Colin Ian King <colin.king@xxxxxxxxxxxxx>
  Date:   Mon Apr 20 10:59:17 2015 -0500

      pinctrl: mediatek: mtk-common: initialize unmask

      cppcheck detected an uninitialized variable:

      [drivers/pinctrl/mediatek/pinctrl-mtk-common.c:897]:
        (error) Uninitialized variable: unmask

      unmask should be initialized to zero to ensure unmasking
      only occurs if a previous mask occurred. The current situation
      is that the unmask variable could contain any random garbage
      causing random unexpected unmasking.

      Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit a00212e21928640486d3cc939cf4d908e8522016
  Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
  Date:   Mon May 4 01:58:27 2015 +0200

      ACPI / documentation: Fix ambiguity in the GPIO properties document

      The first paragraph in Documentation/acpi/gpio-properties.txt is
      ambiguous, so make it more clear.

      Reported-by: Antonio Ospite <ao2@xxxxxx>
      Acked-by: Antonio Ospite <ao2@xxxxxx>
      Acked-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit 1bf1b431d98d7e5b5419876d4c219469e60693e1
  Author: Oded Gabbay <oded.gabbay@xxxxxxx>
  Date:   Thu Apr 16 17:08:44 2015 +0300

      iommu/amd: Fix bug in put_pasid_state_wait

      This patch fixes a bug in put_pasid_state_wait that appeared in kernel 4.0
      The bug is that pasid_state->count wasn't decremented before entering the
      wait_event. Thus, the condition in wait_event will never be true.

      The fix is to decrement (atomically) the pasid_state->count before the
      wait_event.

      Signed-off-by: Oded Gabbay <oded.gabbay@xxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx #v4.0
      Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>

  commit ff419b3f95ab7a97c5f72876b53f12a249dacc2a
  Author: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
  Date:   Sun Apr 26 20:13:34 2015 -0700

      mac80211: fix 90 kernel-doc warnings

      Eliminate 90 of these warnings:

      Warning(..//include/net/mac80211.h:1682): No description found for 
parameter 'drv_priv[0]'

      Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
      Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>

  commit f440c4ee3e53f767974fe60bcbc0b6687a5fb53f
  Author: �lvaro Fernández Rojas <noltari@xxxxxxxxx>
  Date:   Sat May 2 12:08:42 2015 +0200

      hwrng: bcm63xx - Fix driver compilation

      - s/clk_didsable_unprepare/clk_disable_unprepare
      - s/prov/priv
      - s/error/ret (bcm63xx_rng_probe)

      Fixes: 6229c16060fe ("hwrng: bcm63xx - make use of devm_hwrng_register")
      Signed-off-by: �lvaro Fernández Rojas <noltari@xxxxxxxxx>
      Acked-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
      Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>

  commit 7829fb09a2b4268b30dd9bc782fa5ebee278b137
  Author: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
  Date:   Thu Apr 30 04:13:52 2015 +0200

      lib: make memzero_explicit more robust against dead store elimination

      In commit 0b053c951829 ("lib: memzero_explicit: use barrier instead
      of OPTIMIZER_HIDE_VAR"), we made memzero_explicit() more robust in
      case LTO would decide to inline memzero_explicit() and eventually
      find out it could be elimiated as dead store.

      While using barrier() works well for the case of gcc, recent efforts
      from LLVMLinux people suggest to use llvm as an alternative to gcc,
      and there, Stephan found in a simple stand-alone user space example
      that llvm could nevertheless optimize and thus elimitate the memset().
      A similar issue has been observed in the referenced llvm bug report,
      which is regarded as not-a-bug.

      Based on some experiments, icc is a bit special on its own, while it
      doesn't seem to eliminate the memset(), it could do so with an own
      implementation, and then result in similar findings as with llvm.

      The fix in this patch now works for all three compilers (also tested
      with more aggressive optimization levels). Arguably, in the current
      kernel tree it's more of a theoretical issue, but imho, it's better
      to be pedantic about it.

      It's clearly visible with gcc/llvm though, with the below code: if we
      would have used barrier() only here, llvm would have omitted clearing,
      not so with barrier_data() variant:

        static inline void memzero_explicit(void *s, size_t count)
        {
          memset(s, 0, count);
          barrier_data(s);
        }

        int main(void)
        {
          char buff[20];
          memzero_explicit(buff, sizeof(buff));
          return 0;
        }

        $ gcc -O2 test.c
        $ gdb a.out
        (gdb) disassemble main
        Dump of assembler code for function main:
         0x0000000000400400  <+0>: lea   -0x28(%rsp),%rax
         0x0000000000400405  <+5>: movq  $0x0,-0x28(%rsp)
         0x000000000040040e <+14>: movq  $0x0,-0x20(%rsp)
         0x0000000000400417 <+23>: movl  $0x0,-0x18(%rsp)
         0x000000000040041f <+31>: xor   %eax,%eax
         0x0000000000400421 <+33>: retq
        End of assembler dump.

        $ clang -O2 test.c
        $ gdb a.out
        (gdb) disassemble main
        Dump of assembler code for function main:
         0x00000000004004f0  <+0>: xorps  %xmm0,%xmm0
         0x00000000004004f3  <+3>: movaps %xmm0,-0x18(%rsp)
         0x00000000004004f8  <+8>: movl   $0x0,-0x8(%rsp)
         0x0000000000400500 <+16>: lea    -0x18(%rsp),%rax
         0x0000000000400505 <+21>: xor    %eax,%eax
         0x0000000000400507 <+23>: retq
        End of assembler dump.

      As gcc, clang, but also icc defines __GNUC__, it's sufficient to define
      this in compiler-gcc.h only to be picked up. For a fallback or otherwise
      unsupported compiler, we define it as a barrier. Similarly, for ecc which
      does not support gcc inline asm.

      Reference: https://llvm.org/bugs/show_bug.cgi?id=15495
      Reported-by: Stephan Mueller <smueller@xxxxxxxxxx>
      Tested-by: Stephan Mueller <smueller@xxxxxxxxxx>
      Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
      Cc: Theodore Ts'o <tytso@xxxxxxx>
      Cc: Stephan Mueller <smueller@xxxxxxxxxx>
      Cc: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>
      Cc: mancha security <mancha1@xxxxxxxx>
      Cc: Mark Charlebois <charlebm@xxxxxxxxx>
      Cc: Behan Webster <behanw@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>

  commit 184af16b09360d6273fd6160e6ff7f8e2482ef23
  Author: Grygorii Strashko <Grygorii.Strashko@xxxxxxxxxx>
  Date:   Thu Apr 23 13:43:43 2015 +0300

      mmc: core: add missing pm event in mmc_pm_notify to fix hib restore

      The PM_RESTORE_PREPARE is not handled now in mmc_pm_notify(),
      as result mmc_rescan() could be scheduled and executed at
      late hibernation restore stages when MMC device is suspended
      already - which, in turn, will lead to system crash on TI dra7-evm board:

      WARNING: CPU: 0 PID: 3188 at drivers/bus/omap_l3_noc.c:148 
l3_interrupt_handler+0x258/0x374()
      44000000.ocp:L3 Custom Error: MASTER MPU TARGET L4_PER1_P3 (Idle): Data 
Access in User mode during Functional access

      Hence, add missed PM_RESTORE_PREPARE PM event in mmc_pm_notify().

      Fixes: 4c2ef25fe0b8 (mmc: fix all hangs related to mmc/sd card...)
      Signed-off-by: Grygorii Strashko <Grygorii.Strashko@xxxxxxxxxx>
      Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>

  commit efdbd2b30caa65dd9e687853afa4d7ce8b39447e
  Author: Vlad Yasevich <vyasevich@xxxxxxxxx>
  Date:   Fri May 1 17:36:37 2015 -0400

      macvlan: Propagate promiscuity setting to lower devices.

      When a macvlan device is placed in promiscuous mode, it currently
      just sets it's multicast mask to permissive, but doesn't change
      the state of the lower device.  As a result, not all multicast
      traffic can be received on such device.  Additionally, none of
      a vlan traffic can be received on such device as well.
      This patch propagates the promiscuous mode setting to lower device
      so that lower device may receive all packets that macvlan may
      be interested in.

      Signed-off-by: Vladislav Yasevich <vyasevic@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 2e70aedd3d522b018c01df172cd213a8a75e2d55
  Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
  Date:   Sun May 3 08:04:28 2015 +0800

      Revert "net: kernel socket should be released in init_net namespace"

      This reverts commit c243d7e20996254f89c28d4838b5feca735c030d.

      That patch is solving a non-existant problem while creating a
      real problem.  Just because a socket is allocated in the init
      name space doesn't mean that it gets hashed in the init name space.

      When we unhash it the name space must be the same as the one
      we had when we hashed it.  So this patch is completely bogus
      and causes socket leaks.

      Reported-by: Andrey Wagin <avagin@xxxxxxxxx>
      Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit bd4d95a5c9b2973d51934b830e1aa4ebf84645e6
  Merge: 4212b54 e7fcd54
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Mon May 4 00:06:56 2015 -0400

      Merge branch 'dev_kfree_skb'

      Alexander Duyck says:

      ====================
      Clean-up some bits related to netpoll

      This patch set cleans up some minor items related to netpoll.  The first
      patch addresses an Rx clean-up bug that is triggered due to an assumption
      that napi->poll wouldn't be called with a budget of 0.  The other two
      patches address dev_kfree_skb being called in the xmit path which isn't
      valid since netpoll will call ndo_start_xmit with IRQs disabled.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit e7fcd5439ffd76e499b7ba4a2f8e99645addff3e
  Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxxx>
  Date:   Fri May 1 10:34:50 2015 -0700

      ixgbevf: Use dev_kfree_skb_any in xmit path, not dev_kfree_skb

      With netpoll making use of the transmit function it is possible for the
      ndo_start_xmit function to be called with irqs disabled.  As such we need
      to use dev_kfree_skb_any in the Tx cleanup path for frames that are
      dropped.

      Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit eb781397904e5d6b90c80463eaa9dc592831bdae
  Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxxx>
  Date:   Fri May 1 10:34:44 2015 -0700

      r8169: Do not use dev_kfree_skb in xmit path

      The function r8169_csum_workaround is called in the ndo_start_xmit path of
      the r8169 driver.  As such it should not be using dev_kfree_skb as it is
      not irq safe, so instead we should be using dev_kfree_skb_any for freeing
      in the dropped path, and dev_consume_skb_any for any frames that were
      transmitted.

      Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 59486329b46f31532ab032014fbaae72e9f190c3
  Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxxx>
  Date:   Fri May 1 10:34:38 2015 -0700

      fm10k: Do not assume budget will never be 0 for NAPI

      The netpoll path will call napi->poll with a budget of 0 in order to clean
      the Tx rings only.  This change updates the fm10k driver so that it will
      correctly support that instead of cleaning 1 Rx frame if a budget of 0 is
      received.

      Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 4212b5433187d01b5ae83664b06e990a9116250f
  Author: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 1 10:43:52 2015 -0400

      net: dsa: mv88e6xxx: unregister mv88e6352 driver

      Add the missing unregister for the mv88e6352_switch_driver.

      Signed-off-by: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
      Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 4f6d25deed30e1c1918f9f7bbe7e63295ef2bf1b
  Merge: f0e9fc5 5793aff
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Sun May 3 23:45:09 2015 -0400

      Merge tag 'linux-can-fixes-for-4.1-20150501' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

      Marc Kleine-Budde says:

      ====================
      this is a pull request of a single patch for net/master.

      The patch is contributed by Jeppe Ledet-Pedersen, it fixes the
      extended frame handling in the xilinx driver.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit f0e9fc503a0d6c9d74ca5b6d1aaf87febbbd9b06
  Author: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
  Date:   Thu Apr 30 21:47:42 2015 -0400

      drivers/net: include <module.h> for modular stmmac_platform code

      This file is built off of a tristate Kconfig option and also contains
      modular function calls so it should explicitly include module.h to
      avoid compile breakage during header shuffles done in the future.

      Cc: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx>
      Cc: netdev@xxxxxxxxxxxxxxx
      Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit c0adf54a10903b59037a4c5fcb933dfeeb7b2624
  Author: shamir rabinovitch <shamir.rabinovitch@xxxxxxxxxx>
  Date:   Thu Apr 30 20:58:07 2015 -0400

      net/rds: fix unaligned memory access

      rdma_conn_param private data is copied using memcpy after headers such
      as cma_hdr (see cma_resolve_ib_udp as example). so the start of the
      private data is aligned to the end of the structure that come before. if
      this structure end with u32 the meaning is that the start of the private
      data will be 4 bytes aligned. structures that use u8/u16/u32/u64 are
      naturally aligned but in case the structure start is not 8 bytes aligned,
      all u64 members of this structure will not be aligned. to solve this issue
      we must use special macros that allow unaligned access to those
      unaligned members.

      Addresses the following kernel log seen when attempting to use RDMA:

      Kernel unaligned access at TPC[10507a88] 
rds_ib_cm_connect_complete+0x1bc/0x1e0 [rds_rdma]

      Acked-by: Chien Yen <chien.yen@xxxxxxxxxx>
      Signed-off-by: shamir rabinovitch <shamir.rabinovitch@xxxxxxxxxx>
      [Minor tweaks for top of tree by:]
      Signed-off-by: David Ahern <david.ahern@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit edac450d5b5d47aa11e614f19c8f9b17f362e608
  Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 1 08:27:59 2015 +0800

      netlink: Remove max_size setting

      We currently limit the hash table size to 64K which is very bad
      as even 10 years ago it was relatively easy to generate millions
      of sockets.

      Since the hash table is naturally limited by memory allocation
      failure, we don't really need an explicit limit so this patch
      removes it.

      Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
      Acked-by: Thomas Graf <tgraf@xxxxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 5ebe6afaf0057ac3eaeb98defd5456894b446d22
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun May 3 19:22:23 2015 -0700

      Linux 4.1-rc2

  commit a5d28090405038ca1f40c13f38d6d4285456efee
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Thu Apr 30 09:40:40 2015 -0700

      codel: fix maxpacket/mtu confusion

      Under presence of TSO/GSO/GRO packets, codel at low rates can be quite
      useless. In following example, not a single packet was ever dropped,
      while average delay in codel queue is ~100 ms !

      qdisc codel 0: parent 1:12 limit 16000p target 5.0ms interval 100.0ms
       Sent 134376498 bytes 88797 pkt (dropped 0, overlimits 0 requeues 0)
       backlog 13626b 3p requeues 0
        count 0 lastcount 0 ldelay 96.9ms drop_next 0us
        maxpacket 9084 ecn_mark 0 drop_overlimit 0

      This comes from a confusion of what should be the minimal backlog. It is
      pretty clear it is not 64KB or whatever max GSO packet ever reached the
      qdisc.

      codel intent was to use MTU of the device.

      After the fix, we finally drop some packets, and rtt/cwnd of my single
      TCP flow are meeting our expectations.

      qdisc codel 0: parent 1:12 limit 16000p target 5.0ms interval 100.0ms
       Sent 102798497 bytes 67912 pkt (dropped 1365, overlimits 0 requeues 0)
       backlog 6056b 3p requeues 0
        count 1 lastcount 1 ldelay 36.3ms drop_next 0us
        maxpacket 10598 ecn_mark 0 drop_overlimit 0

      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Cc: Kathleen Nichols <nichols@xxxxxxxxxxx>
      Cc: Dave Taht <dave.taht@xxxxxxxxx>
      Cc: Van Jacobson <vanj@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 8663da2c0919896788321cd8a0016af08588c656
  Merge: 101a6fd 2c869b2
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun May 3 18:23:53 2015 -0700

      Merge tag 'for_linus_stable' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

      Pull ext4 fixes from Ted Ts'o:
       "Some miscellaneous bug fixes and some final on-disk and ABI changes
        for ext4 encryption which provide better security and performance"

      * tag 'for_linus_stable' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: fix growing of tiny filesystems
        ext4: move check under lock scope to close a race.
        ext4: fix data corruption caused by unwritten and delayed extents
        ext4 crypto: remove duplicated encryption mode definitions
        ext4 crypto: do not select from EXT4_FS_ENCRYPTION
        ext4 crypto: add padding to filenames before encrypting
        ext4 crypto: simplify and speed up filename encryption

  commit 101a6fd387801bbe164eafea3950b98f8e6440bb
  Merge: 61f06db 71aee81
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun May 3 18:15:48 2015 -0700

      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

      Pull drm fixes from Dave Airlie:
       "One intel fix, one rockchip fix, and a bunch of radeon fixes for some
        regressions from audio rework and vm stability"

      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/i915/chv: Implement WaDisableShadowRegForCpd
        drm/radeon: fix userptr return value checking (v2)
        drm/radeon: check new address before removing old one
        drm/radeon: reset BOs address after clearing it.
        drm/radeon: fix lockup when BOs aren't part of the VM on release
        drm/radeon: add SI DPM quirk for Sapphire R9 270 Dual-X 2G GDDR5
        drm/radeon: adjust pll when audio is not enabled
        drm/radeon: only enable audio streams if the monitor supports it
        drm/radeon: only mark audio as connected if the monitor supports it (v3)
        drm/radeon/audio: don't enable packets until the end
        drm/radeon: drop dce6_dp_enable
        drm/radeon: fix ordering of AVI packet setup
        drm/radeon: Use drm_calloc_ab for CS relocs
        drm/rockchip: fix error check when getting irq
        MAINTAINERS: add entry for Rockchip drm drivers

  commit 71aee81937963ccb07b3fa1b912e4cc6cd77dfa8
  Merge: df9ebeb a04f90a
  Author: Dave Airlie <airlied@xxxxxxxxxx>
  Date:   Mon May 4 08:56:47 2015 +1000

      Merge tag 'drm-intel-fixes-2015-04-30' of 
git://anongit.freedesktop.org/drm-intel into drm-fixes

      Just a single intel fix
      * tag 'drm-intel-fixes-2015-04-30' of 
git://anongit.freedesktop.org/drm-intel:
        drm/i915/chv: Implement WaDisableShadowRegForCpd

  commit df9ebeb2da3ae0122f44521ee833d31e1a2b3845
  Merge: feb589e 3ea6892
  Author: Dave Airlie <airlied@xxxxxxxxxx>
  Date:   Mon May 4 08:56:27 2015 +1000

      Merge branch 'drm-next0420' of 
https://github.com/markyzq/kernel-drm-rockchip into drm-fixes

      one fix and maintainers update
      * 'drm-next0420' of https://github.com/markyzq/kernel-drm-rockchip:
        drm/rockchip: fix error check when getting irq
        MAINTAINERS: add entry for Rockchip drm drivers

  commit 3b8786ff7a1b31645ae2c26a2ec32dbd42ac1094
  Author: Will Deacon <will.deacon@xxxxxxx>
  Date:   Fri May 1 17:16:01 2015 +0100

      ARM: 8352/1: perf: Fix the pmu node name in warning message

      With commit 9fd85eb502a7 ("ARM: pmu: add support for interrupt-affinity
      property"), we print a warning when we find a PMU SPI with a missing
      missing interrupt-affinity property in a pmu node. Unfortunately, we
      pass the wrong (NULL) device node to of_node_full_name, resulting in
      unhelpful messages such as:

       hw perfevents: Failed to parse <no-node>/interrupt-affinity[0]

      This patch fixes the name to that of the pmu node.

      Fixes: 9fd85eb502a7 (ARM: pmu: add support for interrupt-affinity 
property)

      Acked-by: Mark Rutland <mark.rutland@xxxxxxx>
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
      Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

  commit 338d9dd3e2aee00a9198e8bf6e7d535d3feeaf32
  Author: Will Deacon <will.deacon@xxxxxxx>
  Date:   Fri May 1 17:15:23 2015 +0100

      ARM: 8351/1: perf: don't warn about missing interrupt-affinity property 
for PPIs

      PPIs are affine by nature, so the interrupt-affinity property is not
      used and therefore we shouldn't print a warning in its absence.

      Reported-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
      Reviewed-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
      Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

  commit 59c3191628fd1ced948d099f3138b92b06281520
  Author: Andrew Lunn <andrew@xxxxxxx>
  Date:   Thu Apr 30 19:51:43 2015 +0100

      ARM: 8350/1: proc-feroceon: Fix feroceon_proc_info macro

      bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with
      relative offset") broke booting for Kirkwood. The kernel would say:

      Starting kernel ...

      Uncompressing Linux... done, booting the kernel.

      Error: unrecognized/unsupported processor variant (0x56251311).

      Fix it by removing the extraneous .long __feroceon_setup from the
      feroceon_proc_info macro.

      Fixes: bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with 
relative offset")
      Reported-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
      Suggested-by: Arnd Bergmann <arnd@xxxxxxxx>
      Signed-off-by: Andrew Lunn <andrew@xxxxxxx>
      Tested-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
      Acked-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
      Tested-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
      Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

  commit 13f2fa7cb33d82b95e1e1dab8c95fa619b49f418
  Author: Valentin Rothberg <valentinrothberg@xxxxxxxxx>
  Date:   Thu Apr 30 14:36:03 2015 +0100

      ARM: 8349/1: arch/arm/mm/proc-arm925.S: remove dead #ifdef block

      The block could never be compiled;  CPU_ICACHE_STREAMING_DISABLE has not
      been defined in Kconfig since the very first Git commit.  Hence, we can
      safely remove the entire block.

      Signed-off-by: Valentin Rothberg <valentinrothberg@xxxxxxxxx>
      Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

  commit 024587dc2137a22096372fc8df4b283e84e057b5
  Author: Valentin Rothberg <valentinrothberg@xxxxxxxxx>
  Date:   Thu Apr 30 14:34:35 2015 +0100

      ARM: 8348/1: remove comments on CPU_ARM1020_CPU_IDLE

      CPU_ARM1020_CPU_IDLE is not defined in Kconfig.  The last reference on
      LKML dates back to 2001, so we can safely remove the comments to make
      static analysis tools happy.

      Signed-off-by: Valentin Rothberg <valentinrothberg@xxxxxxxxx>
      Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

  commit 1424532b2163bf1580f4b1091a5801e12310fac5
  Author: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
  Date:   Wed Apr 29 11:29:19 2015 +0100

      ARM: 8347/1: dma-mapping: fix off-by-one check in arm_setup_iommu_dma_ops

      Patch 22b3c181c6c324a46f71aae806d8ddbe61d25761 ("arm: dma-mapping: limit
      IOMMU mapping size") added a check for IO address space size. However
      this patch broke IOMMU initialization for typical platforms initialized
      from device tree, which get the default IO address space size of 4GiB.
      This value doesn't fit into size_t and fails a check introduced by that
      commit resulting in failed dma-mapping/iommu initialization. This patch
      fixes this issue by adding proper support for full 4GiB address space
      size.

      Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
      Acked-by: Will Deacon <will.deacon@xxxxxxx>
      Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

  commit f673821864899153142365aca888435815ac93f0
  Author: Lorenzo Bianconi <lorenzo.bianconi83@xxxxxxxxx>
  Date:   Wed Apr 8 20:51:57 2015 +0200

      ath9k: fix per-packet tx power configuration

      Do not use ieee80211_vif pointer in ath_get_rate_txpower() since it has 
been
      overwritten by setup_frame_info() and it will result in a corrupted tx 
power
      configuration. Set per-packet tx power in setup_frame_info() according to
      current vif tx power.

      Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@xxxxxxxxx>
      Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxx>

  commit 0581276deb9c2578a17d9f4463e7b5172da99eb9
  Merge: 414b7e3 e7afe89
  Author: Kalle Valo <kvalo@xxxxxxxxxxxxxx>
  Date:   Sun May 3 23:53:02 2015 +0300

      Merge tag 'iwlwifi-for-kalle-2015-04-28' of 
https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

      * fix firmware API for -13.ucode
      * fix RSSI handling that avoid bad roaming decision
      * fix firmware debug
      * fix MFUART operation
      * fix ASSERT while restart the hardware (because of another ASSERT e.g)

  commit 61f06db00e06b436dca4725c200c891ae8a4a92d
  Merge: 3333222 118c855
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun May 3 13:22:32 2015 -0700

      Merge tag 'scsi-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

      Pull SCSI fixes from James Bottomley:
       "This is three logical fixes (as 5 patches).

        The 3ware class of drivers were causing an oops with multiqueue by
        tearing down the command mappings after completing the command (where
        the variables in the command used to tear down the mapping were
        no-longer valid).  There's also a fix for the qnap iscsi target which
        was choking on us sending it commands that were too long and a fix for
        the reworked aha1542 allocating GFP_KERNEL under a lock"

      * tag 'scsi-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        3w-9xxx: fix command completion race
        3w-xxxx: fix command completion race
        3w-sas: fix command completion race
        aha1542: Allocate memory before taking a lock
        SCSI: add 1024 max sectors black list flag

  commit 9b071a43553d6b2df4364951639f61076a8dd676
  Author: Philippe Coval <philippe.coval@xxxxxxxxxxxxxxxxxxx>
  Date:   Sat May 2 15:14:08 2015 +0200

      ideapad_laptop: Add Lenovo G40-30 to devices without radio switch

      Lenovo G40-30 does not provide any physical radio switch to user.
      Therefore disable the rfkill switch identically to the Yoga 2 approach.
      (Note for later, models ids are sorted alphabetically).

      Benefit is to make wireless available again without unloading module.

      It was tested successfully on 4.1.0-rc1 base with this model:
      (LENOVO_MT_80FY_BU_idea_FM_Lenovo G40-30).

      BugLink: https://bugs.launchpad.net/ideapad-laptop/+bug/1450946
      Cc: platform-driver-x86@xxxxxxxxxxxxxxx
      Cc: linux-kernel@xxxxxxxxxxxxxxx
      Signed-off-by: Philippe Coval <rzr@xxxxxxx>
      Signed-off-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx>

  commit 3333222484dc7e46fd17cc1d394088fb0d963e6c
  Merge: 180d89f 63f89ca
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun May 3 10:49:04 2015 -0700

      Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

      Pull slave dmaengine fixes from Vinod Koul:
       "Here are the fixes in dmaengine subsystem for rc2:

         - privatecnt fix for slave dma request API by Christopher

         - warn fix for PM ifdef in usb-dmac by Geert

         - fix hardware dependency for xgene by Jean"

      * 'next' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: increment privatecnt when using dma_get_any_slave_channel
        dmaengine: xgene: Set hardware dependency
        dmaengine: usb-dmac: Protect PM-only functions to kill warning

  commit 180d89f6ef9c22d088e324eb5e7d030ef3f84df0
  Merge: 6c3c1eb 0aab374
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun May 3 10:28:36 2015 -0700

      Merge tag 'powerpc-4.1-3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

      Pull powerpc fixes from Michael Ellerman:
       - build fix for SMP=n in book3s_xics.c
       - fix for Daniel's pci_controller_ops on powernv.
       - revert the TM syscall abort patch for now.
       - CPU affinity fix from Nathan.
       - two EEH fixes from Gavin.
       - fix for CR corruption from Sam.
       - selftest build fix.

      * tag 'powerpc-4.1-3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc/powernv: Restore non-volatile CRs after nap
        powerpc/eeh: Delay probing EEH device during hotplug
        powerpc/eeh: Fix race condition in pcibios_set_pcie_reset_state()
        powerpc/pseries: Correct cpu affinity for dlpar added cpus
        selftests/powerpc: Fix the pmu install rule
        Revert "powerpc/tm: Abort syscalls in active transactions"
        powerpc/powernv: Fix early pci_controller_ops loading.
        powerpc/kvm: Fix SMP=n build error in book3s_xics.c

  commit 2c869b262a10ca99cb866d04087d75311587a30c
  Author: Jan Kara <jack@xxxxxxx>
  Date:   Sat May 2 23:58:32 2015 -0400

      ext4: fix growing of tiny filesystems

      The estimate of necessary transaction credits in ext4_flex_group_add()
      is too pessimistic. It reserves credit for sb, resize inode, and resize
      inode dindirect block for each group added in a flex group although they
      are always the same block and thus it is enough to account them only
      once. Also the number of modified GDT block is overestimated since we
      fit EXT4_DESC_PER_BLOCK(sb) descriptors in one block.

      Make the estimation more precise. That reduces number of requested
      credits enough that we can grow 20 MB filesystem (which has 1 MB
      journal, 79 reserved GDT blocks, and flex group size 16 by default).

      Signed-off-by: Jan Kara <jack@xxxxxxx>
      Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
      Reviewed-by: Eric Sandeen <sandeen@xxxxxxxxxx>

  commit 280227a75b56ab5d35854f3a77ef74a7ad56a203
  Author: Davide Italiano <dccitaliano@xxxxxxxxx>
  Date:   Sat May 2 23:21:15 2015 -0400

      ext4: move check under lock scope to close a race.

      fallocate() checks that the file is extent-based and returns
      EOPNOTSUPP in case is not. Other tasks can convert from and to
      indirect and extent so it's safe to check only after grabbing
      the inode mutex.

      Signed-off-by: Davide Italiano <dccitaliano@xxxxxxxxx>
      Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit d2dc317d564a46dfc683978a2e5a4f91434e9711
  Author: Lukas Czerner <lczerner@xxxxxxxxxx>
  Date:   Sat May 2 21:36:55 2015 -0400

      ext4: fix data corruption caused by unwritten and delayed extents

      Currently it is possible to lose whole file system block worth of data
      when we hit the specific interaction with unwritten and delayed extents
      in status extent tree.

      The problem is that when we insert delayed extent into extent status
      tree the only way to get rid of it is when we write out delayed buffer.
      However there is a limitation in the extent status tree implementation
      so that when inserting unwritten extent should there be even a single
      delayed block the whole unwritten extent would be marked as delayed.

      At this point, there is no way to get rid of the delayed extents,
      because there are no delayed buffers to write out. So when a we write
      into said unwritten extent we will convert it to written, but it still
      remains delayed.

      When we try to write into that block later ext4_da_map_blocks() will set
      the buffer new and delayed and map it to invalid block which causes
      the rest of the block to be zeroed loosing already written data.

      For now we can fix this by simply not allowing to set delayed status on
      written extent in the extent status tree. Also add WARN_ON() to make
      sure that we notice if this happens in the future.

      This problem can be easily reproduced by running the following xfs_io.

      xfs_io -f -c "pwrite -S 0xaa 4096 2048" \
                -c "falloc 0 131072" \
                -c "pwrite -S 0xbb 65536 2048" \
                -c "fsync" /mnt/test/fff

      echo 3 > /proc/sys/vm/drop_caches
      xfs_io -c "pwrite -S 0xdd 67584 2048" /mnt/test/fff

      This can be theoretically also reproduced by at random by running fsx,
      but it's not very reliable, though on machines with bigger page size
      (like ppc) this can be seen more often (especially xfstest generic/127)

      Signed-off-by: Lukas Czerner <lczerner@xxxxxxxxxx>
      Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 9402bdcacdfedf7219a17e4d93300058a8e2aa4c
  Author: Chanho Park <parkch98@xxxxxxxxx>
  Date:   Sat May 2 10:29:22 2015 -0400

      ext4 crypto: remove duplicated encryption mode definitions

      This patch removes duplicated encryption modes which were already in
      ext4.h. They were duplicated from commit 3edc18d and commit f542fb.

      Cc: Theodore Ts'o <tytso@xxxxxxx>
      Cc: Michael Halcrow <mhalcrow@xxxxxxxxxx>
      Cc: Andreas Dilger <adilger.kernel@xxxxxxxxx>
      Signed-off-by: Chanho Park <chanho61.park@xxxxxxxxxxx>
      Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>

  commit fb63e5489f7ef5bb4d1a655984ca7ef98ffc5849
  Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
  Date:   Sat May 2 10:29:19 2015 -0400

      ext4 crypto: do not select from EXT4_FS_ENCRYPTION

      This patch adds a tristate EXT4_ENCRYPTION to do the selections
      for EXT4_FS_ENCRYPTION because selecting from a bool causes all
      the selected options to be built-in, even if EXT4 itself is a
      module.

      Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>

  commit 6c3c1eb3c35e8856d6dcb01b412316a676f58bbe
  Merge: e412d3a a134f08
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 1 20:51:04 2015 -0700

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

      Pull networking fixes from David Miller:

       1) Receive packet length needs to be adjust by 2 on RX to accomodate
          the two padding bytes in altera_tse driver.  From Vlastimil Setka.

       2) If rx frame is dropped due to out of memory in macb driver, we leave
          the receive ring descriptors in an undefined state.  From Punnaiah
          Choudary Kalluri

       3) Some netlink subsystems erroneously signal NLM_F_MULTI.  That is
          only for dumps.  Fix from Nicolas Dichtel.

       4) Fix mis-use of raw rt->rt_pmtu value in ipv4, one must always go via
          the ipv4_mtu() helper.  From Herbert Xu.

       5) Fix null deref in bridge netfilter, and miscalculated lengths in
          jump/goto nf_tables verdicts.  From Florian Westphal.

       6) Unhash ping sockets properly.

       7) Software implementation of BPF divide did 64/32 rather than 64/64
          bit divide.  The JITs got it right.  Fix from Alexei Starovoitov.

      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (30 commits)
        ipv4: Missing sk_nulls_node_init() in ping_unhash().
        net: fec: Fix RGMII-ID mode
        net/mlx4_en: Schedule napi when RX buffers allocation fails
        netxen_nic: use spin_[un]lock_bh around tx_clean_lock
        net/mlx4_core: Fix unaligned accesses
        mlx4_en: Use correct loop cursor in error path.
        cxgb4: Fix MC1 memory offset calculation
        bnx2x: Delay during kdump load
        net: Fix Kernel Panic in bonding driver debugfs file: rlb_hash_table
        net: dsa: Fix scope of eeprom-length property
        net: macb: Fix race condition in driver when Rx frame is dropped
        hv_netvsc: Fix a bug in netvsc_start_xmit()
        altera_tse: Correct rx packet length
        mlx4: Fix tx ring affinity_mask creation
        tipc: fix problem with parallel link synchronization mechanism
        tipc: remove wrong use of NLM_F_MULTI
        bridge/nl: remove wrong use of NLM_F_MULTI
        bridge/mdb: remove wrong use of NLM_F_MULTI
        net: sched: act_connmark: don't zap skb->nfct
        trivial: net: systemport: bcmsysport.h: fix 0x0x prefix
        ...

  commit e412d3a32badcf17541d7443b033769fdf39b545
  Author: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
  Date:   Sat May 2 08:42:29 2015 +0930

      virtio: fix typo in vring_need_event() doc comment

      Here the "other side" refers to the guest or host.

      Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
      Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit feda5f939eafa4af94dfb547847806e0f2df73b8
  Author: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
  Date:   Sat May 2 08:42:38 2015 +0930

      virtio: pass baton to Michael Tsirkin

      With my job change kernel work will be "own time"; I'm keeping lguest
      and modules (and the virtio standards work), but virtio kernel has to
      go.

      This makes it clear that Michael is in charge.  He's good, but having
      me watch over his shoulder won't help.

      Good luck Michael!

      Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 6fa72720a6b6eced0220031a1e5598e3a2c533ae
  Merge: 64887b6 082a75d
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 1 20:35:39 2015 -0700

      Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

      Pull Ceph RBD fix from Sage Weil.

      * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        rbd: end I/O the entire obj_request on error

  commit a134f083e79fb4c3d0a925691e732c56911b4326
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Fri May 1 22:02:47 2015 -0400

      ipv4: Missing sk_nulls_node_init() in ping_unhash().

      If we don't do that, then the poison value is left in the ->pprev
      backlink.

      This can cause crashes if we do a disconnect, followed by a connect().

      Tested-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
      Reported-by: Wen Xu <hotdog3645@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 082a75dad84d79d1c15ea9e50f31cb4bb4fa7fd6
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Sat Apr 25 15:56:15 2015 +0300

      rbd: end I/O the entire obj_request on error

      When we end I/O struct request with error, we need to pass
      obj_request->length as @nr_bytes so that the entire obj_request worth
      of bytes is completed.  Otherwise block layer ends up confused and we
      trip on

          rbd_assert(more ^ (which == img_request->obj_request_count));

      in rbd_img_obj_callback() due to more being true no matter what.  We
      already do it in most cases but we are missing some, in particular
      those where we don't even get a chance to submit any obj_requests, due
      to an early -ENOMEM for example.

      A number of obj_request->xferred assignments seem to be redundant but
      I haven't touched any of obj_request->xferred stuff to keep this small
      and isolated.

      Cc: Alex Elder <elder@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx # 3.10+
      Reported-by: Shawn Edwards <lesser.evil@xxxxxxxxx>
      Reviewed-by: Sage Weil <sage@xxxxxxxxxx>
      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit db7d4d7f40215843000cb9d441c9149fd42ea36b
  Author: Alex Williamson <alex.williamson@xxxxxxxxxx>
  Date:   Fri May 1 16:31:41 2015 -0600

      vfio: Fix runaway interruptible timeout

      Commit 13060b64b819 ("vfio: Add and use device request op for vfio
      bus drivers") incorrectly makes use of an interruptible timeout.
      When interrupted, the signal remains pending resulting in subsequent
      timeouts occurring instantly.  This makes the loop spin at a much
      higher rate than intended.

      Instead of making this completely non-interruptible, we can change
      this into a sort of interruptible-once behavior and use the "once"
      to log debug information.  The driver API doesn't allow us to abort
      and return an error code.

      Signed-off-by: Alex Williamson <alex.williamson@xxxxxxxxxx>
      Fixes: 13060b64b819
      Cc: stable@xxxxxxxxxxxxxxx # v4.0

  commit 8ebb7e9c1a502cfc300618c19c3c6f06fc76d237
  Author: Marek Belisko <marek@xxxxxxxxxxxxx>
  Date:   Thu Apr 30 22:05:58 2015 +0200

      power: bq27x00_battery: Add missing MODULE_ALIAS

      Without MODULE_ALIAS bq27x00_battery module won't get loaded 
automatically.

      Signed-off-by: Marek Belisko <marek@xxxxxxxxxxxxx>
      Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx>

  commit a44cd7a05496d60fd2ba8cca080e3db8f481549b
  Author: Theodore Ts'o <tytso@xxxxxxx>
  Date:   Fri May 1 16:56:50 2015 -0400

      ext4 crypto: add padding to filenames before encrypting

      This obscures the length of the filenames, to decrease the amount of
      information leakage.  By default, we pad the filenames to the next 4
      byte boundaries.  This costs nothing, since the directory entries are
      aligned to 4 byte boundaries anyway.  Filenames can also be padded to
      8, 16, or 32 bytes, which will consume more directory space.

      Change-Id: Ibb7a0fb76d2c48e2061240a709358ff40b14f322
      Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>

  commit 5de0b4d0cd153c471640b13aae6ae6d18d0a4603
  Author: Theodore Ts'o <tytso@xxxxxxx>
  Date:   Fri May 1 16:56:45 2015 -0400

      ext4 crypto: simplify and speed up filename encryption

      Avoid using SHA-1 when calculating the user-visible filename when the
      encryption key is available, and avoid decrypting lots of filenames
      when searching for a directory entry in a directory block.

      Change-Id: If4655f144784978ba0305b597bfa1c8d7bb69e63
      Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>

  commit 0a73125d308c1453dada1e2998f1c7f68094c45f
  Author: Florian Fainelli <f.fainelli@xxxxxxxxx>
  Date:   Thu Apr 30 12:55:02 2015 -0700

      power: reset: Add MFD_SYSCON depends for brcmstb

      The Broadcom STB reboot driver depends on MFD_SYSCON, it uses
      syscon_regmap_lookup_by_phandle() which will not lookup syscon phandles
      if MFD_SYSCON is disabled, and instead will return -ENOSYS since it is
      turned into an inline stub.

      Fixes: 030494e75064c ("power: reset: Add reboot driver for brcmstb")
      Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
      Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx>

  commit 5f55d2ae699d1756ad6132786c7f9c27dc456b66
  Author: Alex Williamson <alex.williamson@xxxxxxxxxx>
  Date:   Tue Apr 28 10:23:30 2015 -0600

      vfio-pci: Log device requests more verbosely

      Log some clues indicating whether the user is receiving device
      request interfaces or not listening.  This can help indicate why a
      driver unbind is blocked or explain why QEMU automatically unplugged
      a device from the VM.

      Signed-off-by: Alex Williamson <alex.williamson@xxxxxxxxxx>

  commit 1de2a662d0f2d3b211b7d10ea6578abe5c39eda3
  Author: Florian Fainelli <f.fainelli@xxxxxxxxx>
  Date:   Fri Apr 10 11:52:40 2015 -0700

      MAINTAINERS: Update brcmstb entry

      We have not heard back from Marc in a while, since we last asked him to
      ack/nack this change here: https://lkml.org/lkml/2015/1/14/1004

      This was back in January, we are in the 3.21^W4.1 merge window now, so,
      as outlined in this email thread, remove him from the MAINTAINERS list
      now.

      Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx>

  commit 049a4c506586c293b6fe54b5c61762230417dbf8
  Author: Florian Fainelli <f.fainelli@xxxxxxxxx>
  Date:   Fri Apr 10 11:50:40 2015 -0700

      MAINTAINERS: Remove Christian Daudt for mach-bcm

      Christian has not been responding to mach-bcm related emails since
      around July 2013, and with Scott and Ray maintaining the platform, we
      should have enough coverage to get that going now.

      Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx>

  commit d3cc2e865055f58378de86c6b51a5636328ca827
  Author: Florian Fainelli <f.fainelli@xxxxxxxxx>
  Date:   Fri Apr 10 11:49:44 2015 -0700

      MAINTAINERS: Update mach-bcm maintainers list

      Add Ray Jui and Scott Branden for the mach-bcm/ entries.

      Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx>

  commit 64887b6882de36069c18ef2d9623484d6db7cd3a
  Merge: 036f351 5d2361d
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 1 07:46:21 2015 -0700

      Merge branch 'for-linus-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

      Pull btrfs fixes from Chris Mason:
       "A few more btrfs fixes.

        These range from corners Filipe found in the new free space cache
        writeback to a grab bag of fixes from the list"

      * 'for-linus-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: btrfs_release_extent_buffer_page didn't free pages of dummy 
extent
        Btrfs: fill ->last_trans for delayed inode in btrfs_fill_inode.
        btrfs: unlock i_mutex after attempting to delete subvolume during send
        btrfs: check io_ctl_prepare_pages return in __btrfs_write_out_cache
        btrfs: fix race on ENOMEM in alloc_extent_buffer
        btrfs: handle ENOMEM in btrfs_alloc_tree_block
        Btrfs: fix find_free_dev_extent() malfunction in case device tree has 
hole
        Btrfs: don't check for delalloc_bytes in cache_save_setup
        Btrfs: fix deadlock when starting writeback of bg caches
        Btrfs: fix race between start dirty bg cache writeout and bg deletion

  commit 036f351e2566eaa5826581c8512dd55f6585ad01
  Merge: 4a152c3 8291fd0
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri May 1 07:44:32 2015 -0700

      Merge tag 'arm64-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

      Pull arm64 fixes from Will Deacon:
       "Not too much here, but we've addressed a couple of nasty issues in the
        dma-mapping code as well as adding the halfword and byte variants of
        load_acquire/store_release following on from the CSD locking bug that
        you fixed in the core.

         - fix perf devicetree warnings at probe time

         - fix memory leak in __dma_free()

         - ensure DMA buffers are always zeroed

         - show IRQ trigger in /proc/interrupts (for parity with ARM)

         - implement byte and halfword access for 
smp_{load_acquire,store_release}"

      * tag 'arm64-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: perf: Fix the pmu node name in warning message
        arm64: perf: don't warn about missing interrupt-affinity property for 
PPIs
        arm64: add missing PAGE_ALIGN() to __dma_free()
        arm64: dma-mapping: always clear allocated buffers
        ARM64: Enable CONFIG_GENERIC_IRQ_SHOW_LEVEL
        arm64: add missing data types in smp_load_acquire/smp_store_release

  commit e944ec2ca00fb0170ba9d7f2aeec32c22dc0d4ec
  Author: Namhyung Kim <namhyung@xxxxxxxxxx>
  Date:   Wed Apr 29 21:08:48 2015 +0900

      perf report: Fix -T/--threads option to work again

      The commit 512ae1bd6acb ("perf tools: Consolidate management of default
      sort orders") changed default value of the 'sort_order' variable to NULL
      indicating that users don't set any sort keys on the command line.

      However it missed to update a check in perf_evlist__tty_browse_hists()
      so that 'perf report -T' cannot show the per-thread values after the
      normal output.  This patch fixes it to work again.

      Note that the -T option only works on --stdio and neither --sort nor
      --parent option was given.

      Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
      Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
      Cc: David Ahern <dsahern@xxxxxxxxx>
      Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
      Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
      Cc: Stephane Eranian <eranian@xxxxxxxxxx>
      Link: 
http://lkml.kernel.org/r/1430309328-28317-1-git-send-email-namhyung@xxxxxxxxxx
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit 5793affe8c723ece8114b898ab9003c7d97f86d1
  Author: Jeppe Ledet-Pedersen <jlp@xxxxxxxxxxxx>
  Date:   Wed Apr 29 17:05:01 2015 +0200

      net: can: xilinx_can: fix extended frame handling

      Using IDR_SRR in RXFIFO_ID to test for the presence of data is only
      valid for standard frames. For extended frames the bit is always 1 and
      IDR_RTR should be used instead. This patch switches the check to use
      CAN_RTR_FLAG which is correctly set when reading the ID.

      The patch also changes the DW1/DW2 to be read unconditionally, since
      this is necessary to remove the frame from the RXFIFO.

      Signed-off-by: Jeppe Ledet-Pedersen <jlp@xxxxxxxxxxxx>
      Acked-by: Kedareswara rao Appana <appanad@xxxxxxxxxx>
      Cc: linux-stable <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>

  commit 0aab3747091db309b8a484cfd382a41644552aa3
  Author: Sam Bobroff <sam.bobroff@xxxxxxxxxxx>
  Date:   Fri May 1 16:50:34 2015 +1000

      powerpc/powernv: Restore non-volatile CRs after nap

      Patches 7cba160ad "powernv/cpuidle: Redesign idle states management"
      and 77b54e9f2 "powernv/powerpc: Add winkle support for offline cpus"
      use non-volatile condition registers (cr2, cr3 and cr4) early in the 
system
      reset interrupt handler (system_reset_pSeries()) before it has been 
determined
      if state loss has occurred. If state loss has not occurred, control 
returns via
      the power7_wakeup_noloss() path which does not restore those condition
      registers, leaving them corrupted.

      Fix this by restoring the condition registers in the 
power7_wakeup_noloss()
      case.

      This is apparent when running a KVM guest on hardware that does not
      support winkle or sleep and the guest makes use of secondary threads. In
      practice this means Power7 machines, though some early unreleased Power8
      machines may also be susceptible.

      The secondary CPUs are taken off line before the guest is started and
      they call pnv_smp_cpu_kill_self(). This checks support for sleep
      states (in this case there is no support) and power7_nap() is called.

      When the CPU is woken, power7_nap() returns and because the CPU is
      still off line, the main while loop executes again. The sleep states
      support test is executed again, but because the tested values cannot
      have changed, the compiler has optimized the test away and instead we
      rely on the result of the first test, which has been left in cr3
      and/or cr4. With the result overwritten, the wrong branch is taken and
      power7_winkle() is called on a CPU that does not support it, leading
      to it stalling.

      Fixes: 7cba160ad789 ("powernv/cpuidle: Redesign idle states management")
      Fixes: 77b54e9f213f ("powernv/powerpc: Add winkle support for offline 
cpus")
      [mpe: Massage change log a bit more]
      Signed-off-by: Sam Bobroff <sam.bobroff@xxxxxxxxxxx>
      Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>

  commit 8cc67c3b9366699b35775912e0bb91b4f845a57a
  Merge: 0140e61 1d90a68
  Author: Ingo Molnar <mingo@xxxxxxxxxx>
  Date:   Fri May 1 08:30:26 2015 +0200

      Merge tag 'perf-urgent-for-mingo-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

      Pull perf tooling fixes from Arnaldo Carvalho de Melo:

        . Fix a segfault in 'perf top' when kernel map is restricted (Wang Nan)

        . Fix hung wakeup tasks after requeueing in 'perf bench futex' 
(Davidlohr Bueso)

        . Fix bug in perf probe global variables handling, missing curly braces 
on
          an if body (He Kuang)

        . 'perf bench numa' fixes (command line help/handling, etc) (Petr 
Holasek)

        . fix the 'perf kmem' build on RHEL6/OL6 (David Ahern)

        . fix the libtraceevent build on 32-bit arch (Namhyung Kim)

      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
      Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>

  commit d91dafc02f42e23c1a906202ebde5d7c49ef058d
  Author: Gavin Shan <gwshan@xxxxxxxxxxxxxxxxxx>
  Date:   Fri May 1 09:22:15 2015 +1000

      powerpc/eeh: Delay probing EEH device during hotplug

      Commit 1c509148b ("powerpc/eeh: Do probe on pci_dn") probes EEH
      devices in early stage, which is reasonable to pSeries platform.
      However, it's wrong for PowerNV platform because the PE# isn't
      determined until the resources (IO and MMIO) are assigned to
      PE in hotplug case. So we have to delay probing EEH devices
      for PowerNV platform until the PE# is assigned.

      Fixes: ff57b454ddb9 ("powerpc/eeh: Do probe on pci_dn")
      Signed-off-by: Gavin Shan <gwshan@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>

  commit 1ae79b78bc52b910a224f3795122538516e07b5f
  Author: Gavin Shan <gwshan@xxxxxxxxxxxxxxxxxx>
  Date:   Fri May 1 09:14:11 2015 +1000

      powerpc/eeh: Fix race condition in pcibios_set_pcie_reset_state()

      When asserting reset in pcibios_set_pcie_reset_state(), the PE
      is enforced to (hardware) frozen state in order to drop unexpected
      PCI transactions (except PCI config read/write) automatically by
      hardware during reset, which would cause recursive EEH error.
      However, the (software) frozen state EEH_PE_ISOLATED is missed.
      When users get 0xFF from PCI config or MMIO read, EEH_PE_ISOLATED
      is set in PE state retrival backend. Unfortunately, nobody (the
      reset handler or the EEH recovery functinality in host) will clear
      EEH_PE_ISOLATED when the PE has been passed through to guest.

      The patch sets and clears EEH_PE_ISOLATED properly during reset
      in function pcibios_set_pcie_reset_state() to fix the issue.

      Fixes: 28158cd ("Enhance pcibios_set_pcie_reset_state()")
      Reported-by: Carol L. Soto <clsoto@xxxxxxxxxx>
      Signed-off-by: Gavin Shan <gwshan@xxxxxxxxxxxxxxxxxx>
      Tested-by: Carol L. Soto <clsoto@xxxxxxxxxx>
      Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>

  commit f32393c943e297b8ae180c8f83d81a156c7d0412
  Author: Nathan Fontenot <nfont@xxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 29 20:42:06 2015 -0500

      powerpc/pseries: Correct cpu affinity for dlpar added cpus

      The incorrect ordering of operations during cpu dlpar add results in 
invalid
      affinity for the cpu being added. The ibm,associativity property in the
      device tree is populated with all zeroes for the added cpu which results 
in
      invalid affinity mappings and all cpus appear to belong to node 0.

      This occurs because rtas configure-connector is called prior to making the
      rtas set-indicator calls. Phyp does not assign affinity information
      for a cpu until the rtas set-indicator calls are made to set the isolation
      and allocation state.

      Correct the order of operations to make the rtas set-indicator
      calls (done in dlpar_acquire_drc) before calling rtas configure-connector.

      Fixes: 1a8061c46c46 ("powerpc/pseries: Add kernel based CPU DLPAR 
handling")

      Signed-off-by: Nathan Fontenot <nfont@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>

  commit 2fa30fe957f3b3599a2f75688405495771877c14
  Author: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
  Date:   Fri May 1 11:10:09 2015 +1000

      selftests/powerpc: Fix the pmu install rule

      My patch to add install support for the powerpc selftests had a typo,
      leading to the three tests in the pmu directory itself not being
      installed.

      Fixes: 6faeeea44b84 ("selftests: Add install support for the powerpc 
tests")
      Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>

  commit 12392f5896c9affc03c1ddd95a83c32238862a58
  Author: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
  Date:   Wed Apr 29 16:55:43 2015 +0300

      ARM: shmobile: koelsch: Fix adv7511 IRQ sensing

      The adv7511 IRQ is low level triggered, not falling edge triggered. The
      wrong sense configuration results in no interrupt being triggered at
      all, breaking hotplug detection. Fix it.

      Signed-off-by: Laurent Pinchart 
<laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
      Fixes: 83a0731b39f3 ("ARM: shmobile: koelsch: Add DU HDMI output support")
      Signed-off-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>

  commit 2375a212ca06d35f90841bc511b3e9ae8a95a82e
  Author: Antonio Ospite <ao2@xxxxxx>
  Date:   Wed Apr 29 10:37:24 2015 +0200

      ACPI / documentation: fix a sentence about GPIO resources

      The sentence "These resources are used be used to pass ..." contains
      a suspicious repetition, likely the author meant "These resources can
      be used to pass ...".

      Simplify the wording.

      Signed-off-by: Antonio Ospite <ao2@xxxxxx>
      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit 4a152c3913fb46fc2e29081d0251862106c3d55f
  Merge: 5a2e73b 50904a7
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 30 14:23:31 2015 -0700

      Merge tag 'pm+acpi-4.1-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

      Pull power management and ACPI fixes from Rafael Wysocki:
       "Three regression fixes this time, one for a recent regression in the
        cpuidle core affecting multiple systems, one for an inadvertently
        added duplicate typedef in ACPICA that breaks compilation with GCC 4.5
        and one for an ACPI Smart Battery Subsystem driver regression
        introduced during the 3.18 cycle (stable-candidate).

        Specifics:

         - Fix for a regression in the cpuidle core introduced by one of the
           recent commits in the clockevents_notify() removal series that put
           a call to a function which had to be executed with disabled
           interrupts into a code path running with enabled interrupts (Rafael
           J Wysocki)

         - Fix for a build problem in ACPICA (with GCC 4.5) introduced by one
           of the recent ACPICA tools commits that added a duplicate typedef
           to one of the ACPICA's header files by mistake (Olaf Hering)

         - Fix for a regression in the ACPI SBS (Smart Battery Subsystem)
           driver introduced during the 3.18 development cycle causing the
           smart battery manager to be marked as not present when it should be
           marked as present (Chris Bainbridge)"

      * tag 'pm+acpi-4.1-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpuidle: Run tick_broadcast_exit() with disabled interrupts
        ACPI / SBS: Enable battery manager when present
        ACPICA: remove duplicate u8 typedef

  commit 3349fb64b2927407017d970dd5c4daf3c5ad69f8
  Author: Chris Bainbridge <chris.bainbridge@xxxxxxxxx>
  Date:   Wed Apr 29 21:21:40 2015 +0100

      ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook

      Commit 7bc5a2bad0b8 'ACPI: Support _OSI("Darwin") correctly' caused
      the MacBook firmware to expose the SBS, resulting in intermittent
      hangs of several minutes on boot, and failure to detect or report
      the battery.  Fix this by adding a 5 us delay to the start of each
      SMBUS transaction.  This timing is the result of experimentation -
      hangs were observed with 3 us but never with 5 us.

      Fixes: 7bc5a2bad0b8 'ACPI: Support _OSI("Darwin") correctly'
      Link: https://bugzilla.kernel.org/show_bug.cgi?id=94651
      Signed-off-by: Chris Bainbridge <chris.bainbridge@xxxxxxxxx>
      Cc: 3.18+ <stable@xxxxxxxxxxxxxxx> # 3.18+
      [ rjw: Subject and changelog ]
      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit 5a2e73b281b7b8930407daf01b64d69ea942417e
  Merge: 9dbbe3c 0ae3aba
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 30 14:00:18 2015 -0700

      Merge tag 'sound-4.1-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

      Pull sound fixes from Takashi Iwai:
       "One nice fix is Peter's patch to make the old good SB Audigy PCI to
        work with 32bit DMA instead of 31bit.  This allows the MIDI synth
        running on modern machines again.  Along with it, a few fixes for
        emu10k1 have merged.

        In ASoC side, there is one fix in the common code, but it's just
        trivial additions of static inline functions for CONFIG_PM=n.  The
        rest are various device-specific small fixes.

        Last but not least, a few HD-audio fixes are included, as usual, too"

      * tag 'sound-4.1-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (23 commits)
        ASoC: rt5677: fixed wrong DMIC ref clock
        ALSA: emu10k1: Emu10k2 32 bit DMA mode
        ALSA: emux: Fix mutex deadlock in OSS emulation
        ASoC: Update email-id of Rajeev Kumar
        ASoC: rt5645: Fix mask for setting RT5645_DMIC_2_DP_GPIO12 bit
        ALSA: hda - Fix missing va_end() call in snd_hda_codec_pcm_new()
        ALSA: emux: Fix mutex deadlock at unloading
        ALSA: emu10k1: Fix card shortname string buffer overflow
        ALSA: hda - Add mute-LED mode control to Thinkpad
        ALSA: hda - Fix mute-LED fixed mode
        ALSA: hda - Fix click noise at start on Dell XPS13
        ASoC: rt5645: Add ACPI match ID
        ASoC: rt5677: add register patch for PLL
        ASoC: Intel: fix the makefile for atom code
        ASoC: dapm: Enable autodisable on SOC_DAPM_SINGLE_TLV_AUTODISABLE
        ASoC: add static inline funcs to fix a compiling issue
        ASoC: Intel: sst_byt: remove kfree for memory allocated with 
devm_kzalloc
        ASoC: samsung: s3c24xx-i2s: Fix return value check in 
s3c24xx_iis_dev_probe()
        ASoC: tfa9879: Fix return value check in tfa9879_i2c_probe()
        ASoC: fsl_ssi: Fix platform_get_irq() error handling
        ...

  commit fc9e38c0f4d38bfc68b405cf48365d65f7b6319e
  Author: Robert Jarzmik <robert.jarzmik@xxxxxxx>
  Date:   Sun Dec 14 23:04:14 2014 +0100

      ARM: pxa: lubbock: use new pxa_cplds driver

      As the interrupt handling was transferred to the pxa_cplds driver,
      make the switch in lubbock platform code.

      Fixes: 157d2644cb0c ("ARM: pxa: change gpio to platform device")
      Signed-off-by: Robert Jarzmik <robert.jarzmik@xxxxxxx>
      Acked-by: Arnd Bergmann <arnd@xxxxxxxx>

  commit 277688639f98a9e34a6f109f9cd6129f92e718c1
  Author: Robert Jarzmik <robert.jarzmik@xxxxxxx>
  Date:   Fri Apr 24 23:22:35 2015 +0200

      ARM: pxa: mainstone: use new pxa_cplds driver

      As the interrupt handling was transferred to the pxa_cplds driver,
      make the switch in mainstone platform code.

      Fixes: 157d2644cb0c ("ARM: pxa: change gpio to platform device")
      Signed-off-by: Robert Jarzmik <robert.jarzmik@xxxxxxx>
      Acked-by: Arnd Bergmann <arnd@xxxxxxxx>

  commit aa8d6b73ea33c2167c543663ab66039ec94d58f1
  Author: Robert Jarzmik <robert.jarzmik@xxxxxxx>
  Date:   Fri Apr 24 22:22:19 2015 +0200

      ARM: pxa: pxa_cplds: add lubbock and mainstone IO

      Historically, this support was in arch/arm/mach-pxa/lubbock.c and
      arch/arm/mach-pxa/mainstone.c. When gpio-pxa was moved to drivers/pxa,
      it became a driver, and its initialization and probing happened at
      postcore initcall. The lubbock code used to install the chained lubbock
      interrupt handler at init_irq() time.

      The consequence of the gpio-pxa change is that the installed chained irq
      handler lubbock_irq_handler() was overwritten in pxa_gpio_probe(_dt)(),
      removing :
       - the handler
       - the falling edge detection setting of GPIO0, which revealed the
         interrupt request from the lubbock IO board.

      As a fix, move the gpio0 chained handler setup to a place where we have
      the guarantee that pxa_gpio_probe() was called before, so that lubbock
      handler becomes the true IRQ chained handler of GPIO0, demuxing the
      lubbock IO board interrupts.

      This patch moves all that handling to a mfd driver. It's only purpose
      for the time being is the interrupt handling, but in the future it
      should encompass all the motherboard CPLDs handling :
       - leds
       - switches
       - hexleds

      The same logic applies to mainstone board.

      Fixes: 157d2644cb0c ("ARM: pxa: change gpio to platform device")
      Signed-off-by: Robert Jarzmik <robert.jarzmik@xxxxxxx>
      Acked-by: Arnd Bergmann <arnd@xxxxxxxx>

  commit e813bb2b955d9f72c94be7d592746b49929a499b
  Author: Markus Pargmann <mpa@xxxxxxxxxxxxxx>
  Date:   Thu Apr 30 17:07:50 2015 +0200

      net: fec: Fix RGMII-ID mode

      RGMII-ID uses an internal delay within the transmitter or receiver. This
      feature is phy specific. The rest of the communication is normal RGMII.

      So the fec driver has to check for all RGMII modes, not only
      'PHY_INTERFACE_MODE_RGMII'.

      Signed-off-by: Markus Pargmann <mpa@xxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 07841f9d94c11afe00c0498cf242edf4075729f4
  Author: Ido Shamay <idos@xxxxxxxxxxxx>
  Date:   Thu Apr 30 17:32:46 2015 +0300

      net/mlx4_en: Schedule napi when RX buffers allocation fails

      When system is out of memory, refilling of RX buffers fails while
      the driver continue to pass the received packets to the kernel stack.
      At some point, when all RX buffers deplete, driver may fall into a
      sleep, and not recover when memory for new RX buffers is once again
      availible. This is because hardware does not have valid descriptors,
      so no interrupt will be generated for the driver to return to work
      in napi context. Fix it by schedule the napi poll function from
      stats_task delayed workqueue, as long as the allocations fail.

      Signed-off-by: Ido Shamay <idos@xxxxxxxxxxxx>
      Signed-off-by: Amir Vadai <amirv@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit c232d8a8bb1416f7ec21bb1aabc7c4ec8a5a899e
  Author: Tony Camuso <tcamuso@xxxxxxxxxx>
  Date:   Thu Apr 30 07:51:27 2015 -0400

      netxen_nic: use spin_[un]lock_bh around tx_clean_lock

      While testing this driver with DEBUG_LOCKDEP and DEBUG_SPINLOCK
      enabled did not produce any traces, it would be more prudent in the
      case of tx_clean_lock to use spin_[un]lock_bh, since this lock is
      manipulated in both the process and softirq contexts.

      This patch was tested for functionality and regressions with netperf
      and DEBUG_LOCKDEP and DEBUG_SPINLOCK enabled.

      Signed-off-by: Tony Camuso <tcamuso@xxxxxxxxxx>
      Acked-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 17d5ceb6e43ea545d6d92db2f3ddb035233ba335
  Author: David Ahern <david.ahern@xxxxxxxxxx>
  Date:   Wed Apr 29 16:52:51 2015 -0400

      net/mlx4_core: Fix unaligned accesses

      Addresses the following kernel logs seen during boot:

      Kernel unaligned access at TPC[100ee150] mlx4_QUERY_HCA+0x80/0x248 
[mlx4_core]
      Kernel unaligned access at TPC[100f071c] mlx4_QUERY_ADAPTER+0x100/0x12c 
[mlx4_core]
      Kernel unaligned access at TPC[100f071c] mlx4_QUERY_ADAPTER+0x100/0x12c 
[mlx4_core]
      Kernel unaligned access at TPC[100f071c] mlx4_QUERY_ADAPTER+0x100/0x12c 
[mlx4_core]
      Kernel unaligned access at TPC[100f071c] mlx4_QUERY_ADAPTER+0x100/0x12c 
[mlx4_core]

      Signed-off-by: David Ahern <david.ahern@xxxxxxxxxx>
      Acked-by: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit f94813f3c1d02090cc02dcfcbed339897830acb8
  Author: Benjamin Poirier <bpoirier@xxxxxxx>
  Date:   Wed Apr 29 15:59:35 2015 -0700

      mlx4_en: Use correct loop cursor in error path.

      Signed-off-by: Benjamin Poirier <bpoirier@xxxxxxx>
      Fixes: 9e311e7 ("net/mlx4_en: Use affinity hint")
      Acked-by: Amir Vadai <amirv@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 2c62e8492ed7358bbe7da51666c7e0f6da9474ee
  Author: Jiang Liu <jiang.liu@xxxxxxxxxxxxxxx>
  Date:   Thu Apr 30 12:41:28 2015 +0800

      x86/PCI/ACPI: Make all resources except [io 0xcf8-0xcff] available on PCI 
bus

      An IO port or MMIO resource assigned to a PCI host bridge may be
      consumed by the host bridge itself or available to its child
      bus/devices. The ACPI specification defines a bit (Producer/Consumer)
      to tell whether the resource is consumed by the host bridge itself,
      but firmware hasn't used that bit consistently, so we can't rely on it.

      Before commit 593669c2ac0f ("x86/PCI/ACPI: Use common ACPI resource
      interfaces to simplify implementation"), arch/x86/pci/acpi.c ignored
      all IO port resources defined by acpi_resource_io and
      acpi_resource_fixed_io to filter out IO ports consumed by the host
      bridge itself.

      Commit 593669c2ac0f ("x86/PCI/ACPI: Use common ACPI resource interfaces
      to simplify implementation") started accepting all IO port and MMIO
      resources, which caused a regression that IO port resources consumed
      by the host bridge itself became available to its child devices.

      Then commit 63f1789ec716 ("x86/PCI/ACPI: Ignore resources consumed by
      host bridge itself") ignored resources consumed by the host bridge
      itself by checking the IORESOURCE_WINDOW flag, which accidently removed
      MMIO resources defined by acpi_resource_memory24, acpi_resource_memory32
      and acpi_resource_fixed_memory32.

      On x86 and IA64 platforms, all IO port and MMIO resources are assumed
      to be available to child bus/devices except one special case:
          IO port [0xCF8-0xCFF] is consumed by the host bridge itself
          to access PCI configuration space.

      So explicitly filter out PCI CFG IO ports[0xCF8-0xCFF]. This solution
      will also ease the way to consolidate ACPI PCI host bridge common code
      from x86, ia64 and ARM64.

      Related ACPI table are archived at:
      https://bugzilla.kernel.org/show_bug.cgi?id=94221

      Related discussions at:
      http://patchwork.ozlabs.org/patch/461633/
      https://lkml.org/lkml/2015/3/29/304

      Fixes: 63f1789ec716 (Ignore resources consumed by host bridge itself)
      Reported-by: Bernhard Thaler <bernhard.thaler@xxxxxxxx>
      Signed-off-by: Jiang Liu <jiang.liu@xxxxxxxxxxxxxxx>
      Cc: 4.0+ <stable@xxxxxxxxxxxxxxx> # 4.0+
      Reviewed-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit 50904a7ddd1cab3e1d2ca007161e976f858d934f
  Merge: 9e9d55e 61f8ff6 df8d9ee
  Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
  Date:   Thu Apr 30 21:05:57 2015 +0200

      Merge branches 'acpica', 'acpi-battery' and 'pm-cpuidle'

  commit 0ae3aba2865a5a6f5ee82e9651f0a69daf19d79c
  Merge: 7241ea5 d839c98
  Author: Takashi Iwai <tiwai@xxxxxxx>
  Date:   Thu Apr 30 19:08:06 2015 +0200

      Merge tag 'asoc-v4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

      ASoC: Fixes for v4.1

      A few fixes for v4.1, none earth shattering and mostly driver related
      except for one change to fix !PM builds for Intel platforms which is
      done by adding stubs in the core so other platforms don't run into the
      same issue.

  commit 1add15646672ff4e7fe59bec2afcb5a0c80c5e49
  Author: Alexander Aring <alex.aring@xxxxxxxxx>
  Date:   Thu Apr 30 17:45:04 2015 +0200

      ieee802154: trace: fix endian convertion

      This patch fix endian convertions for extended address and short address
      handling when TP_printk is called.

      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Cc: Guido Günther <agx@xxxxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit d2c8bf51d07729ae6887fa84947b1f825b3729e1
  Author: Alexander Aring <alex.aring@xxxxxxxxx>
  Date:   Thu Apr 30 17:45:03 2015 +0200

      at86rf230: add slp_tr support to start tx

      This patch adds support for one of the slp_tr gpio use cases which
      indicates the TX_START command without doing some spi bus traffic.

      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Reviewed-by: Varka Bhadram <varkabhadram@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 8500920317813ed420311d9cf16c345fc216fb86
  Author: Alexander Aring <alex.aring@xxxxxxxxx>
  Date:   Thu Apr 30 17:45:02 2015 +0200

      at86rf230: change state change if from trx_off

      If a transmit ends in a calibration which means the transceiver do a
      TRX_OFF state change, we can directly change into TX_ARET state instead
      doing a TX_ON to TX_ARET statechange.

      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Reviewed-by: Varka Bhadram <varkabhadram@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 2f8cdd95097bdcd8d1e2b02edb0a9deb1e034a7e
  Author: Alexander Aring <alex.aring@xxxxxxxxx>
  Date:   Thu Apr 30 17:45:01 2015 +0200

      at86rf230: remove unnecessary tx state change

      All supported transceivers can do a valid state change from TRX_OFF to
      AACK_ON. This patch removes the state change chain from TRX_OFF ->
      TX_ON -> AACK_ON instead we doing a directly state change from TRX_OFF
      to AACK_ON.

      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 3b951ca7d2772834c7ca828f0fe5745480426982
  Author: Alexander Aring <alex.aring@xxxxxxxxx>
  Date:   Thu Apr 30 17:45:00 2015 +0200

      at86rf230: add TX_ARET_ON for calibration timeout

      This patch adds a calibration timeout reset when change from TRX_OFF to
      TX_ARET_ON which also occurs a calibration.

      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Reviewed-by: Varka Bhadram <varkabhadram@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 2ad33244db816755a27dcdd312a70d966c85f0ee
  Author: Alexander Aring <alex.aring@xxxxxxxxx>
  Date:   Thu Apr 30 17:44:59 2015 +0200

      at86rf230: move cal_timeout to state change

      This patch moves the calculation timeout of TRX_OFF to RX_AACK_ON
      handling to the async state change functionality. With this patch we can
      do a reset of calculation timeout when others TRX_OFF to RX_AACK_ON
      happens instead of doing this on interface up only.

      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Reviewed-by: Varka Bhadram <varkabhadram@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 5e8e01e262be1eeaae598be44b8e43b29aab842a
  Author: Alexander Aring <alex.aring@xxxxxxxxx>
  Date:   Thu Apr 30 17:44:58 2015 +0200

      at86rf230: remove tabs after define

      This patch cleanups the at86rf230 driver to use a space instead a tab
      after define.

      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Reviewed-by: Varka Bhadram <varkabhadram@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 5b4a10390460cccf17a9fac739e153d68cf25ef5
  Author: Varka Bhadram <varkabhadram@xxxxxxxxx>
  Date:   Thu Apr 30 17:44:57 2015 +0200

      cfg802154: pass name_assign_type to rdev_add_virtual_intf()

      This code is based on commit 6bab2e19c5ffd
      ("cfg80211: pass name_assign_type to rdev_add_virtual_intf()")

      This will expose in sysfs whether the ifname of a IEEE-802.15.4
      device is set by userspace or generated by the kernel.
      We are using two types of name_assign_types
       o NET_NAME_ENUM: Default interface name provided by kernel
       o NET_NAME_USER: Interface name provided by user.

      Signed-off-by: Varka Bhadram <varkab@xxxxxxx>
      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 4748e86ecf262ae9d94b7e4073653554951ceb7a
  Author: Christoffer Holmstedt <christoffer.holmstedt@xxxxxxxxx>
  Date:   Thu Apr 30 17:44:56 2015 +0200

      at86rf230: Add macro for TRX STATE MASK

      Instead of using the 'magic' number of 0x1f the TRX_STATE_MASK macro is
      introduced.

      Signed-off-by: Christoffer Holmstedt <christoffer.holmstedt@xxxxxxxxx>
      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 1cc800e7aabb40e2d8ffc3d259e6a153007fa9eb
  Author: Guido Günther <agx@xxxxxxxxxxx>
  Date:   Thu Apr 30 17:44:55 2015 +0200

      ieee802154: Add trace events for rdev->ops

      Enabling tracing via

       echo 1 > /sys/kernel/debug/tracing/events/cfg802154/enable

      enables event tracing like

       iwpan dev wpan0 set pan_id 0xbeef
       cat /sys/kernel/debug/tracing/trace
       # tracer: nop
       #
       # entries-in-buffer/entries-written: 2/2   #P:1
       #
       #                              _-----=> irqs-off
       #                             / _----=> need-resched
       #                            | / _---=> hardirq/softirq
       #                            || / _--=> preempt-depth
       #                            ||| /     delay
       #           TASK-PID   CPU#  ||||    TIMESTAMP  FUNCTION
       #              | |       |   ||||       |         |
                  iwpan-2663  [000] ....   170.369142: 802154_rdev_set_pan_id: 
phy0, wpan_dev(1), pan id: 0xbeef
                  iwpan-2663  [000] ....   170.369177: 802154_rdev_return_int: 
phy0, returned: 0

      Signed-off-by: Guido Günther <agx@xxxxxxxxxxx>
      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 42fb23e2f57accbed69804e6d72ea3a88b8a84c4
  Author: Varka Bhadram <varkabhadram@xxxxxxxxx>
  Date:   Thu Apr 30 17:44:52 2015 +0200

      mac802154: add description to mac802154 APIs

      This patch adds the proper description to the mac802154 core APIs.

      Signed-off-by: Varka Bhadram <varkab@xxxxxxx>
      Acked-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 89eb6d0677a6daf134015bc7bd5ec1432911eed2
  Author: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 30 17:44:54 2015 +0200

      mac802154: llsec: fix return value check in llsec_key_alloc()

      In case of error, the functions crypto_alloc_aead() and 
crypto_alloc_blkcipher()
      returns ERR_PTR() and never returns NULL. The NULL test in the return 
value check
      should be replaced with IS_ERR().

      Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 2b4d413c3871af0f2ccd466fb6581ed2c2d89438
  Author: Alexander Aring <alex.aring@xxxxxxxxx>
  Date:   Thu Apr 30 17:44:53 2015 +0200

      mac802154: fix ieee802154_register_hw error handling

      Currently if ieee802154_if_add failed, we don't unregister the wpan phy
      which was registered before. This patch adds a correct error handling
      for unregister the wpan phy when ieee802154_if_add failed.

      Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit d24d81444f8caf1895256ef2d2e89ae8202a17e4
  Author: Gabriele Mazzotta <gabriele.mzt@xxxxxxxxx>
  Date:   Sun Apr 26 20:51:50 2015 +0200

      Bluetooth: Skip the shutdown routine if the interface is not up

      Most likely, the shutdown routine requires the interface to be up.
      This is the case for BTUSB_INTEL: the routine tries to send a command
      to the interface, but since this one is down, it fails and exits once
      HCI_INIT_TIMEOUT has expired.

      Signed-off-by: Gabriele Mazzotta <gabriele.mzt@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx # 4.0.x

  commit 9dbbe3cfc3c208643cf0e81c8f660f43e1b4b2e8
  Merge: fb45f49 73459e2
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 30 09:44:04 2015 -0700

      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

      Pull kvm changes from Paolo Bonzini:
       "Remove from guest code the handling of task migration during a pvclock
        read; instead use the correct protocol in KVM.

        This removes the need for task migration notifiers in core scheduler
        code"

      [ The scheduler people really hated the migration notifiers, so this was
        kind of required  - Linus ]

      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        x86: pvclock: Really remove the sched notifier for cross-cpu migrations
        kvm: x86: fix kvmclock update protocol

  commit fb45f493c18b5bf0818394662f908d648060310c
  Merge: 9c4249c aa6df8d
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 30 09:39:52 2015 -0700

      Merge tag 'dm-4.1-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

      Pull device mapper bugfixes from Mike Snitzer:
       "Fix two bugs in the request-based DM blk-mq support that was added
        during the 4.1 merge"

      * tag 'dm-4.1-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm: fix free_rq_clone() NULL pointer when requeueing unmapped request
        dm: only initialize the request_queue once

  commit 9c4249c8e0221e5cfae758d35b768aee84abf6c0
  Author: David Howells <dhowells@xxxxxxxxxx>
  Date:   Thu Apr 30 14:58:43 2015 +0100

      modsign: change default key details

      Change default key details to be more obviously unspecified.

      Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
      Acked-by: James Morris <james.l.morris@xxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 9263a06a5896370789a8303baef8d69387071813
  Merge: dcca8de 96a5d18
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 30 09:30:07 2015 -0700

      Merge tag 'tty-4.1-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

      Pull tty/serial fixes from Greg KH:
       "Here are some small tty/serial driver fixes for 4.1-rc2.

        They include some minor fixes that resolve reported issues, and a new
        device quirk.

        All have been in linux-next succesfully"

      * tag 'tty-4.1-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        serial: 8250_pci: Add support for 16 port Exar boards
        serial: samsung: fix serial console break
        tty/serial: at91: maxburst was missing for dma transfers
        serial: of-serial: Remove device_type = "serial" registration
        serial: xilinx: Use platform_get_irq to get irq description structure
        serial: core: Fix kernel-doc build warnings
        tty: Re-add external interface for tty_set_termios()

  commit dcca8de0aa597f14e31a1b38690626c9f6745fd5
  Merge: 73be174 0d3bba0
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 30 09:08:53 2015 -0700

      Merge tag 'usb-4.1-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

      Pull USB fixes from Greg KH:
       "Here are a number of small USB fixes for 4.2-rc2.  They revert one
        problem patch, fix some minor things, and add some new quirks for
        "broken" devices.

        All have been in linux-next successfully"

      * tag 'usb-4.1-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        cdc-acm: prevent infinite loop when parsing CDC headers.
        Revert "usb: host: ehci-msm: Use devm_ioremap_resource instead of 
devm_ioremap"
        usb: chipidea: otg: remove mutex unlock and lock while stop and start 
role
        uas: Set max_sectors_240 quirk for ASM1053 devices
        uas: Add US_FL_MAX_SECTORS_240 flag
        uas: Allow uas_use_uas_driver to return usb-storage flags

  commit 73be174cf5c37a90855b9ae9b8e58848716d898f
  Merge: 3d99e3f 0017052
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 30 09:07:26 2015 -0700

      Merge tag 'renesas-sh-drivers-for-v4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

      Pull SH driver updates from Simon Horman:

       - remove test for now unsupported sh7372 SoC

       - disable PM runtime for multi-platform r8a73a4 and sh73a0 SoCs with
         genpd

      * tag 'renesas-sh-drivers-for-v4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        drivers: sh: Remove test for now unsupported sh7372
        drivers: sh: Disable PM runtime for multi-platform r8a73a4 with genpd
        drivers: sh: Disable PM runtime for multi-platform sh73a0 with genpd

  commit d8818257d3befce6ce7da4c09112654914c3fd58
  Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
  Date:   Tue Apr 14 21:09:20 2015 +0000

      power: reset: ltc2952: Remove bogus hrtimer_start() return value checks

      The return value of hrtimer_start() tells whether the timer was
      inactive or active already when hrtimer_start() was called.

      The code emits a bogus warning if the timer was active already
      claiming that the timer could not be started.

      Remove it.

      Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
      Cc: Sebastian Reichel <sre@xxxxxxxxxx>
      Cc: Dmitry Eremin-Solenikov <dbaryshkov@xxxxxxxxx>
      Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
      Cc: Frans Klaver <frans.klaver@xxxxxxxxx>
      Cc: "René Moll" <linux@xxxxxxxxx>
      Cc: Wolfram Sang <wsa@xxxxxxxxxxxxx>
      Cc: linux-pm@xxxxxxxxxxxxxxx
      Acked-by: Frans Klaver <frans.klaver@xxxxxxxxx>
      Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx>

  commit ce992369cf29a8762b46338756ef5aba35774981
  Author: Dmitry Eremin-Solenikov <dbaryshkov@xxxxxxxxx>
  Date:   Mon Apr 27 20:15:43 2015 +0300

      power_supply: fix oops in collie_battery driver

      Fix an oops happening due to typo in 297d716f6260cc9421d971b124ca196b957ee
      [power_supply: Change ownership from driver to core].

      Unable to handle kernel NULL pointer dereference at virtual address 
00000050
      pgd = c0004000
      [00000050] *pgd=00000000
      Internal error: Oops: 17 [#1] ARM
      Modules linked in:
      CPU: 0 PID: 1 Comm: swapper Not tainted 4.1.0-rc1+ #35
      Hardware name: Sharp-Collie
      task: c381a720 ti: c381e000 task.ti: c381e000
      PC is at collie_bat_get_property+0x10/0x258
      LR is at collie_bat_get_property+0x10/0x258
      pc : [<c0235d28>]    lr : [<c0235d28>]    psr: 20000013
      sp : c381fd60  ip : 00000001  fp : 00000000
      r10: c37b84c0  r9 : c068c9b8  r8 : c37b84a0
      r7 : c37b84c0  r6 : c381fd84  r5 : 00000000  r4 : 00000000
      r3 : c0369380  r2 : c381fd84  r1 : 00000000  r0 : 00000000
      Flags: nzCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
      Control: 0000717f  Table: c3784000  DAC: 00000017
      Process swapper (pid: 1, stack limit = 0xc381e190)
      Stack: (0xc381fd60 to 0xc3820000)
      fd60: c0369380 00000000 c37c0000 c068c9b8 c37b84c0 c0234380 00000000 
c0234bc0
      fd80: c042fcec c37b84a0 c0357c64 00000000 c37b84c0 c37c0000 c37b84a0 
c0234e98
      fda0: c37be020 00000000 ff0a0004 c37b84c8 c37be020 c37b84c0 c042fcec 
c383dbc0
      fdc0: c0364060 00000000 00000000 c01be6a8 00000000 c015b220 c37b84c8 
c381fdf0
      fde0: c37b84c8 c37b84c8 c37b84c8 c37be020 c041e278 c015b478 c04a45b4 
c0045290
      fe00: c381a720 c0345d50 00000001 c37bf020 c0e511d8 c00453c0 c0688058 
c37b84c8
      fe20: 00000000 c37b84c0 c37780c0 c0e511d8 c38e2f60 c0e52d24 c04a45b4 
c01be134
      fe40: c37b8550 c37b8550 00000000 c0347a8c c37b84a0 00000000 c37b84c0 
c0369380
      fe60: c37780c0 00000001 00000061 c02347a0 00000001 c0e52e6c c068d144 
c37b77a0
      fe80: 00000000 c068d164 00000000 c0235b3c 00000000 c067fbb4 00000000 
c068d1e4
      fea0: 00000000 00000000 00000000 00000000 00000000 00000000 c37b77a0 
c068d144
      fec0: c3778020 c06953c0 c049de68 c01d5f54 c0688800 c3778020 c068d144 
c0688700
      fee0: c06953c0 c01d6000 c0675b80 c0675b80 c37b77a0 c0009624 c381a720 
c000d8dc
      ff00: 00000001 c381ff54 c048a500 c00453c0 c00095a0 20000153 ffffffff 
c000d8dc
      ff20: c049cbd0 00000001 c04aa064 00000007 c04a9fb0 00000006 c06953c0 
c06953c0
      ff40: c048a590 c04a45c0 c04a9ffc 00000006 c06953c0 c06953c0 c048a590 
c04a45c0
      ff60: 00000061 c048adf8 00000006 00000006 c048a590 c0036450 00000001 
00000000
      ff80: c00363ec 00000000 c033ee7c 00000000 00000000 00000000 00000000 
00000000
      ffa0: 00000000 c033ee84 00000000 c000a3c8 00000000 00000000 00000000 
00000000
      ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 
00000000
      ffe0: 00000000 00000000 00000000 00000000 00000013 00000000 00000000 
00000000
      [<c0235d28>] (collie_bat_get_property) from [<c0234380>] 
(power_supply_get_property+0x1c/0x28)
      [<c0234380>] (power_supply_get_property) from [<c0234bc0>] 
(power_supply_show_property+0x50/0x1dc)
      [<c0234bc0>] (power_supply_show_property) from [<c0234e98>] 
(power_supply_uevent+0x9c/0x1cc)
      [<c0234e98>] (power_supply_uevent) from [<c01be6a8>] 
(dev_uevent+0xb4/0x1d0)
      [<c01be6a8>] (dev_uevent) from [<c015b478>] 
(kobject_uevent_env+0x1cc/0x4f8)
      [<c015b478>] (kobject_uevent_env) from [<c01be134>] 
(device_add+0x374/0x524)
      [<c01be134>] (device_add) from [<c02347a0>] 
(__power_supply_register+0x120/0x180)
      [<c02347a0>] (__power_supply_register) from [<c0235b3c>] 
(collie_bat_probe+0xe8/0x1b4)
      [<c0235b3c>] (collie_bat_probe) from [<c01d5f54>] 
(ucb1x00_add_dev+0x30/0x88)
      [<c01d5f54>] (ucb1x00_add_dev) from [<c01d6000>] 
(ucb1x00_register_driver+0x54/0x78)
      [<c01d6000>] (ucb1x00_register_driver) from [<c0009624>] 
(do_one_initcall+0x84/0x1f4)
      [<c0009624>] (do_one_initcall) from [<c048adf8>] 
(kernel_init_freeable+0xf8/0x1b4)
      [<c048adf8>] (kernel_init_freeable) from [<c033ee84>] 
(kernel_init+0x8/0xec)
      [<c033ee84>] (kernel_init) from [<c000a3c8>] (ret_from_fork+0x14/0x2c)
      Code: e92d40f8 e1a05001 e1a06002 ebfff9bc (e5903050)
      ---[ end trace 447ee06b251d66b2 ]---

      Fixes: 297d716f6260 ("power_supply: Change ownership from driver to core")
      Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@xxxxxxxxx>
      Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx>

  commit 932df43005389300a3336421e4aedb25390ae144
  Author: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 16 20:19:43 2015 +0800

      power/reset: at91: fix return value check in at91_reset_platform_probe()

      In case of error, the function devm_ioremap() returns NULL
      not ERR_PTR(). The IS_ERR() test in the return value check
      should be replaced with NULL test.

      Fixes: ecfe64d8c55f ("power: reset: Add AT91 reset driver")
      Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
      Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx>

  commit 2a6afddb6656aefbc6e8d6ef1f95749895ae2945
  Author: Pali Rohár <pali.rohar@xxxxxxxxx>
  Date:   Sun Mar 29 15:35:54 2015 +0200

      MAINTAINERS: Add me as maintainer of Nokia N900 power supply drivers

      I'm author of two of those drivers (bq2415x and rx51) and I added
      more patches for other twos. Also I fished (proper) open source
      power management software for Nokia N900 and those kernel drivers
      are part of it.

      Signed-off-by: Pali Rohár <pali.rohar@xxxxxxxxx>
      Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx>

  commit 409e718e09885de78cebcb57f0f908eaed5304df
  Author: Ramakrishna Pallala <ramakrishna.pallala@xxxxxxxxx>
  Date:   Fri Mar 13 21:49:09 2015 +0530

      axp288_fuel_gauge: Add original author details

      Add the original author details of the axp288_fuel_gauge driver.

      Signed-off-by: Ramakrishna Pallala <ramakrishna.pallala@xxxxxxxxx>
      Acked-by: Todd Brandt <todd.e.brandt@xxxxxxxxxxxxxxx>
      Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx>

  commit aa6df8dd28c01d9a3d2cfcfe9dd0a4a334d1cd81
  Author: Mike Snitzer <snitzer@xxxxxxxxxx>
  Date:   Wed Apr 29 10:48:09 2015 -0400

      dm: fix free_rq_clone() NULL pointer when requeueing unmapped request

      Commit 022333427a ("dm: optimize dm_mq_queue_rq to _not_ use kthread if
      using pure blk-mq") mistakenly removed free_rq_clone()'s clone->q check
      before testing clone->q->mq_ops.  It was an oversight to discontinue
      that check for 1 of the 2 use-cases for free_rq_clone():
      1) free_rq_clone() called when an unmapped original request is requeued
      2) free_rq_clone() called in the request-based IO completion path

      The clone->q check made sense for case #1 but not for #2.  However, we
      cannot just reinstate the check as it'd mask a serious bug in the IO
      completion case #2 -- no in-flight request should have an uninitialized
      request_queue (basic block layer refcounting _should_ ensure this).

      The NULL pointer seen for case #1 is detailed here:
      https://www.redhat.com/archives/dm-devel/2015-April/msg00160.html

      Fix this free_rq_clone() NULL pointer by simply checking if the
      mapped_device's type is DM_TYPE_MQ_REQUEST_BASED (clone's queue is
      blk-mq) rather than checking clone->q->mq_ops.  This avoids the need to
      dereference clone->q, but a WARN_ON_ONCE is added to let us know if an
      uninitialized clone request is being completed.

      Reported-by: Bart Van Assche <bart.vanassche@xxxxxxxxxxx>
      Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>

  commit 3e6180f0c82b3790a9ec6d13d67aae359bf1ce84
  Author: Christoph Hellwig <hch@xxxxxx>
  Date:   Thu Apr 30 10:10:36 2015 -0400

      dm: only initialize the request_queue once

      Commit bfebd1cdb4 ("dm: add full blk-mq support to request-based DM")
      didn't properly account for the need to short-circuit re-initializing
      DM's blk-mq request_queue if it was already initialized.

      Otherwise, reloading a blk-mq request-based DM table (either manually
      or via multipathd) resulted in errors, see:
       https://www.redhat.com/archives/dm-devel/2015-April/msg00132.html

      Fix is to only initialize the request_queue on the initial table load
      (when the mapped_device type is assigned).

      This is better than having dm_init_request_based_blk_mq_queue() return
      early if the queue was already initialized because it elevates the
      constraint to a more meaningful location in DM core.  As such the
      pre-existing early return in dm_init_request_based_queue() can now be
      removed.

      Fixes: bfebd1cdb4 ("dm: add full blk-mq support to request-based DM")
      Signed-off-by: Christoph Hellwig <hch@xxxxxx>
      Signed-off-by: Mike Snitzer <snitzer@xxxxxxxxxx>

  commit 8291fd04d86b97869bd34e796bcac3141b9d5432
  Author: Suzuki K. Poulose <suzuki.poulose@xxxxxxx>
  Date:   Mon Apr 13 10:17:55 2015 +0100

      arm64: perf: Fix the pmu node name in warning message

      With commit d5efd9cc9cf2 ("arm64: pmu: add support for interrupt-affinity
      property"), we print a warning when we find a PMU SPI with a missing
      missing interrupt-affinity property in a pmu node. Unfortunately, we
      pass the wrong (NULL) device node to of_node_full_name, resulting in
      unhelpful messages such as:

       hw perfevents: Failed to parse <no-node>/interrupt-affinity[0]

      This patch fixes the name to that of the pmu node.

      Fixes: d5efd9cc9cf2 (arm64: pmu: add support for interrupt-affinity 
property)
      Acked-by: Mark Rutland <mark.rutland@xxxxxxx>
      Signed-off-by: Suzuki K. Poulose <suzuki.poulose@xxxxxxx>
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>

  commit d795ef9aa8311ca3c5158bda1edbcd14479c101c
  Author: Will Deacon <will.deacon@xxxxxxx>
  Date:   Fri Apr 17 14:41:29 2015 +0100

      arm64: perf: don't warn about missing interrupt-affinity property for PPIs

      PPIs are affine by nature, so the interrupt-affinity property is not
      used and therefore we shouldn't print a warning in its absence.

      Reported-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
      Reviewed-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>

  commit 68fc378ce332cc4efd7f314d3e6e15e83f53ebf2
  Author: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
  Date:   Thu Apr 30 15:13:14 2015 +1000

      Revert "powerpc/tm: Abort syscalls in active transactions"

      This reverts commit feba40362b11341bee6d8ed58d54b896abbd9f84.

      Although the principle of this change is good, the implementation has a
      few issues.

      Firstly we can sometimes fail to abort a syscall because r12 may have
      been clobbered by C code if we went down the virtual CPU accounting
      path, or if syscall tracing was enabled.

      Secondly we have decided that it is safer to abort the syscall even
      earlier in the syscall entry path, so that we avoid the syscall tracing
      path when we are transactional.

      So that we have time to thoroughly test those changes we have decided to
      revert this for this merge window and will merge the fixed version in
      the next window.

      NB. Rather than reverting the selftest we just drop tm-syscall from
      TEST_PROGS so that it's not run by default.

      Fixes: feba40362b11 ("powerpc/tm: Abort syscalls in active transactions")
      Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>

  commit feb589e98671da59f9a3c337b8d9865957a7f9f8
  Merge: b787f68 9fb2bcf
  Author: Dave Airlie <airlied@xxxxxxxxxx>
  Date:   Thu Apr 30 12:15:34 2015 +1000

      Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux 
into drm-fixes

      Fixes for 4.1 for radeon all destined for stable:
      - fix fallout from the audio rework
      - VM fixes
      - other assorted bug fixes

      * 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: fix userptr return value checking (v2)
        drm/radeon: check new address before removing old one
        drm/radeon: reset BOs address after clearing it.
        drm/radeon: fix lockup when BOs aren't part of the VM on release
        drm/radeon: add SI DPM quirk for Sapphire R9 270 Dual-X 2G GDDR5
        drm/radeon: adjust pll when audio is not enabled
        drm/radeon: only enable audio streams if the monitor supports it
        drm/radeon: only mark audio as connected if the monitor supports it (v3)
        drm/radeon/audio: don't enable packets until the end
        drm/radeon: drop dce6_dp_enable
        drm/radeon: fix ordering of AVI packet setup
        drm/radeon: Use drm_calloc_ab for CS relocs

  commit c57ddfaea6ec8b1d96f863f7fcfc5554b5dc44c7
  Author: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
  Date:   Mon Apr 20 18:51:35 2015 +0300

      Bluetooth: btusb: off by one in rtl8723b_parse_firmware()

      The ">" should be ">=" so that we don't read past the end of the array.

      Fixes: 9d9a113e3695 ('Bluetooth: btusb: Add Realtek 
8723A/8723B/8761A/8821A support')
      Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
      Reviewed-by: Daniel Drake <drake@xxxxxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit eb50042fd2a9ed3cecc8f9e6799b8e11b4726f94
  Author: Marcel Holtmann <marcel@xxxxxxxxxxxx>
  Date:   Thu Apr 16 23:15:50 2015 +0200

      Bluetooth: btusb: Fix two coding style issues

      ERROR: spaces required around that '<' (ctx:WxV)
      +         if (err <0)
                        ^

      ERROR: code indent should use tabs where possible
      +^I^I^I^I        sizeof(ver));$

      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
      Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>

  commit a2698a9bf9b0cfcf7e556946e04c4456a13a6f5a
  Author: Daniel Drake <drake@xxxxxxxxxxxx>
  Date:   Thu Apr 16 14:09:55 2015 -0600

      Bluetooth: btusb: Add Realtek 8723A/8723B/8761A/8821A support

      Realtek ship a variety of bluetooth USB devices that identify
      themselves with standard USB Bluetooth device class values, but
      require a special driver to actually work. Without that driver,
      you never get any scan results.

      More recently however, Realtek appear to have wisened up and simply
      posted a firmware update that makes these devices comply with
      normal btusb protocols. The firmware needs to be uploaded on each boot.

      Based on Realtek code from https://github.com/lwfinger/rtl8723au_bt
      ('new' branch).

      This enables bluetooth support in the Gigabyte Brix GB-BXBT-2807 which
      has this RTL8723BE USB device:

      T:  Bus=01 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#=  3 Spd=12   MxCh= 0
      D:  Ver= 2.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
      P:  Vendor=13d3 ProdID=3410 Rev= 2.00
      S:  Manufacturer=Realtek
      S:  Product=Bluetooth Radio
      S:  SerialNumber=00e04c000001
      C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA
      I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
      E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
      E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
      I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
      E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
      I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
      E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
      I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
      E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
      I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
      E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
      I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
      E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
      I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
      E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
      E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms

      There is no change to the USB descriptor after firmware update,
      however the version read by HCI_OP_READ_LOCAL_VERSION changes from
      0x8723 to 0x3083.

      This has also been tested on RTL8723AE and RTL8821AE. Support for
      RTL8761A has also been added, but that is untested.

      Signed-off-by: Daniel Drake <drake@xxxxxxxxxxxx>
      Tested-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 4c876c0edbdc28de751dc4b4583dcbfc290a2293
  Author: Marcel Holtmann <marcel@xxxxxxxxxxxx>
  Date:   Sat Apr 11 05:35:38 2015 -0700

      Bluetooth: hci_uart: Add Atheros support for address configuration

      The Atheros support for missing the support for configuration of the
      Bluetooth public address. Add support for the vendor specific command.

      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
      Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>

  commit c0ba7acd48d122fe5941c8f402fc1ee024cac6fb
  Author: Marcel Holtmann <marcel@xxxxxxxxxxxx>
  Date:   Sat Apr 11 05:35:37 2015 -0700

      Bluetooth: hci_uart: Reorder Atheros specific driver callbacks

      The driver callbacks in the Atheros support were all in a random order
      and did not help readability of this driver. So reorder them to make
      them aligned with what other Bluetooth UART drivers do. This patch is
      not changing any actual code.

      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
      Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>

  commit 50862ee5578efa342a25c8b86f0080494736057f
  Author: Marcel Holtmann <marcel@xxxxxxxxxxxx>
  Date:   Fri Apr 10 14:02:20 2015 -0700

      Bluetooth: btbcm: Export patchram download as separate function

      This isolates the Broadcom patchram download procedure as separate
      function so that it can be easily used from USB and UART based drivers.

      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
      Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>

  commit 16e5c47a0f90a37cf8b8d50b5eaf3cd3f7ed9530
  Author: DingXiang <dingxiang@xxxxxxxxxx>
  Date:   Fri Apr 10 16:45:58 2015 +0800

      Bluetooth: bt3c: Delete some unuseful comments

      I think the comments are used to debug, and we don't need them in
      mainline code

      Signed-off-by: DingXiang <dingxiang@xxxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>

  commit 483d821108791092798f5d230686868112927044
  Author: Johan Hovold <johan@xxxxxxxxxx>
  Date:   Tue Apr 21 17:42:09 2015 +0200

      gpio: sysfs: fix memory leaks and device hotplug

      Unregister GPIOs requested through sysfs at chip remove to avoid leaking
      the associated memory and sysfs entries.

      The stale sysfs entries prevented the gpio numbers from being exported
      when the gpio range was later reused (e.g. at device reconnect).

      This also fixes the related module-reference leak.

      Note that kernfs makes sure that any on-going sysfs operations finish
      before the class devices are unregistered and that further accesses
      fail.

      The chip exported flag is used to prevent gpiod exports during removal.
      This also makes it harder to trigger, but does not fix, the related race
      between gpiochip_remove and export_store, which is really a race with
      gpiod_request that needs to be addressed separately.

      Also note that this would prevent the crashes (e.g. NULL-dereferences)
      at reconnect that affects pre-3.18 kernels, as well as use-after-free on
      operations on open attribute files on pre-3.14 kernels (prior to
      kernfs).

      Fixes: d8f388d8dc8d ("gpio: sysfs interface")
      Cc: stable <stable@xxxxxxxxxxxxxxx>       # v2.6.27: 01cca93a9491
      Signed-off-by: Johan Hovold <johan@xxxxxxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit 9dac8835440622c2f84591673969d510ce198c11
  Author: Yuchung Cheng <ycheng@xxxxxxxxxx>
  Date:   Wed Apr 29 11:28:30 2015 -0700

      tcp: update reordering first before detecting loss

      tcp_mark_lost_retrans is not used when FACK is disabled. Since
      tcp_update_reordering may disable FACK, it should be called first
      before tcp_mark_lost_retrans.

      Signed-off-by: Yuchung Cheng <ycheng@xxxxxxxxxx>
      Signed-off-by: Nandita Dukkipati <nanditad@xxxxxxxxxx>
      Signed-off-by: Neal Cardwell <ncardwell@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 6e9250f59ef9efb932c84850cd221f22c2a03c4a
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Tue Apr 28 16:23:49 2015 -0700

      tcp: add TCP_CC_INFO socket option

      Some Congestion Control modules can provide per flow information,
      but current way to get this information is to use netlink.

      Like TCP_INFO, let's add TCP_CC_INFO so that applications can
      issue a getsockopt() if they have a socket file descriptor,
      instead of playing complex netlink games.

      Sample usage would be :

        union tcp_cc_info info;
        socklen_t len = sizeof(info);

        if (getsockopt(fd, SOL_TCP, TCP_CC_INFO, &info, &len) == -1)

      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Cc: Yuchung Cheng <ycheng@xxxxxxxxxx>
      Cc: Neal Cardwell <ncardwell@xxxxxxxxxx>
      Acked-by: Neal Cardwell <ncardwell@xxxxxxxxxx>
      Acked-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
      Acked-by: Yuchung Cheng <ycheng@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 64f40ff5bbdb1b679fb3c4dbc8230d6517d2b8dc
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Tue Apr 28 16:23:48 2015 -0700

      tcp: prepare CC get_info() access from getsockopt()

      We would like that optional info provided by Congestion Control
      modules using netlink can also be read using getsockopt()

      This patch changes get_info() to put this information in a buffer,
      instead of skb, like tcp_get_info(), so that following patch
      can reuse this common infrastructure.

      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Cc: Yuchung Cheng <ycheng@xxxxxxxxxx>
      Cc: Neal Cardwell <ncardwell@xxxxxxxxxx>
      Acked-by: Neal Cardwell <ncardwell@xxxxxxxxxx>
      Acked-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
      Acked-by: Yuchung Cheng <ycheng@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit bdd1f9edacb5f5835d1e6276571bbbe5b88ded48
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Tue Apr 28 15:28:18 2015 -0700

      tcp: add tcpi_bytes_received to tcp_info

      This patch tracks total number of payload bytes received on a TCP socket.
      This is the sum of all changes done to tp->rcv_nxt

      RFC4898 named this : tcpEStatsAppHCThruOctetsReceived

      This is a 64bit field, and can be fetched both from TCP_INFO
      getsockopt() if one has a handle on a TCP socket, or from inet_diag
      netlink facility (iproute2/ss patch will follow)

      Note that tp->bytes_received was placed near tp->rcv_nxt for
      best data locality and minimal performance impact.

      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Cc: Yuchung Cheng <ycheng@xxxxxxxxxx>
      Cc: Matt Mathis <mattmathis@xxxxxxxxxx>
      Cc: Eric Salo <salo@xxxxxxxxxx>
      Cc: Martin Lau <kafai@xxxxxx>
      Cc: Chris Rapier <rapier@xxxxxxx>
      Acked-by: Yuchung Cheng <ycheng@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 0df48c26d8418c5c9fba63fac15b660d70ca2f1c
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Tue Apr 28 15:28:17 2015 -0700

      tcp: add tcpi_bytes_acked to tcp_info

      This patch tracks total number of bytes acked for a TCP socket.
      This is the sum of all changes done to tp->snd_una, and allows
      for precise tracking of delivered data.

      RFC4898 named this : tcpEStatsAppHCThruOctetsAcked

      This is a 64bit field, and can be fetched both from TCP_INFO
      getsockopt() if one has a handle on a TCP socket, or from inet_diag
      netlink facility (iproute2/ss patch will follow)

      Note that tp->bytes_acked was placed near tp->snd_una for
      best data locality and minimal performance impact.

      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Acked-by: Yuchung Cheng <ycheng@xxxxxxxxxx>
      Cc: Matt Mathis <mattmathis@xxxxxxxxxx>
      Cc: Eric Salo <salo@xxxxxxxxxx>
      Cc: Martin Lau <kafai@xxxxxx>
      Cc: Chris Rapier <rapier@xxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 5d2361db48899789fb466ff62db5d5fc7b070e86
  Author: Forrest Liu <forrestl@xxxxxxxxxxxx>
  Date:   Mon Feb 9 17:31:45 2015 +0800

      Btrfs: btrfs_release_extent_buffer_page didn't free pages of dummy extent

      btrfs_release_extent_buffer_page() can't handle dummy extent that
      allocated by btrfs_clone_extent_buffer() properly. That is because
      reference count of pages that allocated by btrfs_clone_extent_buffer()
      was 2, 1 by alloc_page(), and another by attach_extent_buffer_page().

      Running following command repeatly can check this memory leak problem

          btrfs inspect-internal inode-resolve 256 /mnt/btrfs

      Signed-off-by: Chien-Kuan Yeh <ckya@xxxxxxxxxxxx>
      Signed-off-by: Forrest Liu <forrestl@xxxxxxxxxxxx>
      Reviewed-by: Filipe Manana <fdmanana@xxxxxxxx>
      Tested-by: Filipe Manana <fdmanana@xxxxxxxx>
      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit 7f0b8a56c978b0a3315ac84c6cbb065413afb8e9
  Author: Hariprasad Shenai <hariprasad@xxxxxxxxxxx>
  Date:   Wed Apr 29 17:19:05 2015 +0530

      cxgb4: Fix MC1 memory offset calculation

      Commit 6559a7e8296002b4 ("cxgb4: Cleanup macros so they follow the same
      style and look consistent") introduced a regression where reading MC1
      memory in adapters where MC0 isn't present or MC0 size is not equal to MC1
      size caused the adapter to crash due to incorrect computation of 
memoffset.
      Fix is to read the size of MC0 instead of MC1 for offset calculation

      Signed-off-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Hariprasad Shenai <hariprasad@xxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 12a8541d5c82d17d42424d46ec36929cfef06a10
  Author: Yuval Mintz <Yuval.Mintz@xxxxxxxxxx>
  Date:   Wed Apr 29 08:09:49 2015 +0300

      bnx2x: Delay during kdump load

      In a kdump environment interfaces might be re-loaded without a proper
      unload sequence in the previous running kernel.
      bnx2x management FW and driver maintains a `pulse' that notifies the FW
      that the driver is still up and running.

      Driver load on the kdump kernel should be performed only after the pulse
      has been out-of-sync long enough for the management FW to identify that
      the driver has crashed, on which point it will perform some necessary
      cleanup of the HW.

      In today's distros kdump loading is quite fast, sometimes too fast for our
      FW to get out-of-sync. This patch delays the bnx2x's probe during kdump
      to allow a proper re-load on the kdump kernel.

      Signed-off-by: Yuval Mintz <Yuval.Mintz@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit e913fb279c564f2af05658b3f01041757d2e9303
  Author: Pai <vpai@xxxxxxxxxx>
  Date:   Wed Apr 29 14:24:23 2015 -0400

      net: Fix Kernel Panic in bonding driver debugfs file: rlb_hash_table

      This patch fixes a Kernel Panic in bonding driver debugfs file: 
rlb_hash_table.

      $> modprobe bonding mode=6
      $> cat /sys/kernel/debug/bonding/bond0/rlb_hash_table

      This will crash the kernel. The struct alb_bond_info is initialized only 
when
      the bonding interface is initialized (ip link set bond0 up) and not at 
the time
      it is allocated. If we try to read the table before that, it'll result in 
a
      kernel panic.

      The patch applies against both net and net-next

      Signed-off-by: Vishwanath Pai <vpai@xxxxxxxxxx>
      Signed-off-by: Andy Gospodarek <gospo@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 50d4964f1d0411d82cca593f2664bfab7f82dbbf
  Author: Guenter Roeck <linux@xxxxxxxxxxxx>
  Date:   Wed Apr 29 10:56:15 2015 -0700

      net: dsa: Fix scope of eeprom-length property

      eeprom-length is a switch property, not a dsa property, and thus
      needs to be attached to the switch node, not to the dsa node.

      Reported-by: Andrew Lunn <andrew@xxxxxxx>
      Fixes: 6793abb4e849 ("net: dsa: Add support for switch EEPROM access")
      Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Acked-by: Andrew Lunn <andrew@xxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit d4c216c54197d741ed8b7ca54f13645dfb3eacde
  Author: Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@xxxxxxxxxx>
  Date:   Wed Apr 29 08:34:46 2015 +0530

      net: macb: Fix race condition in driver when Rx frame is dropped

      Under heavy Rx load, observed that the Hw is updating the USED bit
      and it is not updating the received frame status to the BD control
      field. This could be lack of resources for processing the BDs at high
      data rates. Driver drops the frame associated with this BD but not
      clearing the USED bit. So, this is causing hang condition as Hw
      expects USED bit to be cleared for this BD.

      Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit b56fc3c536541c8081cd5f1f1d101a16c002a365
  Author: KY Srinivasan <kys@xxxxxxxxxxxxx>
  Date:   Tue Apr 28 17:59:48 2015 -0700

      hv_netvsc: Fix a bug in netvsc_start_xmit()

      Commit b08cc79155fc26d0d112b1470d1ece5034651a4b eliminated memory
      allocation in the packet send path:

          "hv_netvsc: Eliminate memory allocation in the packet send path

          The network protocol used to communicate with the host is the remote 
ndis (rndis)
          protocol. We need to decorate each outgoing packet with a rndis 
header and
          additional rndis state (rndis per-packet state). To manage this 
state, we
          currently allocate memory in the transmit path. Eliminate this 
allocation by
          requesting additional head room in the skb."

      This commit introduced a bug since it did not account for the case if the 
skb
      was cloned. Fix this bug.

      Signed-off-by: K. Y. Srinivasan <kys@xxxxxxxxxxxxx>
      Tested-by: Dexuan Cui <decui@xxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 48734994ac268eb391a66dca4cde7d08a08aba08
  Author: Vlastimil Setka <setka@xxxxxxx>
  Date:   Wed Apr 29 00:17:11 2015 +0200

      altera_tse: Correct rx packet length

      Altera TSE MAC rx DMA transfer starts with the 2 additional bytes for IP
      payload alignment. This patch fixes tse_rx() function loop which reads DMA
      rx status and extracts packet length from it. Status signalises a whole 
DMA
      transfer length, which is 2 bytes longer than the packet itself.

      Signed-off-by: Vlastimil Setka <setka@xxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 42eab005a5dd5d7ea2b0328aecc4d6cc0c23c9c2
  Author: Benjamin Poirier <bpoirier@xxxxxxx>
  Date:   Tue Apr 28 14:49:29 2015 -0700

      mlx4: Fix tx ring affinity_mask creation

      By default, the number of tx queues is limited by the number of online 
cpus
      in mlx4_en_get_profile(). However, this limit no longer holds after the
      ethtool .set_channels method has been called. In that situation, the 
driver
      may access invalid bits of certain cpumask variables when queue_index >=
      nr_cpu_ids.

      Signed-off-by: Benjamin Poirier <bpoirier@xxxxxxx>
      Acked-by: Ido Shamay <idos@xxxxxxxxxxxx>
      Fixes: d03a68f ("net/mlx4_en: Configure the XPS queue mapping on driver 
load")
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 0d699f28ee5d0641470a603ab5904e463cb1532a
  Author: Jon Paul Maloy <jon.maloy@xxxxxxxxxxxx>
  Date:   Tue Apr 28 16:59:04 2015 -0400

      tipc: fix problem with parallel link synchronization mechanism

      Currently, we try to accumulate arrived packets in the links's
      'deferred' queue during the parallel link syncronization phase.

      This entails two problems:

      - With an unlucky combination of arriving packets the algorithm
        may go into a lockstep with the out-of-sequence handling function,
        where the synch mechanism is adding a packet to the deferred queue,
        while the out-of-sequence handling is retrieving it again, thus
        ending up in a loop inside the node_lock scope.

      - Even if this is avoided, the link will very often send out
        unnecessary protocol messages, in the worst case leading to
        redundant retransmissions.

      We fix this by just dropping arriving packets on the upcoming link
      during the synchronization phase, thus relying on the retransmission
      protocol to resolve the situation once the two links have arrived to
      a synchronized state.

      Reviewed-by: Erik Hugne <erik.hugne@xxxxxxxxxxxx>
      Reviewed-by: Ying Xue <ying.xue@xxxxxxxxxxxxx>
      Signed-off-by: Jon Maloy <jon.maloy@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit f2f67390a4b961dae83733732e96e1a394a53c4e
  Author: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
  Date:   Tue Apr 28 18:33:50 2015 +0200

      tipc: remove wrong use of NLM_F_MULTI

      NLM_F_MULTI must be used only when a NLMSG_DONE message is sent. In fact,
      it is sent only at the end of a dump.

      Libraries like libnl will wait forever for NLMSG_DONE.

      Fixes: 35b9dd7607f0 ("tipc: add bearer get/dump to new netlink api")
      Fixes: 7be57fc69184 ("tipc: add link get/dump to new netlink api")
      Fixes: 46f15c6794fb ("tipc: add media get/dump to new netlink api")
      CC: Richard Alpe <richard.alpe@xxxxxxxxxxxx>
      CC: Jon Maloy <jon.maloy@xxxxxxxxxxxx>
      CC: Ying Xue <ying.xue@xxxxxxxxxxxxx>
      CC: tipc-discussion@xxxxxxxxxxxxxxxxxxxxx
      Signed-off-by: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 46c264daaaa569e24f8aba877d0fd8167c42a9a4
  Author: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
  Date:   Tue Apr 28 18:33:49 2015 +0200

      bridge/nl: remove wrong use of NLM_F_MULTI

      NLM_F_MULTI must be used only when a NLMSG_DONE message is sent. In fact,
      it is sent only at the end of a dump.

      Libraries like libnl will wait forever for NLMSG_DONE.

      Fixes: e5a55a898720 ("net: create generic bridge ops")
      Fixes: 815cccbf10b2 ("ixgbe: add setlink, getlink support to ixgbe and 
ixgbevf")
      CC: John Fastabend <john.r.fastabend@xxxxxxxxx>
      CC: Sathya Perla <sathya.perla@xxxxxxxxxx>
      CC: Subbu Seetharaman <subbu.seetharaman@xxxxxxxxxx>
      CC: Ajit Khaparde <ajit.khaparde@xxxxxxxxxx>
      CC: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
      CC: intel-wired-lan@xxxxxxxxxxxxxxxx
      CC: Jiri Pirko <jiri@xxxxxxxxxxx>
      CC: Scott Feldman <sfeldma@xxxxxxxxx>
      CC: Stephen Hemminger <stephen@xxxxxxxxxxxxxxxxxx>
      CC: bridge@xxxxxxxxxxxxxxxxxxxxxxxxxx
      Signed-off-by: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 821996795973fd52703c35811a03db9fec1ac141
  Author: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
  Date:   Tue Apr 28 18:33:48 2015 +0200

      bridge/mdb: remove wrong use of NLM_F_MULTI

      NLM_F_MULTI must be used only when a NLMSG_DONE message is sent. In fact,
      it is sent only at the end of a dump.

      Libraries like libnl will wait forever for NLMSG_DONE.

      Fixes: 37a393bc4932 ("bridge: notify mdb changes via netlink")
      CC: Cong Wang <amwang@xxxxxxxxxx>
      CC: Stephen Hemminger <stephen@xxxxxxxxxxxxxxxxxx>
      CC: bridge@xxxxxxxxxxxxxxxxxxxxxxxxxx
      Signed-off-by: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 2b70fe5aba0dd00d81173243c7ab04c66aeb67d8
  Author: Florian Westphal <fw@xxxxxxxxx>
  Date:   Tue Apr 28 13:33:21 2015 +0200

      net: sched: act_connmark: don't zap skb->nfct

      This action is meant to be passive, i.e. we should not alter
      skb->nfct: If nfct is present just leave it alone.

      Compile tested only.

      Cc: Jamal Hadi Salim <jhs@xxxxxxxxxxxx>
      Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
      Acked-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 165996bd351f0e711feff92479c0796098afaa38
  Author: Antonio Ospite <ao2@xxxxxx>
  Date:   Tue Apr 28 13:11:29 2015 +0200

      trivial: net: systemport: bcmsysport.h: fix 0x0x prefix

      Fix the 0x0x prefix in an integer constant.

      In this case, while at it, also fix a typo (s/unitcast/unicast/).

      Signed-off-by: Antonio Ospite <ao2@xxxxxx>
      Cc: Florian Fainelli <f.fainelli@xxxxxxxxx>
      Cc: netdev@xxxxxxxxxxxxxxx
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 18fe369a5a4f175ee652ba8b7d8d7e49f140e281
  Author: Antonio Ospite <ao2@xxxxxx>
  Date:   Tue Apr 28 13:11:27 2015 +0200

      trivial: net: atl1e: atl1e_hw.h: fix 0x0x prefix

      Fix the 0x0x prefix in an integer constant.

      Signed-off-by: Antonio Ospite <ao2@xxxxxx>
      Cc: Jay Cliburn <jcliburn@xxxxxxxxx>
      Cc: Chris Snook <chris.snook@xxxxxxxxx>
      Cc: netdev@xxxxxxxxxxxxxxx
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit ad93e1d7b9f63bb842925711240e9fba3a104fea
  Merge: 3f300ff f8dcb5e
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Wed Apr 29 14:48:36 2015 -0400

      Merge branch 'bnx2x'

      Michal Schmidt says:

      ====================
      bnx2x: minor cleanups related to TPA bits

      I noticed some simplification possibilities while looking into the bug
      fixed by "bnx2x: really disable TPA if 'disable_tpa' is set'.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit f8dcb5e3365a23b620f5744f23f1918b9c38d883
  Author: Michal Schmidt <mschmidt@xxxxxxxxxx>
  Date:   Tue Apr 28 11:34:23 2015 +0200

      bnx2x: remove {TPA,GRO}_ENABLE_FLAG

      These flags are redundant with dev->features. Remove them.
      Just make sure to set dev->features ourselves in bnx2x_set_features()
      before performing the reload of the card.

      Signed-off-by: Michal Schmidt <mschmidt@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 7e6b4d440b0ae9062b84dfb417ea6d51a45dab76
  Author: Michal Schmidt <mschmidt@xxxxxxxxxx>
  Date:   Tue Apr 28 11:34:22 2015 +0200

      bnx2x: merge fp->disable_tpa with fp->mode

      It is simpler to have the TPA mode as one three-state variable.

      Signed-off-by: Michal Schmidt <mschmidt@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit d9b9e860cef1d904832bc6e92e444adfeabe49e9
  Author: Michal Schmidt <mschmidt@xxxxxxxxxx>
  Date:   Tue Apr 28 11:34:21 2015 +0200

      bnx2x: mark LRO as a fixed disabled feature if disable_tpa is set

      If disable_tpa is set, remove NETIF_F_LRO from hw_features, so ethtool 
sees
      it as "off [fixed]".

      Note that setting the NETIF_F_LRO bit in dev->features in the 'else'
      branch is not needed, because the bit was already set by
      bnx2x_init_dev().

      Then the check for disable_tpa in in bnx2x_fix_features() becomes 
unnecessary.

      Signed-off-by: Michal Schmidt <mschmidt@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 3f300ff41d89fe9674b8dbab950ba2572639ee8d
  Author: Simon Xiao <sixiao@xxxxxxxxxxxxx>
  Date:   Tue Apr 28 01:05:17 2015 -0700

      hv_netvsc: introduce netif-msg into netvsc module

      1. Introduce netif-msg to netvsc to control debug logging output
      and keep msg_enable in netvsc_device_context so that it is
      kept persistently.
      2. Only call dump_rndis_message() when NETIF_MSG_RX_ERR or above
      is specified in netvsc module debug param.
      In non-debug mode, in current code, dump_rndis_message() will not
      dump anything but it still initialize some local variables and
      process the switch logic which is unnecessary, especially in
      high network throughput situation.

      Signed-off-by: Simon Xiao <sixiao@xxxxxxxxxxxxx>
      Reviewed-by: K. Y. Srinivasan <kys@xxxxxxxxxxxxx>
      Reviewed-by: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit cb6ccf09d6b94bec4def1ac5cf4678d12b216474
  Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 28 11:43:15 2015 +0800

      route: Use ipv4_mtu instead of raw rt_pmtu

      The commit 3cdaa5be9e81a914e633a6be7b7d2ef75b528562 ("ipv4: Don't
      increase PMTU with Datagram Too Big message") broke PMTU in cases
      where the rt_pmtu value has expired but is smaller than the new
      PMTU value.

      This obsolete rt_pmtu then prevents the new PMTU value from being
      installed.

      Fixes: 3cdaa5be9e81 ("ipv4: Don't increase PMTU with Datagram Too Big 
message")
      Reported-by: Gerd v. Egidy <gerd.von.egidy@xxxxxxxxxxxxx>
      Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 2cff98b99c469880ce830cbcde015b53b67e0a7b
  Author: Dean Nelson <dnelson@xxxxxxxxxx>
  Date:   Wed Apr 29 16:09:18 2015 +0100

      arm64: add missing PAGE_ALIGN() to __dma_free()

      __dma_alloc() does a PAGE_ALIGN() on the passed in size argument before
      doing anything else. __dma_free() does not. And because it doesn't, it is
      possible to leak memory should size not be an integer multiple of 
PAGE_SIZE.

      The solution is to add a PAGE_ALIGN() to __dma_free() like is done in
      __dma_alloc().

      Additionally, this patch removes a redundant PAGE_ALIGN() from
      __dma_alloc_coherent(), since __dma_alloc_coherent() can only be called
      from __dma_alloc(), which already does a PAGE_ALIGN() before the call.

      Cc: stable@xxxxxxxxxxxxxxx
      Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
      Signed-off-by: Dean Nelson <dnelson@xxxxxxxxxx>
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>

  commit 8014bcc86ef112eab9ee1db312dba4e6b608cf89
  Author: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
  Date:   Mon Apr 13 00:26:35 2015 +0100

      xen-pciback: Add name prefix to global 'permissive' variable

      The variable for the 'permissive' module parameter used to be static
      but was recently changed to be extern.  This puts it in the kernel
      global namespace if the driver is built-in, so its name should begin
      with a prefix identifying the driver.

      Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
      Fixes: af6fc858a35b ("xen-pciback: limit guest control of command 
register")
      Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>

  commit 2b953a5e994ce279904ec70220f7d4f31d380a0a
  Author: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
  Date:   Tue Apr 28 18:46:20 2015 -0400

      xen: Suspend ticks on all CPUs during suspend

      Commit 77e32c89a711 ("clockevents: Manage device's state separately for
      the core") decouples clockevent device's modes from states. With this
      change when a Xen guest tries to resume, it won't be calling its
      set_mode op which needs to be done on each VCPU in order to make the
      hypervisor aware that we are in oneshot mode.

      This happens because clockevents_tick_resume() (which is an intermediate
      step of resuming ticks on a processor) doesn't call 
clockevents_set_state()
      anymore and because during suspend clockevent devices on all VCPUs (except
      for the one doing the suspend) are left in ONESHOT state. As result, 
during
      resume the clockevents state machine will assume that device is already
      where it should be and doesn't need to be updated.

      To avoid this problem we should suspend ticks on all VCPUs during
      suspend.

      Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
      Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>

  commit df8d9eeadd0f7a216f2476351d5aee43c6550bf0
  Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
  Date:   Wed Apr 29 15:19:21 2015 +0200

      cpuidle: Run tick_broadcast_exit() with disabled interrupts

      Commit 335f49196fd6 (sched/idle: Use explicit broadcast oneshot
      control function) replaced clockevents_notify() invocations in
      cpuidle_idle_call() with direct calls to tick_broadcast_enter()
      and tick_broadcast_exit(), but it overlooked the fact that
      interrupts were already enabled before calling the latter which
      led to functional breakage on systems using idle states with the
      CPUIDLE_FLAG_TIMER_STOP flag set.

      Fix that by moving the invocations of tick_broadcast_enter()
      and tick_broadcast_exit() down into cpuidle_enter_state() where
      interrupts are still disabled when tick_broadcast_exit() is
      called.  Also ensure that interrupts will be disabled before
      running tick_broadcast_exit() even if they have been enabled by
      the idle state's ->enter callback.  Trigger a WARN_ON_ONCE() in
      that case, as we generally don't want that to happen for states
      with CPUIDLE_FLAG_TIMER_STOP set.

      Fixes: 335f49196fd6 (sched/idle: Use explicit broadcast oneshot control 
function)
      Reported-and-tested-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
      Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
      Acked-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
      Reported-and-tested-by: Sudeep Holla <sudeep.holla@xxxxxxx>
      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit d839c98f98826f0c13e46d5a4cecb46dd357b50e
  Merge: a78001b 60a8d62 c479163 427ced4
  Author: Mark Brown <broonie@xxxxxxxxxx>
  Date:   Wed Apr 29 13:37:31 2015 +0100

      Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/samsung' and 
'asoc/fix/tfa9879' into asoc-linus

  commit a78001b0137e3dd7acb15f6813bf2e5046d2f2ff
  Merge: 1ce286b 9d7dd6c 28ecc0b aae013d 96f05be d1acba2
  Author: Mark Brown <broonie@xxxxxxxxxx>
  Date:   Wed Apr 29 13:37:28 2015 +0100

      Merge remote-tracking branches 'asoc/fix/email', 'asoc/fix/fsl-ssi', 
'asoc/fix/pm', 'asoc/fix/qcom' and 'asoc/fix/rcar' into asoc-linus

  commit 1ce286b9c9bd08875072a7c3c6a43ef2a2ea4a71
  Merge: 49422ad 53f9b3b
  Author: Mark Brown <broonie@xxxxxxxxxx>
  Date:   Wed Apr 29 13:37:27 2015 +0100

      Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus

  commit 49422ad37d90945fe9ad0220d9505e2be6168777
  Merge: 449f1ca 8faf141
  Author: Mark Brown <broonie@xxxxxxxxxx>
  Date:   Wed Apr 29 13:37:27 2015 +0100

      Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

  commit 449f1ca6253cb8d7bbe84666ac7d2696308d16c8
  Merge: b787f68 a2d9772
  Author: Mark Brown <broonie@xxxxxxxxxx>
  Date:   Wed Apr 29 13:37:26 2015 +0100

      Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

  commit 60a8d62b8497c23eb3d48149af7e55dac2dd83a2
  Author: Bard Liao <bardliao@xxxxxxxxxxx>
  Date:   Tue Apr 28 11:27:39 2015 +0800

      ASoC: rt5677: fixed wrong DMIC ref clock

      DMIC clock source is not from codec system clock directly. it is
      generated from the division of system clock. And it should be 256 *
      sample rate of AIF1.

      Signed-off-by: Bard Liao <bardliao@xxxxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 63f89caad0e32dcfa17b2d17919816253de48996
  Author: Christopher Freeman <cfreeman@xxxxxxxxxx>
  Date:   Wed Mar 4 01:16:58 2015 -0800

      dmaengine: increment privatecnt when using dma_get_any_slave_channel

      Channels allocated via dma_get_any_slave_channel were not increasing
      the counter tracking private allocations.  When these channels were
      released, privatecnt may erroneously fall to zero.  The DMA device
      would then lose its DMA_PRIVATE cap and fail to allocate future private
      channels (via private_candidate) as any allocations still outstanding
      would incorrectly be seen as public allocations.

      Signed-off-by: Christopher Freeman <cfreeman@xxxxxxxxxx>
      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit d33047fd7e7d93662622888681861ba84d43c506
  Author: Daniel Axtens <dja@xxxxxxxxxx>
  Date:   Mon Apr 27 12:33:51 2015 +1000

      powerpc/powernv: Fix early pci_controller_ops loading.

      Load the PowerNV platform pci controller ops into pci controllers
      after all the operations are loaded into the platform ops struct, not
      before.

      Otherwise we aren't actually setting the ops properly which can break
      IO for some devices.

      Fixes: 65ebf4b63 ("powerpc/powernv: Move controller ops from ppc_md to 
controller_ops")
      Reported-by: Gavin Shan <gwshan@xxxxxxxxxxxxxxxxxx>
      Reviewed-by: Gavin Shan <gwshan@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Daniel Axtens <dja@xxxxxxxxxx>
      Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>

  commit 7241ea558c6715501e777396b5fc312c372e11d9
  Author: Peter Zubaj <pzubaj@xxxxxxxxxxxxx>
  Date:   Tue Apr 28 21:57:29 2015 +0200

      ALSA: emu10k1: Emu10k2 32 bit DMA mode

      Looks like audigy emu10k2 (probably emu10k1 - sb live too) support two
      modes for DMA. Second mode is useful for 64 bit os with more then 2 GB
      of ram (fixes problems with big soundfont loading)

      1) 32MB from 2 GB address space using 8192 pages (used now as default)
      2) 16MB from 4 GB address space using 4096 pages

      Mode is set using HCFG_EXPANDED_MEM flag in HCFG register.
      Also format of emu10k2 page table is then different.

      Signed-off-by: Peter Zubaj <pzubaj@xxxxxxxxxxxxx>
      Tested-by: Takashi Iwai <tiwai@xxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 433c5c20c505fef92be84c6afab70f1c2ab5eda3
  Author: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
  Date:   Tue Apr 28 10:34:35 2015 +1000

      powerpc/kvm: Fix SMP=n build error in book3s_xics.c

      Commit 34cb7954c0aa "Convert ICS mutex lock to spin lock" added an
      include of asm/spinlock.h, which does not work in the SMP=n case.

      It should instead include linux/spinlock.h

      Fixes: 34cb7954c0aa ("KVM: PPC: Book3S HV: Convert ICS mutex lock to spin 
lock")
      Acked-by: Paul Mackerras <paulus@xxxxxxxxx>
      Reviewed-by: Alexander Graf <agraf@xxxxxxx>
      Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>

  commit 61f8ff693923e4b19748b0e8287b99778f2661c7
  Author: Chris Bainbridge <chris.bainbridge@xxxxxxxxx>
  Date:   Wed Apr 22 16:40:21 2015 +0100

      ACPI / SBS: Enable battery manager when present

      Commit 9faf6136ff46 (ACPI / SBS: Disable smart battery manager on
      Apple) introduced a regression disabling the SBS battery manager.
      The battery manager should be marked as present when
      acpi_manager_get_info() returns 0.

      Fixes: 9faf6136ff46 (ACPI / SBS: Disable smart battery manager on Apple)
      Signed-off-by: Chris Bainbridge <chris.bainbridge@xxxxxxxxx>
      Cc: 3.18+ <stable@xxxxxxxxxxxxxxx> # 3.18+
      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit 9e9d55e69a95f8583283d9f01b04562d1278c95d
  Author: Olaf Hering <olaf@xxxxxxxxx>
  Date:   Tue Apr 28 16:54:04 2015 +0200

      ACPICA: remove duplicate u8 typedef

      During commit e252652fb266 ("ACPICA: acpidump: Remove integer types
      translation protection.") two 'unsigned char' types got converted to 'u8'.

      The result does not compile with gcc-4.5, it can not cope with duplicate
      typedefs.

      Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit 3d99e3fe13d473ac4578c37f477a59b829530764
  Merge: 14bc84c 9b0f5d6
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 28 14:22:35 2015 -0700

      Merge branch 'stable' of 
git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

      Pull arch/tile bugfix from Chris Metcalf:
       "This just fixes a compiler warning from an old bug that only recently
        started generating a warning"

      * 'stable' of 
git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: properly use node_isset() on a nodemask_t

  commit 96a5d18bc1338786fecac73599f1681f59a59a8e
  Author: Soeren Grunewald <soeren.grunewald@xxxxxxx>
  Date:   Tue Apr 28 16:29:49 2015 +0200

      serial: 8250_pci: Add support for 16 port Exar boards

      The Exar XR17V358 chip usually provides only 8 ports. But two chips can be
      combined to act as a single 16 port chip. Therefor one chip is configured
      as master the second as slave by connecting the mode pin to VCC (master)
      or GND (slave).

      Then the master chip is reporting a different device-id depending on
      whether a slave is detected or not. The UARTs 8-15 are addressed from
      0x2000-0x3fff. So the offset of 0x400 from UART to UART can be used to
      address all 16 ports as before.

      See: https://www.exar.com/common/content/document.ashx?id=1587 page 11

      Signed-off-by: Soeren Grunewald <soeren.grunewald@xxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit 14bc84ce0b41787acc08aefabe718479c5dde60e
  Merge: 2decb26 5712764
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 28 09:58:46 2015 -0700

      Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

      Pull s390 updates from Martin Schwidefsky:
       "One additional new feature for 4.1, a new PRNG based on SHA-512 for
        the zcrypt driver.

        Two memory management related changes, the page table reallocation for
        KVM is removed, and with file ptes gone the encoding of page table
        entries is improved.

        And three bug fixes"

      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/zcrypt: Introduce new SHA-512 based Pseudo Random Generator.
        s390/mm: change swap pte encoding and pgtable cleanup
        s390/mm: correct transfer of dirty & young bits in __pmd_to_pte
        s390/bpf: add dependency to z196 features
        s390/3215: free memory in error path
        s390/kvm: remove delayed reallocation of page tables for KVM
        kexec: allocate the kexec control page with KEXEC_CONTROL_MEMORY_GFP

  commit 1c94e65c668f44d2c69ae7e7fc268ab3268fba3e
  Author: Takashi Iwai <tiwai@xxxxxxx>
  Date:   Tue Apr 28 17:11:44 2015 +0200

      ALSA: emux: Fix mutex deadlock in OSS emulation

      The OSS emulation in synth-emux helper has a potential AB/BA deadlock
      at the simultaneous closing and opening:

        close ->
          snd_seq_release() ->
            sne_seq_free_client() ->
              snd_seq_delete_all_ports(): takes client->ports_mutex ->
          port_delete() ->
            snd_emux_unuse(): takes emux->register_mutex

        open ->
          snd_seq_oss_open() ->
            snd_emux_open_seq_oss(): takes emux->register_mutex ->
              snd_seq_event_port_attach() ->
          snd_seq_create_port(): takes client->ports_mutex

      This patch addresses the deadlock by reducing the rance taking
      emux->register_mutex in snd_emux_open_seq_oss().  The lock is needed
      for the refcount handling, so move it locally.  The calls in
      emux_seq.c are already with the mutex, thus they are replaced with the
      version without mutex lock/unlock.

      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 9d7dd6cd2a1d0d307be6bf783e40e7fda17d6dba
  Author: Rajeev Kumar <rajeevkumar.linux@xxxxxxxxx>
  Date:   Tue Apr 28 11:30:08 2015 +0530

      ASoC: Update email-id of Rajeev Kumar

      rajeev-dlh.kumar@xxxxxx email-id doesn't exist anymore as I have left the
      company.  Replace ST's id with Rajeev Kumar <rajeevkumar.linux@xxxxxxxxx>

      Signed-off-by: Rajeev Kumar <rajeevkumar.linux@xxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit 9b0f5d63e74a987bf56cc1774baca80a291c9d8d
  Author: Chris Metcalf <cmetcalf@xxxxxxxxxx>
  Date:   Tue Apr 28 10:36:45 2015 -0400

      tile: properly use node_isset() on a nodemask_t

      The code accidentally used cpu_isset() previously in one place
      (though properly node_isset() elsewhere).

      Signed-off-by: Chris Metcalf <cmetcalf@xxxxxxxxxx>

  commit a04f90a33fab74789b91fc9739999012f11022d1
  Author: Deepak S <deepak.s@xxxxxxxxxxxxxxx>
  Date:   Thu Apr 16 08:51:28 2015 +0530

      drm/i915/chv: Implement WaDisableShadowRegForCpd

      This WA is avoid problem between shadow vs wake FIFO unload
      problem during CPD/RC6 transactions on CHV.

      v2: Define individual bits GTFIFOCTL (Ville)

      v3: move WA to uncore_early_sanitize (ville)

      Signed-off-by: Deepak S <deepak.s@xxxxxxxxxxxxxxx>
      Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
      [Jani: fixed some whitespace issues while applying]
      Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>

  commit 4e637ac212b63f4b5dd1da626aca34ffcbfd5daa
  Author: Ivan T. Ivanov <ivan.ivanov@xxxxxxxxxx>
  Date:   Thu Apr 9 18:18:37 2015 +0300

      pinctrl: qcom-spmi-mpp: Fix input value report

      Fix interpretation of the pmic_mpp_read() return code,
      negative value means an error.

      Signed-off-by: Ivan T. Ivanov <ivan.ivanov@xxxxxxxxxx>
      Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit 24a66618d63548e1012bf65ed30a3c031f410ca2
  Author: Ivan T. Ivanov <ivan.ivanov@xxxxxxxxxx>
  Date:   Thu Apr 9 18:18:36 2015 +0300

      pinctrl: qcom-spmi-gpio: Fix input value report

      Read input buffer when input is enabled, not when it is
      disabled. Also fix interpretation of the pmic_gpio_read()
      return code, negative value means an error.

      Signed-off-by: Ivan T. Ivanov <ivan.ivanov@xxxxxxxxxx>
      Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit 982df6aec06479c844f46f7a5cc960151f8fc005
  Author: Ivan T. Ivanov <ivan.ivanov@xxxxxxxxxx>
  Date:   Thu Apr 9 18:18:35 2015 +0300

      pinctrl: qcom-spmi-gpio: Fix output type configuration

      GPIO output type configuration was incorrectly overwritten
      by strength value. Fix this.

      Signed-off-by: Ivan T. Ivanov <ivan.ivanov@xxxxxxxxxx>
      Acked-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit 31c6ba97d1671b0a853197fe54a05e0b07ce2631
  Author: Robert Baldyga <r.baldyga@xxxxxxxxxxx>
  Date:   Fri Apr 17 08:43:09 2015 +0200

      serial: samsung: fix serial console break

      This patch fixes problems with serial console break. When function
      s3c64xx_serial_startup() was started while serial console has been 
working,
      it caused lose of characters written to TX FIFO. This effect was 
particularly
      observable with systemd, which closes serial port every time when it's
      not currently needed, hence function s3c64xx_serial_startup() is called
      quite often there. To fix this problem we avoid resetting TX FIFO if port 
is
      used as serial console.

      Example of broken console log:

      [ 1086.7         Expecting device dev-ttySAC1.device...
      [ 1086.[  OK  ] Reached target Paths.
      [ 1086.756416] s[  OK  ] Reached target Swap.
      [ 1086.776413] systemd[1]: Reached target Swap.
      [ 1086.776642] systemd[1]: Starting Root Slice.
      [    5.53403[  OK  ] Created slice Root Slice.
      [    5.548433] systemd[1]: Create[  OK  ] Created slice User and Session 
Slice.
      [    5.568414] sys[  OK  ] Listening on /dev/initctl Compatibility Named 
Pipe.
      [    5.588388] s[  OK  ] Listening on Delayed Shutdown Socket.
      [    5.608376] sy[  OK  ] Listening on Journal Socket (/dev/log).
      [    5.628361] [  OK  ] Listening on udev Kernel Socket.
      [    5.648357] s[  OK  ] Listening on udev Control Socket.
      [    5.668353] s[  OK  ] Listening on Journal Socket.
      [    5.688366] systemd[1]: Listeni[  OK  ] Created slice System Slice.
      [    5.708393]          Mounting Temporary Directory...
      [ 7139.067436]          Starting prepare device daemon...
      [ 7139.091726] sy         Starting Generate environment from 
/etc/profile.d...
      [    5.792867] system         Starting Create Static Device Nodes in 
/dev...
      [ 7848.718         Mounting Debug File System...
      [ 7848.7384         Mounting Configuration File System...
      [    5.852         Starting Apply Kernel Variables...
      [    5.8720         Starting Setup Virtual Console...
      [ 7848.798         Starting udev Coldplug all Devices...
      [ 7848.817         Starting Journal Service...
      [  OK  ] Started Journal Service.
      [ 7848.854222] s[  OK  ] Reached target Slices.
               Starting Remount Root and Kernel File Systems...
      [  OK  ] Mounted Configuration File System.

      Reported-by: Chanwoo Choi <cw00.choi@xxxxxxxxxxx>
      Signed-off-by: Robert Baldyga <r.baldyga@xxxxxxxxxxx>
      Reviewed-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit a8d4e01637902311c5643b69a5c80e2805f04054
  Author: Ludovic Desroches <ludovic.desroches@xxxxxxxxx>
  Date:   Thu Apr 16 16:58:12 2015 +0200

      tty/serial: at91: maxburst was missing for dma transfers

      Maxburst was not set when doing the dma slave configuration. This value
      is checked by the recently introduced xdmac. It causes an error when
      doing the slave configuration and so prevents from using dma.

      Signed-off-by: Ludovic Desroches <ludovic.desroches@xxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx> # 3.12 and later
      Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit 6befa9d883385c580369a2cc9e53fbf329771f6d
  Author: Michal Simek <michal.simek@xxxxxxxxxx>
  Date:   Tue Apr 14 12:03:09 2015 +0200

      serial: of-serial: Remove device_type = "serial" registration

      Do not probe all serial drivers by of_serial.c which are using
      device_type = "serial"; property. Only drivers which have valid
      compatible strings listed in the driver should be probed.

      When PORT_UNKNOWN is setup probe will fail anyway.

      Arnd quotation about driver historical background:
      "when I wrote that driver initially, the idea was that it would
      get used as a stub to hook up all other serial drivers but after
      that, the common code learned to create platform devices from DT"

      This patch fix the problem with on the system with xilinx_uartps and
      16550a where of_serial failed to register for xilinx_uartps and because
      of irq_dispose_mapping() removed irq_desc. Then when xilinx_uartps was 
asking
      for irq with request_irq() EINVAL is returned.

      Signed-off-by: Michal Simek <michal.simek@xxxxxxxxxx>
      CC: <stable@xxxxxxxxxxxxxxx>
      Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit 5c90c07b98c02198d9777a7c4f3047b0a94bf7ed
  Author: Michal Simek <michal.simek@xxxxxxxxxx>
  Date:   Mon Apr 13 16:34:21 2015 +0200

      serial: xilinx: Use platform_get_irq to get irq description structure

      For systems with CONFIG_SERIAL_OF_PLATFORM=y and device_type =
      "serial"; property in DT of_serial.c driver maps and unmaps IRQ (because
      driver probe fails). Then a driver is called but irq mapping is not
      created that's why driver is failing again in again on request_irq().
      Based on this use platform_get_irq() instead of platform_get_resource()
      which is doing irq_desc allocation and driver itself can request IRQ.

      Fix both xilinx serial drivers in the tree.

      Signed-off-by: Michal Simek <michal.simek@xxxxxxxxxx>
      CC: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit 10afbe346bba125e2eedfd1a89b7bd5c92900859
  Author: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 11 10:05:07 2015 -0400

      serial: core: Fix kernel-doc build warnings

      Fix uart_console_write() kernel-doc build warnings.

      Warning(drivers/tty/serial/serial_core.c:1778): No description found for 
parameter 'putchar'
      Warning(drivers/tty/serial/serial_core.c:1778): Excess function parameter 
'write' description in 'uart_console_write'

      Fixes: 1cfe42b7fd29 ("serial: core: Fix kernel doc for 
uart_console_write()")
      Reported-by: Fengguang Wu <fengguang.wu@xxxxxxxxx>
      Signed-off-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit b00f5c2dc01450bed9fed1a41a637fa917e03c5c
  Author: Frederic Danis <frederic.danis@xxxxxxxxxxxxxxx>
  Date:   Fri Apr 10 15:13:05 2015 +0200

      tty: Re-add external interface for tty_set_termios()

      This is needed by Bluetooth hci_uart module to be able to change speed
      of Bluetooth controller and local UART.

      Signed-off-by: Frederic Danis <frederic.danis@xxxxxxxxxxxxxxx>
      Reviewed-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
      Cc: Marcel Holtmann <marcel@xxxxxxxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit e7afe89fd67d40a7f5fff8130c5f925d99a94b1f
  Author: Johannes Berg <johannes.berg@xxxxxxxxx>
  Date:   Tue Apr 21 09:21:46 2015 +0200

      iwlwifi: mvm: force quota update update after FW restart

      During firmware restart, the quota command isn't calculated multiple
      times, but after the firmware restart it has to be sent, so force it.
      Otherwise the firmware crashes.

      Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
      Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>

  commit 6bbd5521edd3896190f5c0581f059b7c93daf670
  Author: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
  Date:   Tue Apr 28 15:00:23 2015 +0300

      iwlwifi: mvm: fix typo in CONFIG option

      I forgot to rename the CPTCFG_ prefix...

      Fixes: 484b3d13b4ac ("iwlwifi: mvm: add debugfs entry with the number of 
net-detect scans")
      Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>

  commit 8d193ca26cc28019e760b77830295a0c349d90dc
  Author: Eran Harary <eran.harary@xxxxxxxxx>
  Date:   Mon Apr 27 10:29:31 2015 +0300

      iwlwifi: mvm: don't power off the device between INIT and OPER firmwares

      Our device needs two different firmwares: the INIT firmware
      and the operational (OPER) firmware. The first one is run
      when the driver loads and it returns calibrations results
      as well as the NVM. The second one implements the WiFi
      protocol.

      If the wlan interface is not brought up, the device is put
      to low power state: no firmware will be running. When the
      interface is brought up, we would run the OPER firmware
      only and reuse the results of the run of the INIT firmware
      when the driver was loaded. This is changing with this
      patch.
      We now run the INIT firmware every time mac80211 calls
      start(). The penalty for that is minimal since the INIT
      firwmare run fast. I now also avoid to power down the device
      between the INIT and OPER firmware on certains buses.

      The motivation for this change is that there are components
      on the device (MFUART) that are triggered by the INIT
      firmware and need the device to be powered up in order to
      keep running. Powering the device down between the INIT and
      OPER firmware would stop these components and prevent them
      from running again since they are triggered by the INIT
      firmware only.
      The new flow allows this and also allows to trigger these
      components again when the interface is brought up after
      it has been brought down.

      Signed-off-by: Eran Harary <eran.harary@xxxxxxxxx>
      Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>

  commit fefad2d54beb8aad6bf4ac6daeb74f86f52565de
  Author: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
  Date:   Sun Apr 12 09:09:05 2015 -0300

      [media] v4l: omap4iss: Replace outdated OMAP4 control pad API with syscon

      The omap4_ctrl_pad_readl and omap4_ctrl_pad_writel functions have been
      removed by commit efde234674d9 but are still used by the OMAP4 ISS
      driver, resulting in a compilation breakage:

      drivers/staging/media/omap4iss/iss_csiphy.c: In function 
'omap4iss_csiphy_config':
      drivers/staging/media/omap4iss/iss_csiphy.c:167:2: error: implicit 
declaration of function 'omap4_ctrl_pad_writel' 
[-Werror=implicit-function-declaration]
        omap4_ctrl_pad_writel(cam_rx_ctrl,

      Fix the problem by using the syscon API to reaplace the control pad API.
      Lookup the syscon instance by compatible name for now as the OMAP4 ISS
      driver doesn't support DT yet.

      Fixes: efde234674d9 ("ARM: OMAP4+: control: remove support for legacy pad 
read/write")

      Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
      Acked-by: Sakari Alius <sakari.ailus@xxxxxx>
      Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>

  commit 414b7e3b9ce8b0577f613e656fdbc36b34b444dd
  Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
  Date:   Fri Apr 24 11:03:37 2015 -0500

      rtlwifi: rtl8192cu: Fix kernel deadlock

      The USB mini-driver in rtlwifi, which is used by rtl8192cu, issues a call 
to
      usb_control_msg() with a timeout value of 0. In some instances where the
      interface is shutting down, this infinite wait results in a CPU deadlock. 
A
      one second timeout fixes this problem without affecting any normal 
operations.

      This bug is reported at 
https://bugzilla.novell.com/show_bug.cgi?id=927786.

      Reported-by: Bernhard Wiedemann <bwiedemann@xxxxxxxx>
      Tested-by: Bernhard Wiedemann <bwiedemann@xxxxxxxx>
      Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
      Cc: Stable <stable@xxxxxxxxxxxxxxx>
      Cc: Bernhard Wiedemann <bwiedemann@xxxxxxxx>
      Cc: Takashi Iwai<tiwai@xxxxxxxx>
      Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxx>

  commit 0d3bba0287d4e284c3ec7d3397e81eec920d5e7e
  Author: Quentin Casasnovas <quentin.casasnovas@xxxxxxxxxx>
  Date:   Tue Apr 14 11:25:43 2015 +0200

      cdc-acm: prevent infinite loop when parsing CDC headers.

      Phil and I found out a problem with commit:

        7e860a6e7aa6 ("cdc-acm: add sanity checks")

      It added some sanity checks to ignore potential garbage in CDC headers but
      also introduced a potential infinite loop.  This can happen at the first
      loop iteration (elength = 0 in that case) if the description isn't a
      DT_CS_INTERFACE or later if 'buffer[0]' is zero.

      It should also be noted that the wrong length was being added to 'buffer'
      in case 'buffer[1]' was not a DT_CS_INTERFACE descriptor, since elength 
was
      assigned after that check in the loop.

      A specially crafted USB device could be used to trigger this infinite 
loop.

      Fixes: 7e860a6e7aa6 ("cdc-acm: add sanity checks")
      Signed-off-by: Phil Turnbull <phil.turnbull@xxxxxxxxxx>
      Signed-off-by: Quentin Casasnovas <quentin.casasnovas@xxxxxxxxxx>
      CC: Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx>
      CC: Oliver Neukum <oneukum@xxxxxxx>
      CC: Adam Lee <adam8157@xxxxxxxxx>
      CC: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit bb304b71f8dbcb284f0f876dfb4eecbadf079773
  Author: Ivan T. Ivanov <ivan.ivanov@xxxxxxxxxx>
  Date:   Mon Apr 27 15:27:36 2015 +0300

      Revert "usb: host: ehci-msm: Use devm_ioremap_resource instead of 
devm_ioremap"

      This reverts commit 70843f623b58 ("usb: host: ehci-msm: Use
      devm_ioremap_resource instead of devm_ioremap") and commit
      e507bf577e5a ("host: ehci-msm: remove duplicate check on resource"),
      because msm_otg and this driver are using same address space to
      access AHB mode and USB command registers.

      Signed-off-by: Ivan T. Ivanov <ivan.ivanov@xxxxxxxxxx>
      Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
      Acked-by: Vivek Gautam <gautam.vivek@xxxxxxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit a5a356cee89f86ff86cc3ce24136ca1f802c1bf1
  Author: Li Jun <jun.li@xxxxxxxxxxxxx>
  Date:   Sun Apr 12 17:51:02 2015 +0800

      usb: chipidea: otg: remove mutex unlock and lock while stop and start role

      Wrongly release mutex lock during otg_statemachine may result in re-enter
      otg_statemachine, which is not allowed, we should do next state 
transtition
      after previous one completed.

      Fixes: 826cfe751f3e ("usb: chipidea: add OTG fsm operation functions 
implementation")
      Cc: <stable@xxxxxxxxxxxxxxx> # v3.16+
      Signed-off-by: Li Jun <jun.li@xxxxxxxxxxxxx>
      Signed-off-by: Peter Chen <peter.chen@xxxxxxxxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit 8e779c6c4a398763c21371fe40f649206041dc1e
  Author: Hans de Goede <hdegoede@xxxxxxxxxx>
  Date:   Tue Apr 21 11:20:32 2015 +0200

      uas: Set max_sectors_240 quirk for ASM1053 devices

      Testing has shown that ASM1053 devices do not work properly with transfers
      larger than 240 sectors, so set max_sectors to 240 on these.

      Cc: stable@xxxxxxxxxxxxxxx # 3.16
      Reported-by: Steve Bangert <sbangert@xxxxxxxxxxxx>
      Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
      Tested-by: Steve Bangert <sbangert@xxxxxxxxxxxx>
      Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit ee136af4a064c2f61e2025873584d2c7ec93f4ae
  Author: Hans de Goede <hdegoede@xxxxxxxxxx>
  Date:   Tue Apr 21 11:20:31 2015 +0200

      uas: Add US_FL_MAX_SECTORS_240 flag

      The usb-storage driver sets max_sectors = 240 in its scsi-host template,
      for uas we do not want to do that for all devices, but testing has shown
      that some devices need it.

      This commit adds a US_FL_MAX_SECTORS_240 flag for such devices, and
      implements support for it in uas.c, while at it it also adds support
      for US_FL_MAX_SECTORS_64 to uas.c.

      Cc: stable@xxxxxxxxxxxxxxx # 3.16
      Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
      Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit a5011d44f0e1117a6db14b19b57c51f8be5673a0
  Author: Hans de Goede <hdegoede@xxxxxxxxxx>
  Date:   Tue Apr 21 11:20:30 2015 +0200

      uas: Allow uas_use_uas_driver to return usb-storage flags

      uas_use_uas_driver may set some US_FL_foo flags during detection, 
currently
      these are stored in a local variable and then throw away, but these may be
      of interest to the caller, so add an extra parameter to (optionally) 
return
      the detected flags, and use this in the uas driver.

      Cc: stable@xxxxxxxxxxxxxxx # 3.16
      Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
      Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

  commit 39376ccb1968ba9f83e2a880a8bf02ad5dea44e1
  Merge: 876a7ae 547c4b5
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Mon Apr 27 23:12:34 2015 -0400

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

      Pablo Neira Ayuso says:

      ====================
      Netfilter fixes for net

      The following patchset contains Netfilter fixes for your net tree,
      they are:

      1) Fix a crash in nf_tables when dictionaries are used from the ruleset,
         due to memory corruption, from Florian Westphal.

      2) Fix another crash in nf_queue when used with br_netfilter. Also from
         Florian.

      Both fixes are related to new stuff that got in 4.0-rc.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 876a7ae65b86d8cec8efe7d15d050ac61116874e
  Author: Alexei Starovoitov <ast@xxxxxxxxxxxx>
  Date:   Mon Apr 27 14:40:37 2015 -0700

      bpf: fix 64-bit divide

      ALU64_DIV instruction should be dividing 64-bit by 64-bit,
      whereas do_div() does 64-bit by 32-bit divide.
      x64 and arm64 JITs correctly implement 64 by 64 unsigned divide.
      llvm BPF backend emits code assuming that ALU64_DIV does 64 by 64.

      Fixes: 89aa075832b0 ("net: sock: allow eBPF programs to be attached to 
sockets")
      Reported-by: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx>
      Acked-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
      Signed-off-by: Alexei Starovoitov <ast@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 8e046d68ba719a5bb95912c154c6314472edccfa
  Author: Karicheri, Muralidharan <m-karicheri2@xxxxxx>
  Date:   Mon Apr 27 14:12:43 2015 -0400

      net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface

      Currently when interface type is MAC to Phy, netif_carrier_(on/off)
      is called which is not needed as Phy lib already updates the carrier
      status to net stack. This is needed only for other interface types

      Signed-off-by: Murali Karicheri <m-karicheri2@xxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 68ce9a1f24b8e8894955032a4af74998315be9fe
  Author: Shawn Guo <shawn.guo@xxxxxxxxxx>
  Date:   Tue Apr 28 09:05:21 2015 +0800

      ARM: dts: imx6qdl-sabreauto: remove pinctrl-assert-gpios

      The pinctrl-assert-gpios is an invalid pinctrl property.  It was
      probably sneaked from vendor tree.  Remove it.

      Fixes: 4e18a2243a87 ("ARM: imx6qdl-sabreauto.dtsi: add max7310 support")
      Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxx>

  commit 2decb2682f80759f631c8332f9a2a34a02150a03
  Merge: b787f68 22a8f23
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 27 14:05:19 2015 -0700

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

      Pull networking fixes from David Miller:

       1) mlx4 doesn't check fully for supported valid RSS hash function, fix
          from Amir Vadai

       2) Off by one in ibmveth_change_mtu(), from David Gibson

       3) Prevent altera chip from reporting false error interrupts in some
          circumstances, from Chee Nouk Phoon

       4) Get rid of that stupid endless loop trying to allocate a FIN packet
          in TCP, and in the process kill deadlocks.  From Eric Dumazet

       5) Fix get_rps_cpus() crash due to wrong invalid-cpu value, also from
          Eric Dumazet

       6) Fix two bugs in async rhashtable resizing, from Thomas Graf

       7) Fix topology server listener socket namespace bug in TIPC, from Ying
          Xue

       8) Add some missing HAS_DMA kconfig dependencies, from Geert
          Uytterhoeven

       9) bgmac driver intends to force re-polling but does so by returning
          the wrong value from it's ->poll() handler.  Fix from RafaÅ? MiÅ?ecki

      10) When the creater of an rhashtable configures a max size for it,
          don't bark in the logs and drop insertions when that is exceeded.
          Fix from Johannes Berg

      11) Recover from out of order packets in ppp mppe properly, from Sylvain
          Rochet

      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (41 commits)
        bnx2x: really disable TPA if 'disable_tpa' option is set
        net:treewide: Fix typo in drivers/net
        net/mlx4_en: Prevent setting invalid RSS hash function
        mdio-mux-gpio: use new gpiod_get_array and gpiod_put_array functions
        netfilter; Add some missing default cases to switch statements in 
nft_reject.
        ppp: mppe: discard late packet in stateless mode
        ppp: mppe: sanity error path rework
        net/bonding: Make DRV macros private
        net: rfs: fix crash in get_rps_cpus()
        altera tse: add support for fixed-links.
        pxa168: fix double deallocation of managed resources
        net: fix crash in build_skb()
        net: eth: altera: Resolve false errors from MSGDMA to TSE
        ehea: Fix memory hook reference counting crashes
        net/tg3: Release IRQs on permanent error
        net: mdio-gpio: support access that may sleep
        inet: fix possible panic in reqsk_queue_unlink()
        rhashtable: don't attempt to grow when at max_size
        bgmac: fix requests for extra polling calls from NAPI
        tcp: avoid looping in tcp_send_fin()
        ...

  commit 53f9b3baa937e0cbdd75ea11b3c824462e4359b2
  Author: Axel Lin <axel.lin@xxxxxxxxxx>
  Date:   Tue Apr 21 12:19:49 2015 +0800

      ASoC: rt5645: Fix mask for setting RT5645_DMIC_2_DP_GPIO12 bit

      Current code uses wrong mask when setting RT5645_DMIC_2_DP_GPIO12 bit,
      fix it.

      Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit 5a9b06a27db6b006605421658418fb8943a6e217
  Author: Koji Matsuoka <koji.matsuoka.xm@xxxxxxxxxxx>
  Date:   Sun Mar 29 10:04:56 2015 -0300

      [media] media: soc_camera: rcar_vin: Fix wait_for_completion

      When stopping abnormally, a driver can't return from wait_for_completion.
      This patch resolved this problem by changing wait_for_completion_timeout
      from wait_for_completion.

      Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@xxxxxxxxxxx>
      Signed-off-by: Yoshihiro Kaneko <ykaneko0929@xxxxxxxxx>
      Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
      Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>

  commit 2a700d8edffdbfb8200332d96c3147e042b337f1
  Author: Hans Verkuil <hans.verkuil@xxxxxxxxx>
  Date:   Mon Apr 13 11:18:51 2015 -0300

      [media] marvell-ccic: fix Y'CbCr ordering

      Various formats had their byte ordering implemented incorrectly, and
      the V4L2_PIX_FMT_UYVY is actually impossible to create, instead you
      get V4L2_PIX_FMT_YVYU.

      This was working before commit ad6ac452227b7cb93ac79beec092850d178740b1
      ("add new formats support for marvell-ccic driver"). That commit broke
      the original format support and the OLPC XO-1 laptop showed wrong
      colors ever since (if you are crazy enough to attempt to run the latest
      kernel on it, like I did).

      The email addresses of the authors of that patch are no longer valid,
      so without a way to reach them and ask them about their test setup
      I am going with what I can test on the OLPC laptop.

      If this breaks something for someone on their non-OLPC setup, then
      contact the linux-media mailinglist. My suspicion however is that
      that commit went in untested.

      Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
      Acked-by: Jonathan Corbet <corbet@xxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>      # for v3.19 and up
      Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
      Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>

  commit 22a8f237c0551bae95ffcd2a7ff17d6f5fcce7e7
  Author: Michal Schmidt <mschmidt@xxxxxxxxxx>
  Date:   Mon Apr 27 17:20:38 2015 +0200

      bnx2x: really disable TPA if 'disable_tpa' option is set

      bnx2x's 'disable_tpa=1' module option is not respected properly and TPA
      (transparent packet aggregation) remains enabled. Even though the
      module option causes LRO to be disabled, TPA is enabled in GRO mode.

      Additionally, disabling GRO via ethtool then has no effect. One can
      still observe tpa_* statistics increase and large packets being received
      in tcpdump.

      The bug was an unintended consequence of commit aebf6244cd39 "bnx2x: Be
      more forgiving toward SW GRO".

      Fix it by following the bp->disable_tpa flag when initializing fp's.

      Signed-off-by: Michal Schmidt <mschmidt@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 94435f764cc5838a7e94008f17628ad63384bf06
  Author: Masanari Iida <standby24x7@xxxxxxxxx>
  Date:   Mon Apr 27 23:14:57 2015 +0900

      net:treewide: Fix typo in drivers/net

      This patch fix spelling typo in printk.

      Signed-off-by: Masanari Iida <standby24x7@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit b37069090b7c5615610a8aa6b36533d67b364d38
  Author: Amir Vadai <amirv@xxxxxxxxxxxx>
  Date:   Mon Apr 27 13:40:56 2015 +0300

      net/mlx4_en: Prevent setting invalid RSS hash function

      mlx4_en_check_rxfh_func() was checking for hardware support before
      setting a known RSS hash function, but didn't do any check before
      setting unknown RSS hash function. Need to make it fail on such values.
      In this occasion, moved the actual setting of the new value from the
      check function into mlx4_en_set_rxfh().

      Fixes: 947cbb0 ("net/mlx4_en: Support for configurable RSS hash function")
      Signed-off-by: Amir Vadai <amirv@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 33df10e2ee414183953cc89453bf9c85027a188b
  Author: Rojhalat Ibrahim <imr@xxxxxxxxxxx>
  Date:   Mon Apr 27 10:37:31 2015 +0200

      mdio-mux-gpio: use new gpiod_get_array and gpiod_put_array functions

      Use the new gpiod_get_array and gpiod_put_array functions
      (added to mainline in the v4.1 merge window) for obtaining and
      disposing of GPIO descriptors.

      Cc: David Miller <davem@xxxxxxxxxxxxx>
      Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
      Signed-off-by: Rojhalat Ibrahim <imr@xxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 129d23a56623eea0947a05288158d76dc7f2f0ac
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Mon Apr 27 13:20:34 2015 -0400

      netfilter; Add some missing default cases to switch statements in 
nft_reject.

      This fixes:

      ====================
      net/netfilter/nft_reject.c: In function â??nft_reject_dumpâ??:
      net/netfilter/nft_reject.c:61:2: warning: enumeration value 
â??NFT_REJECT_TCP_RSTâ?? not handled in switch [-Wswitch]
        switch (priv->type) {
        ^
      net/netfilter/nft_reject.c:61:2: warning: enumeration value 
â??NFT_REJECT_ICMPX_UNREACHâ?? not handled in switch [-Wswi\
      tch]
      net/netfilter/nft_reject_inet.c: In function â??nft_reject_inet_dumpâ??:
      net/netfilter/nft_reject_inet.c:105:2: warning: enumeration value 
â??NFT_REJECT_TCP_RSTâ?? not handled in switch [-Wswi\
      tch]
        switch (priv->type) {
        ^
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 118c855b5623f3e2e6204f02623d88c09e0c34de
  Author: Christoph Hellwig <hch@xxxxxx>
  Date:   Thu Apr 23 09:48:51 2015 +0200

      3w-9xxx: fix command completion race

      The 3w-9xxx driver needs to tear down the dma mappings before returning
      the command to the midlayer, as there is no guarantee the sglist and
      count are valid after that point.  Also remove the dma mapping helpers
      which have another inherent race due to the request_id index.

      Signed-off-by: Christoph Hellwig <hch@xxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Acked-by: Adam Radford <aradford@xxxxxxxxx>
      Signed-off-by: James Bottomley <JBottomley@xxxxxxxx>

  commit 9cd9554615cba14f0877cc9972a6537ad2bdde61
  Author: Christoph Hellwig <hch@xxxxxx>
  Date:   Thu Apr 23 09:48:50 2015 +0200

      3w-xxxx: fix command completion race

      The 3w-xxxx driver needs to tear down the dma mappings before returning
      the command to the midlayer, as there is no guarantee the sglist and
      count are valid after that point.  Also remove the dma mapping helpers
      which have another inherent race due to the request_id index.

      Signed-off-by: Christoph Hellwig <hch@xxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Acked-by: Adam Radford <aradford@xxxxxxxxx>
      Signed-off-by: James Bottomley <JBottomley@xxxxxxxx>

  commit 579d69bc1fd56d5af5761969aa529d1d1c188300
  Author: Christoph Hellwig <hch@xxxxxx>
  Date:   Thu Apr 23 09:48:49 2015 +0200

      3w-sas: fix command completion race

      The 3w-sas driver needs to tear down the dma mappings before returning
      the command to the midlayer, as there is no guarantee the sglist and
      count are valid after that point.  Also remove the dma mapping helpers
      which have another inherent race due to the request_id index.

      Signed-off-by: Christoph Hellwig <hch@xxxxxx>
      Reported-by: Torsten Luettgert <ml-lkml@xxxxxxx>
      Tested-by: Bernd Kardatzki <Bernd.Kardatzki@xxxxxxxxxxxxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Acked-by: Adam Radford <aradford@xxxxxxxxx>
      Signed-off-by: James Bottomley <JBottomley@xxxxxxxx>

  commit 8c08a6215a432a8f3629da0e8ccfd534ffa480f5
  Author: Ondrej Zary <linux@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 23:27:50 2015 +0200

      aha1542: Allocate memory before taking a lock

      The driver currently calls kmalloc with GFP_KERNEL while holding a lock.
      Fix it by doing the allocation earlier, before taking the lock.

      Tested on AHA-1542B.

      Signed-off-by: Ondrej Zary <linux@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: James Bottomley <JBottomley@xxxxxxxx>

  commit 1d90a685eb75a56648d7dd22c704a1a6da516de9
  Author: Petr Holasek <pholasek@xxxxxxxxxx>
  Date:   Thu Apr 16 17:38:19 2015 +0200

      perf bench numa: Fix immediate meeting of convergence condition

      This patch fixes the race in the beginning of benchmark run when some
      threads hasn't got assigned curr_cpu yet so they don't occur in
      nodes-of-process stats and benchmark concludes that all remaining
      threads are converged already.

      The race can be reproduced with small amount of threads and some bigger
      amount of shared process memory, e.g. one process, two threads and 5GB
      of process memory.

      Signed-off-by: Petr Holasek <pholasek@xxxxxxxxxx>
      Reviewed-by: Ingo Molnar <mingo@xxxxxxxxxx>
      Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
      Link: 
http://lkml.kernel.org/r/1429198699-25039-4-git-send-email-pholasek@xxxxxxxxxx
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit 24f1ced167e5e011040b4c3aae75aee45a79eed5
  Author: Petr Holasek <pholasek@xxxxxxxxxx>
  Date:   Thu Apr 16 17:38:17 2015 +0200

      perf bench numa: Fixes of --quiet argument

      Corrected description and fixed function of --quiet argument.

      Signed-off-by: Petr Holasek <pholasek@xxxxxxxxxx>
      Reviewed-by: Ingo Molnar <mingo@xxxxxxxxxx>
      Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
      Link: 
http://lkml.kernel.org/r/1429198699-25039-2-git-send-email-pholasek@xxxxxxxxxx
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit 052b0f6eaf8b1f02669884a177bc3ce463133a42
  Author: Davidlohr Bueso <dave@xxxxxxxxxxxx>
  Date:   Fri Apr 24 10:00:48 2015 -0700

      perf bench futex: Fix hung wakeup tasks after requeueing

      The futex-requeue benchmark can hang because of missing wakeups once the
      benchmark is done, ie:

      [Run 1]: Requeued 1024 of 1024 threads in 0.3290 ms
      perf: couldn't wakeup all tasks (135/1024)

      This bug, while perhaps suggesting missing wakeups in kernel futex code,
      is merely a consequence of the crappy FUTEX_CMP_REQUEUE man page,
      incorrectly mentioning that the number of requeued tasks is in fact
      returned, not the wakeups.

      This patch acknowledges this and updates the corresponding futex_wake
      code around it.

      Signed-off-by: Davidlohr Bueso <dbueso@xxxxxxx>
      Cc: Mel Gorman <mgorman@xxxxxxx>
      Link: http://lkml.kernel.org/r/1429894848.10273.44.camel@xxxxxxxxxxxx
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit d13855ef18e1852b2c4dc86ddf5759c5b34628cb
  Author: He Kuang <hekuang@xxxxxxxxxx>
  Date:   Sat Apr 25 16:08:58 2015 +0800

      perf probe: Fix bug with global variables handling

      There are missing curly braces which causes find_variable() return wrong
      value when probing with global variables.

      This problem can be reproduced as following:

        $ perf probe -v --add='generic_perform_write global_variable_for_test'
        ...
        Try to find probe point from debuginfo.
        Probe point found: generic_perform_write+0
        Searching 'global_variable_for_test' variable in context.
        An error occurred in debuginfo analysis (-2).
          Error: Failed to add events. Reason: No such file or directory (Code: 
-2)

      After this patch:

        $ perf probe -v --add='generic_perform_write global_variable_for_test'
        ...
        Converting variable global_variable_for_test into trace event.
        global_variable_for_test type is int.
        Found 1 probe_trace_events.
        Opening /sys/kernel/debug/tracing/kprobe_events write=1
        Added new event:
        Writing event: p:probe/generic_perform_write _stext+1237464
        global_variable_for_test=@global_variable_for_test+0:s32
          probe:generic_perform_write (on generic_perform_write with
          global_variable_for_test)

        You can now use it in all perf tools, such as:

            perf record -e probe:generic_perform_write -aR sleep 1

      Signed-off-by: He Kuang <hekuang@xxxxxxxxxx>
      Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
      Cc: Paul Mackerras <paulus@xxxxxxxxx>
      Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
      Cc: Wang Nan <wangnan0@xxxxxxxxxx>
      Link: 
http://lkml.kernel.org/r/1429949338-18678-1-git-send-email-hekuang@xxxxxxxxxx
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit 35e9a9f93994d7f7d12afa41169c7ba05513721b
  Author: Mike Christie <michaelc@xxxxxxxxxxx>
  Date:   Mon Apr 20 22:42:24 2015 -0500

      SCSI: add 1024 max sectors black list flag

      This works around a issue with qnap iscsi targets not handling large IOs
      very well.

      The target returns:

      VPD INQUIRY: Block limits page (SBC)
        Maximum compare and write length: 1 blocks
        Optimal transfer length granularity: 1 blocks
        Maximum transfer length: 4294967295 blocks
        Optimal transfer length: 4294967295 blocks
        Maximum prefetch, xdread, xdwrite transfer length: 0 blocks
        Maximum unmap LBA count: 8388607
        Maximum unmap block descriptor count: 1
        Optimal unmap granularity: 16383
        Unmap granularity alignment valid: 0
        Unmap granularity alignment: 0
        Maximum write same length: 0xffffffff blocks
        Maximum atomic transfer length: 0
        Atomic alignment: 0
        Atomic transfer length granularity: 0

      and it is *sometimes* able to handle at least one IO of size up to 8 MB. 
We
      have seen in traces where it will sometimes work, but other times it
      looks like it fails and it looks like it returns failures if we send
      multiple large IOs sometimes. Also it looks like it can return 2 different
      errors. It will sometimes send iscsi reject errors indicating out of
      resources or it will send invalid cdb illegal requests check conditions.
      And then when it sends iscsi rejects it does not seem to handle retries
      when there are command sequence holes, so I could not just add code to
      try and gracefully handle that error code.

      The problem is that we do not have a good contact for the company,
      so we are not able to determine under what conditions it returns
      which error and why it sometimes works.

      So, this patch just adds a new black list flag to set targets like this to
      the old max safe sectors of 1024. The max_hw_sectors changes added in 3.19
      caused this regression, so I also ccing stable.

      Reported-by: Christian Hesse <list@xxxxxxxx>
      Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Reviewed-by: Christoph Hellwig <hch@xxxxxx>
      Signed-off-by: James Bottomley <JBottomley@xxxxxxxx>

  commit 6cd18e711dd8075da9d78cfc1239f912ff28968a
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Mon Apr 27 14:12:22 2015 +1000

      block: destroy bdi before blockdev is unregistered.

      Because of the peculiar way that md devices are created (automatically
      when the device node is opened), a new device can be created and
      registered immediately after the
        blk_unregister_region(disk_devt(disk), disk->minors);
      call in del_gendisk().

      Therefore it is important that all visible artifacts of the previous
      device are removed before this call.  In particular, the 'bdi'.

      Since:
      commit c4db59d31e39ea067c32163ac961e9c80198fd37
      Author: Christoph Hellwig <hch@xxxxxx>
          fs: don't reassign dirty inodes to default_backing_dev_info

      moved the
         device_unregister(bdi->dev);
      call from bdi_unregister() to bdi_destroy() it has been quite easy to
      lose a race and have a new (e.g.) "md127" be created after the
      blk_unregister_region() call and before bdi_destroy() is ultimately
      called by the final 'put_disk', which must come after del_gendisk().

      The new device finds that the bdi name is already registered in sysfs
      and complains

      > [ 9627.630029] WARNING: CPU: 18 PID: 3330 at fs/sysfs/dir.c:31 
sysfs_warn_dup+0x5a/0x70()
      > [ 9627.630032] sysfs: cannot create duplicate filename 
'/devices/virtual/bdi/9:127'

      We can fix this by moving the bdi_destroy() call out of
      blk_release_queue() (which can happen very late when a refcount
      reaches zero) and into blk_cleanup_queue() - which happens exactly when 
the md
      device driver calls it.

      Then it is only necessary for md to call blk_cleanup_queue() before
      del_gendisk().  As loop.c devices are also created on demand by
      opening the device node, we make the same change there.

      Fixes: c4db59d31e39ea067c32163ac961e9c80198fd37
      Reported-by: Azat Khuzhin <a3at.mail@xxxxxxxxx>
      Cc: Christoph Hellwig <hch@xxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx (v4.0)
      Signed-off-by: NeilBrown <neilb@xxxxxxx>
      Reviewed-by: Christoph Hellwig <hch@xxxxxx>
      Signed-off-by: Jens Axboe <axboe@xxxxxx>

  commit c671835021798c1c40ca0b55b49feff76ed5e0e1
  Author: Wang Nan <wangnan0@xxxxxxxxxx>
  Date:   Sat Apr 25 07:25:03 2015 +0000

      perf top: Fix a segfault when kernel map is restricted.

      Perf top raise a warning if a kernel sample is collected but kernel map
      is restricted. The warning message needs to dereference al.map->dso...

      However, previous perf_event__preprocess_sample() doesn't always
      guarantee al.map != NULL, for example, when kernel map is restricted.

      This patch validates al.map before dereferencing, avoid the segfault.

      Before this patch:

       $ cat /proc/sys/kernel/kptr_restrict
       1
       $ perf top -p  120183
       perf: Segmentation fault
       -------- backtrace --------
       /path/to/perf[0x509868]
       /lib64/libc.so.6(+0x3545f)[0x7f9a1540045f]
       /path/to/perf[0x448820]
       /path/to/perf(cmd_top+0xe3c)[0x44a5dc]
       /path/to/perf[0x4766a2]
       /path/to/perf(main+0x5f5)[0x42e545]
       /lib64/libc.so.6(__libc_start_main+0xf4)[0x7f9a153ecbd4]
       /path/to/perf[0x42e674]

      And gdb call trace:

       Program received signal SIGSEGV, Segmentation fault.
       perf_event__process_sample (machine=0xa44030, sample=0x7fffffffa4c0, 
evsel=0xa43b00, event=0x7ffff41c3000, tool=0x7fffffffa8a0)
          at builtin-top.c:736
       736                                
!RB_EMPTY_ROOT(&al.map->dso->symbols[MAP__FUNCTION]) ?
       (gdb) bt
       #0  perf_event__process_sample (machine=0xa44030, sample=0x7fffffffa4c0, 
evsel=0xa43b00, event=0x7ffff41c3000, tool=0x7fffffffa8a0)
           at builtin-top.c:736
       #1  perf_top__mmap_read_idx (top=top@entry=0x7fffffffa8a0, 
idx=idx@entry=0) at builtin-top.c:855
       #2  0x000000000044a5dd in perf_top__mmap_read (top=0x7fffffffa8a0) at 
builtin-top.c:872
       #3  __cmd_top (top=0x7fffffffa8a0) at builtin-top.c:997
       #4  cmd_top (argc=<optimized out>, argv=<optimized out>, 
prefix=<optimized out>) at builtin-top.c:1267
       #5  0x00000000004766a3 in run_builtin (p=p@entry=0x8a6ce8 
<commands+264>, argc=argc@entry=3, argv=argv@entry=0x7fffffffdf70)
            at perf.c:371
       #6  0x000000000042e546 in handle_internal_command (argv=0x7fffffffdf70, 
argc=3) at perf.c:430
       #7  run_argv (argv=0x7fffffffdcf0, argcp=0x7fffffffdcfc) at perf.c:474
       #8  main (argc=3, argv=0x7fffffffdf70) at perf.c:589
       (gdb)

      Signed-off-by: Wang Nan <wangnan0@xxxxxxxxxx>
      Tested-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
      Cc: David Ahern <dsahern@xxxxxxxxx>
      Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
      Cc: Paul Mackerras <paulus@xxxxxxxxx>
      Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
      Cc: Zefan Li <lizefan@xxxxxxxxxx>
      Link: 
http://lkml.kernel.org/r/1429946703-80807-1-git-send-email-wangnan0@xxxxxxxxxx
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit 9fb2bcf928ed5c664affaeb7edf9cc19f590b9f3
  Author: Christian König <christian.koenig@xxxxxxx>
  Date:   Mon Apr 27 17:04:37 2015 +0200

      drm/radeon: fix userptr return value checking (v2)

      Otherwise we print false warning from time to time.

      v2: agd5f: rebase

      Signed-off-by: Christian König <christian.koenig@xxxxxxx>
      Signed-off-by: Jack Xiao <Jack.Xiao@xxxxxxx>
      CC: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit c29c0876ec05d51a93508a39b90b92c29ba6423d
  Author: Christian König <christian.koenig@xxxxxxx>
  Date:   Mon Apr 27 17:04:36 2015 +0200

      drm/radeon: check new address before removing old one

      Otherwise the change isn't atomic.

      Signed-off-by: Christian König <christian.koenig@xxxxxxx>
      CC: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit 48afbd70ac7b6aa62e8d452091023941d8085f8a
  Author: Christian König <christian.koenig@xxxxxxx>
  Date:   Mon Apr 27 17:04:35 2015 +0200

      drm/radeon: reset BOs address after clearing it.

      Otherwise it is possible that we will have page table corruption
      if we change a BOs address multiple times.

      Signed-off-by: Christian König <christian.koenig@xxxxxxx>
      CC: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit 26d4d129b6042197b4cbc8341c0618f99231af2f
  Author: Christian König <christian.koenig@xxxxxxx>
  Date:   Mon Apr 27 17:04:34 2015 +0200

      drm/radeon: fix lockup when BOs aren't part of the VM on release

      If we unmap BOs before releasing them them the intervall tree locks
      up because we try to remove an entry not inside the tree.

      Based on a patch from Michel Dänzer.

      Signed-off-by: Christian König <christian.koenig@xxxxxxx>
      CC: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit 393a33970540ac6a2c894b0d6ef3f5d485860884
  Author: Wang YanQing <udknight@xxxxxxxxx>
  Date:   Sun Apr 26 16:43:31 2015 +0800

      block:bounce: fix call inc_|dec_zone_page_state on different pages 
confuse value of NR_BOUNCE

      Commit d2c5e30c9a1420902262aa923794d2ae4e0bc391
      ("[PATCH] zoned vm counters: conversion of nr_bounce to per zone counter")
      convert statistic of nr_bounce to per zone and one global value in 
vm_stat,
      but it call inc_|dec_zone_page_state on different pages, then different
      zones, and cause us to get unexpected value of NR_BOUNCE.

      Below is the result on my machine:
      Mar  2 09:26:08 udknight kernel: [144766.778265] Mem-Info:
      Mar  2 09:26:08 udknight kernel: [144766.778266] DMA per-cpu:
      Mar  2 09:26:08 udknight kernel: [144766.778268] CPU    0: hi:    0, 
btch:   1 usd:   0
      Mar  2 09:26:08 udknight kernel: [144766.778269] CPU    1: hi:    0, 
btch:   1 usd:   0
      Mar  2 09:26:08 udknight kernel: [144766.778270] Normal per-cpu:
      Mar  2 09:26:08 udknight kernel: [144766.778271] CPU    0: hi:  186, 
btch:  31 usd:   0
      Mar  2 09:26:08 udknight kernel: [144766.778273] CPU    1: hi:  186, 
btch:  31 usd:   0
      Mar  2 09:26:08 udknight kernel: [144766.778274] HighMem per-cpu:
      Mar  2 09:26:08 udknight kernel: [144766.778275] CPU    0: hi:  186, 
btch:  31 usd:   0
      Mar  2 09:26:08 udknight kernel: [144766.778276] CPU    1: hi:  186, 
btch:  31 usd:   0
      Mar  2 09:26:08 udknight kernel: [144766.778279] active_anon:46926 
inactive_anon:287406 isolated_anon:0
      Mar  2 09:26:08 udknight kernel: [144766.778279]  active_file:105085 
inactive_file:139432 isolated_file:0
      Mar  2 09:26:08 udknight kernel: [144766.778279]  unevictable:653 dirty:0 
writeback:0 unstable:0
      Mar  2 09:26:08 udknight kernel: [144766.778279]  free:178957 
slab_reclaimable:6419 slab_unreclaimable:9966
      Mar  2 09:26:08 udknight kernel: [144766.778279]  mapped:4426 
shmem:305277 pagetables:784 bounce:0
      Mar  2 09:26:08 udknight kernel: [144766.778279]  free_cma:0
      Mar  2 09:26:08 udknight kernel: [144766.778286] DMA free:3324kB min:68kB 
low:84kB high:100kB active_anon:0kB inactive_anon:0kB active_file:0kB 
inactive_file:0kB unevictable:0kB isolated(anon):0kB isolated(file):0kB 
present:15976kB managed:15900kB mlocked:0kB dirty:0kB writeback:0kB mapped:0kB 
shmem:0kB slab_reclaimable:0kB slab_unreclaimable:0kB kernel_stack:0kB 
pagetables:0kB unstable:0kB bounce:0kB free_cma:0kB writeback_tmp:0kB 
pages_scanned:0 all_unreclaimable? yes
      Mar  2 09:26:08 udknight kernel: [144766.778287] lowmem_reserve[]: 0 822 
3754 3754
      Mar  2 09:26:08 udknight kernel: [144766.778293] Normal free:26828kB 
min:3632kB low:4540kB high:5448kB active_anon:4872kB inactive_anon:68kB 
active_file:1796kB inactive_file:1796kB unevictable:0kB isolated(anon):0kB 
isolated(file):0kB present:892920kB managed:842560kB mlocked:0kB dirty:0kB 
writeback:0kB mapped:0kB shmem:4144kB slab_reclaimable:25676kB 
slab_unreclaimable:39864kB kernel_stack:1944kB pagetables:3136kB unstable:0kB 
bounce:0kB free_cma:0kB writeback_tmp:0kB pages_scanned:2412612 
all_unreclaimable? yes
      Mar  2 09:26:08 udknight kernel: [144766.778294] lowmem_reserve[]: 0 0 
23451 23451
      Mar  2 09:26:08 udknight kernel: [144766.778299] HighMem free:685676kB 
min:512kB low:3748kB high:6984kB active_anon:182832kB inactive_anon:1149556kB 
active_file:418544kB inactive_file:555932kB unevictable:2612kB 
isolated(anon):0kB isolated(file):0kB present:3001732kB managed:3001732kB 
mlocked:0kB dirty:0kB writeback:0kB mapped:17704kB shmem:1216964kB 
slab_reclaimable:0kB slab_unreclaimable:0kB kernel_stack:0kB pagetables:0kB 
unstable:0kB bounce:75771152kB free_cma:0kB writeback_tmp:0kB pages_scanned:0 
all_unreclaimable? no
      Mar  2 09:26:08 udknight kernel: [144766.778300] lowmem_reserve[]: 0 0 0 0

      You can see bounce:75771152kB for HighMem, but bounce:0 for lowmem and 
global.

      This patch fix it.

      Signed-off-by: Wang YanQing <udknight@xxxxxxxxx>
      Signed-off-by: Jens Axboe <axboe@xxxxxx>

  commit 4ada77e37a773168fea484899201e272ab44ba8b
  Author: Marek Vasut <marex@xxxxxxx>
  Date:   Fri Apr 24 13:29:47 2015 +0200

      ARM: dts: imx28: Fix AUART4 TX-DMA interrupt name

      Fix a typo in the TX DMA interrupt name for AUART4.
      This patch makes AUART4 operational again.

      Signed-off-by: Marek Vasut <marex@xxxxxxx>
      Fixes: f30fb03d4d3a ("ARM: dts: add generic DMA device tree binding for 
mxs-dma")
      Cc: stable@xxxxxxxxxxxxxxx
      Acked-by: Stefan Wahren <stefan.wahren@xxxxxxxx>
      Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxx>

  commit f90d3f0d0a11fa77918fd5497cb616dd2faa8431
  Author: Markus Pargmann <mpa@xxxxxxxxxxxxxx>
  Date:   Fri Apr 24 09:27:33 2015 +0200

      ARM: dts: imx25: Add #pwm-cells to pwm4

      The property '#pwm-cells' is currently missing. It is not possible to
      use pwm4 without this property.

      Signed-off-by: Markus Pargmann <mpa@xxxxxxxxxxxxxx>
      Fixes: 5658a68fb578 ("ARM i.MX25: Add devicetree")
      Cc: <stable@xxxxxxxxxxxxxxx>
      Reviewed-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
      Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxx>

  commit 30e5f003ff4b2be86f71733b6c9b11355d66584c
  Author: Takashi Iwai <tiwai@xxxxxxx>
  Date:   Mon Apr 27 16:39:19 2015 +0200

      ALSA: hda - Fix missing va_end() call in snd_hda_codec_pcm_new()

      Reported by coverity CID 1296024.

      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 7f8d49dcc66a3dd3a8fc3078330b8fb9e616ad3f
  Author: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
  Date:   Tue Apr 21 15:59:53 2015 +0200

      ARM: dts: imx6: phyFLEX: USB VBUS control is active-high

      The fixed-regulator bindings require a separate property 
enable-active-high,
      the standard gpio phandle property polarity setting is ignored.

      Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
      Fixes: 4fe69a934b1f ("ARM: dts: Add Phytec pfla02 with i.MX6 
DualLite/Solo")
      Cc: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxx>

  commit cd17e02ff4db58ec32d35cf331c705d295779930
  Author: Alex Deucher <alexander.deucher@xxxxxxx>
  Date:   Mon Apr 27 09:51:43 2015 -0400

      drm/radeon: add SI DPM quirk for Sapphire R9 270 Dual-X 2G GDDR5

      Seems to have problems with high mclks.

      bug:
      https://bugs.freedesktop.org/show_bug.cgi?id=76490

      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 7fe04d6fa824ccea704535a597dc417c8687f990
  Author: Alex Deucher <alexander.deucher@xxxxxxx>
  Date:   Sun Apr 19 12:01:00 2015 -0400

      drm/radeon: adjust pll when audio is not enabled

      Fixes display problems with some monitors when audio
      is not enabled.

      Bugs:
      https://bugs.freedesktop.org/show_bug.cgi?id=89505
      https://bugzilla.kernel.org/show_bug.cgi?id=94171
      Plus several reports on IRC.

      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 38aef1549b18539eaecd804383a6ccb6588a9ce1
  Author: Alex Deucher <alexander.deucher@xxxxxxx>
  Date:   Tue Apr 7 10:20:49 2015 -0400

      drm/radeon: only enable audio streams if the monitor supports it

      Selectively enable which packets we send based on monitor caps.

      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 0f55db36d49d45b80eff0c0a2a498766016f458b
  Author: Alex Deucher <alexander.deucher@xxxxxxx>
  Date:   Tue Apr 7 09:52:42 2015 -0400

      drm/radeon: only mark audio as connected if the monitor supports it (v3)

      Otherwise the driver may try and send audio which may confuse the
      monitor.

      v2: set pin to NULL if no audio
      v3: avoid crash with analog encoders

      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 362ff251390f3d1f8fe94666f4fc4e5876381114
  Author: Alex Deucher <alexander.deucher@xxxxxxx>
  Date:   Tue Mar 31 11:43:12 2015 -0400

      drm/radeon/audio: don't enable packets until the end

      Don't enable the audio and avi infoframes and audio stream
      until all the state is set up.

      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 12428327bbd1180b5d8ef83fdf9482b878d0502a
  Author: Alex Deucher <alexander.deucher@xxxxxxx>
  Date:   Tue Mar 31 11:38:48 2015 -0400

      drm/radeon: drop dce6_dp_enable

      It's mostly duplicated with evergreen_dp_enable. This
      is a prerequisite for fix implemented in another patch.

      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 304f07e9c8d302cf3183248cbabb40598eb5b732
  Author: Alex Deucher <alexander.deucher@xxxxxxx>
  Date:   Tue Mar 31 10:33:05 2015 -0400

      drm/radeon: fix ordering of AVI packet setup

      Set the line first, then enable the stream.  May fix
      pink line problems on some displays.

      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit b421ed15d2c3039eb724680e4de1e4b2bd196a9a
  Author: Michel Dänzer <michel.daenzer@xxxxxxx>
  Date:   Thu Apr 16 11:17:27 2015 +0900

      drm/radeon: Use drm_calloc_ab for CS relocs

      The number of relocs is passed in by userspace and can be large. It has
      been observed to cause kcalloc failures in the wild.

      Cc: stable@xxxxxxxxxxxxxxx
      Reviewed-by: Christian König <christian.koenig@xxxxxxx>
      Signed-off-by: Michel Dänzer <michel.daenzer@xxxxxxx>
      Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>

  commit 73459e2a1ada09a68c02cc5b73f3116fc8194b3d
  Author: Paolo Bonzini <pbonzini@xxxxxxxxxx>
  Date:   Thu Apr 23 13:20:18 2015 +0200

      x86: pvclock: Really remove the sched notifier for cross-cpu migrations

      This reverts commits 0a4e6be9ca17c54817cf814b4b5aa60478c6df27
      and 80f7fdb1c7f0f9266421f823964fd1962681f6ce.

      The task migration notifier was originally introduced in order to support
      the pvclock vsyscall with non-synchronized TSC, but KVM only supports it
      with synchronized TSC.  Hence, on KVM the race condition is only needed
      due to a bad implementation on the host side, and even then it's so rare
      that it's mostly theoretical.

      As far as KVM is concerned it's possible to fix the host, avoiding the
      additional complexity in the vDSO and the (re)introduction of the task
      migration notifier.

      Xen, on the other hand, hasn't yet implemented vsyscall support at
      all, so we do not care about its plans for non-synchronized TSC.

      Reported-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
      Suggested-by: Marcelo Tosatti <mtosatti@xxxxxxxxxx>
      Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>

  commit 5dca0d9147458be9b9363b8a484aa77d710b412a
  Author: Radim KrÄ?máÅ? <rkrcmar@xxxxxxxxxx>
  Date:   Wed Mar 25 12:08:14 2015 +0100

      kvm: x86: fix kvmclock update protocol

      The kvmclock spec says that the host will increment a version field to
      an odd number, then update stuff, then increment it to an even number.
      The host is buggy and doesn't do this, and the result is observable
      when one vcpu reads another vcpu's kvmclock data.

      There's no good way for a guest kernel to keep its vdso from reading
      a different vcpu's kvmclock data, but we don't need to care about
      changing VCPUs as long as we read a consistent data from kvmclock.
      (VCPU can change outside of this loop too, so it doesn't matter if we
      return a value not fit for this VCPU.)

      Based on a patch by Radim KrÄ?máÅ?.

      Reviewed-by: Radim KrÄ?máÅ? <rkrcmar@xxxxxxxxxx>
      Acked-by: Marcelo Tosatti <mtosatti@xxxxxxxxxx>
      Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>

  commit dc391502fdbf97a9cabdc58ba8c915175383f681
  Author: Ivan T. Ivanov <ivan.ivanov@xxxxxxxxxx>
  Date:   Fri Apr 17 17:50:49 2015 +0300

      pinctrl: qcom-spmi: Fix pin direction configuration

      Pin direction configuration was incorrectly overwritten
      by output and function values in set_mux(). Fix this.

      Signed-off-by: Ivan T. Ivanov <ivan.ivanov@xxxxxxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit a526973e0291b245aefe12023a7f775f3c0e59a2
  Author: Andrew Andrianov <andrew@xxxxxxxxxx>
  Date:   Sat Apr 11 23:29:19 2015 +0300

      pinctrl: mvebu: Fix mapping of pin 63 (gpo -> gpio)

      Signed-off-by: Andrew Andrianov <andrew@xxxxxxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit a4811622fea15fdc78102069f573061fc87f3570
  Author: Qipeng Zha <qipeng.zha@xxxxxxxxx>
  Date:   Fri Apr 10 06:25:10 2015 +0800

      gpiolib: change gpio pin from unsigned to signed in acpi callback

      The signed error will be wrongly used as valid gpio offset

      Reported-by: David Binderman <dcb314@xxxxxxxxxxx>
      Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
      Signed-off-by: Qipeng Zha <qipeng.zha@xxxxxxxxx>
      Acked-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit 07b0e5d49d227e3950cb13a3e8caf248ef2a310e
  Author: Takashi Iwai <tiwai@xxxxxxx>
  Date:   Mon Apr 27 14:50:39 2015 +0200

      ALSA: emux: Fix mutex deadlock at unloading

      The emux-synth driver has a possible AB/BA mutex deadlock at unloading
      the emu10k1 driver:

        snd_emux_free() ->
          snd_emux_detach_seq(): mutex_lock(&emu->register_mutex) ->
            snd_seq_delete_kernel_client() ->
              snd_seq_free_client(): mutex_lock(&register_mutex)

        snd_seq_release() ->
          snd_seq_free_client(): mutex_lock(&register_mutex) ->
            snd_seq_delete_all_ports() ->
              snd_emux_unuse(): mutex_lock(&emu->register_mutex)

      Basically snd_emux_detach_seq() doesn't need a protection of
      emu->register_mutex as it's already being unregistered.  So, we can
      get rid of this for avoiding the deadlock.

      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 61b8c7b58450846b63b35e90866d2eb4fde44834
  Author: Wolfram Sang <wsa@xxxxxxxxxxxxx>
  Date:   Mon Apr 20 15:51:38 2015 +0200

      ARM: mach-imx: devices: platform-sdhci-esdhc-imx: fix broken email address

      My Pengutronix address is not valid anymore, redirect people to the 
Pengutronix
      kernel team.

      Reported-by: Harald Geyer <harald@xxxxxxxxx>
      Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxxxxx>
      Acked-by: Robert Schwebel <r.schwebel@xxxxxxxxxxxxxx>
      Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxx>

  commit 0fdebe1a2f4d3a8fc03754022fabf8ba95e131a3
  Author: Stefan Wahren <stefan.wahren@xxxxxxxx>
  Date:   Tue Apr 14 20:37:26 2015 +0000

      ARM: dts: imx23-olinuxino: Fix dr_mode of usb0

      The dr_mode of usb0 on imx233-olinuxino is left to default "otg".
      Since the green LED (GPIO2_1) on imx233-olinuxino is connected to the
      same pin as USB_OTG_ID it's possible to disable USB host by LED toggling:

      echo 0 > /sys/class/leds/green/brightness
      [ 1068.890000] ci_hdrc ci_hdrc.0: remove, state 1
      [ 1068.890000] usb usb1: USB disconnect, device number 1
      [ 1068.920000] usb 1-1: USB disconnect, device number 2
      [ 1068.920000] usb 1-1.1: USB disconnect, device number 3
      [ 1069.070000] usb 1-1.2: USB disconnect, device number 4
      [ 1069.450000] ci_hdrc ci_hdrc.0: USB bus 1 deregistered
      [ 1074.460000] ci_hdrc ci_hdrc.0: timeout waiting for 00000800 in 11

      This patch fixes the issue by setting dr_mode to "host" in the dts file.

      Reported-by: Harald Geyer <harald@xxxxxxxxx>
      Signed-off-by: Stefan Wahren <stefan.wahren@xxxxxxxx>
      Reviewed-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
      Reviewed-by: Marek Vasut <marex@xxxxxxx>
      Acked-by: Peter Chen <peter.chen@xxxxxxxxxxxxx>
      Fixes: b49312948285 ("ARM: dts: imx23-olinuxino: Add USB host support")
      Cc: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxx>

  commit cfe8c59762244251fd9a5e281d48808095ff4090
  Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
  Date:   Tue Apr 14 11:05:04 2015 -0300

      ARM: dts: imx23-olinuxino: Fix polarity of LED GPIO

      On imx23-olinuxino the LED turns on when level logic high is aplied to
      GPIO2_1.

      Fix the gpios property accordingly.

      Fixes: b34aa1850244 ("ARM: dts: imx23-olinuxino: Remove unneeded 
"default-on"")
      Reported-by: Stefan Wahren <stefan.wahren@xxxxxxxx>
      Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
      Tested-by: Stefan Wahren <stefan.wahren@xxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxx>

  commit d02260824e2cad626fb2a9d62e27006d34b6dedc
  Author: Takashi Iwai <tiwai@xxxxxxx>
  Date:   Mon Apr 27 13:00:09 2015 +0200

      ALSA: emu10k1: Fix card shortname string buffer overflow

      Some models provide too long string for the shortname that has 32bytes
      including the terminator, and it results in a non-terminated string
      exposed to the user-space.  This isn't too critical, though, as the
      string is stopped at the succeeding longname string.

      This patch fixes such entries by dropping "SB" prefix (it's enough to
      fit within 32 bytes, so far).  Meanwhile, it also changes strcpy()
      with strlcpy() to make sure that this kind of problem won't happen in
      future, too.

      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit b44166cd46e28dd608d5baa5873047a40f32919c
  Author: Bob Liu <bob.liu@xxxxxxxxxx>
  Date:   Fri Apr 3 14:42:59 2015 +0800

      xen/grant: introduce func gnttab_unmap_refs_sync()

      There are several place using gnttab async unmap and wait for
      completion, so move the common code to a function
      gnttab_unmap_refs_sync().

      Signed-off-by: Bob Liu <bob.liu@xxxxxxxxxx>
      Acked-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
      Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
      Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>

  commit 325d73bf8fea8af2227240b7305253fb052d3a68
  Author: Bob Liu <bob.liu@xxxxxxxxxx>
  Date:   Fri Apr 3 14:42:58 2015 +0800

      xen/blkback: safely unmap purge persistent grants

      Commit c43cf3ea8385 ("xen-blkback: safely unmap grants in case they
      are still in use") use gnttab_unmap_refs_async() to wait until the
      mapped pages are no longer in use before unmapping them, but that
      commit missed the persistent case.  Purge persistent pages can't be
      unmapped either unless no longer in use.

      Signed-off-by: Bob Liu <bob.liu@xxxxxxxxxx>
      Acked-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
      Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>

  commit 6829e274a623187c24f7cfc0e3d35f25d087fcc5
  Author: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
  Date:   Thu Apr 23 12:46:16 2015 +0100

      arm64: dma-mapping: always clear allocated buffers

      Buffers allocated by dma_alloc_coherent() are always zeroed on Alpha,
      ARM (32bit), MIPS, PowerPC, x86/x86_64 and probably other architectures.
      It turned out that some drivers rely on this 'feature'. Allocated buffer
      might be also exposed to userspace with dma_mmap() call, so clearing it
      is desired from security point of view to avoid exposing random memory
      to userspace. This patch unifies dma_alloc_coherent() behavior on ARM64
      architecture with other implementations by unconditionally zeroing
      allocated buffer.

      Cc: <stable@xxxxxxxxxxxxxxx> # v3.14+
      Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>

  commit 6544e67bfb1bf55bcf3c0f6b37631917e9acfb74
  Author: Sudeep Holla <sudeep.holla@xxxxxxx>
  Date:   Wed Apr 22 18:16:33 2015 +0100

      ARM64: Enable CONFIG_GENERIC_IRQ_SHOW_LEVEL

      Since several interrupt controllers including GIC support both edge and
      level triggered interrupts, it's useful to provide that information in
      /proc/interrupts even on ARM64 similar to ARM and PPC.

      This is based on Geert Uytterhoeven's commit 7c07005eea96 ("ARM: 8339/1:
      Enable CONFIG_GENERIC_IRQ_SHOW_LEVEL")

      Signed-off-by: Sudeep Holla <sudeep.holla@xxxxxxx>
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>

  commit 878a84d5a8a18a4ab241d40cebb791d6aedf5605
  Author: Andre Przywara <andre.przywara@xxxxxxx>
  Date:   Mon Apr 20 11:14:19 2015 +0100

      arm64: add missing data types in smp_load_acquire/smp_store_release

      Commit 8053871d0f7f ("smp: Fix smp_call_function_single_async()
      locking") introduced a call to smp_load_acquire() with a u16 argument,
      but we only cared about u32 and u64 types in that function so far.
      This resulted in a compiler warning fortunately, pointing at an
      uninitialized use. Due to the implementation structure the compiler
      misses that bug in the smp_store_release(), though.
      Add the u16 and u8 variants using ldarh/stlrh and ldarb/stlrb,
      respectively. Together with the compiletime_assert_atomic_type() check
      this should cover all cases now.

      Acked-by: Will Deacon <will.deacon@xxxxxxx>
      Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>

  commit 7290006d8c0900c56d8c58428134f02c35109d17
  Author: Takashi Iwai <tiwai@xxxxxxx>
  Date:   Mon Apr 27 10:40:45 2015 +0200

      ALSA: hda - Add mute-LED mode control to Thinkpad

      This patch adds the missing flag to enable "Mute-LED Mode" mixer enum
      ctl for Thinkpads that have also the software mute-LED control.

      Reported-and-tested-by: Pali Rohár <pali.rohar@xxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit ee52e56e7b12834476cd0031c5986254ba1b6317
  Author: Takashi Iwai <tiwai@xxxxxxx>
  Date:   Mon Apr 27 10:36:11 2015 +0200

      ALSA: hda - Fix mute-LED fixed mode

      The mute-LED mode control has the fixed on/off states that are
      supposed to remain on/off regardless of the master switch.  However,
      this doesn't work actually because the vmaster hook is called in the
      vmaster code itself.

      This patch fixes it by calling the hook indirectly after checking the
      mute LED mode.

      Reported-and-tested-by: Pali Rohár <pali.rohar@xxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 3e1b0c4a9d563d7fc6e22dc92613cd3237bb5ce0
  Author: Takashi Iwai <tiwai@xxxxxxx>
  Date:   Mon Apr 27 10:43:22 2015 +0200

      ALSA: hda - Fix click noise at start on Dell XPS13

      Dell XPS13 produces a click noise at boot up, and Gabriele spotted out
      that it's triggered by the initial pin control of the mic (NID 0x19).
      This has to be set to Hi-Z Vref while the driver initializes to Vref
      80% as a normal mic.

      This patch fixes the generic parser code not to override the target
      vref if it has been already set by the driver, and adds a proper
      initialization of the target vref for this pin in the Realtek driver
      side.

      Reported-and-tested-by: Gabriele Mazzotta <gabriele.mzt@xxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 750e30d4076ae5e02ad13a376e96c95a2627742c
  Author: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 14 11:50:13 2015 +0200

      ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC

      There is no crystal connected to the internal RTC on the Open Block
      AX3. So let's disable it in order to prevent the kernel probing the
      driver uselessly. Eventually this patches removes the following
      warning message from the boot log:
      "rtc-mv d0010300.rtc: internal RTC not ticking"

      Acked-by: Andrew Lunn <andrew@xxxxxxx>
      Signed-off-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx> # v3.8 +

  commit 11133db7a836b0cb411faa048f07a38e994d1382
  Author: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
  Date:   Mon Apr 20 16:02:33 2015 +0200

      ARM: ux500: Enable GPIO regulator for SD-card for snowball

      Fixes: c94a4ab7af3f ("ARM: ux500: Disable the MMCI gpio-regulator by 
default")
      Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
      Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit f9a8c3914ba85f19c3360b19612d77c47adb8942
  Author: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
  Date:   Mon Apr 20 16:02:32 2015 +0200

      ARM: ux500: Enable GPIO regulator for SD-card for HREF boards

      Fixes: c94a4ab7af3f ("ARM: ux500: Disable the MMCI gpio-regulator by 
default")
      Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
      Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit 53d2669844263fd5fdc70f0eb6a2eb8a21086d8e
  Author: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
  Date:   Mon Apr 20 16:02:31 2015 +0200

      ARM: ux500: Move GPIO regulator for SD-card into board DTSs

      The GPIO regulator for the SD-card isn't a ux500 SOC configuration, but
      instead it's specific to the board. Move the definition of it, into the
      board DTSs.

      Fixes: c94a4ab7af3f ("ARM: ux500: Disable the MMCI gpio-regulator by 
default")
      Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
      Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxxxxxx>
      Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

  commit 00170528f0486c08a18475af7fefa0a7679e042d
  Author: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
  Date:   Thu Feb 19 18:46:46 2015 +0100

      drivers: sh: Remove test for now unsupported sh7372

      Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
      Signed-off-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>

  commit 230f259ffe4ad6d334bb100ce1c0c6a73ff18989
  Author: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
  Date:   Tue Feb 17 16:43:03 2015 +0100

      drivers: sh: Disable PM runtime for multi-platform r8a73a4 with genpd

      If the default PM domain using PM_CLK is used for PM runtime, the real PM
      domain(s) cannot be registered from DT later.

      Hence do not enable it when running a multi-platform kernel with genpd
      support on an r8a73a4. The R-Mobile PM domain driver will take care of
      PM runtime management of the module clocks.

      The default PM domain is still needed for:
        - platforms without genpd support,
        - the legacy (non-DT) case, where genpd may take over later, except
          for the C5 "always on" PM domain.

      Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
      Signed-off-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>

  commit 41b4b3bc7905615f7617c88bf9cf4b3b04bda78f
  Author: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
  Date:   Tue Feb 17 16:31:39 2015 +0100

      drivers: sh: Disable PM runtime for multi-platform sh73a0 with genpd

      If the default PM domain using PM_CLK is used for PM runtime, the real PM
      domain(s) cannot be registered from DT later.

      Hence do not enable it when running a multi-platform kernel with genpd
      support on an sh73a0. The R-Mobile PM domain driver will take care of
      PM runtime management of the module clocks.

      The default PM domain is still needed for:
        - platforms without genpd support,
        - the legacy (non-DT) case, where genpd may take over later, except
          for the C5 "always on" PM domain.

      Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
      Signed-off-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>

  commit 8e9b29cc716c7940f9ad1d635fb3f725435b8ae9
  Merge: 73b5a6f 0365476
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Sun Apr 26 23:25:13 2015 -0400

      Merge branch 'ppp_mppe_desync'

      Sylvain Rochet says:

      ====================
      ppp: mppe: fixes MPPE desync on links which don't guarantee packet 
ordering

      I am currently having an issue with PPP over L2TP (UDP) and MPPE in
      stateless mode (default mode), UDP does not guarantee packet ordering so
      we might get out of order packet. MPPE needs to be continuously synched
      so we should drop late UDP packet.

      I added a printk on the number of time we rekeyed in MPPE decompressor,
      this is what we currently have if we receive a slightly out of order UDP
      packet:

      [1731001.049206] mppe_decompress[1]: ccount 1559
      [1731001.049216] mppe_decompress[1]: rekeyed 1 times

      [1731001.049228] mppe_decompress[1]: ccount 1560
      [1731001.049232] mppe_decompress[1]: rekeyed 1 times

      [1731001.050170] mppe_decompress[1]: ccount 1562
      [1731001.050182] mppe_decompress[1]: rekeyed 2 times

      [1731001.050191] mppe_decompress[1]: ccount 1561
      [1731001.062576] mppe_decompress[1]: rekeyed 4095 times
                                                   ^^^^
      This is obviously wrong, we missed packet 1561 and we already rekeyed 2
      times for 1562 we previously received, we can't recover the decryption
      key we need for 1561, we should drop it instead of rekeying 4095 times.

      This patch series drop any packet with are not within the 4096/2 forward
      window.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 03654763148f9a3878b8b70c30d1ffce2fca3dff
  Author: Sylvain Rochet <sylvain.rochet@xxxxxxxxxxxx>
  Date:   Sun Apr 26 20:40:53 2015 +0200

      ppp: mppe: discard late packet in stateless mode

      When PPP is used over a link which does not guarantee packet ordering,
      we might get late MPPE packets. This is a problem because MPPE must be
      kept synchronized and the current implementation does not drop them and
      rekey 4095 times instead of 0, which is wrong.

      In order to prevent rekeying about a whole count space times (~ 4095
      times), drop packets which are not within the forward 4096/2 window and
      increase sanity error counter.

      Signed-off-by: Sylvain Rochet <sylvain.rochet@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 325301892a2d348323e09598ae108ba26889f7f9
  Author: Sylvain Rochet <sylvain.rochet@xxxxxxxxxxxx>
  Date:   Sun Apr 26 20:40:52 2015 +0200

      ppp: mppe: sanity error path rework

      We are going to need sanity error path a little further, rework to be
      able to use the sanity error path anywhere in decompressor.

      Signed-off-by: Sylvain Rochet <sylvain.rochet@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 801661467fd50832191c81665d061ffabcc1c5de
  Author: Jean Delvare <jdelvare@xxxxxxx>
  Date:   Sun Apr 26 12:52:02 2015 +0200

      dmaengine: xgene: Set hardware dependency

      The xgene-dma driver is only useful on X-Gene SoC.

      Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
      Cc: Rameshwar Prasad Sahu <rsahu@xxxxxxx>
      Cc: Loc Ho <lho@xxxxxxx>
      Cc: Vinod Koul <vinod.koul@xxxxxxxxx>
      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit 8ad31bf45db1c4a8f400cbc10400ce9fc0bed227
  Author: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
  Date:   Sun Apr 26 11:53:54 2015 +0200

      dmaengine: usb-dmac: Protect PM-only functions to kill warning

      If CONFIG_PM=n:

          drivers/dma/sh/usb-dmac.c:677: warning: 
â??usb_dmac_runtime_suspendâ?? defined but not used
          drivers/dma/sh/usb-dmac.c:688: warning: â??usb_dmac_runtime_resumeâ?? 
defined but not used

      Protect the unused functions by #ifdef CONFIG_PM to fix this.

      Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit 73b5a6f2a7a1cb78ccdec3900afc8657e11bc6bf
  Author: Matan Barak <matanb@xxxxxxxxxxxx>
  Date:   Sun Apr 26 15:55:57 2015 +0300

      net/bonding: Make DRV macros private

      The bonding modules currently defines four macros with
      general names that pollute the global namespace:
      DRV_VERSION
      DRV_RELDATE
      DRV_NAME
      DRV_DESCRIPTION

      Fixing that by defining a private bonding_priv.h
      header files which includes those defines.

      Signed-off-by: Matan Barak <matanb@xxxxxxxxxxxx>
      Signed-off-by: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit b787f68c36d49bb1d9236f403813641efa74a031
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 17:59:10 2015 -0700

      Linux 4.1-rc1

  commit 61f01dd941ba9e06d2bf05994450ecc3d61b6b8b
  Author: Andy Lutomirski <luto@xxxxxxxxxx>
  Date:   Sun Apr 26 16:47:59 2015 -0700

      x86_64, asm: Work around AMD SYSRET SS descriptor attribute issue

      AMD CPUs don't reinitialize the SS descriptor on SYSRET, so SYSRET with
      SS == 0 results in an invalid usermode state in which SS is apparently
      equal to __USER_DS but causes #SS if used.

      Work around the issue by setting SS to __KERNEL_DS __switch_to, thus
      ensuring that SYSRET never happens with SS set to NULL.

      This was exposed by a recent vDSO cleanup.

      Fixes: e7d6eefaaa44 x86/vdso32/syscall.S: Do not load __USER32_DS to %ss
      Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxx>
      Cc: Peter Anvin <hpa@xxxxxxxxx>
      Cc: Borislav Petkov <bp@xxxxxxxxx>
      Cc: Denys Vlasenko <vda.linux@xxxxxxxxxxxxxx>
      Cc: Brian Gerst <brgerst@xxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 1190944f4b12203330ac5ed8784f6c181bf26f2d
  Merge: 9f86262 59fd7e4
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 17:55:26 2015 -0700

      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

      Pull intel drm fixes from Dave Airlie.

      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg
        drm/i915: Workaround to avoid lite restore with HEAD==TAIL
        drm/i915: cope with large i2c transfers

  commit 9f86262dcc573ca195488de9ec6e4d6d74288ad3
  Merge: 85f2901 03ecc32
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 17:47:46 2015 -0700

      Merge git://git.infradead.org/intel-iommu

      Pull intel iommu updates from David Woodhouse:
       "This lays a little of the groundwork for upcoming Shared Virtual
        Memory support â?? fixing some bogus #defines for capability bits and
        adding the new ones, and starting to use the new wider page tables
        where we can, in anticipation of actually filling in the new fields
        therein.

        It also allows graphics devices to be assigned to VM guests again.
        This got broken in 3.17 by disallowing assignment of RMRR-afflicted
        devices.  Like USB, we do understand why there's an RMRR for graphics
        devices â?? and unlike USB, it's actually sane.  So we can make an
        exception for graphics devices, just as we do USB controllers.

        Finally, tone down the warning about the X2APIC_OPT_OUT bit, due to
        persistent requests.  X2APIC_OPT_OUT was added to the spec as a nasty
        hack to allow broken BIOSes to forbid us from using X2APIC when they
        do stupid and invasive things and would break if we did.

        Someone noticed that since Windows doesn't have full IOMMU support for
        DMA protection, setting the X2APIC_OPT_OUT bit made Windows avoid
        initialising the IOMMU on the graphics unit altogether.

        This means that it would be available for use in "driver mode", where
        the IOMMU registers are made available through a BAR of the graphics
        device and the graphics driver can do SVM all for itself.

        So they started setting the X2APIC_OPT_OUT bit on *all* platforms with
        SVM capabilities.  And even the platforms which *might*, if the
        planets had been aligned correctly, possibly have had SVM capability
        but which in practice actually don't"

      * git://git.infradead.org/intel-iommu:
        iommu/vt-d: support extended root and context entries
        iommu/vt-d: Add new extended capabilities from v2.3 VT-d specification
        iommu/vt-d: Allow RMRR on graphics devices too
        iommu/vt-d: Print x2apic opt out info instead of printing a warning
        iommu/vt-d: kill bogus ecap_niotlb_iunits()

  commit 85f2901bdf4bdc0d034e1bbe8629e269ec200389
  Merge: f583381 fcdd5f0
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 17:44:09 2015 -0700

      Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

      Pull i2c fixes from Wolfram Sang:
       "This has a mixture of merge window cleanups and bugfixes"

      * 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: st: add include for pinctrl
        i2c: mux: use proper dev when removing "channel-X" symlinks
        i2c: digicolor: remove duplicate include
        i2c: Mark adapter devices with pm_runtime_no_callbacks
        i2c: pca-platform: fix broken email address
        i2c: mxs: fix broken email address
        i2c: rk3x: report number of messages transmitted

  commit f583381f506dc53b9d3e98cf9d6577323eb3fcd2
  Merge: 59953fb a3bdccc
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 17:40:30 2015 -0700

      Merge branch 'for-linus-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

      Pull btrfs fixes from Chris Mason:
       "Filipe hit two problems in my block group cache patches.  We finalized
        the fixes last week and ran through more tests"

      * 'for-linus-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: prevent list corruption during free space cache processing
        Btrfs: fix inode cache writeout

  commit 59fd7e4b0b0769638b5162e56c28bbb027a118d3
  Merge: c8b3fd0 b5f1c97
  Author: Dave Airlie <airlied@xxxxxxxxxx>
  Date:   Mon Apr 27 10:35:15 2015 +1000

      Merge tag 'drm-intel-next-fixes-2015-04-25' of 
git://anongit.freedesktop.org/drm-intel into drm-fixes

      three fixes for i915.

      * tag 'drm-intel-next-fixes-2015-04-25' of 
git://anongit.freedesktop.org/drm-intel:
        drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg
        drm/i915: Workaround to avoid lite restore with HEAD==TAIL
        drm/i915: cope with large i2c transfers

  commit 59953fba87e5e535657403cc6439d24187929559
  Merge: 9ec3a64 f139b6c
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 17:33:59 2015 -0700

      Merge tag 'nfs-for-4.1-1' of 
git://git.linux-nfs.org/projects/trondmy/linux-nfs

      Pull NFS client updates from Trond Myklebust:
       "Another set of mainly bugfixes and a couple of cleanups.  No new
        functionality in this round.

        Highlights include:

        Stable patches:
         - Fix a regression in /proc/self/mountstats
         - Fix the pNFS flexfiles O_DIRECT support
         - Fix high load average due to callback thread sleeping

        Bugfixes:
         - Various patches to fix the pNFS layoutcommit support
         - Do not cache pNFS deviceids unless server notifications are enabled
         - Fix a SUNRPC transport reconnection regression
         - make debugfs file creation failure non-fatal in SUNRPC
         - Another fix for circular directory warnings on NFSv4 "junctioned"
           mountpoints
         - Fix locking around NFSv4.2 fallocate() support
         - Truncating NFSv4 file opens should also sync O_DIRECT writes
         - Prevent infinite loop in rpcrdma_ep_create()

        Features:
         - Various improvements to the RDMA transport code's handling of
           memory registration
         - Various code cleanups"

      * tag 'nfs-for-4.1-1' of 
git://git.linux-nfs.org/projects/trondmy/linux-nfs: (55 commits)
        fs/nfs: fix new compiler warning about boolean in switch
        nfs: Remove unneeded casts in nfs
        NFS: Don't attempt to decode missing directory entries
        Revert "nfs: replace nfs_add_stats with nfs_inc_stats when add one"
        NFS: Rename idmap.c to nfs4idmap.c
        NFS: Move nfs_idmap.h into fs/nfs/
        NFS: Remove CONFIG_NFS_V4 checks from nfs_idmap.h
        NFS: Add a stub for GETDEVICELIST
        nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes
        nfs: fix DIO good bytes calculation
        nfs: Fetch MOUNTED_ON_FILEID when updating an inode
        sunrpc: make debugfs file creation failure non-fatal
        nfs: fix high load average due to callback thread sleeping
        NFS: Reduce time spent holding the i_mutex during fallocate()
        NFS: Don't zap caches on fallocate()
        xprtrdma: Make rpcrdma_{un}map_one() into inline functions
        xprtrdma: Handle non-SEND completions via a callout
        xprtrdma: Add "open" memreg op
        xprtrdma: Add "destroy MRs" memreg op
        xprtrdma: Add "reset MRs" memreg op
        ...

  commit 9ec3a646fe09970f801ab15e0f1694060b9f19af
  Merge: c8b3fd0 3cab989
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 15:48:49 2015 -0700

      Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

      Pull fourth vfs update from Al Viro:
       "d_inode() annotations from David Howells (sat in for-next since before
        the beginning of merge window) + four assorted fixes"

      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        RCU pathwalk breakage when running into a symlink overmounting something
        fix I_DIO_WAKEUP definition
        direct-io: only inc/dec inode->i_dio_count for file systems
        fs/9p: fix readdir()
        VFS: assorted d_backing_inode() annotations
        VFS: fs/inode.c helpers: d_inode() annotations
        VFS: fs/cachefiles: d_backing_inode() annotations
        VFS: fs library helpers: d_inode() annotations
        VFS: assorted weird filesystems: d_inode() annotations
        VFS: normal filesystems (and lustre): d_inode() annotations
        VFS: security/: d_inode() annotations
        VFS: security/: d_backing_inode() annotations
        VFS: net/: d_inode() annotations
        VFS: net/unix: d_backing_inode() annotations
        VFS: kernel/: d_inode() annotations
        VFS: audit: d_backing_inode() annotations
        VFS: Fix up some ->d_inode accesses in the chelsio driver
        VFS: Cachefiles should perform fs modifications on the top layer only
        VFS: AF_UNIX sockets should call mknod on the top layer only

  commit c8b3fd0ce313443731e8fd6d5a541085eb465f99
  Merge: d89b3e1 e0155a9
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 13:56:35 2015 -0700

      Merge tag 'pm+acpi-4.1-rc1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

      Pull more power management and ACPI updates from Rafael Wysocki:
       "These are fixes mostly (intel_pstate, ACPI core, ACPI EC driver,
        cpupower tool), a new CPU ID for the Intel RAPL driver and one
        intel_pstate driver improvement that didn't make it to my previous
        pull requests due to timing.

        Specifics:

         - Fix a build warning in the intel_pstate driver showing up in
           non-SMP builds (Borislav Petkov)

         - Change one of the intel_pstate's P-state selection parameters for
           Baytrail and Cherrytrail CPUs to significantly improve performance
           at the cost of a small increase in energy consumption (Kristen
           Carlson Accardi)

         - Fix a NULL pointer dereference in the ACPI EC driver due to an
           unsafe list walk in the query handler removal routine (Chris
           Bainbridge)

         - Get rid of a false-positive lockdep warning in the ACPI container
           hot-remove code (Rafael J Wysocki)

         - Prevent the ACPI device enumeration code from creating device
           objects of a wrong type in some cases (Rafael J Wysocki)

         - Add Skylake processors support to the Intel RAPL power capping
           driver (Brian Bian)

         - Drop the stale MAINTAINERS entry for the ACPI dock driver that is
           regarded as part of the ACPI core and maintained along with it now
           (Chao Yu)

         - Fix cpupower tool breakage caused by a library API change in libpci
           3.3.0 (Lucas Stach)"

      * tag 'pm+acpi-4.1-rc1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / scan: Add a scan handler for PRP0001
        ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()
        ACPI / EC: fix NULL pointer dereference in 
acpi_ec_remove_query_handler()
        MAINTAINERS: remove maintainship entry of docking station driver
        powercap / RAPL: Add support for Intel Skylake processors
        cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning
        intel_pstate: Change the setpoint for Atom params
        cpupower: fix breakage from libpci API change

  commit d89b3e19ef98a8d3b81a9f8a62c6ac89fd00412e
  Merge: 78d4256 8c98ebd
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 13:51:05 2015 -0700

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

      Pull crypto fixes from Herbert Xu:
       "This push fixes a build problem with img-hash under non-standard
        configurations and a serious regression with sha512_ssse3 which can
        lead to boot failures"

      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: img-hash - CRYPTO_DEV_IMGTEC_HASH should depend on HAS_DMA
        crypto: x86/sha512_ssse3 - fixup for asm function prototype change

  commit 78d425677217b655ed36c492a070b5002832fc73
  Merge: 36a8032 358d6a2
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 13:44:46 2015 -0700

      Merge tag 'platform-drivers-x86-v4.1-1' of 
git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

      Pull x86 platform driver updates from Darren Hart:
       "This series includes significant updates to the toshiba_acpi driver
        and the reintroduction of the dell-laptop keyboard backlight additions
        I had to revert previously.  Also included are various fixes for
        typos, warnings, correctness, and minor bugs.

        Specifics:

        dell-laptop:
           - add support for keyboard backlight.

        toshiba_acpi:
           - adaptive keyboard, hotkey, USB sleep and charge, and backlight
             updates.  Update sysfs documentation.

        toshiba_bluetooth:
           - fix enabling/disabling loop on recent devices

        apple-gmux:
           - lock iGP IO to protect from vgaarb changes

        other:
           - Fix typos, clear gcc warnings, clarify pr_* messages, correct
             return types, update MAINTAINERS"

      * tag 'platform-drivers-x86-v4.1-1' of 
git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (25 commits)
        toshiba_acpi: Do not register vendor backlight when acpi_video bl is 
available
        MAINTAINERS: Add me on list of Dell laptop drivers
        platform: x86: dell-laptop: Add support for keyboard backlight
        Documentation/ABI: Update sysfs-driver-toshiba_acpi entry
        toshiba_acpi: Fix pr_* messages from USB Sleep Functions
        toshiba_acpi: Update and fix USB Sleep and Charge modes
        wmi: Use bool function return values of true/false not 1/0
        toshiba_bluetooth: Fix enabling/disabling loop on recent devices
        toshiba_bluetooth: Clean up *_add function and disable BT device at 
removal
        toshiba_bluetooth: Add three new functions to the driver
        toshiba_acpi: Fix the enabling of the Special Functions
        toshiba_acpi: Use the Hotkey Event Type function for keymap choosing
        toshiba_acpi: Add Hotkey Event Type function and definitions
        x86/wmi: delete unused wmi_data_lock mutex causing gcc warning
        apple-gmux: lock iGP IO to protect from vgaarb changes
        MAINTAINERS: Add missing Toshiba devices and add myself as maintainer
        toshiba_acpi: Update events in toshiba_acpi_notify
        intel-oaktrail: Fix trivial typo in comment
        thinkpad_acpi: off by one in adaptive_keyboard_hotkey_notify_hotkey()
        thinkpad_acpi: signedness bugs getting current_mode
        ...

  commit 36a8032d77649430f5ef11fbf0df2bb026be0b04
  Merge: 7f9f443 96cba9b
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 13:36:02 2015 -0700

      Merge tag 'chrome-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform

      Pull chrome platform updates from Olof Johansson:
       "Here's a set of updates to the Chrome OS platform drivers for this
        merge window.

        Main new things this cycle is:

         - Driver changes to expose the lightbar to users.  With this, you can
           make your own blinkenlights on Chromebook Pixels.

         - Changes in the way that the atmel_mxt trackpads are probed.  The
           laptop driver is trying to be smart and not instantiate the devices
           that don't answer to probe.  For the trackpad that can come up in
           two modes (bootloader or regular), this gets complicated since the
           driver already knows how to handle the two modes including the
           actual addresses used.  So now the laptop driver needs to know more
           too, instantiating the regular address even if the bootloader one
           is the probe that passed.

         - mfd driver improvements by Javier Martines Canillas, and a few
           bugfixes from him, kbuild and myself"

      * tag 'chrome-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform:
        platform/chrome: chromeos_laptop - instantiate Atmel at primary address
        platform/chrome: cros_ec_lpc - Depend on X86 || COMPILE_TEST
        platform/chrome: cros_ec_lpc - Include linux/io.h header file
        platform/chrome: fix platform_no_drv_owner.cocci warnings
        platform/chrome: cros_ec_lightbar - fix duplicate const warning
        platform/chrome: cros_ec_dev - fix Unknown escape '%' warning
        platform/chrome: Expose Chrome OS Lightbar to users
        platform/chrome: Create sysfs attributes for the ChromeOS EC
        mfd: cros_ec: Instantiate ChromeOS EC character device
        platform/chrome: Add Chrome OS EC userspace device interface
        platform/chrome: Add cros_ec_lpc driver for x86 devices
        mfd: cros_ec: Add char dev and virtual dev pointers
        mfd: cros_ec: Use fixed size arrays to transfer data with the EC

  commit 7f9f44308c8993c9ab8078d174dad34bea3e82d7
  Merge: 63905bb d939b52
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 13:31:05 2015 -0700

      Merge tag 'cris-for-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris

      Pull arch/cris updates from Jesper Nilsson:
       "Some much needed love for the CRIS-port.

        There's a bunch of changes this time, giving the CRISv32 port a bit of
        modern makeover with device-tree, irq domain and gpiolib support, and
        more switchover to generic frameworks.

        Some small fixes and removal of the theoretical SMP support brings up
        the rear"

      * tag 'cris-for-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
        cris: fix integer overflow in ELF_ET_DYN_BASE
        CRISv32: use GENERIC_SCHED_CLOCK
        CRISv32: use MMIO clocksource
        CRISv32: use generic clockevents
        CRIS: use generic headers via Kbuild
        CRIS: use generic cmpxchg.h
        CRIS: use generic atomic.h
        CRIS: use generic atomic bitops
        CRISv10: remove redundant macros from system.h
        CRIS: remove SMP code
        CRISv32: don't enable irqs in INIT_THREAD
        CRISv32: handle multiple signals
        CRISv32: prevent bogus restarts on sigreturn
        CRISv32: don't attempt syscall restart on irq exit
        Add binding documentation for CRIS
        CRIS: add Axis 88 board device tree
        CRISv32: add device tree support
        CRISv32: add irq domains support
        CRIS: enable GPIOLIB

  commit 63905bba5b0170492777b327ac5e2aaef64989d6
  Merge: eadf16a 2e826695
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 13:23:15 2015 -0700

      Merge tag 'powerpc-4.1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

      Pull powerpc fixes from Michael Ellerman:

       - fix for mm_dec_nr_pmds() from Scott.

       - fixes for oopses seen with KVM + THP from Aneesh.

       - build fixes from Aneesh & Shreyas.

      * tag 'powerpc-4.1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc/mm: Fix build error with CONFIG_PPC_TRANSACTIONAL_MEM disabled
        powerpc/kvm: Fix ppc64_defconfig + PPC_POWERNV=n build error
        powerpc/mm/thp: Return pte address if we find trans_splitting.
        powerpc/mm/thp: Make page table walk safe against thp split/collapse
        KVM: PPC: Remove page table walk helpers
        KVM: PPC: Use READ_ONCE when dereferencing pte_t pointer
        powerpc/hugetlb: Call mm_dec_nr_pmds() in hugetlb_free_pmd_range()

  commit a31196b07f8034eba6a3487a1ad1bb5ec5cd58a5
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Sat Apr 25 09:35:24 2015 -0700

      net: rfs: fix crash in get_rps_cpus()

      Commit 567e4b79731c ("net: rfs: add hash collision detection") had one
      mistake :

      RPS_NO_CPU is no longer the marker for invalid cpu in set_rps_cpu()
      and get_rps_cpu(), as @next_cpu was the result of an AND with
      rps_cpu_mask

      This bug showed up on a host with 72 cpus :
      next_cpu was 0x7f, and the code was trying to access percpu data of an
      non existent cpu.

      In a follow up patch, we might get rid of compares against nr_cpu_ids,
      if we init the tables with 0. This is silly to test for a very unlikely
      condition that exists only shortly after table initialization, as
      we got rid of rps_reset_sock_flow() and similar functions that were
      writing this RPS_NO_CPU magic value at flow dismantle : When table is
      old enough, it never contains this value anymore.

      Fixes: 567e4b79731c ("net: rfs: add hash collision detection")
      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Cc: Tom Herbert <tom@xxxxxxxxxxxxxxx>
      Cc: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 7cdbc6f74f8e6c06304b69b4e944fbd669581c7c
  Author: Andreas Oetken <ennoerlangen@xxxxxxxxx>
  Date:   Sat Apr 25 18:07:52 2015 +0200

      altera tse: add support for fixed-links.

      Add support for fixed-links in configurations without PHY.
      (e.g. connection to a switch, SGMII point to point, SFPs)

      Check: Documentation/devicetree/bindings/net/fixed-link.txt.
      Signed-off-by: Andreas Oetken <ennoerlangen@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit eadf16a912b6bdf8bd476bde2f19fb41d06e0c3b
  Merge: 4a65546 2fa462f
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 26 13:06:22 2015 -0700

      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

      Pull second batch of KVM changes from Paolo Bonzini:
       "This mostly includes the PPC changes for 4.1, which this time cover
        Book3S HV only (debugging aids, minor performance improvements and
        some cleanups).  But there are also bug fixes and small cleanups for
        ARM, x86 and s390.

        The task_migration_notifier revert and real fix is still pending
        review, but I'll send it as soon as possible after -rc1"

      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (29 
commits)
        KVM: arm/arm64: check IRQ number on userland injection
        KVM: arm: irqfd: fix value returned by kvm_irq_map_gsi
        KVM: VMX: Preserve host CR4.MCE value while in guest mode.
        KVM: PPC: Book3S HV: Use msgsnd for signalling threads on POWER8
        KVM: PPC: Book3S HV: Translate kvmhv_commence_exit to C
        KVM: PPC: Book3S HV: Streamline guest entry and exit
        KVM: PPC: Book3S HV: Use bitmap of active threads rather than count
        KVM: PPC: Book3S HV: Use decrementer to wake napping threads
        KVM: PPC: Book3S HV: Don't wake thread with no vcpu on guest IPI
        KVM: PPC: Book3S HV: Get rid of vcore nap_count and n_woken
        KVM: PPC: Book3S HV: Move vcore preemption point up into kvmppc_run_vcpu
        KVM: PPC: Book3S HV: Minor cleanups
        KVM: PPC: Book3S HV: Simplify handling of VCPUs that need a VPA update
        KVM: PPC: Book3S HV: Accumulate timing information for real-mode code
        KVM: PPC: Book3S HV: Create debugfs file for each guest's HPT
        KVM: PPC: Book3S HV: Add ICP real mode counters
        KVM: PPC: Book3S HV: Move virtual mode ICP functions to real-mode
        KVM: PPC: Book3S HV: Convert ICS mutex lock to spin lock
        KVM: PPC: Book3S HV: Add guest->host real mode completion counters
        KVM: PPC: Book3S HV: Add helpers for lock/unlock hpte
        ...

  commit 0e03fd3e335d272bee88fe733d5fd13f5c5b7140
  Author: Alexey Khoroshilov <khoroshilov@xxxxxxxxx>
  Date:   Sat Apr 25 04:07:03 2015 +0300

      pxa168: fix double deallocation of managed resources

      Commit 43d3ddf87a57 ("net: pxa168_eth: add device tree support") starts
      to use managed resources by adding devm_clk_get() and
      devm_ioremap_resource(), but it leaves explicit iounmap() and clock_put()
      in pxa168_eth_remove() and in failure handling code of pxa168_eth_probe().
      As a result double free can happen.

      The patch removes explicit resource deallocation. Also it converts
      clk_disable() to clk_disable_unprepare() to make it symmetrical with
      clk_prepare_enable().

      Found by Linux Driver Verification project (linuxtesting.org).

      Signed-off-by: Alexey Khoroshilov <khoroshilov@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 4a6554665c62ee39be40f4a18c3d37e49d03ccc1
  Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
  Date:   Mon Apr 13 12:48:27 2015 +1000

      v4l: xilinx: fix for include file movement

      Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 6e17d30bfaf43e04d991392d8484f1c556810c33
  Author: Yang Dongsheng <yangds.fnst@xxxxxxxxxxxxxx>
  Date:   Thu Apr 9 12:08:43 2015 +0800

      Btrfs: fill ->last_trans for delayed inode in btrfs_fill_inode.

      We need to fill inode when we found a node for it in delayed_nodes_tree.
      But we did not fill the ->last_trans currently, it will cause the test
      of xfstest/generic/311 fail. Scenario of the 311 is shown as below:

      Problem:
        (1). test_fd = open(fname, O_RDWR|O_DIRECT)
        (2). pwrite(test_fd, buf, 4096, 0)
        (3). close(test_fd)
        (4). drop_all_caches()  <-------- "echo 3 > /proc/sys/vm/drop_caches"
        (5). test_fd = open(fname, O_RDWR|O_DIRECT)
        (6). fsync(test_fd);
                                <-------- we did not get the correct log entry 
for the file
      Reason:
        When we re-open this file in (5), we would find a node
      in delayed_nodes_tree and fill the inode we are lookup with the
      information. But the ->last_trans is not filled, then the fsync()
      will check the ->last_trans and found it's 0 then say this inode
      is already in our tree which is commited, not recording the extents
      for it.

      Fix:
        This patch fill the ->last_trans properly and set the
      runtime_flags if needed in this situation. Then we can get the
      log entries we expected after (6) and generic/311 passed.

      Signed-off-by: Dongsheng Yang <yangds.fnst@xxxxxxxxxxxxxx>
      Reviewed-by: Miao Xie <miaoxie@xxxxxxxxxx>
      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit 909e26dce3f7600f5e293ac0522c28790a0c8c9c
  Author: Omar Sandoval <osandov@xxxxxxxxxxx>
  Date:   Fri Apr 10 14:20:40 2015 -0700

      btrfs: unlock i_mutex after attempting to delete subvolume during send

      Whenever the check for a send in progress introduced in commit
      521e0546c970 (btrfs: protect snapshots from deleting during send) is
      hit, we return without unlocking inode->i_mutex. This is easy to see
      with lockdep enabled:

      [  +0.000059] ================================================
      [  +0.000028] [ BUG: lock held when returning to user space! ]
      [  +0.000029] 4.0.0-rc5-00096-g3c435c1 #93 Not tainted
      [  +0.000026] ------------------------------------------------
      [  +0.000029] btrfs/211 is leaving the kernel with locks still held!
      [  +0.000029] 1 lock held by btrfs/211:
      [  +0.000023]  #0:  (&type->i_mutex_dir_key){+.+.+.}, at: 
[<ffffffff8135b8df>] btrfs_ioctl_snap_destroy+0x2df/0x7a0

      Make sure we unlock it in the error path.

      Reviewed-by: Filipe Manana <fdmanana@xxxxxxxx>
      Reviewed-by: David Sterba <dsterba@xxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Omar Sandoval <osandov@xxxxxxxxxxx>
      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit b86054540e4ad7d8df67f3a80658d037a2ce1c02
  Author: Omar Sandoval <osandov@xxxxxxxxxxx>
  Date:   Tue Feb 24 02:47:06 2015 -0800

      btrfs: check io_ctl_prepare_pages return in __btrfs_write_out_cache

      If io_ctl_prepare_pages fails, the pages in io_ctl.pages are not valid.
      When we try to access them later, things will blow up in various ways.

      Also fix the comment about the return value, which is an errno on error,
      not -1, and update the cases where it was not.

      Reviewed-by: Liu Bo <bo.li.liu@xxxxxxxxxx>
      Signed-off-by: Omar Sandoval <osandov@xxxxxxxxxxx>
      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit 5ca64f45e92dc52bd3bc1ad93f4f9e5a57955f28
  Author: Omar Sandoval <osandov@xxxxxxxxxxx>
  Date:   Tue Feb 24 02:47:05 2015 -0800

      btrfs: fix race on ENOMEM in alloc_extent_buffer

      Consider the following interleaving of overlapping calls to
      alloc_extent_buffer:

      Call 1:

      - Successfully allocates a few pages with find_or_create_page
      - find_or_create_page fails, goto free_eb
      - Unlocks the allocated pages

      Call 2:
      - Calls find_or_create_page and gets a page in call 1's extent_buffer
      - Finds that the page is already associated with an extent_buffer
      - Grabs a reference to the half-written extent_buffer and calls
        mark_extent_buffer_accessed on it

      mark_extent_buffer_accessed will then try to call mark_page_accessed on
      a null page and panic.

      The fix is to decrement the reference count on the half-written
      extent_buffer before unlocking the pages so call 2 won't use it. We
      should also set exists = NULL in the case that we don't use exists to
      avoid accidentally returning a freed extent_buffer in an error case.

      Signed-off-by: Omar Sandoval <osandov@xxxxxxxxxxx>
      Reviewed-by: David Sterba <dsterba@xxxxxxx>
      Reviewed-by: Liu Bo <bo.li.liu@xxxxxxxxxx>
      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit 67b7859e9bfa0dcee5a8256932e393e98739be1b
  Author: Omar Sandoval <osandov@xxxxxxxxxxx>
  Date:   Tue Feb 24 02:47:04 2015 -0800

      btrfs: handle ENOMEM in btrfs_alloc_tree_block

      This is one of the first places to give out when memory is tight. Handle
      it properly rather than with a BUG_ON.

      Also fix the comment about the return value, which is an ERR_PTR, not
      NULL, on error.

      Signed-off-by: Omar Sandoval <osandov@xxxxxxxxxxx>
      Reviewed-by: David Sterba <dsterba@xxxxxxx>
      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit 1b9845081633072c18f30d8cfd09c267adf0b109
  Author: Forrest Liu <forrestl@xxxxxxxxxxxx>
  Date:   Mon Feb 9 17:30:47 2015 +0800

      Btrfs: fix find_free_dev_extent() malfunction in case device tree has hole

      If device tree has hole, find_free_dev_extent() cannot find available
      address properly.

      The problem can be reproduce by following script.

          mntpath=/btrfs
          loopdev=/dev/loop0
          filepath=/home/forrest/image

          umount $mntpath
          losetup -d $loopdev
          truncate --size 100g $filepath
          losetup $loopdev $filepath
          mkfs.btrfs -f $loopdev
          mount $loopdev $mntpath

          # make device tree with one big hole
          for i in `seq 1 1 100`; do
              fallocate -l 1g $mntpath/$i
          done
          sync
          for i in `seq 1 1 95`; do
              rm $mntpath/$i
          done
          sync

          # wait cleaner thread remove unused block group
          sleep 300

          fallocate -l 1g $mntpath/aaa

          # failed to allocate new chunk
          fallocate -l 1g $mntpath/bbb

      Above script will make device tree with one big hole, and can only 
allocate
      just one chunk in a transaction, so failed to allocate new chunk for 
$mntpath/bbb

          item 8 key (1 DEV_EXTENT 2185232384) itemoff 15859 itemsize 48
              dev extent chunk_tree 3
              chunk objectid 256 chunk offset 106292051968 length 1073741824
          item 9 key (1 DEV_EXTENT 104190705664) itemoff 15811 itemsize 48
              dev extent chunk_tree 3
              chunk objectid 256 chunk offset 103108575232 length 1073741824

      Signed-off-by: Forrest Liu <forrestl@xxxxxxxxxxxx>
      Reviewed-by: Liu Bo <bo.li.liu@xxxxxxxxxx>
      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit e4c88f007be78d38eaef316c599a1ee2f0272c15
  Author: Chris Mason <clm@xxxxxx>
  Date:   Sat Apr 18 05:22:48 2015 -0700

      Btrfs: don't check for delalloc_bytes in cache_save_setup

      Now that we're doing free space cache writeback outside the critical
      section in the commit, there is a bigger window for delalloc_bytes to
      be added after a cache has been written.  find_free_extent may do this
      without putting the block group back into the dirty list, and also
      without a transaction running.

      Checking for delalloc_bytes in cache_save_setup means we might leave the
      cache marked as written without invalidating it.  Consistency checks
      during mount will toss the cache, but it's better to get rid of the
      check in cache_save_setup and let it get invalidated by the checks
      already done during cache write out.

      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit 24b89d08ef63f9c62e55593e27a55e57b0062046
  Author: Filipe Manana <fdmanana@xxxxxxxx>
  Date:   Sat Apr 25 18:31:05 2015 +0100

      Btrfs: fix deadlock when starting writeback of bg caches

      While starting the writes of the dirty block group caches, if we don't
      find a block group item in the extent tree we were leaving without
      releasing our path, running delayed references and then looping again to
      process any new dirty block groups. However this second iteration of the
      loop could cause a deadlock because it tries to lock some other extent
      tree node/leaf which another task already locked and it's blocked because
      it's waiting for a lock on some node/leaf that is in our path that was not
      released before.
      We could also deadlock when running the delayed references - as we could
      end up trying to lock the same nodes/leafs that we have in our local path
      (with a different lock type).

      Got into such case when running xfstests:

      [20892.242791] ------------[ cut here ]------------
      [20892.243776] WARNING: CPU: 0 PID: 13299 at fs/btrfs/super.c:260 
__btrfs_abort_transaction+0x52/0x114 [btrfs]()
      [20892.245874] BTRFS: Transaction aborted (error -2)
      (...)
      [20892.269378] Call Trace:
      [20892.269915]  [<ffffffff8142fa46>] dump_stack+0x4f/0x7b
      [20892.271097]  [<ffffffff8108b6a2>] ? console_unlock+0x361/0x3ad
      [20892.272173]  [<ffffffff81045ea5>] warn_slowpath_common+0xa1/0xbb
      [20892.273386]  [<ffffffffa0509a6d>] ? 
__btrfs_abort_transaction+0x52/0x114 [btrfs]
      [20892.274857]  [<ffffffff81045f05>] warn_slowpath_fmt+0x46/0x48
      [20892.275851]  [<ffffffffa0509a6d>] __btrfs_abort_transaction+0x52/0x114 
[btrfs]
      [20892.277341]  [<ffffffffa0515e10>] write_one_cache_group+0x68/0xaf 
[btrfs]
      [20892.278628]  [<ffffffffa052088a>] 
btrfs_start_dirty_block_groups+0x18d/0x29b [btrfs]
      [20892.280191]  [<ffffffffa052f077>] btrfs_commit_transaction+0x130/0x9c9 
[btrfs]
      (...)
      [20892.291316] ---[ end trace 597f77e664245373 ]---
      [20892.293955] BTRFS: error (device sdg) in write_one_cache_group:3184: 
errno=-2 No such entry
      [20892.297390] BTRFS info (device sdg): forced readonly
      [20892.298222] ------------[ cut here ]------------
      [20892.299190] WARNING: CPU: 0 PID: 13299 at fs/btrfs/ctree.c:2683 
btrfs_search_slot+0x7e/0x7d2 [btrfs]()
      (...)
      [20892.326253] Call Trace:
      [20892.326904]  [<ffffffff8142fa46>] dump_stack+0x4f/0x7b
      [20892.329503]  [<ffffffff8108b6a2>] ? console_unlock+0x361/0x3ad
      [20892.330815]  [<ffffffff81045ea5>] warn_slowpath_common+0xa1/0xbb
      [20892.332556]  [<ffffffffa0510b73>] ? btrfs_search_slot+0x7e/0x7d2 
[btrfs]
      [20892.333955]  [<ffffffff81045f62>] warn_slowpath_null+0x1a/0x1c
      [20892.335562]  [<ffffffffa0510b73>] btrfs_search_slot+0x7e/0x7d2 [btrfs]
      [20892.336849]  [<ffffffff8107b024>] ? arch_local_irq_save+0x9/0xc
      [20892.338222]  [<ffffffffa051ad52>] ? cache_save_setup+0x43/0x2a5 [btrfs]
      [20892.339823]  [<ffffffffa051ad66>] ? cache_save_setup+0x57/0x2a5 [btrfs]
      [20892.341275]  [<ffffffff814351a4>] ? _raw_spin_unlock+0x32/0x46
      [20892.342810]  [<ffffffffa0515de7>] write_one_cache_group+0x3f/0xaf 
[btrfs]
      [20892.344184]  [<ffffffffa052088a>] 
btrfs_start_dirty_block_groups+0x18d/0x29b [btrfs]
      [20892.347162]  [<ffffffffa052f077>] btrfs_commit_transaction+0x130/0x9c9 
[btrfs]
      (...)
      [20892.361015] ---[ end trace 597f77e664245374 ]---
      [21120.688097] INFO: task kworker/u8:17:29854 blocked for more than 120 
seconds.
      [21120.689881]       Tainted: G        W       4.0.0-rc5-btrfs-next-9+ #2
      [21120.691384] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" 
disables this message.
      (...)
      [21120.703696] Call Trace:
      [21120.704310]  [<ffffffff8143107e>] schedule+0x74/0x83
      [21120.705490]  [<ffffffffa055f025>] btrfs_tree_lock+0xd7/0x236 [btrfs]
      [21120.706757]  [<ffffffff81075cd6>] ? signal_pending_state+0x31/0x31
      [21120.708156]  [<ffffffffa054ac1e>] lock_extent_buffer_for_io+0x3e/0x194 
[btrfs]
      [21120.709892]  [<ffffffffa054bb86>] ? 
btree_write_cache_pages+0x273/0x385 [btrfs]
      [21120.711605]  [<ffffffffa054bc42>] btree_write_cache_pages+0x32f/0x385 
[btrfs]
      [21120.723440]  [<ffffffffa0527552>] btree_writepages+0x23/0x5c [btrfs]
      [21120.724943]  [<ffffffff8110c4c8>] do_writepages+0x23/0x2c
      [21120.726008]  [<ffffffff81176dde>] __writeback_single_inode+0x73/0x2fa
      [21120.727230]  [<ffffffff8117714a>] ? writeback_sb_inodes+0xe5/0x38b
      [21120.728526]  [<ffffffff811771fb>] ? writeback_sb_inodes+0x196/0x38b
      [21120.729701]  [<ffffffff8117726a>] writeback_sb_inodes+0x205/0x38b
      (...)
      [21120.747853] INFO: task btrfs:13282 blocked for more than 120 seconds.
      [21120.749459]       Tainted: G        W       4.0.0-rc5-btrfs-next-9+ #2
      [21120.751137] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" 
disables this message.
      (...)
      [21120.768457] Call Trace:
      [21120.769039]  [<ffffffff8143107e>] schedule+0x74/0x83
      [21120.770107]  [<ffffffffa052f25c>] btrfs_commit_transaction+0x315/0x9c9 
[btrfs]
      [21120.771558]  [<ffffffff81075cd6>] ? signal_pending_state+0x31/0x31
      [21120.773659]  [<ffffffffa056fd8c>] prepare_to_relocate+0xcb/0xd2 [btrfs]
      [21120.776257]  [<ffffffffa05741da>] relocate_block_group+0x44/0x4a9 
[btrfs]
      [21120.777755]  [<ffffffffa05747a0>] ? 
btrfs_relocate_block_group+0x161/0x288 [btrfs]
      [21120.779459]  [<ffffffffa05747a8>] 
btrfs_relocate_block_group+0x169/0x288 [btrfs]
      [21120.781153]  [<ffffffffa0550403>] 
btrfs_relocate_chunk.isra.29+0x3e/0xa7 [btrfs]
      [21120.783918]  [<ffffffffa05518fd>] btrfs_balance+0xaa4/0xc52 [btrfs]
      [21120.785436]  [<ffffffff8114306e>] ? cpu_cache_get.isra.39+0xe/0x1f
      [21120.786434]  [<ffffffffa0559252>] btrfs_ioctl_balance+0x23f/0x2b0 
[btrfs]
      (...)
      [21120.889251] INFO: task fsstress:13288 blocked for more than 120 
seconds.
      [21120.890526]       Tainted: G        W       4.0.0-rc5-btrfs-next-9+ #2
      [21120.891773] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" 
disables this message.
      (...)
      [21120.899960] Call Trace:
      [21120.900743]  [<ffffffff8143107e>] schedule+0x74/0x83
      [21120.903004]  [<ffffffffa055f025>] btrfs_tree_lock+0xd7/0x236 [btrfs]
      [21120.904383]  [<ffffffff81075cd6>] ? signal_pending_state+0x31/0x31
      [21120.905608]  [<ffffffffa051125b>] btrfs_search_slot+0x766/0x7d2 [btrfs]
      [21120.906812]  [<ffffffff8114290e>] ? virt_to_head_page+0x9/0x2c
      [21120.907874]  [<ffffffff81144b7f>] ? 
cache_alloc_debugcheck_after.isra.42+0x16c/0x1cb
      [21120.909551]  [<ffffffffa05124e0>] btrfs_insert_empty_items+0x5d/0xa8 
[btrfs]
      [21120.910914]  [<ffffffffa0512585>] btrfs_insert_item+0x5a/0xa5 [btrfs]
      [21120.912181]  [<ffffffffa0520271>] ? 
btrfs_create_pending_block_groups+0x96/0x130 [btrfs]
      [21120.913784]  [<ffffffffa052028a>] 
btrfs_create_pending_block_groups+0xaf/0x130 [btrfs]
      [21120.915374]  [<ffffffffa052ffc2>] __btrfs_end_transaction+0x84/0x366 
[btrfs]
      [21120.916735]  [<ffffffffa05302b4>] btrfs_end_transaction+0x10/0x12 
[btrfs]
      [21120.917996]  [<ffffffffa051ab26>] 
btrfs_check_data_free_space+0x11f/0x27c [btrfs]
      [21120.919478]  [<ffffffffa051ba25>] 
btrfs_delalloc_reserve_space+0x1e/0x51 [btrfs]
      [21120.921226]  [<ffffffffa05382f2>] btrfs_truncate_page+0x85/0x2c4 
[btrfs]
      [21120.923121]  [<ffffffffa0538572>] btrfs_cont_expand+0x41/0x3ef [btrfs]
      [21120.924449]  [<ffffffffa0541091>] ? btrfs_file_write_iter+0x19a/0x431 
[btrfs]
      [21120.926602]  [<ffffffff8107b024>] ? arch_local_irq_save+0x9/0xc
      [21120.927769]  [<ffffffffa0541091>] ? btrfs_file_write_iter+0x19a/0x431 
[btrfs]
      [21120.929324]  [<ffffffffa05410a0>] ? btrfs_file_write_iter+0x1a9/0x431 
[btrfs]
      [21120.930723]  [<ffffffffa05410d9>] btrfs_file_write_iter+0x1e2/0x431 
[btrfs]
      [21120.931897]  [<ffffffff81067d85>] ? get_parent_ip+0xe/0x3e
      [21120.934446]  [<ffffffff811534c3>] new_sync_write+0x7c/0xa0
      [21120.935528]  [<ffffffff81153b58>] vfs_write+0xb2/0x117
      (...)

      Fixes: 1bbc621ef284 ("Btrfs: allow block group cache writeout
                            outside critical section in commit")

      Signed-off-by: Filipe Manana <fdmanana@xxxxxxxx>
      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit b58d1a9ef92031a6fc2f418c01abafb4458ba009
  Author: Filipe Manana <fdmanana@xxxxxxxx>
  Date:   Sat Apr 25 18:29:16 2015 +0100

      Btrfs: fix race between start dirty bg cache writeout and bg deletion

      While running xfstests I ran into the following:

      [20892.242791] ------------[ cut here ]------------
      [20892.243776] WARNING: CPU: 0 PID: 13299 at fs/btrfs/super.c:260 
__btrfs_abort_transaction+0x52/0x114 [btrfs]()
      [20892.245874] BTRFS: Transaction aborted (error -2)
      [20892.247329] Modules linked in: btrfs dm_snapshot dm_bufio dm_flakey 
dm_mod crc32c_generic xor raid6_pq nfsd auth_rpcgss oid_registry nfs_acl nfs 
lockd grace fscache sunrpc loop fuse$
      [20892.258488] CPU: 0 PID: 13299 Comm: fsstress Tainted: G        W       
4.0.0-rc5-btrfs-next-9+ #2
      [20892.262011] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), 
BIOS rel-1.7.5-0-ge51488c-20140602_164612-nilsson.home.kraxel.org 04/01/2014
      [20892.264738]  0000000000000009 ffff880427f8bc18 ffffffff8142fa46 
ffffffff8108b6a2
      [20892.266244]  ffff880427f8bc68 ffff880427f8bc58 ffffffff81045ea5 
ffff880427f8bc48
      [20892.267761]  ffffffffa0509a6d 00000000fffffffe ffff8803545d6f40 
ffffffffa05a15a0
      [20892.269378] Call Trace:
      [20892.269915]  [<ffffffff8142fa46>] dump_stack+0x4f/0x7b
      [20892.271097]  [<ffffffff8108b6a2>] ? console_unlock+0x361/0x3ad
      [20892.272173]  [<ffffffff81045ea5>] warn_slowpath_common+0xa1/0xbb
      [20892.273386]  [<ffffffffa0509a6d>] ? 
__btrfs_abort_transaction+0x52/0x114 [btrfs]
      [20892.274857]  [<ffffffff81045f05>] warn_slowpath_fmt+0x46/0x48
      [20892.275851]  [<ffffffffa0509a6d>] __btrfs_abort_transaction+0x52/0x114 
[btrfs]
      [20892.277341]  [<ffffffffa0515e10>] write_one_cache_group+0x68/0xaf 
[btrfs]
      [20892.278628]  [<ffffffffa052088a>] 
btrfs_start_dirty_block_groups+0x18d/0x29b [btrfs]
      [20892.280191]  [<ffffffffa052f077>] btrfs_commit_transaction+0x130/0x9c9 
[btrfs]
      [20892.281781]  [<ffffffff8107d33d>] ? trace_hardirqs_on+0xd/0xf
      [20892.282873]  [<ffffffffa054163b>] btrfs_sync_file+0x313/0x387 [btrfs]
      [20892.284111]  [<ffffffff8117acad>] vfs_fsync_range+0x95/0xa4
      [20892.285203]  [<ffffffff810e603f>] ? time_hardirqs_on+0x15/0x28
      [20892.286290]  [<ffffffff8123960b>] ? trace_hardirqs_on_thunk+0x3a/0x3f
      [20892.287469]  [<ffffffff8117acd8>] vfs_fsync+0x1c/0x1e
      [20892.288412]  [<ffffffff8117ae54>] do_fsync+0x34/0x4e
      [20892.289348]  [<ffffffff8117b07c>] SyS_fsync+0x10/0x14
      [20892.290255]  [<ffffffff81435b32>] system_call_fastpath+0x12/0x17
      [20892.291316] ---[ end trace 597f77e664245373 ]---
      [20892.293955] BTRFS: error (device sdg) in write_one_cache_group:3184: 
errno=-2 No such entry
      [20892.297390] BTRFS info (device sdg): forced readonly

      This happens because in btrfs_start_dirty_block_groups() we splice the
      transaction's list of dirty block groups into a local list and then we
      keep extracting the first element of the list without holding the
      cache_write_mutex mutex. This means that before we acquire that mutex
      the first block group on the list might be removed by a conurrent task
      running btrfs_remove_block_group(). So make sure we extract the first
      element (and test the list emptyness) while holding that mutex.

      Fixes: 1bbc621ef284 ("Btrfs: allow block group cache writeout
                            outside critical section in commit")

      Signed-off-by: Filipe Manana <fdmanana@xxxxxxxx>
      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit 09c5b4803a80a5451d950d6a539d2eb311dc0fb1
  Author: Gabriele Mazzotta <gabriele.mzt@xxxxxxxxx>
  Date:   Sat Apr 25 19:52:37 2015 +0200

      libata: Ignore spurious PHY event on LPM policy change

      When the LPM policy is set to ATA_LPM_MAX_POWER, the device might
      generate a spurious PHY event that cuases errors on the link.
      Ignore this event if it occured within 10s after the policy change.

      The timeout was chosen observing that on a Dell XPS13 9333 these
      spurious events can occur up to roughly 6s after the policy change.

      Link: http://lkml.kernel.org/g/3352987.ugV1Ipy7Z5@xps13
      Signed-off-by: Gabriele Mazzotta <gabriele.mzt@xxxxxxxxx>
      Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 8393b811f38acdf7fd8da2028708edad3e68ce1f
  Author: Gabriele Mazzotta <gabriele.mzt@xxxxxxxxx>
  Date:   Sat Apr 25 19:52:36 2015 +0200

      libata: Add helper to determine when PHY events should be ignored

      This is a preparation commit that will allow to add other criteria
      according to which PHY events should be dropped.

      Signed-off-by: Gabriele Mazzotta <gabriele.mzt@xxxxxxxxx>
      Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 2ea2f62c8bda242433809c7f4e9eae1c52c40bbe
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Fri Apr 24 16:05:01 2015 -0700

      net: fix crash in build_skb()

      When I added pfmemalloc support in build_skb(), I forgot netlink
      was using build_skb() with a vmalloc() area.

      In this patch I introduce __build_skb() for netlink use,
      and build_skb() is a wrapper handling both skb->head_frag and
      skb->pfmemalloc

      This means netlink no longer has to hack skb->head_frag

      [ 1567.700067] kernel BUG at arch/x86/mm/physaddr.c:26!
      [ 1567.700067] invalid opcode: 0000 [#1] PREEMPT SMP KASAN
      [ 1567.700067] Dumping ftrace buffer:
      [ 1567.700067]    (ftrace buffer empty)
      [ 1567.700067] Modules linked in:
      [ 1567.700067] CPU: 9 PID: 16186 Comm: trinity-c182 Not tainted 
4.0.0-next-20150424-sasha-00037-g4796e21 #2167
      [ 1567.700067] task: ffff880127efb000 ti: ffff880246770000 task.ti: 
ffff880246770000
      [ 1567.700067] RIP: __phys_addr (arch/x86/mm/physaddr.c:26 (discriminator 
3))
      [ 1567.700067] RSP: 0018:ffff8802467779d8  EFLAGS: 00010202
      [ 1567.700067] RAX: 000041000ed8e000 RBX: ffffc9008ed8e000 RCX: 
000000000000002c
      [ 1567.700067] RDX: 0000000000000004 RSI: 0000000000000000 RDI: 
ffffffffb3fd6049
      [ 1567.700067] RBP: ffff8802467779f8 R08: 0000000000000019 R09: 
ffff8801d0168000
      [ 1567.700067] R10: ffff8801d01680c7 R11: ffffed003a02d019 R12: 
ffffc9000ed8e000
      [ 1567.700067] R13: 0000000000000f40 R14: 0000000000001180 R15: 
ffffc9000ed8e000
      [ 1567.700067] FS:  00007f2a7da3f700(0000) GS:ffff8801d1000000(0000) 
knlGS:0000000000000000
      [ 1567.700067] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [ 1567.700067] CR2: 0000000000738308 CR3: 000000022e329000 CR4: 
00000000000007e0
      [ 1567.700067] Stack:
      [ 1567.700067]  ffffc9000ed8e000 ffff8801d0168000 ffffc9000ed8e000 
ffff8801d0168000
      [ 1567.700067]  ffff880246777a28 ffffffffad7c0a21 0000000000001080 
ffff880246777c08
      [ 1567.700067]  ffff88060d302e68 ffff880246777b58 ffff880246777b88 
ffffffffad9a6821
      [ 1567.700067] Call Trace:
      [ 1567.700067] build_skb (include/linux/mm.h:508 net/core/skbuff.c:316)
      [ 1567.700067] netlink_sendmsg (net/netlink/af_netlink.c:1633 
net/netlink/af_netlink.c:2329)
      [ 1567.774369] ? sched_clock_cpu (kernel/sched/clock.c:311)
      [ 1567.774369] ? netlink_unicast (net/netlink/af_netlink.c:2273)
      [ 1567.774369] ? netlink_unicast (net/netlink/af_netlink.c:2273)
      [ 1567.774369] sock_sendmsg (net/socket.c:614 net/socket.c:623)
      [ 1567.774369] sock_write_iter (net/socket.c:823)
      [ 1567.774369] ? sock_sendmsg (net/socket.c:806)
      [ 1567.774369] __vfs_write (fs/read_write.c:479 fs/read_write.c:491)
      [ 1567.774369] ? get_lock_stats (kernel/locking/lockdep.c:249)
      [ 1567.774369] ? default_llseek (fs/read_write.c:487)
      [ 1567.774369] ? vtime_account_user (kernel/sched/cputime.c:701)
      [ 1567.774369] ? rw_verify_area (fs/read_write.c:406 (discriminator 4))
      [ 1567.774369] vfs_write (fs/read_write.c:539)
      [ 1567.774369] SyS_write (fs/read_write.c:586 fs/read_write.c:577)
      [ 1567.774369] ? SyS_read (fs/read_write.c:577)
      [ 1567.774369] ? __this_cpu_preempt_check (lib/smp_processor_id.c:63)
      [ 1567.774369] ? trace_hardirqs_on_caller (kernel/locking/lockdep.c:2594 
kernel/locking/lockdep.c:2636)
      [ 1567.774369] ? trace_hardirqs_on_thunk (arch/x86/lib/thunk_64.S:42)
      [ 1567.774369] system_call_fastpath (arch/x86/kernel/entry_64.S:261)

      Fixes: 79930f5892e ("net: do not deplete pfmemalloc reserve")
      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Reported-by: Sasha Levin <sasha.levin@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 20d96964b51844d4f3bea0249f62db7073c13c30
  Author: Chee Nouk Phoon <cnphoon@xxxxxxxxxx>
  Date:   Fri Apr 24 02:32:07 2015 -0500

      net: eth: altera: Resolve false errors from MSGDMA to TSE

      This patch resolves false errors from MSGDMA in TX mSGDMA MM to ST
      mode, and is a continuation of the patch recently submitted by Andrea
      Oetken. The MSGDMA had a logic bug that masked detection of this issue
      prior to Quartus 14.1/Build 164. When the MSGDMA logic bug was addressed
      in Quartus 14.1/Build 164, the driver problem was exposed.

      The problem is corrected by making sure MSGDMA_DESC_CTL_TR_ERR_IRQ is not
      set for any of the transmit DMA descriptors, and only used for receive
      descriptors.

      Fixes: 71cd26e altera tse: Error-Bit on tx-avalon-stream always set.

      Signed-off-by: Chee Nouk Phoon <cnphoon@xxxxxxxxxx>
      Signed-off-by: Vince Bridgers <vbridger@xxxxxxxxxxxxxxxxxxxxx>a
      Cc: Andreas Oetken <ennoerlangen@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 3051f39253680624504021fd3b29fc621a4fd6b6
  Author: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
  Date:   Fri Apr 24 15:52:32 2015 +1000

      ehea: Fix memory hook reference counting crashes

      The recent commit to only register the EHEA memory hotplug hooks on
      adapter probe has a few problems.

      Firstly the reference counting is wrong for multiple adapters, in that
      the hooks are registered multiple times. Secondly the check in the tear
      down path is backward. Finally the error path doesn't decrement the
      count.

      The multiple registration of the hooks is the biggest problem, as it
      leads to oopses when the system is rebooted, and/or errors during memory
      hotplug, eg:

        $ ./mem-on-off-test.sh -r 2
        ...
        ehea: memory is going offline
        ehea: LPAR memory changed - re-initializing driver
        ehea: re-initializing driver complete
        ehea: memory is going offline
        ehea: LPAR memory changed - re-initializing driver
        ehea: opcode=26c ret=fffffffffffffffc arg1=8000000003000003 arg2=0 
arg3=700000060000d600 arg4=3fded0000 arg5=200 arg6=0 arg7=0
        ehea: register_rpage_mr failed
        ehea: registering mr failed
        ehea: register MR failed - driver inoperable!
        ehea: memory is going offline

      Fixes: aa183323312d ("ehea: Register memory hotplug, reboot and crash 
hooks on adapter probe")
      Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit dfc8f370316b31b9ca9ce96e50f1c438d9410b4f
  Author: Gavin Shan <gwshan@xxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 15:22:23 2015 +1000

      net/tg3: Release IRQs on permanent error

      When having permanent EEH error, the PCI device will be removed
      from the system. For this case, we shouldn't set pcierr_recovery
      to true wrongly, which blocks the driver to release the allocated
      interrupts and their handlers. Eventually, we can't disable MSI
      or MSIx successfully because of the MSI or MSIx interrupts still
      have associated interrupt actions, which is turned into following
      stack dump.

      Oops: Exception in kernel mode, sig: 5 [#1]
              :
      [c0000000003b76a8] .free_msi_irqs+0x80/0x1a0 (unreliable)
      [c00000000039f388] .pci_remove_bus_device+0x98/0x110
      [c0000000000790f4] .pcibios_remove_pci_devices+0x9c/0x128
      [c000000000077b98] .handle_eeh_events+0x2d8/0x4b0
      [c0000000000782d0] .eeh_event_handler+0x130/0x1c0
      [c000000000022bd4] .kernel_thread+0x54/0x70

      Signed-off-by: Gavin Shan <gwshan@xxxxxxxxxxxxxxxxxx>
      Acked-by: Prashant Sreedharan <prashant@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 2000058e892cd6773b3061a56c0bd6535ac15afe
  Author: Jonatas Rech <jonatas.rech@xxxxxxxxxxxxxx>
  Date:   Wed Apr 15 12:23:18 2015 -0300

      spi: fsl-espi: fix behaviour for full-duplex xfers

      This patch makes possible for protocol drivers to do full-duplex SPI
      transfers properly. Until now this driver could only be used for
      half-duplex transfers, since it always expected an spi_transfer with
      non-null tx_buf to be only used for TX, and those with non-null rx_buf
      to be only used for RX.

      The fix consists in correcting the fsl_espi_transfer length by taking
      into consideration duplex spi_transfers, and not just by adding n_tx
      and n_rx.

      Furthermore, this correction has exposed an inconsistency in the
      protocol driver <-> controller driver interaction. The spi-fsl-espi
      driver artificially inserts TX bytes when message fragmentation is
      necessary (due to SPCOM_TRANLEN_MAX) instead of informing the
      protocol driver of the hardware limitation. This was tested with the
      m25p80 NOR flash protocol driver. Since fixing this issue may cause
      other client drivers to malfunction, it was left as is.

      Signed-off-by: Jonatas Rech <jonatas.rech@xxxxxxxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit 96cba9b00e297303774bec59e192064d20adeb3d
  Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
  Date:   Tue Apr 14 13:50:09 2015 -0700

      platform/chrome: chromeos_laptop - instantiate Atmel at primary address

      The new Atmel MXT driver expects i2c client's address contain the
      primary (main address) of the chip, and calculates the expected
      bootloader address form the primary address. Unfortunately chrome_laptop
      does probe the devices and if touchpad (or touchscreen, or both) comes
      up in bootloader mode the i2c device gets instantiated with the
      bootloader address which confuses the driver.

      To work around this issue let's probe the primary address first. If the
      device is not detected at the primary address we'll probe alternative
      addresses as "dummy" devices. If any of them are found, destroy the
      dummy client and instantiate client with proper name at primary address
      still.

      Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
      Signed-off-by: Olof Johansson <olof@xxxxxxxxx>

  commit 3cab989afd8d8d1bc3d99fef0e7ed87c31e7b647
  Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 15:47:07 2015 -0400

      RCU pathwalk breakage when running into a symlink overmounting something

      Calling unlazy_walk() in walk_component() and do_last() when we find
      a symlink that needs to be followed doesn't acquire a reference to 
vfsmount.
      That's fine when the symlink is on the same vfsmount as the parent 
directory
      (which is almost always the case), but it's not always true - one _can_
      manage to bind a symlink on top of something.  And in such cases we end up
      with excessive mntput().

      Cc: stable@xxxxxxxxxxxxxxx # since 2.6.39
      Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

  commit ac74d8d65c83d8061034d0908e1eab6a0c24f923
  Author: Eric Sandeen <sandeen@xxxxxxxxxx>
  Date:   Thu Apr 16 15:04:56 2015 -0500

      fix I_DIO_WAKEUP definition

      I_DIO_WAKEUP is never directly used, but fix it up anyway.

      Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
      Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

  commit fe0f07d08ee35fb13d2cb048970072fe4f71ad14
  Author: Jens Axboe <axboe@xxxxxx>
  Date:   Wed Apr 15 17:05:48 2015 -0600

      direct-io: only inc/dec inode->i_dio_count for file systems

      do_blockdev_direct_IO() increments and decrements the inode
      ->i_dio_count for each IO operation. It does this to protect against
      truncate of a file. Block devices don't need this sort of protection.

      For a capable multiqueue setup, this atomic int is the only shared
      state between applications accessing the device for O_DIRECT, and it
      presents a scaling wall for that. In my testing, as much as 30% of
      system time is spent incrementing and decrementing this value. A mixed
      read/write workload improved from ~2.5M IOPS to ~9.6M IOPS, with
      better latencies too. Before:

      clat percentiles (usec):
       |  1.00th=[   33],  5.00th=[   34], 10.00th=[   34], 20.00th=[   34],
       | 30.00th=[   34], 40.00th=[   34], 50.00th=[   35], 60.00th=[   35],
       | 70.00th=[   35], 80.00th=[   35], 90.00th=[   37], 95.00th=[   80],
       | 99.00th=[   98], 99.50th=[  151], 99.90th=[  155], 99.95th=[  155],
       | 99.99th=[  165]

      After:

      clat percentiles (usec):
       |  1.00th=[   95],  5.00th=[  108], 10.00th=[  129], 20.00th=[  149],
       | 30.00th=[  155], 40.00th=[  161], 50.00th=[  167], 60.00th=[  171],
       | 70.00th=[  177], 80.00th=[  185], 90.00th=[  201], 95.00th=[  270],
       | 99.00th=[  390], 99.50th=[  398], 99.90th=[  418], 99.95th=[  422],
       | 99.99th=[  438]

      In other setups, Robert Elliott reported seeing good performance
      improvements:

      https://lkml.org/lkml/2015/4/3/557

      The more applications accessing the device, the worse it gets.

      Add a new direct-io flags, DIO_SKIP_DIO_COUNT, which tells
      do_blockdev_direct_IO() that it need not worry about incrementing
      or decrementing the inode i_dio_count for this caller.

      Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Cc: Christoph Hellwig <hch@xxxxxx>
      Cc: Theodore Ts'o <tytso@xxxxxxx>
      Cc: Elliott, Robert (Server Storage) <elliott@xxxxxx>
      Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Jens Axboe <axboe@xxxxxx>
      Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

  commit 8e3c500594dca9a12c27eb6d77b82e0766879bfd
  Author: Johannes Berg <johannes.berg@xxxxxxxxx>
  Date:   Wed Apr 22 11:55:14 2015 +0200

      fs/9p: fix readdir()

      Al Viro's IOV changes broke 9p readdir() because the new code
      didn't abort the read when it returned nothing. The original
      code checked if the combined error/length was <= 0 but in the
      new code that accidentally got changed to just an error check.

      Add back the return from the function when nothing is read.

      Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
      Fixes: e1200fe68f20 ("9p: switch p9_client_read() to passing struct 
iov_iter *")
      Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
      Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

  commit 149aabcc44e3e2c1f8fe4f0832be53d2db55b598
  Author: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
  Date:   Fri Apr 10 12:56:41 2015 +0530

      clockevents: Shutdown detached clockevent device

      A clockevent device is marked DETACHED when it is replaced by another
      clockevent device.

      The device is shutdown properly for drivers that implement legacy
      ->set_mode() callback, as we call ->set_mode() for CLOCK_EVT_MODE_UNUSED
      as well.

      But for the new per-state callback interface, we skip shutting down the
      device, as we thought its an internal state change. That wasn't correct.

      The effect is that the device is left programmed in oneshot or periodic
      mode.

      Fall-back to 'case CLOCK_EVT_STATE_SHUTDOWN', to shutdown the device.

      Fixes: bd624d75db21 "clockevents: Introduce mode specific callbacks"
      Reported-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
      Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
      Cc: linaro-kernel@xxxxxxxxxxxxxxxx
      Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
      Link: 
http://lkml.kernel.org/r/eef0a91c51b74d4e52c8e5a95eca27b5a0563f07.1428650683.git.viresh.kumar@xxxxxxxxxx
      Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

  commit 1dcc73d7bb0429994c54d33b40c5fb82b741a791
  Author: Marc Zyngier <marc.zyngier@xxxxxxx>
  Date:   Wed Apr 22 18:20:04 2015 +0100

      irqchip: gic: Drop support for gic_arch_extn

      Now that the users of gic_arch_extn have been fixed, drop the
      "feature" for good. This leads to the removal of some now useless
      locking.

      Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>
      Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
      Cc: Jason Cooper <jason@xxxxxxxxxxxxxx>
      Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

  commit 10a50f1ab5f06c9a3ee5ece3ec52e607ed53c79f
  Author: Roger Quadros <rogerq@xxxxxx>
  Date:   Wed Apr 15 11:14:11 2015 +0300

      genirq: Set IRQCHIP_SKIP_SET_WAKE flag for dummy_irq_chip

      Without this system suspend is broken on systems that have
      drivers calling enable/disable_irq_wake() for interrupts based off
      the dummy irq hook. (e.g. drivers/gpio/gpio-pcf857x.c)

      Signed-off-by: Roger Quadros <rogerq@xxxxxx>
      Cc: <cw00.choi@xxxxxxxxxxx>
      Cc: <balbi@xxxxxx>
      Cc: <tony@xxxxxxxxxxx>
      Cc: Gregory Clement <gregory.clement@xxxxxxxxxxxxxxxxxx>
      Link: http://lkml.kernel.org/r/552E1DD3.4040106@xxxxxx
      Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

  commit a3bdccc4e683f0ac69230707ed3fa20e7cf73a79
  Author: Chris Mason <clm@xxxxxx>
  Date:   Fri Apr 24 11:00:00 2015 -0700

      Btrfs: prevent list corruption during free space cache processing

      __btrfs_write_out_cache is holding the ctl->tree_lock while it prepares
      a list of bitmaps to record in the free space cache.  It was dropping
      the lock while it worked on other components, which made a window for
      free_bitmap() to free the bitmap struct without removing it from the
      list.

      This changes things to hold the lock the whole time, and also makes sure
      we hold the lock during enospc cleanup.

      Reported-by: Filipe Manana <fdmanana@xxxxxxxx>
      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit 547c4b547e07dcc60874b6ef6252dd49ff74aec1
  Author: Florian Westphal <fw@xxxxxxxxx>
  Date:   Mon Apr 20 12:35:47 2015 +0200

      netfilter: bridge: fix NULL deref in physin/out ifindex helpers

      Might not have an outdev yet. We'll oops when iface goes down while skbs
      are still nfqueue'd:

      RIP: 0010:[<ffffffff81422a2f>]  [<ffffffff81422a2f>] dev_cmp+0x4f/0x80
      nfqnl_rcv_dev_event+0xe2/0x150
      notifier_call_chain+0x53/0xa0

      Fixes: c737b7c4510026 ("netfilter: bridge: add helpers for fetching 
physin/outdev")
      Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
      Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>

  commit 4c4ed0748f82e26d8b884383e6737cf5a861ed6f
  Author: Florian Westphal <fw@xxxxxxxxx>
  Date:   Tue Apr 14 16:44:14 2015 +0200

      netfilter: nf_tables: fix wrong length for jump/goto verdicts

      NFT_JUMP/GOTO erronously sets length to sizeof(void *).

      We then allocate insufficient memory when such element is added to a vmap.

      Suggested-by: Patrick McHardy <kaber@xxxxxxxxx>
      Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
      Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>

  commit 358d6a2c3ecae2b22c7d7e61f9d5672557446dfb
  Author: Hans de Goede <hdegoede@xxxxxxxxxx>
  Date:   Tue Apr 21 12:01:32 2015 +0200

      toshiba_acpi: Do not register vendor backlight when acpi_video bl is 
available

      commit a39f46df33c6 ("toshiba_acpi: Fix regression caused by backlight 
extra
      check code") causes the backlight to no longer work on the Toshiba Z30,
      reverting that commit fixes this but restores the original issue fixed
      by that commit.

      Looking at the toshiba_acpi backlight code for a fix for this I noticed 
that
      the toshiba code is the only code under platform/x86 which unconditionally
      registers a vendor acpi backlight interface, without checking for 
acpi_video
      backlight support first.

      This commit adds the necessary checks bringing toshiba_acpi in line with 
the
      other drivers, and fixing the Z30 regression without needing to revert the
      commit causing it.

      Chances are that there will be some Toshiba models which have a non 
working
      acpi-video implementation while the toshiba vendor backlight interface 
does
      work, this commit adds an empty dmi_id table where such systems can be 
added,
      this is identical to how other drivers handle such systems.

      BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1206036
      BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=86521
      Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
      Reviewed-and-tested-by: Azael Avalos <coproscefalo@xxxxxxxxx>
      Signed-off-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx>

  commit d19d133e432248c9b3efa9c10dda5f050cbbcd72
  Merge: c666872 e8191a8
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 10:31:32 2015 -0700

      Merge tag 'sound-fix-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

      Pull sound fixes from Takashi Iwai:
       "Here are a few fixes that have been pending since the previous pull
        request: a regression fix for HD-audio multiple SPDIF / HDMI devices,
        several ALC256 codec fixes, a couple of i915 HDMI audio fixes, and
        various small fixes.

        Nothing exciting, just boring, but things good to have"

      * tag 'sound-fix-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - fix headset mic detection problem for one more machine
        ALSA: hda/realtek - Fix Headphone Mic doesn't recording for ALC256
        ALSA: hda - fix "num_steps = 0" error on ALC256
        ALSA: usb-audio: Fix audio output on Roland SC-D70 sound module
        ALSA: hda - add AZX_DCAPS_I915_POWERWELL to Baytrail
        ALSA: hda - only sync BCLK to the display clock for Haswell & Broadwell
        ALSA: hda - Mute headphone pin on suspend on XPS13 9333
        sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND)
        ALSA: asound.h - use SNDRV_CTL_ELEM_ID_NAME_MAXLEN
        ALSA: hda - potential (but unlikely) uninitialized variable
        ALSA: hda - Fix regression for slave SPDIF setups
        ALSA: intel8x0: Check pci_iomap() success for DEVICE_ALI
        ALSA: hda - simplify azx_has_pm_runtime

  commit c6668726d2c2c581e6c417448c472c994d026f5f
  Merge: 06b45f2 68d4cef
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 10:22:09 2015 -0700

      Merge branch 'for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

      Pull SCSI target updates from Nicholas Bellinger:
       "Lots of activity in target land the last months.

        The highlights include:

         - Convert fabric drivers tree-wide to target_register_template() (hch
           + bart)

         - iser-target hardening fixes + v1.0 improvements (sagi)

         - Convert iscsi_thread_set usage to kthread.h + kill
           iscsi_target_tq.c (sagi + nab)

         - Add support for T10-PI WRITE_STRIP + READ_INSERT operation (mkp +
           sagi + nab)

         - DIF fixes for CONFIG_DEBUG_SG=y + UNMAP file emulation (akinobu +
           sagi + mkp)

         - Extended TCMU ABI v2 for future BIDI + DIF support (andy + ilias)

         - Fix COMPARE_AND_WRITE handling for NO_ALLLOC drivers (hch + nab)

        Thanks to everyone who contributed this round with new features,
        bug-reports, fixes, cleanups and improvements.

        Looking forward, it's currently shaping up to be a busy v4.2 as well"

      * 'for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (69 commits)
        target: Put TCMU under a new config option
        target: Version 2 of TCMU ABI
        target: fix tcm_mod_builder.py
        target/file: Fix UNMAP with DIF protection support
        target/file: Fix SG table for prot_buf initialization
        target/file: Fix BUG() when CONFIG_DEBUG_SG=y and DIF protection enabled
        target: Make core_tmr_abort_task() skip TMFs
        target/sbc: Update sbc_dif_generate pr_debug output
        target/sbc: Make internal DIF emulation honor ->prot_checks
        target/sbc: Return INVALID_CDB_FIELD if DIF + sess_prot_type disabled
        target: Ensure sess_prot_type is saved across session restart
        target/rd: Don't pass incomplete scatterlist entries to sbc_dif_verify_*
        target: Remove the unused flag SCF_ACK_KREF
        target: Fix two sparse warnings
        target: Fix COMPARE_AND_WRITE with SG_TO_MEM_NOALLOC handling
        target: simplify the target template registration API
        target: simplify target_xcopy_init_pt_lun
        target: remove the unused SCF_CMD_XCOPY_PASSTHROUGH flag
        target/rd: reduce code duplication in rd_execute_rw()
        tcm_loop: fixup tpgt string to integer conversion
        ...

  commit 06b45f2aa703837163496f5db6a53575665cc6b4
  Merge: b3f4ef0 c264f11
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 10:11:24 2015 -0700

      Merge tag 'pwm/for-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

      Pull pwm changes from Thierry Reding:
       "Not much has been happening in PWM land lately, so this contains
        mostly minor fixes that didn't seem urgent enough for a late
        pull-request last cycle"

      * tag 'pwm/for-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: Remove __init initializer for pwm_add_table()
        pwm: samsung: Fix output race on disabling
        pwm: mxs: Fix period divider computation
        pwm: atmel-hlcdc: Add errata handling for sama5d4
        pwm: pca9685: Constify struct regmap_config
        pwm: imx-pwm: add explicit compatible strings and required clock 
properties

  commit b3f4ef0bf21da37e4dfc1cdfa0288ba39186fb56
  Merge: d6a4c0e 72449cb
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 10:05:39 2015 -0700

      Merge tag 'dma-buf-for-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf

      Pull dma-buf updates from Sumit Semwal:
       "Minor cleanup only; this could've gone in for the 4.0 merge window,
        but for a copy-paste stupidity from me.

        It has been in the for-next since then, and no issues reported.

         - cleanup of dma_buf_export()

         - correction of copy-paste stupidity while doing the cleanup"

      * tag 'dma-buf-for-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
        staging: android: ion: fix wrong init of dma_buf_export_info
        dma-buf: cleanup dma_buf_export() to make it easily extensible

  commit d6a4c0e5d3d433ef296f8f417e835329a834a256
  Merge: 474095e cdde0e6
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 09:49:37 2015 -0700

      Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

      Pull slave-dmaengine updates from Vinod Koul:

       - new drivers for:
              - Ingenic JZ4780 controller
              - APM X-Gene controller
              - Freescale RaidEngine device
              - Renesas USB Controller

        - remove device_alloc_chan_resources dummy handlers

        - sh driver cleanups for peri peri and related emmc and asoc patches
          as well

        - fixes and enhancements spread over the drivers

      * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (59 
commits)
        dmaengine: dw: don't prompt for DW_DMAC_CORE
        dmaengine: shdmac: avoid unused variable warnings
        dmaengine: fix platform_no_drv_owner.cocci warnings
        dmaengine: pch_dma: fix memory leak on failure path in pch_dma_probe()
        dmaengine: at_xdmac: unlock spin lock before return
        dmaengine: xgene: devm_ioremap() returns NULL on error
        dmaengine: xgene: buffer overflow in xgene_dma_init_channels()
        dmaengine: usb-dmac: Fix dereferencing freed memory 'desc'
        dmaengine: sa11x0: report slave capabilities to upper layers
        dmaengine: vdma: Fix compilation warnings
        dmaengine: fsl_raid: statify fsl_re_chan_probe
        dmaengine: Driver support for FSL RaidEngine device.
        dmaengine: xgene_dma_init_ring_mngr() can be static
        Documentation: dma: Add documentation for the APM X-Gene SoC DMA device 
DTS binding
        arm64: dts: Add APM X-Gene SoC DMA device and DMA clock DTS nodes
        dmaengine: Add support for APM X-Gene SoC DMA engine driver
        dmaengine: usb-dmac: Add Renesas USB DMA Controller (USB-DMAC) driver
        dmaengine: renesas,usb-dmac: Add device tree bindings documentation
        dmaengine: edma: fixed wrongly initialized data parameter to the edma 
callback
        dmaengine: ste_dma40: fix implicit conversion
        ...

  commit 474095e46cd14421821da3201a9fd6a4c070996b
  Merge: d56a669 9ffc8f7
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 09:28:01 2015 -0700

      Merge tag 'md/4.1' of git://neil.brown.name/md

      Pull md updates from Neil Brown:
       "More updates that usual this time.  A few have performance impacts
        which hould mostly be positive, but RAID5 (in particular) can be very
        work-load ensitive...  We'll have to wait and see.

        Highlights:

         - "experimental" code for managing md/raid1 across a cluster using
           DLM.  Code is not ready for general use and triggers a WARNING if
           used.  However it is looking good and mostly done and having in
           mainline will help co-ordinate development.

         - RAID5/6 can now batch multiple (4K wide) stripe_heads so as to
           handle a full (chunk wide) stripe as a single unit.

         - RAID6 can now perform read-modify-write cycles which should help
           performance on larger arrays: 6 or more devices.

         - RAID5/6 stripe cache now grows and shrinks dynamically.  The value
           set is used as a minimum.

         - Resync is now allowed to go a little faster than the 'mininum' when
           there is competing IO.  How much faster depends on the speed of the
           devices, so the effective minimum should scale with device speed to
           some extent"

      * tag 'md/4.1' of git://neil.brown.name/md: (58 commits)
        md/raid5: don't do chunk aligned read on degraded array.
        md/raid5: allow the stripe_cache to grow and shrink.
        md/raid5: change ->inactive_blocked to a bit-flag.
        md/raid5: move max_nr_stripes management into grow_one_stripe and 
drop_one_stripe
        md/raid5: pass gfp_t arg to grow_one_stripe()
        md/raid5: introduce configuration option rmw_level
        md/raid5: activate raid6 rmw feature
        md/raid6 algorithms: xor_syndrome() for SSE2
        md/raid6 algorithms: xor_syndrome() for generic int
        md/raid6 algorithms: improve test program
        md/raid6 algorithms: delta syndrome functions
        raid5: handle expansion/resync case with stripe batching
        raid5: handle io error of batch list
        RAID5: batch adjacent full stripe write
        raid5: track overwrite disk count
        raid5: add a new flag to track if a stripe can be batched
        raid5: use flex_array for scribble data
        md raid0: access mddev->queue (request queue member) conditionally 
because it is not set when accessed from dm-raid
        md: allow resync to go faster when there is competing IO.
        md: remove 'go_faster' option from ->sync_request()
        ...

  commit 2d6c9091ab7630dfcf34417c6683ce4764d7d40a
  Author: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 13:06:54 2015 -0400

      net: mdio-gpio: support access that may sleep

      Some systems using mdio-gpio may use gpio on message based busses, which
      require sleeping (e.g. gpio from an I2C I/O expander).

      Since this driver does not use IRQ handler, it is safe to use the
      _cansleep suffixed gpio accessors.

      Signed-off-by: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 410ceb8f2f1d4edeb02d229ef192e76602005b8b
  Author: Namhyung Kim <namhyung@xxxxxxxxxx>
  Date:   Fri Apr 24 10:45:16 2015 +0900

      tools lib traceevent: Fix build failure on 32-bit arch

      In my i386 build, it failed like this:

          CC       event-parse.o
        event-parse.c: In function 'print_str_arg':
        event-parse.c:3868:5: warning: format '%lu' expects argument of type 
'long unsigned int',
                              but argument 3 has type 'uint64_t' [-Wformat]

      Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
      Acked-by: Javi Merino <javi.merino@xxxxxxx>
      Link: http://lkml.kernel.org/r/20150424020218.GF1905@sejong
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit d56a669ca59c37ed0a7282a251b2f2f22533343a
  Merge: 836ee48 04fca0e
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 08:46:18 2015 -0700

      Merge tag 'devicetree-for-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

      Pull second batch of devicetree updates from Rob Herring:
       "As Grant mentioned in the first devicetree pull request, here is the
        2nd batch of DT changes for 4.1.  The main remaining item here is the
        endianness bindings and related 8250 driver support.

         - DT endianness specification bindings

         - big-endian 8250 serial support

         - DT overlay unittest updates

         - various DT doc updates

         - compile fixes for OF_IRQ=n"

      * tag 'devicetree-for-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        frv: add io{read,write}{16,32}be functions
        mn10300: add io{read,write}{16,32}be functions
        Documentation: DT bindings: add doc for Altera's SoCFPGA platform
        of: base: improve of_get_next_child() kernel-doc
        Doc: dt: arch_timer: discourage clock-frequency use
        of: unittest: overlay: Keep track of created overlays
        of/fdt: fix allocation size for device node path
        serial: of_serial: Support big-endian register accesses
        serial: 8250: Add support for big-endian MMIO accesses
        of: Document {little,big,native}-endian bindings
        of/fdt: Add endianness helper function for early init code
        of: Add helper function to check MMIO register endianness
        of/fdt: Remove "reg" data prints from early_init_dt_scan_memory
        of: add vendor prefix for Artesyn
        of: Add dummy of_irq_to_resource_table() for IRQ_OF=n
        of: OF_IRQ should depend on IRQ_DOMAIN

  commit 4ad1f4300e3bddf63109aa63cfb2d37e8585ecc7
  Author: David Ahern <david.ahern@xxxxxxxxxx>
  Date:   Tue Apr 14 13:49:33 2015 -0400

      perf kmem: Fix compiles on RHEL6/OL6

      0d68bc92c48 breaks compiles on RHEL6/OL6:
          cc1: warnings being treated as errors
          builtin-kmem.c: In function â??search_page_alloc_statâ??:
          builtin-kmem.c:322: error: declaration of â??statâ?? shadows a global 
declaration
                                  node = &parent->rb_left;
          /usr/include/sys/stat.h:455: error: shadowed declaration is here
          builtin-kmem.c: In function 
â??perf_evsel__process_page_alloc_eventâ??:
          builtin-kmem.c:378: error: declaration of â??statâ?? shadows a global 
declaration
          /usr/include/sys/stat.h:455: error: shadowed declaration is here
          builtin-kmem.c: In function â??perf_evsel__process_page_free_eventâ??:
          builtin-kmem.c:431: error: declaration of â??statâ?? shadows a global 
declaration
          /usr/include/sys/stat.h:455: error: shadowed declaration is here

      Rename local variable to pstat to avoid the name conflict.

      Signed-off-by: David Ahern <david.ahern@xxxxxxxxxx>
      Link: 
http://lkml.kernel.org/r/1429033773-31383-1-git-send-email-david.ahern@xxxxxxxxxx
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit b357a364c57c940ddb932224542494363df37378
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Thu Apr 23 18:03:44 2015 -0700

      inet: fix possible panic in reqsk_queue_unlink()

      [ 3897.923145] BUG: unable to handle kernel NULL pointer dereference at
       0000000000000080
      [ 3897.931025] IP: [<ffffffffa9f27686>] reqsk_timer_handler+0x1a6/0x243

      There is a race when reqsk_timer_handler() and tcp_check_req() call
      inet_csk_reqsk_queue_unlink() on the same req at the same time.

      Before commit fa76ce7328b2 ("inet: get rid of central tcp/dccp listener
      timer"), listener spinlock was held and race could not happen.

      To solve this bug, we change reqsk_queue_unlink() to not assume req
      must be found, and we return a status, to conditionally release a
      refcount on the request sock.

      This also means tcp_check_req() in non fastopen case might or not
      consume req refcount, so tcp_v6_hnd_req() & tcp_v4_hnd_req() have
      to properly handle this.

      (Same remark for dccp_check_req() and its callers)

      inet_csk_reqsk_queue_drop() is now too big to be inlined, as it is
      called 4 times in tcp and 3 times in dccp.

      Fixes: fa76ce7328b2 ("inet: get rid of central tcp/dccp listener timer")
      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Reported-by: Yuchung Cheng <ycheng@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 1d8dc3d3c8f1d8ee1da9d54c5d7c8694419ade42
  Author: Johannes Berg <johannes.berg@xxxxxxxxx>
  Date:   Thu Apr 23 16:38:43 2015 +0200

      rhashtable: don't attempt to grow when at max_size

      The conversion of mac80211's station table to rhashtable had a bug
      that I found by accident in code review, that hadn't been found as
      rhashtable apparently managed to have a maximum hash chain length
      of one (!) in all our testing.

      In order to test the bug and verify the fix I set my rhashtable's
      max_size very low (4) in order to force getting hash collisions.

      At that point, rhashtable WARNed in rhashtable_insert_rehash() but
      didn't actually reject the hash table insertion. This caused it to
      lose insertions - my master list of stations would have 9 entries,
      but the rhashtable only had 5. This may warrant a deeper look, but
      that WARN_ON() just shouldn't happen.

      Fix this by not returning true from rht_grow_above_100() when the
      rhashtable's max_size has been reached - in this case the user is
      explicitly configuring it to be at most that big, so even if it's
      now above 100% it shouldn't attempt to resize.

      This fixes the "lost insertion" issue and consequently allows my
      code to display its error (and verify my fix for it.)

      Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
      Acked-by: Thomas Graf <tgraf@xxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit e580267df97eda407c525dbaee5430e0d51a0edb
  Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
  Date:   Thu Apr 23 20:56:29 2015 +0200

      bgmac: fix requests for extra polling calls from NAPI

      After d75b1ade567f ("net: less interrupt masking in NAPI") polling
      function has to return whole budget when it wants NAPI to call it again.

      Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
      Cc: Felix Fietkau <nbd@xxxxxxxxxxx>
      Fixes: eb64e2923a886 ("bgmac: leave interrupts disabled as long as there 
is work to do")
      Acked-by: Felix Fietkau <nbd@xxxxxxxxxxx>
      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 836ee4874e201a5907f9658fb2bf3527dd952d30
  Merge: fb65d87 7676fa7
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 08:23:45 2015 -0700

      Merge tag 'arm64-upstream' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

      Pull initial ACPI support for arm64 from Will Deacon:
       "This series introduces preliminary ACPI 5.1 support to the arm64
        kernel using the "hardware reduced" profile.  We don't support any
        peripherals yet, so it's fairly limited in scope:

         - MEMORY init (UEFI)

         - ACPI discovery (RSDP via UEFI)

         - CPU init (FADT)

         - GIC init (MADT)

         - SMP boot (MADT + PSCI)

         - ACPI Kconfig options (dependent on EXPERT)

        ACPI for arm64 has been in development for a while now and hardware
        has been available that can boot with either FDT or ACPI tables.  This
        has been made possible by both changes to the ACPI spec to cater for
        ARM-based machines (known as "hardware-reduced" in ACPI parlance) but
        also a Linaro-driven effort to get this supported on top of the Linux
        kernel.  This pull request is the result of that work.

        These changes allow us to initialise the CPUs, interrupt controller,
        and timers via ACPI tables, with memory information and cmdline coming
        from EFI.  We don't support a hybrid ACPI/FDT scheme.  Of course,
        there is still plenty of work to do (a serial console would be nice!)
        but I expect that to happen on a per-driver basis after this core
        series has been merged.

        Anyway, the diff stat here is fairly horrible, but splitting this up
        and merging it via all the different subsystems would have been
        extremely painful.  Instead, we've got all the relevant Acks in place
        and I've not seen anything other than trivial (Kconfig) conflicts in
        -next (for completeness, I've included my resolution below).  Nearly
        half of the insertions fall under Documentation/.

        So, we'll see how this goes.  Right now, it all depends on EXPERT and
        I fully expect people to use FDT by default for the immediate future"

      * tag 'arm64-upstream' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (31 commits)
        ARM64 / ACPI: make acpi_map_gic_cpu_interface() as void function
        ARM64 / ACPI: Ignore the return error value of 
acpi_map_gic_cpu_interface()
        ARM64 / ACPI: fix usage of acpi_map_gic_cpu_interface
        ARM64: kernel: acpi: honour acpi=force command line parameter
        ARM64: kernel: acpi: refactor ACPI tables init and checks
        ARM64: kernel: psci: let ACPI probe PSCI version
        ARM64: kernel: psci: factor out probe function
        ACPI: move arm64 GSI IRQ model to generic GSI IRQ layer
        ARM64 / ACPI: Don't unflatten device tree if acpi=force is passed
        ARM64 / ACPI: additions of ACPI documentation for arm64
        Documentation: ACPI for ARM64
        ARM64 / ACPI: Enable ARM64 in Kconfig
        XEN / ACPI: Make XEN ACPI depend on X86
        ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on 
ARM64
        clocksource / arch_timer: Parse GTDT to initialize arch timer
        irqchip: Add GICv2 specific ACPI boot support
        ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi
        ACPI / processor: Make it possible to get CPU hardware ID via GICC
        ACPI / processor: Introduce phys_cpuid_t for CPU hardware ID
        ARM64 / ACPI: Parse MADT for SMP initialization
        ...

  commit fb65d872d7a8dc629837a49513911d0281577bfd
  Merge: 05f0c55 6b7acae
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 08:10:53 2015 -0700

      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

      Pull ARM fixes from Russell King:
       "A few fixes for the recently merged development updates:

         - the update to convert a code branch in the procinfo structure
           forgot to update the nommu code.

         - VDSO only supported for V7 CPUs and later.

         - VDSO build creates files which should be ignored by git but are not.

         - ensure that make arch/arm/vdso/ doesn't build if it isn't enabled"

      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile
        ARM: 8343/1: VDSO: add build artifacts to .gitignore
        ARM: Fix nommu booting
        ARM: 8342/1: VDSO: depend on CPU_V7

  commit 845704a535e9b3c76448f52af1b70e4422ea03fd
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Thu Apr 23 10:42:39 2015 -0700

      tcp: avoid looping in tcp_send_fin()

      Presence of an unbound loop in tcp_send_fin() had always been hard
      to explain when analyzing crash dumps involving gigantic dying processes
      with millions of sockets.

      Lets try a different strategy :

      In case of memory pressure, try to add the FIN flag to last packet
      in write queue, even if packet was already sent. TCP stack will
      be able to deliver this FIN after a timeout event. Note that this
      FIN being delivered by a retransmit, it also carries a Push flag
      given our current implementation.

      By checking sk_under_memory_pressure(), we anticipate that cooking
      many FIN packets might deplete tcp memory.

      In the case we could not allocate a packet, even with __GFP_WAIT
      allocation, then not sending a FIN seems quite reasonable if it allows
      to get rid of this socket, free memory, and not block the process from
      eventually doing other useful work.

      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 05f0c553e2155b93a9b4edb96898458762bda867
  Merge: 668b54a 1a70db49
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 07:59:07 2015 -0700

      Merge tag 'nios2-v4.1-rc1' of 
git://git.rocketboards.org/linux-socfpga-next

      Pull arch/nios2 updates from Ley Foon Tan:

       - update cache management code

       - rework trap handler with new define trap #.

       - fix on check header warning.

      * tag 'nios2-v4.1-rc1' of git://git.rocketboards.org/linux-socfpga-next:
        nios2: rework cache
        nios2: Add types.h header required for __u32 type
        nios2: rework trap handler
        nios2: remove end address checking for initda

  commit 668b54a1c2c25bde34cd9c077b1c5f03b46bcb49
  Merge: fab1e55 d91e14b
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 07:58:07 2015 -0700

      Merge tag 'blackfin-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux

      Pull blackfin updates from Steven Miao.

      * tag 'blackfin-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
        eth: bf609 eth clock: add pclk clock for stmmac driver probe
        blackfin: Wire up missing syscalls
        arch: blackfin: kernel: kgdb: Remove unused function
        dma: fix build error after update to v3.19
        blackfin: io: define __raw_readx/writex with bfin_readx/writex
        bf609: add resources for lcd nl8048
        pm: sometimes wake up from suspend to RAM would fail
        debug-mmrs: Eliminate all traces of the USB_PHY_TEST MMR
        bf609: remove softswitch i2c configuration from adv7842 and adv7511 
platform data
        bf609: add platform data for soft switch devices on the video extenders
        bf609: enable soft switch gpio driver by default
        bf609: add gpio soft switch platform data for mcp23017 i2c devices
        bf609: use new SND_BF6XX_PCM to choose audio pcm driver
        bug[220] kgdb: change the smp cross core function entry
        arch: blackfin: kernel: setup.c: Cleaning up missing null-terminate in 
conjunction with strncpy
        blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR 
for BF537-STAMP

  commit fab1e5502cf5719669c96c6f240e8eb963abfe6b
  Merge: c76397e 40346a0
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 07:56:50 2015 -0700

      Merge tag 'metag-for-v4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

      Pull Metag architecture updates from James Hogan:
       "Just the one change for v4.1-rc1.  A minor cleanup of copy_thread()"

      * tag 'metag-for-v4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
        metag: copy_thread(): rename 'arg' argument to 'kthread_arg'

  commit c76397e9303f2c9ac3c2b9d94834ff241d2b2bd4
  Merge: 860448c d8f6ad8
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 07:55:54 2015 -0700

      Merge tag 'arc-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

      Pull ARC updates from Vineet Gupta:

       - perf fixes/improvements

       - misc cleanups

      * tag 'arc-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: perf: don't add code for impossible case
        ARC: perf: Rename DT binding to not confuse with power mgmt
        ARC: perf: add user space attribution in callchains
        ARC: perf: Add kernel callchain support
        ARC: perf: support cache hit/miss ratio
        ARC: perf: Add some comments/debug stuff
        ARC: perf: make @arc_pmu static global
        ARC: mem init spring cleaning - No functional changes
        ARC: Fix RTT boot printing
        ARC: fold __builtin_constant_p() into test_bit()
        ARC: rename unhandled exception handler
        ARC: cosmetic: Remove unused ECR bitfield masks
        ARC: Fix WRITE_BCR
        ARC: [nsimosci] Update defconfig
        arc: copy_thread(): rename 'arg' argument to 'kthread_arg'

  commit 860448cf76c0878b83d3cf343a0436188b396b8e
  Merge: ba0e4ae bff1752
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 07:46:05 2015 -0700

      Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux

      Pull nfsd updates from Bruce Fields:
       "A quiet cycle this time; this is basically entirely bugfixes.

        The few that aren't cc'd to stable are cleanup or seemed unlikely to
        affect anyone much"

      * 'for-4.1' of git://linux-nfs.org/~bfields/linux:
        uapi: Remove kernel internal declaration
        nfsd: fix nsfd startup race triggering BUG_ON
        nfsd: eliminate NFSD_DEBUG
        nfsd4: fix READ permission checking
        nfsd4: disallow SEEK with special stateids
        nfsd4: disallow ALLOCATE with special stateids
        nfsd: add NFSEXP_PNFS to the exflags array
        nfsd: Remove duplicate macro define for max sec label length
        nfsd: allow setting acls with unenforceable DENYs
        nfsd: NFSD_FAULT_INJECTION depends on DEBUG_FS
        nfsd: remove unused status arg to nfsd4_cleanup_open_state
        nfsd: remove bogus setting of status in nfsd4_process_open2
        NFSD: Use correct reply size calculating function
        NFSD: Using path_equal() for checking two paths

  commit ba0e4ae88f0f71b42ad8734e0c371d321554f13b
  Merge: 1aef882 e082f56
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 07:40:02 2015 -0700

      Merge branch 'for-linus-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

      Pull btrfs updates from Chris Mason:
       "I've been running these through a longer set of load tests because my
        commits change the free space cache writeout.  It fixes commit stalls
        on large filesystems (~20T space used and up) that we have been
        triggering here.  We were seeing new writers blocked for 10 seconds or
        more during commits, which is far from good.

        Josef and I fixed up ENOSPC aborts when deleting huge files (3T or
        more), that are triggered because our metadata reservations were not
        properly accounting for crcs and were not replenishing during the
        truncate.

        Also in this series, a number of qgroup fixes from Fujitsu and Dave
        Sterba collected most of the pending cleanups from the list"

      * 'for-linus-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (93 commits)
        btrfs: quota: Update quota tree after qgroup relationship change.
        btrfs: quota: Automatically update related qgroups or mark INCONSISTENT 
flags when assigning/deleting a qgroup relations.
        btrfs: qgroup: clear STATUS_FLAG_ON in disabling quota.
        btrfs: Update btrfs qgroup status item when rescan is done.
        btrfs: qgroup: Fix dead judgement on qgroup_rescan_leaf() return value.
        btrfs: Don't allow subvolid >= (1 << BTRFS_QGROUP_LEVEL_SHIFT) to be 
created
        btrfs: Check qgroup level in kernel qgroup assign.
        btrfs: qgroup: allow to remove qgroup which has parent but no child.
        btrfs: qgroup: return EINVAL if level of parent is not higher than 
child's.
        btrfs: qgroup: do a reservation in a higher level.
        Btrfs: qgroup, Account data space in more proper timings.
        Btrfs: qgroup: Introduce a may_use to account space_info->bytes_may_use.
        Btrfs: qgroup: free reserved in exceeding quota.
        Btrfs: qgroup: cleanup, remove an unsued parameter in 
btrfs_create_qgroup().
        btrfs: qgroup: fix limit args override whole limit struct
        btrfs: qgroup: update limit info in function btrfs_run_qgroups().
        btrfs: qgroup: consolidate the parameter of fucntion 
update_qgroup_limit_item().
        btrfs: qgroup: update qgroup in memory at the same time when we update 
it in btree.
        btrfs: qgroup: inherit limit info from srcgroup in creating snapshot.
        btrfs: Support busy loop of write and delete
        ...

  commit 1aef882f023eb7c24d6d77f001bd0ba956fdd861
  Merge: d869844 542c311
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 07:08:41 2015 -0700

      Merge tag 'xfs-for-linus-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs

      Pull xfs update from Dave Chinner:
       "This update contains:

         - RENAME_WHITEOUT support

         - conversion of per-cpu superblock accounting to use generic counters

         - new inode mmap lock so that we can lock page faults out of
           truncate, hole punch and other direct extent manipulation functions
           to avoid racing mmap writes from causing data corruption

         - rework of direct IO submission and completion to solve data
           corruption issue when running concurrent extending DIO writes.
           Also solves problem of running IO completion transactions in
           interrupt context during size extending AIO writes.

         - FALLOC_FL_INSERT_RANGE support for inserting holes into a file via
           direct extent manipulation to avoid needing to copy data within the
           file

         - attribute block header field overflow fix for 64k block size
           filesystems

         - Lots of changes to log messaging to be more informative and concise
           when errors occur.  Also prevent a lot of unnecessary log spamming
           due to cascading failures in error conditions.

         - lots of cleanups and bug fixes

        One thing of note is the direct IO fixes that we merged last week
        after the window opened.  Even though a little late, they fix a user
        reported data corruption and have been pretty well tested.  I figured
        there was not much point waiting another 2 weeks for -rc1 to be
        released just so I could send them to you..."

      * tag 'xfs-for-linus-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (49 commits)
        xfs: using generic_file_direct_write() is unnecessary
        xfs: direct IO EOF zeroing needs to drain AIO
        xfs: DIO write completion size updates race
        xfs: DIO writes within EOF don't need an ioend
        xfs: handle DIO overwrite EOF update completion correctly
        xfs: DIO needs an ioend for writes
        xfs: move DIO mapping size calculation
        xfs: factor DIO write mapping from get_blocks
        xfs: unlock i_mutex in xfs_break_layouts
        xfs: kill unnecessary firstused overflow check on attr3 leaf removal
        xfs: use larger in-core attr firstused field and detect overflow
        xfs: pass attr geometry to attr leaf header conversion functions
        xfs: disallow ro->rw remount on norecovery mount
        xfs: xfs_shift_file_space can be static
        xfs: Add support FALLOC_FL_INSERT_RANGE for fallocate
        fs: Add support FALLOC_FL_INSERT_RANGE for fallocate
        xfs: Fix incorrect positive ENOMEM return
        xfs: xfs_mru_cache_insert() should use GFP_NOFS
        xfs: %pF is only for function pointers
        xfs: fix shadow warning in xfs_da3_root_split()
        ...

  commit d869844bd081081bf537e806a44811884230643e
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 23 08:33:59 2015 -0700

      x86: fix special __probe_kernel_write() tail zeroing case

      Commit cae2a173fe94 ("x86: clean up/fix 'copy_in_user()' tail zeroing")
      fixed the failure case tail zeroing of one special case of the x86-64
      generic user-copy routine, namely when used for the user-to-user case
      ("copy_in_user()").

      But in the process it broke an even more unusual case: using the user
      copy routine for kernel-to-kernel copying.

      Now, normally kernel-kernel copies are obviously done using memcpy(),
      but we have a couple of special cases when we use the user-copy
      functions.  One is when we pass a kernel buffer to a regular user-buffer
      routine, using set_fs(KERNEL_DS).  That's a "normal" case, and continued
      to work fine, because it never takes any faults (with the possible
      exception of a silent and successful vmalloc fault).

      But Jan Beulich pointed out another, very unusual, special case: when we
      use the user-copy routines not because it's a path that expects a user
      pointer, but for a couple of ftrace/kgdb cases that want to do a kernel
      copy, but do so using "unsafe" buffers, and use the user-copy routine to
      gracefully handle faults.  IOW, for probe_kernel_write().

      And that broke for the case of a faulting kernel destination, because we
      saw the kernel destination and wanted to try to clear the tail of the
      buffer.  Which doesn't work, since that's what faults.

      This only triggers for things like kgdb and ftrace users (eg trying
      setting a breakpoint on read-only memory), but it's definitely a bug.
      The fix is to not compare against the kernel address start (TASK_SIZE),
      but instead use the same limits "access_ok()" uses.

      Reported-and-tested-by: Jan Beulich <jbeulich@xxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx # 4.0
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 73ee39a4c944a11cfd6d43ba1f634da340bf5537
  Author: Christophe Leroy <christophe.leroy@xxxxxx>
  Date:   Thu Apr 23 14:11:47 2015 +0200

      spi: fsl-spi: fix devm_ioremap_resource() error case

      devm_ioremap_resource() doesn't return NULL but an ERR_PTR on error.

      Reported-by: Jonas Gorsky <jogo@xxxxxxxxxxx>
      Signed-off-by: Christophe Leroy <christophe.leroy@xxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit 50574dd2f63ed0afc3b666da27eb7062d26a39c5
  Author: Haikun Wang <haikun.wang@xxxxxxxxxxxxx>
  Date:   Fri Apr 24 18:41:17 2015 +0800

      spi: Kconfig: Add SOC_LS1021A to SPI_FSL_DSPI dependence

      LS1021A chip also has the DSPI module.
      Add it to the dependence.

      Signed-off-by: Haikun Wang <haikun.wang@xxxxxxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit 8c98ebd7a6ff6ef352bb4c5516a8849b40b5ef6b
  Author: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
  Date:   Thu Apr 23 20:03:58 2015 +0200

      crypto: img-hash - CRYPTO_DEV_IMGTEC_HASH should depend on HAS_DMA

      If NO_DMA=y:

          drivers/built-in.o: In function `img_hash_write_via_dma_stop':
          img-hash.c:(.text+0xa2b822): undefined reference to `dma_unmap_sg'
          drivers/built-in.o: In function `img_hash_xmit_dma':
          img-hash.c:(.text+0xa2b8d8): undefined reference to `dma_map_sg'
          img-hash.c:(.text+0xa2b948): undefined reference to `dma_unmap_sg'

      Also move the "depends" section below the "tristate" line while we're at
      it.

      Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
      Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>

  commit 00425bb181c204c8f250fec122e2817a930e0286
  Author: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
  Date:   Fri Apr 24 08:37:09 2015 +0200

      crypto: x86/sha512_ssse3 - fixup for asm function prototype change

      Patch e68410ebf626 ("crypto: x86/sha512_ssse3 - move SHA-384/512
      SSSE3 implementation to base layer") changed the prototypes of the
      core asm SHA-512 implementations so that they are compatible with
      the prototype used by the base layer.

      However, in one instance, the register that was used for passing the
      input buffer was reused as a scratch register later on in the code,
      and since the input buffer param changed places with the digest param
      -which needs to be written back before the function returns- this
      resulted in the scratch register to be dereferenced in a memory write
      operation, causing a GPF.

      Fix this by changing the scratch register to use the same register as
      the input buffer param again.

      Fixes: e68410ebf626 ("crypto: x86/sha512_ssse3 - move SHA-384/512 SSSE3 
implementation to base layer")
      Reported-By: Bobby Powers <bobbypowers@xxxxxxxxx>
      Tested-By: Bobby Powers <bobbypowers@xxxxxxxxx>
      Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
      Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>

  commit 5a1b11cbccda7680b6859a4648f7af16f30e79b4
  Merge: 334c40b 8844d0f 145367b 7d0ec8b 575bec5 c5a06e7
  Author: Mark Brown <broonie@xxxxxxxxxx>
  Date:   Fri Apr 24 11:10:46 2015 +0100

      Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm2835-code', 
'spi/fix/bitbang', 'spi/fix/fsl-cpm' and 'spi/fix/omap2-mcspi' into spi-linus

  commit 334c40b17f0cc3de114197fa2cd75f89e3387d22
  Merge: 39a8804 f8bb820
  Author: Mark Brown <broonie@xxxxxxxxxx>
  Date:   Fri Apr 24 11:10:45 2015 +0100

      Merge remote-tracking branch 'spi/fix/core' into spi-linus

  commit 3168c201f7ca333d12f80f8d98bbbe3a33746f8b
  Author: Fang, Yang A <yang.a.fang@xxxxxxxxx>
  Date:   Thu Apr 23 16:35:17 2015 -0700

      ASoC: rt5645: Add ACPI match ID

      This patch adds the ACPI match ID for rt5645/5650 codec

      Signed-off-by: Fang, Yang A <yang.a.fang@xxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit 74d6ea52aeef0236242221c6eff6d892565c5a92
  Author: Bard Liao <bardliao@xxxxxxxxxxx>
  Date:   Fri Apr 24 15:19:29 2015 +0800

      ASoC: rt5677: add register patch for PLL

      The PLL output will be unstable in some cases. We can fix it by
      setting some registers.

      Signed-off-by: Bard Liao <bardliao@xxxxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit c5a06e75f38376238db6a38240bac4b27dfe5216
  Author: Fionn Cleary <clearyf@xxxxxx>
  Date:   Thu Apr 23 21:13:40 2015 +0200

      spi/omap2-mcpsi: Always call spi_finalize_current_message()

      The spi queue waits forever for spi_finalize_current_message() to be
      called, blocking the bus.  Ensure that all error paths from
      omap2_mcspi_transfer_one_message() call spi_finalize_current_message().

      Signed-off-by: Fionn Cleary <fionn.cleary@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit caf22d311a35d1c0c2c73e1f0988276d51175c8f
  Author: Johannes Berg <johannes.berg@xxxxxxxxx>
  Date:   Fri Apr 24 11:10:10 2015 +0200

      mac80211: enable hash table shrinking

      The hashtable behaviour change was merged into the tree
      at about the same time as the mac80211 use of rhashtable,
      but of course these don't really conflict in the normal
      sense. Enable hash table shrinking now.

      Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>

  commit 1a70db49a735350f221959bf26e9a12f63a743bc
  Author: Ley Foon Tan <lftan@xxxxxxxxxx>
  Date:   Fri Apr 24 14:18:55 2015 +0800

      nios2: rework cache

      - flush dcache before flush instruction cache
      - remork update_mmu_cache and flush_dcache_page
      - add shmparam.h

      Signed-off-by: Ley Foon Tan <lftan@xxxxxxxxxx>

  commit 2009337e30cdae64405ea7b8fa1578b921508871
  Author: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 24 14:48:35 2015 +0800

      nios2: Add types.h header required for __u32 type

      Reported by the header checker (CONFIG_HEADERS_CHECK=y):

        CHECK   usr/include/asm/ (31 files)
      ./usr/include/asm/ptrace.h:77: found __[us]{8,16,32,64} type without 
#include <linux/types.h>

      Signed-off-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxxxxxxxxx>
      Acked-by: Ley Foon Tan <lftan@xxxxxxxxxx>

  commit e8191a8e475551b277d85cd76c3f0f52fdf42e86
  Author: Hui Wang <hui.wang@xxxxxxxxxxxxx>
  Date:   Fri Apr 24 13:39:59 2015 +0800

      ALSA: hda - fix headset mic detection problem for one more machine

      We have two machines with alc256 codec in the pin quirk table, so
      moving the common pins to ALC256_STANDARD_PINS.

      Cc: stable@xxxxxxxxxxxxxxx
      BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1447909
      Signed-off-by: Hui Wang <hui.wang@xxxxxxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1
  Author: Steven Miao <realmz6@xxxxxxxxx>
  Date:   Fri Apr 24 11:39:08 2015 +0800

      eth: bf609 eth clock: add pclk clock for stmmac driver probe

      Signed-off-by: Steven Miao <realmz6@xxxxxxxxx>

  commit 4f650a5966038f439c5f8d7d85dcc6b3a77a4e7c
  Author: Chen Gang <xili_gchen_5257@xxxxxxxxxxx>
  Date:   Mon Apr 13 22:02:58 2015 +0800

      blackfin: Wire up missing syscalls

      The related syscalls are below which may cause samples/kdbus building
      break in next-20150401 tree, the related information and error:

          CALL    scripts/checksyscalls.sh
        <stdin>:1223:2: warning: #warning syscall kcmp not implemented [-Wcpp]
        <stdin>:1226:2: warning: #warning syscall finit_module not implemented 
[-Wcpp]
        <stdin>:1229:2: warning: #warning syscall sched_setattr not implemented 
[-Wcpp]
        <stdin>:1232:2: warning: #warning syscall sched_getattr not implemented 
[-Wcpp]
        <stdin>:1235:2: warning: #warning syscall renameat2 not implemented 
[-Wcpp]
        <stdin>:1238:2: warning: #warning syscall seccomp not implemented 
[-Wcpp]
        <stdin>:1241:2: warning: #warning syscall getrandom not implemented 
[-Wcpp]
        <stdin>:1244:2: warning: #warning syscall memfd_create not implemented 
[-Wcpp]
        <stdin>:1247:2: warning: #warning syscall bpf not implemented [-Wcpp]
        <stdin>:1250:2: warning: #warning syscall execveat not implemented 
[-Wcpp]
        [...]
          HOSTCC  samples/kdbus/kdbus-workers
        samples/kdbus/kdbus-workers.c: In function â??prime_newâ??:
        samples/kdbus/kdbus-workers.c:930:18: error: â??__NR_memfd_createâ?? 
undeclared (first use in this function)
          p->fd = syscall(__NR_memfd_create, "prime-area", MFD_CLOEXEC);
                          ^
        samples/kdbus/kdbus-workers.c:930:18: note: each undeclared identifier 
is reported only once for each function it appears in

      Signed-off-by: Chen Gang <gang.chen.5i5j@xxxxxxxxx>

  commit 85db36cfb3de1422aeafb4e2ce83396333b744bb
  Author: Chris Mason <clm@xxxxxx>
  Date:   Thu Apr 23 08:02:49 2015 -0700

      Btrfs: fix inode cache writeout

      The code to fix stalls during free spache cache IO wasn't using
      the correct root when waiting on the IO for inode caches.  This
      is only a problem when the inode cache is enabled with

      mount -o inode_cache

      This fixes the inode cache writeout to preserve any error values and
      makes sure not to override the root when inode cache writeout is done.

      Reported-by: Filipe Manana <fdmanana@xxxxxxxx>
      Signed-off-by: Chris Mason <clm@xxxxxx>

  commit e0155a99b28f63e007c0c74076ad8ae486a3c9d3
  Merge: 2363ccb 78b9ae3 6b5eab5 7d28435
  Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
  Date:   Fri Apr 24 02:18:52 2015 +0200

      Merge branches 'acpi-dock', 'acpi-ec' and 'acpi-scan'

      * acpi-dock:
        MAINTAINERS: remove maintainship entry of docking station driver

      * acpi-ec:
        ACPI / EC: fix NULL pointer dereference in 
acpi_ec_remove_query_handler()

      * acpi-scan:
        ACPI / scan: Add a scan handler for PRP0001
        ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()

  commit 7d284352f9cbc032f2294024b1a6b5c06765c246
  Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
  Date:   Fri Apr 24 02:18:01 2015 +0200

      ACPI / scan: Add a scan handler for PRP0001

      If the special PRP0001 device ID is present in the given device's list
      of ACPI/PNP IDs and the device has a valid "compatible" property in
      the _DSD, it should be enumerated using the default mechanism,
      unless some scan handlers match the IDs preceding PRP0001 in the
      device's list of ACPI/PNP IDs.  In addition to that, no scan handlers
      matching the IDs following PRP0001 in that list should be attached
      to the device.

      To make that happen, define a scan handler that will match PRP0001
      and trigger the default enumeration for the matching devices if the
      "compatible" property is present for them.

      Since that requires the check for platform_id and device->handler
      to be removed from acpi_default_enumeration(), move the fallback
      invocation of acpi_default_enumeration() to acpi_bus_attach()
      (after it's checked if there's a matching ACPI driver for the
      device), which is a better place to call it, and do the platform_id
      check in there too (device->handler is guaranteed to be unset at
      the point where the function is looking for a matching ACPI driver).

      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
      Acked-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx>

  commit 4c533c801d1c9b5c38458a0e7516e0cf50643782
  Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
  Date:   Sat Apr 18 01:25:46 2015 +0200

      ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()

      acpi_scan_is_offline() may be called under the physical_node_lock
      lock of the given device object's parent, so prevent lockdep from
      complaining about that by annotating that instance with
      SINGLE_DEPTH_NESTING.

      Fixes: caa73ea158de (ACPI / hotplug / driver core: Handle containers in a 
special way)
      Reported-and-tested-by: Xie XiuQi <xiexiuqi@xxxxxxxxxx>
      Reviewed-by: Toshi Kani <toshi.kani@xxxxxx>
      Cc: 3.14+ <stable@xxxxxxxxxxxxxxx> # 3.14+
      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit b5f1c97f944482e98e6e39208af356630389d1ea
  Author: Imre Deak <imre.deak@xxxxxxxxx>
  Date:   Wed Apr 15 16:52:30 2015 -0700

      drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg

      Due this typo we don't save/restore the GFX_MAX_REQ_COUNT register across
      suspend/resume, so fix this.

      This was introduced in

      commit ddeea5b0c36f3665446518c609be91f9336ef674
      Author: Imre Deak <imre.deak@xxxxxxxxx>
      Date:   Mon May 5 15:19:56 2014 +0300

          drm/i915: vlv: add runtime PM support

      I noticed this only by reading the code. To my knowledge it shouldn't
      cause any real problems at the moment, since the power well backing this
      register remains on across a runtime s/r. This may change once
      system-wide s0ix functionality is enabled in the kernel.

      v2:
      - resend after a missing git add -u :/

      Cc: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
      Tested-By: PRC QA PRTS (Patch Regression Test System Contact: 
shuang.he@xxxxxxxxx)
      Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
      Reviewed-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxx>
      Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>

  commit 6b7acae74fc2ffe6cfd7592e95ca933cadb31219
  Merge: 4b2f883 0a9024e f80f653
  Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
  Date:   Thu Apr 23 21:05:16 2015 +0000

      Merge branches 'misc' and 'vdso' into for-next

  commit 53292cdb066950611e5bc2e0eb109c7edb42af78
  Author: Michel Thierry <michel.thierry@xxxxxxxxx>
  Date:   Wed Apr 15 18:11:33 2015 +0100

      drm/i915: Workaround to avoid lite restore with HEAD==TAIL

      WaIdleLiteRestore is an execlists-only workaround, and requires the driver
      to ensure that any context always has HEAD!=TAIL when attempting lite
      restore.

      Add two extra MI_NOOP instructions at the end of each request, but keep
      the requests tail pointing before the MI_NOOPs. We may not need to
      executed them, and this is why request->tail is sampled before adding
      these extra instructions.

      If we submit a context to the ELSP which has previously been submitted,
      move the tail pointer past the MI_NOOPs. This ensures HEAD!=TAIL.

      v2: Move overallocation to gen8_emit_request, and added note about
      sampling request->tail in commit message (Chris).

      v3: Remove redundant request->tail assignment in __i915_add_request, in
      lrc mode this is already set in execlists_context_queue.
      Do not add wa implementation details inside gem (Chris).

      v4: Apply the wa whenever the req has been resubmitted and update
      comment (Chris).

      Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
      Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Thomas Daniel <thomas.daniel@xxxxxxxxx>
      Signed-off-by: Michel Thierry <michel.thierry@xxxxxxxxx>
      Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>

  commit 9535c4757b881e06fae72a857485ad57c422b8d2
  Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
  Date:   Tue Apr 21 09:49:11 2015 -0700

      drm/i915: cope with large i2c transfers

      The hardware, according to the specs, is limited to 256 byte transfers,
      and current driver has no protections in case users attempt to do larger
      transfers. The code will just stomp over status register and mayhem
      ensues.

      Let's split larger transfers into digestable chunks. Doing this allows
      Atmel MXT driver on Pixel 1 function properly (it hasn't since commit
      9d8dc3e529a19e427fd379118acd132520935c5d "Input: atmel_mxt_ts -
      implement T44 message handling" which tries to consume multiple
      touchscreen/touchpad reports in a single transaction).

      Cc: stable@xxxxxxxxxxxxxxx
      Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
      Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>

  commit de28c15daf60e9625bece22f13a091fac8d05f1d
  Author: Bobby Powers <bobbypowers@xxxxxxxxx>
  Date:   Tue Apr 21 19:19:41 2015 -0400

      tools lib api: Undefine _FORTIFY_SOURCE before setting it

      Some toolchains (like Hardened Gentoo) define _FORTIFY_SOURCE in the
      built-in, default args.  This causes perf builds to fail with:

      <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
      <built-in>: note: this is the location of the previous definition cc1:
      all warnings being treated as errors

      To avoid this, undefine _FORTIFY_SOURCE before (possibly re-)defining it
      in tools/lib/api.

      v2 applies cleanly on top of already pulled kbuild changes for 4.1-rc1.

      Signed-off-by: Bobby Powers <bobbypowers@xxxxxxxxx>
      Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
      Cc: Dirk Gouders <dirk@xxxxxxxxxxx>
      Cc: Michal Marek <mmarek@xxxxxxx>
      Cc: Paul Mackerras <paulus@xxxxxxxxx>
      Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
      Cc: linux-kbuild@xxxxxxxxxxxxxxx
      Link: 
http://lkml.kernel.org/r/1429658381-3039-1-git-send-email-bobbypowers@xxxxxxxxx
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit 6145c259cd454bcb7a1288f7bbb7b4fbc18175dd
  Author: Will Deacon <will.deacon@xxxxxxx>
  Date:   Thu Apr 23 14:40:37 2015 +0100

      perf kmem: Consistently use PRIu64 for printing u64 values

      Building the perf tool for 32-bit ARM results in the following build
      error due to a combination of an incorrect conversion specifier and
      compiling with -Werror:

        builtin-kmem.c: In function â??print_page_summaryâ??:
        builtin-kmem.c:644:9: error: format â??%luâ?? expects argument of type 
â??long unsigned intâ??, but argument 3 has type â??u64â?? [-Werror=format=]
                 nr_alloc_freed, (total_alloc_freed_bytes) / 1024);
                 ^
        builtin-kmem.c:647:9: error: format â??%luâ?? expects argument of type 
â??long unsigned intâ??, but argument 3 has type â??u64â?? [-Werror=format=]
                 (total_page_alloc_bytes - total_alloc_freed_bytes) / 1024);
                 ^
        cc1: all warnings being treated as errors

      This patch fixes the problem by consistently using PRIu64 for printing
      out u64 values.

      Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
      Cc: David Ahern <dsahern@xxxxxxxxx>
      Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
      Cc: Joonsoo Kim <js1304@xxxxxxxxx>
      Cc: Minchan Kim <minchan@xxxxxxxxxx>
      Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
      Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
      Link: 
http://lkml.kernel.org/r/1429796437-1790-1-git-send-email-will.deacon@xxxxxxx
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit 02ac5421ddc634767c732f9b6a10a395a9ecfc4f
  Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
  Date:   Wed Apr 22 11:11:57 2015 -0300

      perf trace: Disable events and drain events when forked workload ends

      We were not checking in the inner event processing loop if the forked 
workload
      had finished, which, on a busy system, may make it take a long time 
trying to
      drain events, entering a seemingly neverending loop, waiting for the 
system to
      get idle enough to make it drain the buffers.

      Fix it by disabling the events when 'done' is true, in the inner loop, to 
start
      draining what is in the buffers.

      Now:

      [root@ssdandy ~]# time trace --filter-pids 14003 -a sleep 1 | tail
        996.748 ( 0.002 ms): sh/30296 rt_sigprocmask(how: SETMASK, nset: 
0x7ffc83418160, sigsetsize: 8) = 0
        996.751 ( 0.002 ms): sh/30296 rt_sigprocmask(how: BLOCK, nset: 
0x7ffc834181f0, oset: 0x7ffc83418270, sigsetsize: 8) = 0
        996.755 ( 0.002 ms): sh/30296 rt_sigaction(sig: INT, act: 
0x7ffc83417f50, oact: 0x7ffc83417ff0, sigsetsize: 8) = 0
       1004.543 ( 0.362 ms): tail/30198  ... [continued]: read()) = 4096
       1004.548 ( 7.791 ms): sh/30296 wait4(upid: -1, stat_addr: 
0x7ffc834181a0) ...
       1004.975 ( 0.427 ms): tail/30198 read(buf: 0x7633f0, count: 8192) = 4096
       1005.390 ( 0.410 ms): tail/30198 read(buf: 0x765410, count: 8192) = 4096
       1005.743 ( 0.348 ms): tail/30198 read(buf: 0x7633f0, count: 8192) = 4096
       1006.197 ( 0.449 ms): tail/30198 read(buf: 0x765410, count: 8192) = 4096
       1006.492 ( 0.290 ms): tail/30198 read(buf: 0x7633f0, count: 8192) = 4096

      real      0m1.219s
      user      0m0.704s
      sys       0m0.331s
      [root@ssdandy ~]#

      Reported-by: Michael Petlan <mpetlan@xxxxxxxxxx>
      Suggested-by: Jiri Olsa <jolsa@xxxxxxxxxx>
      Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
      Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
      Cc: Borislav Petkov <bp@xxxxxxx>
      Cc: David Ahern <dsahern@xxxxxxxxx>
      Cc: Don Zickus <dzickus@xxxxxxxxxx>
      Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
      Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
      Cc: Stephane Eranian <eranian@xxxxxxxxxx>
      Link: http://lkml.kernel.org/n/tip-p6kpn1b26qcbe47pufpw0tex@xxxxxxxxxxxxxx
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit cb24d01d217497fb32467de22d773655f47d3896
  Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
  Date:   Wed Apr 22 10:04:23 2015 -0300

      perf trace: Enable events when doing system wide tracing and starting a 
workload

       commit f7aa222ff397
       Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
       Date:   Tue Feb 3 13:25:39 2015 -0300

          perf trace: No need to enable evsels for workload started from perf

      The assumption was that whenever a workload is specified, the
      attr.enable_on_exec evsel flag would be set, but that is not happening
      when perf_record_opts.system_wide is set, for instance

      That resulted in both perf_evlist__enable() and attr.enable_on_exec
      being not called/set, which made the events to remain disabled while the
      workload runs, producing no output.

      Fix it,  by calling perf_evlist__enable() in the 'trace' tool
      when forking and not targetting a workload started from trace

      v2: Test against !target__none(), as suggested by Namhyung Kim, that is
      what is used in perf_evsel__config() when deciding if the
      attr.enable_on_exec flag to be set. More work is needed to cover other
      cases such as opts->initial_delay.

      Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
      Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
      Cc: Borislav Petkov <bp@xxxxxxx>
      Cc: David Ahern <dsahern@xxxxxxxxx>
      Cc: Don Zickus <dzickus@xxxxxxxxxx>
      Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
      Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
      Cc: Stephane Eranian <eranian@xxxxxxxxxx>
      Link: http://lkml.kernel.org/n/tip-27z7169pvfxgj8upic636syv@xxxxxxxxxxxxxx
      Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

  commit f139b6c676c7e49b66016b28bf3f8ec5c54be891
  Merge: 21330b6 d654788
  Author: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
  Date:   Thu Apr 23 15:16:37 2015 -0400

      Merge tag 'nfs-rdma-for-4.1-1' of 
git://git.linux-nfs.org/projects/anna/nfs-rdma

      NFS: NFSoRDMA Client Changes

      This patch series creates an operation vector for each of the different
      memory registration modes.  This should make it easier to one day increase
      credit limit, rsize, and wsize.

      Signed-off-by: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>

  commit 21330b667070fd64b2340d8d31c1b0800df78ec8
  Merge: c775707 5fcdfac
  Author: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
  Date:   Thu Apr 23 15:16:27 2015 -0400

      Merge branch 'bugfixes'

      * bugfixes:
        NFSv4: Return delegations synchronously in evict_inode
        SUNRPC: Fix a regression when reconnecting
        NFS: remount with security change should return EINVAL
        nfs: do not export discarded symbols
        NFSv4.1: don't export static symbol

  commit c7757074839f2cd440521482d76ea180d0d4bdac
  Author: Andre Przywara <andre.przywara@xxxxxxx>
  Date:   Thu Apr 23 17:17:40 2015 +0100

      fs/nfs: fix new compiler warning about boolean in switch

      The brand new GCC 5.1.0 warns by default on using a boolean in the
      switch condition. This results in the following warning:

      fs/nfs/nfs4proc.c: In function 'nfs4_proc_get_rootfh':
      fs/nfs/nfs4proc.c:3100:10: warning: switch condition has boolean value 
[-Wswitch-bool]
        switch (auth_probe) {
                ^

      This code was obviously using switch to make use of the fall-through
      semantics (without the usual comment, though).
      Rewrite that code using if statements to avoid the warning and make
      the code a bit more readable on the way.

      Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit c456aacf3c27b9a3013d4524fdc4bd0bb61fb884
  Author: Firo Yang <firogm@xxxxxxxxx>
  Date:   Thu Apr 23 17:17:51 2015 +0800

      nfs: Remove unneeded casts in nfs

      Don't unnecessarily cast allocation return value in
      fs/nfs/inode.c::nfs_alloc_inode().

      Signed-off-by: Firo Yang <firogm@xxxxxxxxx>
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit ce85cfbed6fe3dbc01bd1976b23ac3e97878cde6
  Author: Benjamin Coddington <bcodding@xxxxxxxxxx>
  Date:   Tue Apr 21 14:17:35 2015 -0400

      NFS: Don't attempt to decode missing directory entries

      If a READDIR reply comes back without any page data, avoid a NULL pointer
      dereference in xdr_copy_to_scratch().

      BUG: unable to handle kernel NULL pointer dereference at 0000000000000001
      IP: [<ffffffff813a378d>] memcpy+0xd/0x110
      ...
      Call Trace:
        ? xdr_inline_decode+0x7a/0xb0 [sunrpc]
        nfs3_decode_dirent+0x73/0x320 [nfsv3]
        nfs_readdir_page_filler+0xd5/0x4e0 [nfs]
        ? nfs3_rpc_wrapper.constprop.9+0x42/0xc0 [nfsv3]
        nfs_readdir_xdr_to_array+0x1fa/0x330 [nfs]
        ? mem_cgroup_commit_charge+0xac/0x160
        ? nfs_readdir_xdr_to_array+0x330/0x330 [nfs]
        nfs_readdir_filler+0x22/0x90 [nfs]
        do_read_cache_page+0x7e/0x1a0
        read_cache_page+0x1c/0x20
        nfs_readdir+0x18e/0x660 [nfs]
        ? nfs3_xdr_dec_getattr3res+0x80/0x80 [nfsv3]
        iterate_dir+0x97/0x130
        SyS_getdents+0x94/0x120
        ? fillonedir+0xd0/0xd0
        system_call_fastpath+0x12/0x17

      Signed-off-by: Benjamin Coddington <bcodding@xxxxxxxxxx>
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit 3708f842e107b9b79d54a75d152e666b693649e8
  Author: Nicolas Iooss <nicolas.iooss_linux@xxxxxxx>
  Date:   Thu Apr 16 18:48:39 2015 +0800

      Revert "nfs: replace nfs_add_stats with nfs_inc_stats when add one"

      This reverts commit 5a254d08b086d80cbead2ebcee6d2a4b3a15587a.

      Since commit 5a254d08b086 ("nfs: replace nfs_add_stats with
      nfs_inc_stats when add one"), nfs_readpage and nfs_do_writepage use
      nfs_inc_stats to increment NFSIOS_READPAGES and NFSIOS_WRITEPAGES
      instead of nfs_add_stats.

      However nfs_inc_stats does not do the same thing as nfs_add_stats with
      value 1 because these functions work on distinct stats:
      nfs_inc_stats increments stats from "enum nfs_stat_eventcounters" (in
      server->io_stats->events) and nfs_add_stats those from "enum
      nfs_stat_bytecounters" (in server->io_stats->bytes).

      Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@xxxxxxx>
      Fixes: 5a254d08b086 ("nfs: replace nfs_add_stats with nfs_inc_stats...")
      Cc: stable@xxxxxxxxxxxxxxx # 3.19+
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit 7b320382d0d861e46f55087b50d252410b1f402f
  Author: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
  Date:   Wed Apr 15 13:00:06 2015 -0400

      NFS: Rename idmap.c to nfs4idmap.c

      I added the nfs4 prefix to make it obvious that this file is built into
      the NFS v4 module, and not the generic client.

      Signed-off-by: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit 40c64c26a43494ba9982fd1b87dc54e3819566fc
  Author: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
  Date:   Wed Apr 15 13:00:05 2015 -0400

      NFS: Move nfs_idmap.h into fs/nfs/

      This file is only used internally to the NFS v4 module, so it doesn't
      need to be in the global include path.  I also renamed it from
      nfs_idmap.h to nfs4idmap.h to emphasize that it's an NFSv4-only include
      file.

      Signed-off-by: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit f9ebd61855253078fe8b07bacaf516337f8078e8
  Author: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
  Date:   Wed Apr 15 13:00:04 2015 -0400

      NFS: Remove CONFIG_NFS_V4 checks from nfs_idmap.h

      The idmapper is completely internal to the NFS v4 module, so this macro
      will always evaluate to true.  This patch also removes unnecessary
      includes of this file from the generic NFS client.

      Signed-off-by: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit 7c61f0d3897eeeff6f3294adb9f910ddefa8035a
  Author: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
  Date:   Tue Apr 14 10:34:20 2015 -0400

      NFS: Add a stub for GETDEVICELIST

      d4b18c3e (pnfs: remove GETDEVICELIST implementation) removed the
      GETDEVICELIST operation from the NFS client, but left a "hole" in the
      nfs4_procedures array.  This caused /proc/self/mountstats to report an
      operation named "51" where GETDEVICELIST used to be.  This patch adds a
      stub to fix mountstats.

      Signed-off-by: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
      Fixes: d4b18c3e (pnfs: remove GETDEVICELIST implementation)
      Cc: stable@xxxxxxxxxxxxxxx # 3.17+
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit 05f54903d9d370a4cd302a85681304d3ec59e5c1
  Author: Peng Tao <tao.peng@xxxxxxxxxxxxxxx>
  Date:   Thu Apr 9 23:02:17 2015 +0800

      nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes

      For flexfiles driver, we might choose to read from mirror index other
      than 0 while mirror_count is always 1 for read.

      Reported-by: Jean Spector <jean@xxxxxxxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx> # v3.19+
      Cc: Weston Andros Adamson <dros@xxxxxxxxxxxxxxx>
      Signed-off-by: Peng Tao <tao.peng@xxxxxxxxxxxxxxx>
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit 1ccbad9f9f9bd36db26a10f0b17fbaf12b3ae93a
  Author: Peng Tao <tao.peng@xxxxxxxxxxxxxxx>
  Date:   Thu Apr 9 23:02:16 2015 +0800

      nfs: fix DIO good bytes calculation

      For direct read that has IO size larger than rsize, we'll split
      it into several READ requests and nfs_direct_good_bytes() would
      count completed bytes incorrectly by eating last zero count reply.

      Fix it by handling mirror and non-mirror cases differently such that
      we only count mirrored writes differently.

      This fixes 5fadeb47("nfs: count DIO good bytes correctly with mirroring").

      Reported-by: Jean Spector <jean@xxxxxxxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx> # v3.19+
      Signed-off-by: Peng Tao <tao.peng@xxxxxxxxxxxxxxx>
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit ea96d1ecbe4fcb1df487d99309d3157b4ff5fc02
  Author: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
  Date:   Fri Apr 3 14:35:59 2015 -0400

      nfs: Fetch MOUNTED_ON_FILEID when updating an inode

      2ef47eb1 (NFS: Fix use of nfs_attr_use_mounted_on_fileid()) was a good
      start to fixing a circular directory structure warning for NFS v4
      "junctioned" mountpoints.  Unfortunately, further testing continued to
      generate this error.

      My server is configured like this:

      anna@nfsd ~ % df
      Filesystem      Size  Used Avail Use% Mounted on
      /dev/vda1       9.1G  2.0G  6.5G  24% /
      /dev/vdc1      1014M   33M  982M   4% /exports
      /dev/vdc2      1014M   33M  982M   4% /exports/vol1
      /dev/vdc3      1014M   33M  982M   4% /exports/vol1/vol2

      anna@nfsd ~ % cat /etc/exports
      /exports/          *(rw,async,no_subtree_check,no_root_squash)
      /exports/vol1/     *(rw,async,no_subtree_check,no_root_squash)
      /exports/vol1/vol2 *(rw,async,no_subtree_check,no_root_squash)

      I've been running chown across the entire mountpoint twice in a row to
      hit this problem.  The first run succeeds, but the second one fails with
      the circular directory warning along with:

      anna@client ~ % dmesg
      [Apr 3 14:28] NFS: server 192.168.100.204 error: fileid changed
                    fsid 0:39: expected fileid 0x100080, got 0x80

      WHere 0x80 is the mountpoint's fileid and 0x100080 is the mounted-on
      fileid.

      This patch fixes the issue by requesting an updated mounted-on fileid
      from the server during nfs_update_inode(), and then checking that the
      fileid stored in the nfs_inode matches either the fileid or mounted-on
      fileid returned by the server.

      Signed-off-by: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit 3f9400981691f6845e5c22b962500742b80a5484
  Author: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
  Date:   Tue Mar 31 12:03:28 2015 -0400

      sunrpc: make debugfs file creation failure non-fatal

      v2: gracefully handle the case where some dentry pointers end up NULL
          and be more dilligent about zeroing out dentry pointers

      We currently have a problem that SELinux policy is being enforced when
      creating debugfs files. If a debugfs file is created as a side effect of
      doing some syscall, then that creation can fail if the SELinux policy
      for that process prevents it.

      This seems wrong. We don't do that for files under /proc, for instance,
      so Bruce has proposed a patch to fix that.

      While discussing that patch however, Greg K.H. stated:

          "No kernel code should care / fail if a debugfs function fails, so
           please fix up the sunrpc code first."

      This patch converts all of the sunrpc debugfs setup code to be void
      return functins, and the callers to not look for errors from those
      functions.

      This should allow rpc_clnt and rpc_xprt creation to work, even if the
      kernel fails to create debugfs files for some reason.

      Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
      Acked-by: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
      Signed-off-by: Jeff Layton <jeff.layton@xxxxxxxxxxxxxxx>
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit 5d05e54af3cdbb13cf19c557ff2184781b91a22c
  Author: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
  Date:   Fri Mar 20 15:15:14 2015 -0400

      nfs: fix high load average due to callback thread sleeping

      Chuck pointed out a problem that crept in with commit 6ffa30d3f734 (nfs:
      don't call blocking operations while !TASK_RUNNING). Linux counts tasks
      in uninterruptible sleep against the load average, so this caused the
      system's load average to be pinned at at least 1 when there was a
      NFSv4.1+ mount active.

      Not a huge problem, but it's probably worth fixing before we get too
      many complaints about it. This patch converts the code back to use
      TASK_INTERRUPTIBLE sleep, simply has it flush any signals on each loop
      iteration. In practice no one should really be signalling this thread at
      all, so I think this is reasonably safe.

      With this change, there's also no need to game the hung task watchdog so
      we can also convert the schedule_timeout call back to a normal schedule.

      Cc: <stable@xxxxxxxxxxxxxxx>
      Reported-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
      Signed-off-by: Jeff Layton <jeff.layton@xxxxxxxxxxxxxxx>
      Tested-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
      Fixes: commit 6ffa30d3f734 (â??nfs: don't call blocking . . .â??)
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit f830f7ddd9165c8bd69127458627f03df4b1a406
  Author: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
  Date:   Mon Mar 16 14:06:24 2015 -0400

      NFS: Reduce time spent holding the i_mutex during fallocate()

      At the very least, we should not be taking the i_mutex until after
      checking if the server even supports ALLOCATE or DEALLOCATE, allowing
      v4.0 or v4.1 to exit without potentially waiting on a lock.

      Signed-off-by: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit 9a51940bf65bf9fdc93027d70bdecdfc403c5b24
  Author: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
  Date:   Mon Mar 16 14:06:23 2015 -0400

      NFS: Don't zap caches on fallocate()

      This patch adds a GETATTR to the end of ALLOCATE and DEALLOCATE
      operations so we can set the updated inode size and change attribute
      directly.  DEALLOCATE will still need to release pagecache pages, so
      nfs42_proc_deallocate() now calls truncate_pagecache_range() before
      contacting the server.

      Signed-off-by: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
      Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>

  commit e4b6c30375e83b92d9c3e9b9d853417e8cc74006
  Author: Luis R. Rodriguez <mcgrof@xxxxxxxx>
  Date:   Tue Apr 21 13:09:45 2015 -0700

      ethernet: myri10ge: use arch_phys_wc_add()

      This driver already uses ioremap_wc() on the same range
      so when write-combining is available that will be used
      instead.

      Cc: Hyong-Youb Kim <hykim@xxxxxxxx>
      Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
      Cc: Suresh Siddha <sbsiddha@xxxxxxxxx>
      Cc: Ingo Molnar <mingo@xxxxxxx>
      Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
      Cc: Juergen Gross <jgross@xxxxxxxx>
      Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
      Cc: netdev@xxxxxxxxxxxxxxx
      Cc: Juergen Gross <jgross@xxxxxxxx>
      Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
      Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
      Cc: Dave Airlie <airlied@xxxxxxxxxx>
      Cc: Antonino Daplas <adaplas@xxxxxxxxx>
      Cc: Jean-Christophe Plagniol-Villard <plagnioj@xxxxxxxxxxxx>
      Cc: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
      Cc: linux-kernel@xxxxxxxxxxxxxxx
      Cc: netdev@xxxxxxxxxxxxxxx
      Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 2fb42aab48762fb1d5e21fbb40acad0f2650b9b4
  Author: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
  Date:   Thu Apr 23 20:04:51 2015 +0200

      can: CAN_GRCAN should depend on HAS_DMA

      If NO_DMA=y:

          drivers/built-in.o: In function `grcan_free_dma_buffers':
          grcan.c:(.text+0x2d7716): undefined reference to `dma_free_coherent'
          drivers/built-in.o: In function `grcan_allocate_dma_buffers':
          grcan.c:(.text+0x2d779c): undefined reference to `dma_alloc_coherent'

      Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 0357cc1def050c4d6107835ed6b79122243bd240
  Author: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
  Date:   Thu Apr 23 19:59:34 2015 +0200

      ethernet: arc: ARC_EMAC and EMAC_ROCKCHIP should depend on HAS_DMA

      If NO_DMA=y:

          drivers/built-in.o: In function `arc_emac_tx_clean':
          emac_main.c:(.text+0x2decde): undefined reference to 
`dma_unmap_single'
          drivers/built-in.o: In function `arc_emac_rx':
          emac_main.c:(.text+0x2dee1c): undefined reference to 
`dma_unmap_single'
          emac_main.c:(.text+0x2dee72): undefined reference to `dma_map_single'
          emac_main.c:(.text+0x2dee7e): undefined reference to 
`dma_mapping_error'
          drivers/built-in.o: In function `arc_emac_probe':
          (.text+0x2df2ee): undefined reference to `dmam_alloc_coherent'
          drivers/built-in.o: In function `arc_emac_open':
          emac_main.c:(.text+0x2df6d8): undefined reference to `dma_map_single'
          emac_main.c:(.text+0x2df6e4): undefined reference to 
`dma_mapping_error'
          drivers/built-in.o: In function `arc_emac_tx':
          emac_main.c:(.text+0x2df9e4): undefined reference to `dma_map_single'
          emac_main.c:(.text+0x2df9f0): undefined reference to 
`dma_mapping_error'

      Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 61e77d297dd1fc739828027a2790ee5365de50d2
  Author: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
  Date:   Thu Apr 23 19:59:33 2015 +0200

      ethernet: amd: AMD_XGBE should depend on HAS_DMA

      If NO_DMA=y:

          drivers/built-in.o: In function `xgbe_probe':
          xgbe-main.c:(.text+0x2def0a): undefined reference to `dma_set_mask'
          xgbe-main.c:(.text+0x2def20): undefined reference to `dma_supported'
          drivers/built-in.o: In function `xgbe_rx_poll':
          xgbe-drv.c:(.text+0x2e0320): undefined reference to 
`dma_sync_single_for_cpu'
          xgbe-drv.c:(.text+0x2e035e): undefined reference to 
`dma_sync_single_for_cpu'
          drivers/built-in.o: In function `xgbe_unmap_rdata':
          xgbe-desc.c:(.text+0x2e5fe4): undefined reference to `dma_unmap_page'
          xgbe-desc.c:(.text+0x2e5ffa): undefined reference to 
`dma_unmap_single'
          xgbe-desc.c:(.text+0x2e604a): undefined reference to `dma_unmap_page'
          xgbe-desc.c:(.text+0x2e6084): undefined reference to `dma_unmap_page'
          drivers/built-in.o: In function `xgbe_alloc_pages':
          xgbe-desc.c:(.text+0x2e6156): undefined reference to `dma_map_page'
          xgbe-desc.c:(.text+0x2e6164): undefined reference to 
`dma_mapping_error'
          drivers/built-in.o: In function `xgbe_free_ring':
          xgbe-desc.c:(.text+0x2e63d4): undefined reference to `dma_unmap_page'
          xgbe-desc.c:(.text+0x2e640e): undefined reference to `dma_unmap_page'
          xgbe-desc.c:(.text+0x2e644a): undefined reference to 
`dma_free_coherent'
          drivers/built-in.o: In function `xgbe_init_ring':
          xgbe-desc.c:(.text+0x2e64d4): undefined reference to 
`dma_alloc_coherent'
          drivers/built-in.o: In function `xgbe_map_tx_skb':
          xgbe-desc.c:(.text+0x2e6628): undefined reference to `dma_map_single'
          xgbe-desc.c:(.text+0x2e6638): undefined reference to 
`dma_mapping_error'
          xgbe-desc.c:(.text+0x2e66b2): undefined reference to `dma_map_single'
          xgbe-desc.c:(.text+0x2e66c2): undefined reference to 
`dma_mapping_error'
          xgbe-desc.c:(.text+0x2e6762): undefined reference to `dma_map_page'
          xgbe-desc.c:(.text+0x2e6772): undefined reference to 
`dma_mapping_error'

      Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit fcdd5f09c03bfc95f196dfa781ff447c5cbcc319
  Author: Wolfram Sang <wsa@xxxxxxxxxxxxx>
  Date:   Thu Apr 23 13:42:02 2015 +0200

      i2c: st: add include for pinctrl

      The driver uses pinctrl directly and thus should include the appropriate
      header. Sort the headers while we are here to have a better view what is
      included and what is not.

      Reported-by: Pascal Huerst <pascal.huerst@xxxxxxxxx>
      Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxxxxx>

  commit 133778482ec6c8fde69406be380333963627c17a
  Author: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 23 10:29:09 2015 +0200

      i2c: mux: use proper dev when removing "channel-X" symlinks

      Those symlinks are created for the mux_dev, so we need to remove it from
      there. Currently, it breaks for muxes where the mux_dev is not the device
      of the parent adapter like this:

      [   78.234644] WARNING: CPU: 0 PID: 365 at fs/sysfs/dir.c:31 
sysfs_warn_dup+0x5c/0x78()
      [   78.242438] sysfs: cannot create duplicate filename 
'/devices/platform/i2cbus@8/channel-0'

      Remove confusing comments while we are here.

      Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxxxxx>
      Fixes: c9449affad2ae0
      Cc: stable@xxxxxxxxxx

  commit 4c8979b226d773a02586ca75e88b6fb4b2d63a7b
  Author: Wolfram Sang <wsa@xxxxxxxxxxxxx>
  Date:   Wed Apr 22 10:16:11 2015 +0200

      i2c: digicolor: remove duplicate include

      And sort them to prevent this from happening again.

      Reported-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
      Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxxxxx>

  commit 6ada5c1e1b077ab98fc144d7ac132b4dcc0148ec
  Author: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 16 13:05:19 2015 +0100

      i2c: Mark adapter devices with pm_runtime_no_callbacks

      Commit 523c5b89640e ("i2c: Remove support for legacy PM") removed the PM
      ops from the bus type, which causes the pm operations on the s3c2410
      adapter device to fail (-ENOSUPP in rpm_callback). The adapter device
      doesn't get bound to a driver and as such can't have its own pm_runtime
      callbacks. Previously this was fine as the bus callbacks would have been
      used, but now this can cause devices which use PM runtime and are
      attached over I2C to fail to resume.

      This commit fixes this issue by marking all adapter devices with
      pm_runtime_no_callbacks, since they can't have any.

      Signed-off-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
      Acked-by: Beata Michalska <b.michalska@xxxxxxxxxxx>
      Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxxxxx>
      Fixes: 523c5b89640e
      Cc: stable@xxxxxxxxxx

  commit 9ef8a0bee93606afb1dd111ccc1d467f261099cc
  Author: Wolfram Sang <wsa@xxxxxxxxxxxxx>
  Date:   Mon Apr 20 15:51:40 2015 +0200

      i2c: pca-platform: fix broken email address

      My Pengutronix address is not valid anymore, redirect people to the 
Pengutronix
      kernel team.

      Reported-by: Harald Geyer <harald@xxxxxxxxx>
      Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxxxxx>
      Acked-by: Robert Schwebel <r.schwebel@xxxxxxxxxxxxxx>

  commit 4daf5a2839b38cbb2d234d35bff993609d12ba61
  Author: Wolfram Sang <wsa@xxxxxxxxxxxxx>
  Date:   Mon Apr 20 15:51:39 2015 +0200

      i2c: mxs: fix broken email address

      My Pengutronix address is not valid anymore, redirect people to the 
Pengutronix
      kernel team.

      Reported-by: Harald Geyer <harald@xxxxxxxxx>
      Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxxxxx>
      Acked-by: Robert Schwebel <r.schwebel@xxxxxxxxxxxxxx>

  commit c6cbfb91b878224e78408a2e15901c79de77115a
  Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
  Date:   Mon Apr 20 15:14:47 2015 -0700

      i2c: rk3x: report number of messages transmitted

      master_xfer() method should return number of i2c messages transferred,
      but on Rockchip we were usually returning just 1, which caused trouble
      with users that actually check number of transferred messages vs.
      checking for negative error codes.

      Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
      Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxxxxx>
      Cc: stable@xxxxxxxxxx

  commit d1ab39f17f8653021620d0355ee1cd24d7442a4f
  Author: Jason Eastman <eastman.jason.linux@xxxxxxxxx>
  Date:   Wed Apr 22 00:56:42 2015 -0600

      net: unix: garbage: fixed several comment and whitespace style issues

      fixed several comment and whitespace style issues

      Signed-off-by: Jason Eastman <eastman.jason.linux@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 8406a4d56ea94d1d91f62cab3bed15399bac73cb
  Author: Chao Yu <chao2.yu@xxxxxxxxxxx>
  Date:   Thu Apr 23 10:47:44 2015 -0600

      elevator: fix double release of elevator module

      Our issue is descripted in below call path:
      ->elevator_init
       ->elevator_init_fn
        ->{cfq,deadline,noop}_init_queue
         ->elevator_alloc
          ->kzalloc_node
         fail to call kzalloc_node and then put module in elevator_alloc;
      fail to call elevator_init_fn and then put module again in elevator_init.

      Remove elevator_put invoking in error path of elevator_alloc to avoid
      double release issue.

      Signed-off-by: Chao Yu <chao2.yu@xxxxxxxxxxx>
      Reviewed-by: Jeff Moyer <jmoyer@xxxxxxxxxx>
      Signed-off-by: Jens Axboe <axboe@xxxxxx>

  commit 464d1387acb94dc43ba772b35242345e3d2ead1b
  Author: Tejun Heo <tj@xxxxxxxxxx>
  Date:   Tue Apr 21 16:49:13 2015 -0400

      writeback: use |1 instead of +1 to protect against div by zero

      mm/page-writeback.c has several places where 1 is added to the divisor
      to prevent division by zero exceptions; however, if the original
      divisor is equivalent to -1, adding 1 leads to division by zero.

      There are three places where +1 is used for this purpose - one in
      pos_ratio_polynom() and two in bdi_position_ratio().  The second one
      in bdi_position_ratio() actually triggered div-by-zero oops on a
      machine running a 3.10 kernel.  The divisor is

        x_intercept - bdi_setpoint + 1 == span + 1

      span is confirmed to be (u32)-1.  It isn't clear how it ended up that
      but it could be from write bandwidth calculation underflow fixed by
      c72efb658f7c ("writeback: fix possible underflow in write bandwidth
      calculation").

      At any rate, +1 isn't a proper protection against div-by-zero.  This
      patch converts all +1 protections to |1.  Note that
      bdi_update_dirty_ratelimit() was already using |1 before this patch.

      Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Reviewed-by: Jan Kara <jack@xxxxxxx>
      Signed-off-by: Jens Axboe <axboe@xxxxxx>

  commit 2a34c0872adf252f23a6fef2d051a169ac796cef
  Author: Ming Lei <ming.lei@xxxxxxxxxxxxx>
  Date:   Tue Apr 21 10:00:20 2015 +0800

      blk-mq: fix CPU hotplug handling

      hctx->tags has to be set as NULL in case that it is to be unmapped
      no matter if set->tags[hctx->queue_num] is NULL or not in 
blk_mq_map_swqueue()
      because shared tags can be freed already from another request queue.

      The same situation has to be considered during handling CPU online too.
      Unmapped hw queue can be remapped after CPU topo is changed, so we need
      to allocate tags for the hw queue in blk_mq_map_swqueue(). Then tags
      allocation for hw queue can be removed in hctx cpu online notifier, and it
      is reasonable to do that after mapping is updated.

      Cc: <stable@xxxxxxxxxxxxxxx>
      Reported-by: Dongsu Park <dongsu.park@xxxxxxxxxxxxxxxx>
      Tested-by: Dongsu Park <dongsu.park@xxxxxxxxxxxxxxxx>
      Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxxxxx>
      Signed-off-by: Jens Axboe <axboe@xxxxxx>

  commit f054b56c951bf1731ba7314a4c7f1cc0b2977cc9
  Author: Ming Lei <ming.lei@xxxxxxxxxxxxx>
  Date:   Tue Apr 21 10:00:19 2015 +0800

      blk-mq: fix race between timeout and CPU hotplug

      Firstly during CPU hotplug, even queue is freezed, timeout
      handler still may come and access hctx->tags, which may cause
      use after free, so this patch deactivates timeout handler
      inside CPU hotplug notifier.

      Secondly, tags can be shared by more than one queues, so we
      have to check if the hctx has been unmapped, otherwise
      still use-after-free on tags can be triggered.

      Cc: <stable@xxxxxxxxxxxxxxx>
      Reported-by: Dongsu Park <dongsu.park@xxxxxxxxxxxxxxxx>
      Tested-by: Dongsu Park <dongsu.park@xxxxxxxxxxxxxxxx>
      Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxxxxx>
      Signed-off-by: Jens Axboe <axboe@xxxxxx>

  commit 9283b42e46c2646dff1bec47e2dd683add7f9972
  Author: Keith Busch <keith.busch@xxxxxxxxx>
  Date:   Thu Apr 23 10:24:45 2015 -0600

      NVMe: Fix VPD B0 max sectors translation

      Use the namespace's block format for reporting the max transfer length.

      Max unmap count is left as-is since NVMe doesn't provide a max, so the
      value the driver provided the block layer is valid for any format.

      Reported-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
      Signed-off-by: Keith Busch <keith.busch@xxxxxxxxx>
      Signed-off-by: Jens Axboe <axboe@xxxxxx>

  commit 37a06a87f20d93c2cec3db9aaf0360a322b703dd
  Merge: 4fce148 73a3173
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Thu Apr 23 11:50:34 2015 -0400

      Merge branch 'tipc-fixes'

      Jon Maloy says:

      ====================
      tipc: three bug fixes

      A set of unrelated corrections; one for the tipc netns implementation,
      one regarding problems with random link resets, and one removing a
      an erroneous refcount decrement when reading link statistsics via
      netlink.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 73a317377303b5ec14d4703d73ba87efffbb779d
  Author: Erik Hugne <erik.hugne@xxxxxxxxxxxx>
  Date:   Thu Apr 23 09:37:40 2015 -0400

      tipc: fix node refcount issue

      When link statistics is dumped over netlink, we iterate over
      the list of peer nodes and append each links statistics to
      the netlink msg. In the case where the dump is resumed after
      filling up a nlmsg, the node refcnt is decremented without
      having been incremented previously which may cause the node
      reference to be freed. When this happens, the following
      info/stacktrace will be generated, followed by a crash or
      undefined behavior.
      We fix this by removing the erroneous call to tipc_node_put
      inside the loop that iterates over nodes.

      [  384.312303] INFO: trying to register non-static key.
      [  384.313110] the code is fine but needs lockdep annotation.
      [  384.313290] turning off the locking correctness validator.
      [  384.313290] CPU: 1 PID: 0 Comm: swapper/1 Not tainted 4.0.0+ #13
      [  384.313290] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
      [  384.313290]  ffff88003c6d0290 ffff88003cc03ca8 ffffffff8170adf1 
0000000000000007
      [  384.313290]  ffffffff82728730 ffff88003cc03d38 ffffffff810a6a6d 
00000000001d7200
      [  384.313290]  ffff88003c6d0ab0 ffff88003cc03ce8 0000000000000285 
0000000000000001
      [  384.313290] Call Trace:
      [  384.313290]  <IRQ>  [<ffffffff8170adf1>] dump_stack+0x4c/0x65
      [  384.313290]  [<ffffffff810a6a6d>] __lock_acquire+0xf3d/0xf50
      [  384.313290]  [<ffffffff810a7375>] lock_acquire+0xd5/0x290
      [  384.313290]  [<ffffffffa0043e8c>] ? link_timeout+0x1c/0x170 [tipc]
      [  384.313290]  [<ffffffffa0043e70>] ? link_state_event+0x4e0/0x4e0 [tipc]
      [  384.313290]  [<ffffffff81712890>] _raw_spin_lock_bh+0x40/0x80
      [  384.313290]  [<ffffffffa0043e8c>] ? link_timeout+0x1c/0x170 [tipc]
      [  384.313290]  [<ffffffffa0043e8c>] link_timeout+0x1c/0x170 [tipc]
      [  384.313290]  [<ffffffff810c4698>] call_timer_fn+0xb8/0x490
      [  384.313290]  [<ffffffff810c45e0>] ? process_timeout+0x10/0x10
      [  384.313290]  [<ffffffff810c5a2c>] run_timer_softirq+0x21c/0x420
      [  384.313290]  [<ffffffffa0043e70>] ? link_state_event+0x4e0/0x4e0 [tipc]
      [  384.313290]  [<ffffffff8105a954>] __do_softirq+0xf4/0x630
      [  384.313290]  [<ffffffff8105afdd>] irq_exit+0x5d/0x60
      [  384.313290]  [<ffffffff8103ade1>] smp_apic_timer_interrupt+0x41/0x50
      [  384.313290]  [<ffffffff817144a0>] apic_timer_interrupt+0x70/0x80
      [  384.313290]  <EOI>  [<ffffffff8100db10>] ? default_idle+0x20/0x210
      [  384.313290]  [<ffffffff8100db0e>] ? default_idle+0x1e/0x210
      [  384.313290]  [<ffffffff8100e61a>] arch_cpu_idle+0xa/0x10
      [  384.313290]  [<ffffffff81099803>] cpu_startup_entry+0x2c3/0x530
      [  384.313290]  [<ffffffff810d2893>] ? 
clockevents_register_device+0x113/0x200
      [  384.313290]  [<ffffffff81038b0f>] start_secondary+0x13f/0x170

      Fixes: 8a0f6ebe8494 ("tipc: involve reference counter for node structure")
      Signed-off-by: Erik Hugne <erik.hugne@xxxxxxxxxxxx>
      Signed-off-by: Jon Maloy <jon.maloy@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 9871b27f6705fc6e0ba633b136369a289b2bfb99
  Author: Erik Hugne <erik.hugne@xxxxxxxxxxxx>
  Date:   Thu Apr 23 09:37:39 2015 -0400

      tipc: fix random link reset problem

      In the function tipc_sk_rcv(), the stack variable 'err'
      is only initialized to TIPC_ERR_NO_PORT for the first
      iteration over the link input queue. If a chain of messages
      are received from a link, failure to lookup the socket for
      any but the first message will cause the message to bounce back
      out on a random link.
      We fix this by properly initializing err.

      Signed-off-by: Erik Hugne <erik.hugne@xxxxxxxxxxxx>
      Signed-off-by: Jon Maloy <jon.maloy@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit def81f69bfbd70a3278a7592a4ab8717300cbac1
  Author: Ying Xue <ying.xue@xxxxxxxxxxxxx>
  Date:   Thu Apr 23 09:37:38 2015 -0400

      tipc: fix topology server broken issue

      When a new topology server is launched in a new namespace, its
      listening socket is inserted into the "init ns" namespace's socket
      hash table rather than the one owned by the new namespace. Although
      the socket's namespace is forcedly changed to the new namespace later,
      the socket is still stored in the socket hash table of "init ns"
      namespace. When a client created in the new namespace connects
      its own topology server, the connection is failed as its server's
      socket could not be found from its own namespace's socket table.

      If __sock_create() instead of original sock_create_kern() is used
      to create the server's socket through specifying an expected namesapce,
      the socket will be inserted into the specified namespace's socket
      table, thereby avoiding to the topology server broken issue.

      Fixes: 76100a8a64bc ("tipc: fix netns refcnt leak")

      Reported-by: Erik Hugne <erik.hugne@xxxxxxxxxxxx>
      Signed-off-by: Ying Xue <ying.xue@xxxxxxxxxxxxx>
      Signed-off-by: Jon Maloy <jon.maloy@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 4fce14820c1b0a3fd399719f970e0c3ae40dd270
  Author: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 23 14:43:05 2015 +1000

      ibmveth: Fix off-by-one error in ibmveth_change_mtu()

      AFAIK the PAPR document which defines the virtual device interface used by
      the ibmveth driver doesn't specify a specific maximum MTU.  So, in the
      ibmveth driver, the maximum allowed MTU is determined by the maximum
      allocated buffer size of 64k (corresponding to one page in the common 
case)
      minus the per-buffer overhead IBMVETH_BUFF_OH (which has value 22 for 14
      bytes of ethernet header, plus 8 bytes for an opaque handle).

      This suggests a maximum allowable MTU of 65514 bytes, but in fact the
      driver only permits a maximum MTU of 65513.  This is because there is a <
      instead of an <= in ibmveth_change_mtu(), which only permits an MTU which
      is strictly smaller than the buffer size, rather than allowing the buffer
      to be completely filled.

      This patch fixes the buglet.

      Signed-off-by: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
      Acked-by: Thomas Falcon <tlfalcon@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit ec65aafb9e3f316ff9167289e288856a7d528773
  Author: Johannes Berg <johannes.berg@xxxxxxxxx>
  Date:   Thu Apr 23 12:06:30 2015 +0200

      netdev_alloc_pcpu_stats: use less common iterator variable

      With the CPU iteration variable called 'i', it's relatively easy
      to have variable shadowing which sparse will warn about. Avoid
      that by renaming the variable to __cpu which is less likely to
      be used in the surrounding context.

      Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit b9061ef5d4da934cfc6e052a1e486077d29f267d
  Author: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
  Date:   Thu Jan 1 18:54:26 2015 +0100

      arch: blackfin: kernel: kgdb: Remove unused function

      Remove the function kgdb_post_primary_code() that is not used anywhere.

      This was partially found by using a static code analysis program called 
cppcheck.

      Signed-off-by: Rickard Strandqvist 
<rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
      Acked-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>

  commit 57127645d79d2e83e801f141f7d03f64accf28aa
  Author: Harald Freudenberger <freude@xxxxxxxxxxxxxxxxxx>
  Date:   Mon Mar 16 14:52:52 2015 +0100

      s390/zcrypt: Introduce new SHA-512 based Pseudo Random Generator.

      Rework of the prandom device with introduction of a new SHA-512 based
      NIST SP 800-90 conform deterministic random bit generator.

      Signed-off-by: Harald Freudenberger <freude@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

  commit a1c843b82541fdd4c4644607c942dabc7c7e6f6c
  Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
  Date:   Wed Apr 22 13:55:59 2015 +0200

      s390/mm: change swap pte encoding and pgtable cleanup

      After the file ptes have been removed the bit combination used to
      encode non-linear mappings can be reused for the swap ptes. This
      frees up a precious pte software bit. Reflect the change in the
      swap encoding in the comments and do some cleanup while we are
      at it.

      Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

  commit b7d14f3a92223c3f5e52e9f20c74cb96dc130e87
  Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
  Date:   Wed Apr 22 10:26:20 2015 +0200

      s390/mm: correct transfer of dirty & young bits in __pmd_to_pte

      The dirty & young bit from the pmd is not copied correctly to the
      pseudo pte in __pmd_to_pte. In fact it is not copied at all, the
      bits get lost. As the old style huge page currently does not need
      the dirty & young information this has no effect, but may be needed
      in the future.

      Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

  commit 77a87f0cb1a57237860754525d4e8cb2789e6e12
  Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
  Date:   Tue Apr 21 16:50:08 2015 +0200

      s390/bpf: add dependency to z196 features

      The new ebpf code uses e.g. the laal instruction which is part of the
      interlocked-access facility 1 which again was introduced with z196.

      So we must make sure the ebpf code generator depends on 
MARCH_Z196_FEATURES.

      Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>

  commit 0a7c501e6759db49d9dffb10ed62142d705e3f90
  Author: Christophe Jaillet <christophe.jaillet@xxxxxxxxxx>
  Date:   Mon Apr 20 10:26:52 2015 +0200

      s390/3215: free memory in error path

      If one memory allocation fails, there is a memory leak.

      Signed-off-by: Christophe Jaillet <christophe.jaillet@xxxxxxxxxx>
      Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

  commit 0b46e0a3ec0d7a04af6a091354f1b5e1b952d70a
  Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
  Date:   Wed Apr 15 13:23:26 2015 +0200

      s390/kvm: remove delayed reallocation of page tables for KVM

      Replacing a 2K page table with a 4K page table while a VMA is active
      for the affected memory region is fundamentally broken. Rip out the
      page table reallocation code and replace it with a simple system
      control 'vm.allocate_pgste'. If the system control is set the page
      tables for all processes are allocated as full 4K pages, even for
      processes that do not need it.

      Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

  commit 7e01b5acd88b3f3108d8c4ce44e3205d67437202
  Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
  Date:   Thu Apr 16 14:47:33 2015 +0200

      kexec: allocate the kexec control page with KEXEC_CONTROL_MEMORY_GFP

      Introduce KEXEC_CONTROL_MEMORY_GFP to allow the architecture code
      to override the gfp flags of the allocation for the kexec control
      page. The loop in kimage_alloc_normal_control_pages allocates pages
      with GFP_KERNEL until a page is found that happens to have an
      address smaller than the KEXEC_CONTROL_MEMORY_LIMIT. On systems
      with a large memory size but a small KEXEC_CONTROL_MEMORY_LIMIT
      the loop will keep allocating memory until the oom killer steps in.

      Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

  commit 60f4b626d5b5c5724b010200a8c2ff3169f6f4db
  Author: Johannes Berg <johannes.berg@xxxxxxxxx>
  Date:   Thu Apr 23 14:02:30 2015 +0200

      mac80211: fix rhashtable conversion

      My conversion of the mac80211 station hash table to rhashtable
      completely broke the lookup in sta_info_get() as it no longer
      took into account the virtual interface. Fix that.

      Fixes: 7bedd0cfad4e1 ("mac80211: use rhashtable for station table")
      Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>

  commit 37557178a0388f52c05ead69e24587e67f2cc304
  Author: Steven Miao <realmz6@xxxxxxxxx>
  Date:   Fri Mar 6 17:52:33 2015 +0800

      dma: fix build error after update to v3.19

      Signed-off-by: Steven Miao <realmz6@xxxxxxxxx>

  commit 1a3372bc522ef8ba749c019c52d63168267fac0a
  Author: Steven Miao <realmz6@xxxxxxxxx>
  Date:   Tue Jan 20 16:53:38 2015 +0800

      blackfin: io: define __raw_readx/writex with bfin_readx/writex

      Signed-off-by: Steven Miao <realmz6@xxxxxxxxx>

  commit b3df664b85c7926619346cddad3aefab6554e0b1
  Author: Scott Jiang <scott.jiang.linux@xxxxxxxxx>
  Date:   Thu Dec 11 17:47:37 2014 +0800

      bf609: add resources for lcd nl8048

      Signed-off-by: Scott Jiang <scott.jiang.linux@xxxxxxxxx>
      Signed-off-by: Steven Miao <realmz6@xxxxxxxxx>

  commit ef7dcaf1e7bbf7adaaf45cac1c1d208929fb25e5
  Author: Aaron Wu <Aaron.wu@xxxxxxxxxx>
  Date:   Wed Oct 22 13:45:58 2014 +0800

      pm: sometimes wake up from suspend to RAM would fail

      Sometimes it fails to wake up from suspend to RAM, this is because
      we would flush the data cache by assemble command FLUSHINV before
      suspend to RAM, and there is a delay between this command execution
      and cache flush completion. Add a 1uS delay to works around this.

      Signed-off-by: Aaron Wu <Aaron.wu@xxxxxxxxxx>

  commit bb717b33aa6b01abcc78c7a18dec343a3bde9574
  Author: Andre Wolokita <Andre.Wolokita@xxxxxxxxxx>
  Date:   Fri Sep 5 10:42:28 2014 +1000

      debug-mmrs: Eliminate all traces of the USB_PHY_TEST MMR

      Interacting with the USB_PHY_TEST MMR through debugfs was causing 
wide-spread
      chaos in the realm (kernel panic). Expunge all references to this demonic
      register.

      Signed-off-by: Andre Wolokita <Andre.Wolokita@xxxxxxxxxx>

  commit f7fee0366c861c66c9abc8ab9a250bea2dd53c8d
  Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
  Date:   Thu Aug 21 15:49:27 2014 +0800

      bf609: remove softswitch i2c configuration from adv7842 and adv7511 
platform data

      Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>

  commit 199aad16d517d47cf13f96caf0eedc6a4542bc60
  Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
  Date:   Wed Aug 20 18:32:22 2014 +0800

      bf609: add platform data for soft switch devices on the video extenders

      Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>

  commit 707e6f0bc40b4db1fae616b8825c9e0f1231f873
  Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
  Date:   Wed Aug 20 18:04:32 2014 +0800

      bf609: enable soft switch gpio driver by default

      Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>

  commit ea9b706b8688ab155b092abc854bde0224332743
  Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
  Date:   Wed Aug 20 17:04:55 2014 +0800

      bf609: add gpio soft switch platform data for mcp23017 i2c devices

      Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>

  commit 374feb1f049b0a9eed62ac1b865c93b35aaef7c6
  Author: Scott Jiang <scott.jiang.linux@xxxxxxxxx>
  Date:   Thu Jul 31 16:36:25 2014 +0800

      bf609: use new SND_BF6XX_PCM to choose audio pcm driver

      There is a new bf6xx audio dma driver, so we don't reuse
      bf5xx i2s pcm driver again.

      Signed-off-by: Scott Jiang <scott.jiang.linux@xxxxxxxxx>

  commit a0f4207d03b40eee6338b51288849965ac2b94e2
  Author: Sonic Zhang <sonic.zhang@xxxxxxxxxx>
  Date:   Tue Jul 29 16:41:10 2014 +0800

      bug[220] kgdb: change the smp cross core function entry

      Signed-off-by: Sonic Zhang <sonic.zhang@xxxxxxxxxx>

  commit 4eb147c83f34e00184557923d2bf93f593deb41c
  Author: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
  Date:   Sat Jul 26 15:58:22 2014 +0200

      arch: blackfin: kernel: setup.c: Cleaning up missing null-terminate in 
conjunction with strncpy

      Replacing strncpy with strlcpy to avoid strings that lacks null terminate.

      Signed-off-by: Rickard Strandqvist 
<rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Steven Miao <realmz6@xxxxxxxxx>

  commit 2fcc440ca69a5d857523e5aed00c959c07085f3c
  Author: Steven Miao <realmz6@xxxxxxxxx>
  Date:   Tue Jul 29 14:21:41 2014 +0800

      blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for 
BF537-STAMP

      Signed-off-by: Steven Miao <realmz6@xxxxxxxxx>

  commit c264f1110d27185f8531602f5fce400a6bbce946
  Author: Shobhit Kumar <shobhit.kumar@xxxxxxxxx>
  Date:   Thu Mar 12 22:01:31 2015 +0530

      pwm: Remove __init initializer for pwm_add_table()

      For platforms that don't support DT, some early MFD modules can register
      lookup tables. Remove the __init annotation so that this works. This is
      similar to gpio_add_lookup_table() which allows late additions.

      CC: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
      Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
      Cc: Alexandre Courbot <gnurou@xxxxxxxxx>
      Cc: Thierry Reding <thierry.reding@xxxxxxxxx>
      Signed-off-by: Shobhit Kumar <shobhit.kumar@xxxxxxxxx>
      Signed-off-by: Thierry Reding <thierry.reding@xxxxxxxxx>

  commit d32b66668c702aed0e330dc5ca186afbadcdacf8
  Author: Kailang Yang <kailang@xxxxxxxxxxx>
  Date:   Thu Apr 23 15:10:53 2015 +0800

      ALSA: hda/realtek - Fix Headphone Mic doesn't recording for ALC256

      Switch default pcbeep path to Line in path.

      Signed-off-by: Kailang Yang <kailang@xxxxxxxxxxx>
      Tested-by: Hui Wang <hui.wang@xxxxxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 8faf141a9903477910387af062ece04ea7d730ed
  Author: Vinod Koul <vinod.koul@xxxxxxxxx>
  Date:   Thu Apr 23 14:38:13 2015 +0530

      ASoC: Intel: fix the makefile for atom code

      The tom code should be using SND_SST_MFLD_PLATFORM and not the baytrail 
one.
      So fix it now

      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit 2e826695d87c2d213def07bc344ae97d88384f62
  Author: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 20:10:26 2015 +0530

      powerpc/mm: Fix build error with CONFIG_PPC_TRANSACTIONAL_MEM disabled

      This fix the below build error

      arch/powerpc/mm/hash_utils_64.c: In function â??flush_hash_hugepageâ??:
      arch/powerpc/mm/hash_utils_64.c:1381:1: error: label at end of compound 
statement
       tm_abort:
       ^
      make[1]: *** [arch/powerpc/mm/hash_utils_64.o] Error 1

      Reported-by: Anshuman Khandual <khandual@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>

  commit 04fca0e390e80d88c2f959aef86e0bb7f26fea01
  Author: Guenter Roeck <linux@xxxxxxxxxxxx>
  Date:   Mon Apr 20 08:36:15 2015 -0700

      frv: add io{read,write}{16,32}be functions

      These functions are used in various drivers, including the latest
      version of the 8250 driver. The latter causes the following build
      failure.

      drivers/tty/serial/8250/8250_core.c: In function 'mem32be_serial_out':
      drivers/tty/serial/8250/8250_core.c:456:2: error:
                        implicit declaration of function 'iowrite32be'
      drivers/tty/serial/8250/8250_core.c: In function 'mem32be_serial_in':
      drivers/tty/serial/8250/8250_core.c:462:2: error:
                        implicit declaration of function 'ioread32be'

      Cc: Kevin Cernekee <cernekee@xxxxxxxxx>
      Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
      Fixes: c627f2ceb692 ("serial: 8250: Add support for big-endian MMIO
        accesses")
      Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Rob Herring <robh@xxxxxxxxxx>

  commit 601e3ad9def147f714c1b66fd397d138ba5dbd3b
  Author: Guenter Roeck <linux@xxxxxxxxxxxx>
  Date:   Mon Apr 20 08:37:42 2015 -0700

      mn10300: add io{read,write}{16,32}be functions

      These functions are used in various drivers, including the latest
      version of the 8250 driver. The latter causes the following build failure.

      drivers/tty/serial/8250/8250_core.c: In function 'mem32be_serial_out':
      drivers/tty/serial/8250/8250_core.c:456:2: error:
                        implicit declaration of function 'iowrite32be'
      drivers/tty/serial/8250/8250_core.c: In function 'mem32be_serial_in':
      drivers/tty/serial/8250/8250_core.c:462:2: error:
                        implicit declaration of function 'ioread32be'

      Cc: Kevin Cernekee <cernekee@xxxxxxxxx>
      Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
      Fixes: c627f2ceb692 ("serial: 8250: Add support for big-endian MMIO
        accesses")
      Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Rob Herring <robh@xxxxxxxxxx>

  commit f3b07b8611ede9584ef27288d9c35bc2fd7a8353
  Author: Dinh Nguyen <dinguyen@xxxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 09:55:47 2015 -0500

      Documentation: DT bindings: add doc for Altera's SoCFPGA platform

      Document "altr,socfpga-cyclone5", "altr,socfpga-arria5", and
      "altr,socfpga-arria10".

      Signed-off-by: Dinh Nguyen <dinguyen@xxxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Rob Herring <robh@xxxxxxxxxx>

  commit 608404290e2d9d1756db4013c4ee12fa7617dad9
  Author: Li RongQing <roy.qing.li@xxxxxxxxx>
  Date:   Wed Apr 22 15:49:10 2015 +0800

      vxlan: remove the unnecessary codes

      The return value of vxlan_fdb_replace always is greater than or equal to 0

      Signed-off-by: Li RongQing <roy.qing.li@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 21d3515ce7179523a2941cc015960dd788290e33
  Author: Ben Shelton <ben.shelton@xxxxxx>
  Date:   Wed Apr 22 17:28:54 2015 -0500

      net/macb: Factor out one-time assignment from loop

      In 02c958dd3 (net/macb: add TX multiqueue support for gem), the
      initialization of tx_head and tx_tail in macb_init_rings() was moved
      inside the loop that iterates over each element in the ring.  Since
      tx_head and tx_tail only need to be assigned once, move them back out of
      the loop.

      Signed-off-by: Ben Shelton <ben.shelton@xxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 27cf3a16b2535a490f8cf1d29a6634f1c70f7831
  Merge: a62d016 724e7bf
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 14:49:23 2015 -0700

      Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

      Pull audit fixes from Paul Moore:
       "Seven audit patches for v4.1, all bug fixes.

        The largest, and perhaps most significant commit helps resolve some
        memory pressure issues related to the inode cache and audit, there are
        also a few small commits which help resolve some timing issues with
        the audit log queue, and the rest fall into the always popular "code
        clean-up" category.

        In general, nothing really substantial, just a nice set of maintenance
        patches"

      * 'upstream' of git://git.infradead.org/users/pcmoore/audit:
        audit: Remove condition which always evaluates to false
        audit: reduce mmap_sem hold for mm->exe_file
        audit: consolidate handling of mm->exe_file
        audit: code clean up
        audit: don't reset working wait time accidentally with auditd
        audit: don't lose set wait time on first successful call to 
audit_log_start()
        audit: move the tree pruning to a dedicated thread

  commit 79930f5892e134c6da1254389577fffb8bd72c66
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Wed Apr 22 07:33:36 2015 -0700

      net: do not deplete pfmemalloc reserve

      build_skb() should look at the page pfmemalloc status.
      If set, this means page allocator allocated this page in the
      expectation it would help to free other pages. Networking
      stack can do that only if skb->pfmemalloc is also set.

      Also, we must refrain using high order pages from the pfmemalloc
      reserve, so __page_frag_refill() must also use __GFP_NOMEMALLOC for
      them. Under memory pressure, using order-0 pages is probably the best
      strategy.

      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit a2d97723cb3a7741af81868427b36bba274b681b
  Author: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 13:58:47 2015 +0100

      ASoC: dapm: Enable autodisable on SOC_DAPM_SINGLE_TLV_AUTODISABLE

      Correct small copy and paste error where autodisable was not being
      enabled for the SOC_DAPM_SINGLE_TLV_AUTODISABLE control.

      Signed-off-by: Charles Keepax <ckeepax@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 575bec53181526ed01c0936ec008e1b70f8f5f31
  Author: Christophe Leroy <christophe.leroy@xxxxxx>
  Date:   Wed Apr 22 16:28:20 2015 +0200

      spi: fsl-spi: use devm_ioremap_resource() to map parameter ram on CPM1

      On CPM2, the SPI parameter RAM is dynamically allocated in the
      dualport RAM whereas in CPM1, it is statically allocated to a default
      address with capability to relocate it somewhere else via the use of
      CPM micropatch. The address of the parameter RAM is given by the boot
      loader and expected to be mapped via devm_ioremap_resource()

      In the current implementation, in function fsl_spi_cpm_get_pram()
      there is a confusion between the SPI_BASE register and the base of the
      SPI parameter RAM. Fortunatly, it is working properly with MPC866 and
      MPC885 because they do set SPI_BASE, but on MPC860 and other old
      MPC8xx that doesn't set SPI_BASE, pram_ofs is not properly set.
      Also, the parameter RAM is not properly mapped with
      devm_ioremap_resource() as it should but still gets accessible by
      chance through the full RAM which is mapped from somewhere else.

      This patch applies to the SPI driver the same principle as for the
      CPM UART: when the CPM is of type CPM1, we simply do an
      devm_ioremap_resource() of the area provided via the device tree.

      Signed-off-by: Christophe Leroy <christophe.leroy@xxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit 26349c71b4323e62f8de0fe45f2f06c4df535b9b
  Author: Johannes Berg <johannes.berg@xxxxxxxxx>
  Date:   Wed Apr 22 16:56:16 2015 +0200

      ip6_gre: use netdev_alloc_pcpu_stats()

      The code there just open-codes the same, so use the provided macro 
instead.

      Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit a62d016cece2fce1d5e4eedf36b17f03a7a5c78e
  Merge: 7c034df 3e550d2
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 12:00:44 2015 -0700

      Merge tag 'for-linus-20150422' of git://git.infradead.org/linux-mtd

      Pull MTD updates from Brian Norris:
       "Common MTD:

         - Add Kconfig option for keeping both the 'master' and 'partition'
           MTDs registered as devices.  This would really make a better
           default if we could do it over, as it allows a lot more flexibility
           in (1) determining the flash topology of the system from user-space
           and (2) adding temporary partitions at runtime (ioctl(BLKPG)).

           Unfortunately, this would possibly cause user-space breakage, as it
           will cause renumbering of the /dev/mtdX devices.  We'll see if we
           can change this in the future, as there have already been a few
           people looking for this feature, and I know others have just been
           working around our current limitations instead of fixing them this
           way.

         - Along with the previous change, add some additional information to
           sysfs, so user-space can read the offset of each partition within
           its master device

        SPI NOR:

         - add new device tree compatible binding to represent the
           mostly-compatible class of SPI NOR flash which can be detected by
           their extended JEDEC ID bytes, cutting down the duplication of our
           ID tables

         - misc.  new IDs

        Various other miscellaneous fixes and changes"

      * tag 'for-linus-20150422' of git://git.infradead.org/linux-mtd: (53 
commits)
        mtd: spi-nor: Add support for Macronix mx25u6435f serial flash
        mtd: spi-nor: Add support for Winbond w25q64dw serial flash
        mtd: spi-nor: add support for the Winbond W25X05 flash
        mtd: spi-nor: support en25s64 device
        mtd: m25p80: bind to "nor-jedec" ID, for auto-detection
        Documentation: devicetree: m25p80: add "nor-jedec" binding
        mtd: Make MTD tests cancelable
        mtd: mtd_oobtest: Fix bitflip_limit usage in test case 3
        mtd: docg3: remove invalid __exit annotations
        mtd: fsl_ifc_nand: use msecs_to_jiffies for time conversion
        mtd: atmel_nand: don't map the ROM table if no pmecc table offset in DT
        mtd: atmel_nand: add a definition for the oob reserved bytes
        mtd: part: Remove partition overlap checks
        mtd: part: Add sysfs variable for offset of partition
        mtd: part: Create the master device node when partitioned
        mtd: ts5500_flash: Fix typo in MODULE_DESCRIPTION in ts5500_flash.c
        mtd: denali: Disable sub-page writes in Denali NAND driver
        mtd: pxa3xx_nand: cleanup wait_for_completion handling
        mtd: nand: gpmi: Check for scan_bbt() error
        mtd: nand: gpmi: fixup return type of wait_for_completion_timeout
        ...

  commit 7c034dfd58bbc056280262887acf5b7a98944d0a
  Merge: 1204c46 c1c2fef
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 11:50:05 2015 -0700

      Merge tag 'rdma-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

      Pull InfiniBand/RDMA updates from Roland Dreier:

       - IPoIB fixes from Doug Ledford and Erez Shitrit

       - iSER updates from Sagi Grimberg

       - mlx4 GUID handling changes from Yishai Hadas

       - other misc fixes

      * tag 'rdma-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (51 commits)
        mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit 
architectures
        IB/iser: Rewrite bounce buffer code path
        IB/iser: Bump version to 1.6
        IB/iser: Remove code duplication for a single DMA entry
        IB/iser: Pass struct iser_mem_reg to iser_fast_reg_mr and 
iser_reg_sig_mr
        IB/iser: Modify struct iser_mem_reg members
        IB/iser: Make fastreg pool cache friendly
        IB/iser: Move PI context alloc/free to routines
        IB/iser: Move fastreg descriptor pool get/put to helper functions
        IB/iser: Merge build page-vec into register page-vec
        IB/iser: Get rid of struct iser_rdma_regd
        IB/iser: Remove redundant assignments in iser_reg_page_vec
        IB/iser: Move memory reg/dereg routines to iser_memory.c
        IB/iser: Don't pass ib_device to fall_to_bounce_buff routine
        IB/iser: Remove a redundant struct iser_data_buf
        IB/iser: Remove redundant cmd_data_len calculation
        IB/iser: Fix wrong calculation of protection buffer length
        IB/iser: Handle fastreg/local_inv completion errors
        IB/iser: Fix unload during ep_poll wrong dereference
        ib_srpt: convert printk's to pr_* functions
        ...

  commit 1204c464458e9837320a326a9fce550e3c5ef5de
  Merge: 4f21123 f77303b
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 11:30:10 2015 -0700

      Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

      Pull Ceph updates from Sage Weil:
       "This time around we have a collection of CephFS fixes from Zheng
        around MDS failure handling and snapshots, support for a new CRUSH
        straw2 algorithm (to sync up with userspace) and several RBD cleanups
        and fixes from Ilya, an error path leak fix from Taesoo, and then an
        assorted collection of cleanups from others"

      * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (28 commits)
        rbd: rbd_wq comment is obsolete
        libceph: announce support for straw2 buckets
        crush: straw2 bucket type with an efficient 64-bit crush_ln()
        crush: ensuring at most num-rep osds are selected
        crush: drop unnecessary include from mapper.c
        ceph: fix uninline data function
        ceph: rename snapshot support
        ceph: fix null pointer dereference in send_mds_reconnect()
        ceph: hold on to exclusive caps on complete directories
        libceph: simplify our debugfs attr macro
        ceph: show non-default options only
        libceph: expose client options through debugfs
        libceph, ceph: split ceph_show_options()
        rbd: mark block queue as non-rotational
        libceph: don't overwrite specific con error msgs
        ceph: cleanup unsafe requests when reconnecting is denied
        ceph: don't zero i_wrbuffer_ref when reconnecting is denied
        ceph: don't mark dirty caps when there is no auth cap
        ceph: keep i_snap_realm while there are writers
        libceph: osdmap.h: Add missing format newlines
        ...

  commit 4f2112351b4ac964b0249bdd883f7b79601f39d8
  Merge: 9b60afe 3193899
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 11:27:36 2015 -0700

      Merge tag 'trace-v4.1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

      Pull tracing fixes from Steven Rostedt:
       "This adds three fixes for the tracing code.

        The first is a bug when ftrace_dump_on_oops is triggered in atomic
        context and function graph tracer is the tracer that is being
        reported.

        The second fix is bad parsing of the trace_events from the kernel
        command line, where it would ignore specific events if the system name
        is used with defining the event(it enables all events within the
        system).

        The last one is a fix to the TRACE_DEFINE_ENUM(), where a check was
        missing to see if the ptr was incremented to the end of the string,
        but the loop increments it again and can miss the nul delimiter to
        stop processing"

      * tag 'trace-v4.1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix possible out of bounds memory access when parsing enums
        tracing: Fix incorrect enabling of trace events by boot cmdline
        tracing: Handle ftrace_dump() atomic context in graph_trace_open()

  commit 9b60afee50425064fa0a69bea22f07b6ea55ebc1
  Merge: 7dcca3e 9fbbda5
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 11:26:00 2015 -0700

      Merge tag 'pci-v4.1-fixes-1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

      Pull PCI fixes from Bjorn Helgaas:
       "These fix an ia64 regression caused by tighter resource checking we
        merged during the merge window and remove an invalid email address
        from MAINTAINERS.

        Resource management:
          - ia64: Treat all Address Space Descriptors as windows (Bjorn Helgaas)

        Miscellaneous:
          - MAINTAINERS: Remove Mohit Kumar (email bounces) (Bjorn Helgaas)"

      * tag 'pci-v4.1-fixes-1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        ia64/PCI: Treat all host bridge Address Space Descriptors (even 
consumers) as windows
        MAINTAINERS: Remove Mohit Kumar (email bounces)

  commit 0e2d686530d5e6c3c50c2c4f9ef8d6428252c35c
  Merge: 909d9fa 5a9ab01
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Wed Apr 22 14:24:55 2015 -0400

      Merge branch 'mpls'

      Robert Shearman says:

      ====================
      mpls: ABI changes for security and correctness

      V2:
       - don't treat loopback interfaces specially by enabling mpls by
         default

      These changes make mpls not be enabled by default on all
      interfaces when in use for security, along with ensuring that a label
      not valid as an outgoing label can be added in mpls routes.

      This series contains three ABI/behaviour-affecting changes which have
      been split out from "[PATCH net-next v4 0/6] mpls: Behaviour-changing
      improvements" without any further modification. These changes need to
      be considered for 4.1 otherwise we'll be stuck with the current
      behaviour/ABI forever.
      ====================

      Reviewed-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 5a9ab0176198d91dfc153f5e6c5fdc5afa613607
  Author: Robert Shearman <rshearma@xxxxxxxxxxx>
  Date:   Wed Apr 22 11:14:39 2015 +0100

      mpls: Prevent use of implicit NULL label as outgoing label

      The reserved implicit-NULL label isn't allowed to appear in the label
      stack for packets, so make it an error for the control plane to
      specify it as an outgoing label.

      Suggested-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
      Signed-off-by: Robert Shearman <rshearma@xxxxxxxxxxx>
      Reviewed-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 37bde79979c3862c79294c62ddcef7efc477e4bf
  Author: Robert Shearman <rshearma@xxxxxxxxxxx>
  Date:   Wed Apr 22 11:14:38 2015 +0100

      mpls: Per-device enabling of packet input

      An MPLS network is a single trust domain where the edges must be in
      control of what labels make their way into the core. The simplest way
      of ensuring this is for the edge device to always impose the labels,
      and not allow forward labeled traffic from untrusted neighbours. This
      is achieved by allowing a per-device configuration of whether MPLS
      traffic input from that interface should be processed or not.

      To be secure by default, the default state is changed to MPLS being
      disabled on all interfaces unless explicitly enabled and no global
      option is provided to change the default. Whilst this differs from
      other protocols (e.g. IPv6), network operators are used to explicitly
      enabling MPLS forwarding on interfaces, and with the number of links
      to the MPLS core typically fairly low this doesn't present too much of
      a burden on operators.

      Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
      Signed-off-by: Robert Shearman <rshearma@xxxxxxxxxxx>
      Reviewed-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 03c57747a7020a28a200e7e920fb48ecdc9b0fb8
  Author: Robert Shearman <rshearma@xxxxxxxxxxx>
  Date:   Wed Apr 22 11:14:37 2015 +0100

      mpls: Per-device MPLS state

      Add per-device MPLS state to supported interfaces. Use the presence of
      this state in mpls_route_add to determine that this is a supported
      interface.

      Use the presence of mpls_dev to drop packets that arrived on an
      unsupported interface - previously they were allowed through.

      Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
      Signed-off-by: Robert Shearman <rshearma@xxxxxxxxxxx>
      Reviewed-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 909d9faae2a447110aa061070145297fffe129cb
  Author: Yuval Mintz <Yuval.Mintz@xxxxxxxxxx>
  Date:   Wed Apr 22 12:47:32 2015 +0300

      bnx2x: Prevent inner-reload while VFs exist

      On some feature changes, driver employes an inner-reload flow where it
      resets the function and re-configures it with the new required set of
      parameters.

      Such a flow proves fatal to any VF since those were not intended to be 
used
      while HW is being reset underneath, causing them [at best] to lose all
      connectivity.

      This changes driver behavior to fail all configuration changes [e.g., mtu
      change] requested of the driver in case VFs are active.

      Signed-off-by: Yuval Mintz <Yuval.Mintz@xxxxxxxxxx>
      Signed-off-by: Ariel Elior <Ariel.Elior@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 7dcca3e92a34bf8ffdc4c01a49182ce1cb6ff534
  Merge: b9bb6fb cf82f52
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 11:22:55 2015 -0700

      Merge git://www.linux-watchdog.org/linux-watchdog

      Pull watchdog updates from Wim Van Sebroeck:
       "This contains following changes:

         - Octeon: convert to watchdog-API and apply some fixes
         - Cadence wdt: remove dependency on ARCH
         - add DT bindings for qcom + msm
         - bcm281xx: Remove use of seq_printf return value
         - stmp3xxx_rtc_wdt + pnx4008_wdt: fix broken email addresses"

      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: stmp3xxx_rtc_wdt: fix broken email address
        watchdog: pnx4008_wdt: fix broken email address
        watchdog: octeon: use fixed length string for register names
        watchdog: octeon: fix some trivial coding style issues
        watchdog: octeon: convert to WATCHDOG_CORE API
        watchdog: cadence: Remove Kconfig dependency on ARCH
        ARM: msm: add watchdog entries to DT timer binding doc
        ARM: qcom: add description of KPSS WDT for IPQ8064
        watchdog: qcom: use timer devicetree binding
        watchdog: bcm281xx: Remove use of seq_printf return value

  commit a2c3935aaa8fe99dbddb13ff244ecec7c324ec8b
  Merge: d83769a a87b9eb
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Wed Apr 22 14:17:23 2015 -0400

      Merge branch 'rhashtable-fixes'

      Thomas Graf says:

      ====================
      rhashtable rehashing fixes

      Some rhashtable rehashing bugs found while testing with the
      next rhashtable self-test queued up for the next devel cycle:

      https://github.com/tgraf/net-next/commits/rht

      v2:
       - Moved schedule_work() call into rhashtable_insert_rehash()
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit a87b9ebf1709687ff213091d0fdb4254b1564803
  Author: Thomas Graf <tgraf@xxxxxxx>
  Date:   Wed Apr 22 09:41:46 2015 +0200

      rhashtable: Do not schedule more than one rehash if we can't grow further

      The current code currently only stops inserting rehashes into the
      chain when no resizes are currently scheduled. As long as resizes
      are scheduled and while inserting above the utilization watermark,
      more and more rehashes will be scheduled.

      This lead to a perfect DoS storm with thousands of rehashes
      scheduled which lead to thousands of spinlocks to be taken
      sequentially.

      Instead, only allow either a series of resizes or a single rehash.
      Drop any further rehashes and return -EBUSY.

      Fixes: ccd57b1bd324 ("rhashtable: Add immediate rehash during insertion")
      Signed-off-by: Thomas Graf <tgraf@xxxxxxx>
      Acked-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit e2307ed6cbe71c74e291681aaa7e92ab98bc3177
  Author: Thomas Graf <tgraf@xxxxxxx>
  Date:   Wed Apr 22 09:41:45 2015 +0200

      rhashtable: Schedule async resize when sync realloc fails

      When rhashtable_insert_rehash() fails with ENOMEM, this indicates that
      we can't allocate the necessary memory in the current context but the
      limits as set by the user would still allow to grow.

      Thus attempt an async resize in the background where we can allocate
      using GFP_KERNEL which is more likely to succeed. The insertion itself
      will still fail to indicate pressure.

      This fixes a bug where the table would never continue growing once the
      utilization is above 100%.

      Fixes: ccd57b1bd324 ("rhashtable: Add immediate rehash during insertion")
      Signed-off-by: Thomas Graf <tgraf@xxxxxxx>
      Acked-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit d83769a580f1132ac26439f50068a29b02be535e
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Tue Apr 21 18:32:24 2015 -0700

      tcp: fix possible deadlock in tcp_send_fin()

      Using sk_stream_alloc_skb() in tcp_send_fin() is dangerous in
      case a huge process is killed by OOM, and tcp_mem[2] is hit.

      To be able to free memory we need to make progress, so this
      patch allows FIN packets to not care about tcp_mem[2], if
      skb allocation succeeded.

      In a follow-up patch, we might abort tcp_send_fin() infinite loop
      in case TIF_MEMDIE is set on this thread, as memory allocator
      did its best getting extra memory already.

      This patch reverts d22e15371811 ("tcp: fix tcp fin memory accounting")

      Fixes: d22e15371811 ("tcp: fix tcp fin memory accounting")
      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit b9bb6fb73b3e112d241a5edd146740be9a0c3cc0
  Merge: 15ce265 9abbfb4
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 10:55:06 2015 -0700

      Merge tag 'virtio-next-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

      Pull virtio updates from Rusty Russell:
       "Some virtio internal cleanups, a new virtio device "virtio input", and
        a change to allow the legacy virtio balloon.

        Most excitingly, some lguest work! No seriously, I got some cleanup
        patches"

      * tag 'virtio-next-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        virtio: drop virtio_device_is_legacy_only
        virtio_pci: support non-legacy balloon devices
        virtio_mmio: support non-legacy balloon devices
        virtio_ccw: support non-legacy balloon devices
        virtio: balloon might not be a legacy device
        virtio_balloon: transitional interface
        virtio_ring: Update weak barriers to use dma_wmb/rmb
        virtio_pci_modern: switch to type-safe io accessors
        virtio_pci_modern: type-safe io accessors
        lguest: handle traps on the "interrupt suppressed" iret instruction.
        virtio: drop a useless config read
        virtio_config: reorder functions
        Add virtio-input driver.
        lguest: suppress interrupts for single insn, not range.
        lguest: simplify lguest_iret
        lguest: rename i386_head.S in the comments
        lguest: explicitly set miscdevice's private_data NULL
        lguest: fix pending interrupt test.

  commit 3e550d2396d9deef77328237ed992e19dcfefca5
  Merge: 81a1209 5e0899d
  Author: Brian Norris <computersforpeace@xxxxxxxxx>
  Date:   Wed Apr 22 10:29:19 2015 -0700

      Merge MTD fixes from 4.0 into -next

  commit 15ce2658ddbd3db20dfba3622f3d224f01837fdc
  Merge: f3ca10d 4a3893d
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 09:49:24 2015 -0700

      Merge tag 'modules-next-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

      Pull module updates from Rusty Russell:
       "Quentin opened a can of worms by adding extable entry checking to
        modpost, but most architectures seem fixed now.  Thanks to all
        involved.

        Last minute rebase because I noticed a "[PATCH]" had snuck into a
        commit message somehow"

      * tag 'modules-next-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        modpost: don't emit section mismatch warnings for compiler optimizations
        modpost: expand pattern matching to support substring matches
        modpost: do not try to match the SHT_NUL section.
        modpost: fix extable entry size calculation.
        modpost: fix inverted logic in is_extable_fault_address().
        modpost: handle -ffunction-sections
        modpost: Whitelist .text.fixup and .exception.text
        params: handle quotes properly for values not of form foo="bar".
        modpost: document the use of struct section_check.
        modpost: handle relocations mismatch in __ex_table.
        scripts: add check_extable.sh script.
        modpost: mismatch_handler: retrieve tosym information only when needed.
        modpost: factorize symbol pretty print in get_pretty_name().
        modpost: add handler function pointer to sectioncheck.
        modpost: add .sched.text and .kprobes.text to the TEXT_SECTIONS list.
        modpost: add strict white-listing when referencing sections.
        module: do not print allocation-fail warning on bogus user buffer size
        kernel/module.c: fix typos in message about unused symbols

  commit f3ca10dde49043fbbb055854278b26954b549b36
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 09:44:36 2015 -0700

      Revert "mm: avoid tail page refcounting on non-THP compound pages"

      This reverts commit 8d63d99a5dfbdb997d12dd3c07b2070ca723db3b.

      It causes in VM mapping refcount errors:

        page:ffffea0010a15040 count:0 mapcount:1 mapping:          (null) 
index:0x0
        flags: 0x8000000000008014(referenced|dirty|tail)
        page dumped because: VM_BUG_ON_PAGE(page_mapcount(page) != 0)
        ------------[ cut here ]------------
        kernel BUG at mm/swap.c:134!

      as reported by Borislav Petkov

      Reported-and-tested-by: Borislav Petkov <bp@xxxxxxxxx>
      Cc: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx>
      Cc: Hugh Dickins <hughd@xxxxxxxxxx>
      Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
      Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Cc: linux-mm@xxxxxxxxx
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 5e6c94a999f67f120c6bbba71bbee840dfee6338
  Merge: 3cfe213 96541ba
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 09:29:08 2015 -0700

      Merge tag 'mmc-4.1-rc1' of git://git.linaro.org/people/ulf.hansson/mmc

      Pull MMC fixes from Ulf Hansson:
       "Here is two mmc core fixes for v.4.1 rc1:

         - fix error code propagation in mmc_pwrseq_simple_alloc()

         - revert 'mmc: core: Convert mmc_driver to device_driver'"

      * tag 'mmc-4.1-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
        Revert "mmc: core: Convert mmc_driver to device_driver"
        mmc: pwrseq: Fix error code propagation in mmc_pwrseq_simple_alloc()

  commit 3cfe213756a5c208ab51816d51641bf49f2e67fd
  Author: Vinod Koul <vinod.koul@xxxxxxxxx>
  Date:   Wed Apr 22 12:17:46 2015 +0530

      dmaengine: hsu: don't prompt for hsu_core part

      HSU_DMA is selected by the HSU_DMA_PCI driver, this should be user 
selected
      so remove the user prompt for this

      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 8b3c8ba3d8c2680dab5363a80c024965cac08b1e
  Merge: d34dc4f 48c1078
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 09:24:55 2015 -0700

      Merge tag 'armsoc-late' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

      Pull ARM SoC late changes from Olof Johansson:
       "We were expecting to sit on this branch through most of the merge
        window since the contents was merged into our tree late, but we ended
        up sitting on all of our contents so it can go in with the rest.

        The contents here is:

         - a large branch of cleanups of the CM/PRM blocks on OMAP.

         - a couple of patches plumbing up CM/PRM on OMAP5 and DRA7.

         - a branch with DT updates for Freescale i.MX.  including some
           shuffling from .dts to .dtsi (include) files that causes a little
           churn"

      * tag 'armsoc-late' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (78 commits)
        ARM: OMAP2+: Fix booting with configs that don't have MFD_SYSCON
        ARM: OMAP4+: control: add support for initializing control module via DT
        ARM: dts: dra7: add minimal l4 bus layout with control module support
        ARM: dts: omap5: add minimal l4 bus layout with control module support
        ARM: OMAP4+: control: remove support for legacy pad read/write
        ARM: OMAP4: display: convert display to use syscon for dsi muxing
        ARM: dts: omap4: add minimal l4 bus layout with control module support
        ARM: dts: am4372: add minimal l4 bus layout with control module support
        ARM: dts: am43xx-epos-evm: fix pinmux node layout
        ARM: dts: am33xx: add minimal l4 bus layout with control module support
        ARM: dts: omap3: add minimal l4 bus layout with control module support
        ARM: dts: omap24xx: add minimal l4 bus layout with control module 
support
        ARM: OMAP2+: control: add syscon support for register accesses
        ARM: OMAP2+: id: cache omap_type value
        ARM: OMAP2+: control: remove API for getting control module base address
        ARM: OMAP2+: clock: add low-level support for regmap
        ARM: OMAP4+: PRM: get rid of cpu_is_omap44xx calls from interrupt init
        ARM: OMAP4+: PRM: setup prm_features from the PRM init time flags
        ARM: OMAP2+: CM: move SoC specific init calls within a generic API
        ARM: OMAP4+: PRM: determine prm_device_inst based on DT compatibility
        ...

  commit d34dc4f9e88e4b6beefb819e4e743fd6160a9b75
  Merge: 2144de8 bb1518f
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 09:23:58 2015 -0700

      Merge tag 'armsoc-arm64' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

      Pull ARM SoC 64-bit changes from Olof Johansson:
       "Mostly DT updates for arm64, but also a couple of Kconfig additions.

        Main contents:

         - Qualcomm MSM8916/APQ8016

         - Spreadtrum SC9836

         - Xilinx ZynqMP

         - pincontrol entries for MediaTek MT8173"

      * tag 'armsoc-arm64' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        arm64: dts: add interrupt-affinity property to pmu node for juno
        arm64: dts: Add Qualcomm APQ8016 SBC evaluation board dts
        arm64: dts: Add Qualcomm MSM8916 SoC and evaluation board dts
        arm64: dts: sprd: adding coresight entries to Spreadtrum SC9836
        arm64: Add support for Spreadtrum's Sharkl64 Platform in Kconfig and 
defconfig
        arm64: dts: Add support for Spreadtrum SC9836 SoC in dts and Makefile
        ARM64: Add new Xilinx ZynqMP SoC
        arm64: qcom: Add support for Qualcomm MSM8916 SoC
        arm64: dts: mt8173: Add pinctrl/GPIO/EINT node for mt8173.
        arm64: mediatek: Select PINCTRL for Mediatek platform

  commit 2144de826e1eeac0c2e30a22029b3330d8bb813c
  Merge: e5ac320 b50c9c2
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 09:21:30 2015 -0700

      Merge tag 'armsoc-defconfig' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

      Pull ARM SoC defconfig updates from Olof Johansson:
       "We keep collecting defconfig updates in a separate branch mostly to
        encourage people to handle them separately and avoid conflicts between
        different topics.

        Most of these are enablement of new drivers that have come in, or
        minor config refreshes due to reorderings in Kconfig files, etc.  I.e.
        mostly minor churn of various kinds.

        We might start folding this branch into something else for upstream
        merge since it's so small, but keep it independent in our own tree for
        the above reasons"

      * tag 'armsoc-defconfig' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
        ARM: multi_v7_defconfig: enable alpine platform
        ARM: multi_v7_defconfig: Add gpio-restart driver
        ARM: multi_v7_defconfig: Build the Marvell WiFi-Ex driver as a module
        ARM: multi_v7_defconfig: Enable support for ELAN i2c trackpads
        ARM: multi_v7_defconfig: Enable Tegra ACTMON support
        ARM: configs: remove all CONFIG_RCAR_AUDMAC_PP from ARM defconfigs
        ARM: configs: enable Marvell Armada 39x in multi_v7_defconfig
        ARM: exynos_defconfig: Enable HDMI support
        ARM: exynos_defconfig: Enable options to mount a rootfs via NFS
        ARM: qcom: Increase MMC_BLOCK_MINORS in defconfig
        ARM: mvebu: Enable perf support in mvebu_v7_defconfig
        ARM: exynos_defconfig: Enable ChromeOS EC chardev driver
        ARM: exynos_defconfig: Enable CPU idle
        ARM: exynos_defconfig: Enable Marvell WiFi-Ex support
        arm: qcom: Update defconfig
        arm: qcom: Enable lpass clock driver in defconfig
        ARM: omap2plus_defconfig: Enable n900 modem as loadable modules
        ARM: omap2plus_defconfig: Update bluetooth options
        ARM: omap2plus_defconfig: Enable leds-pwm
        ARM: omap1_defconfig: drop obsolete Kconfig symbols
        ...

  commit e5ac320de1fe3ef5a5afa5f8a0cd19b0c5373a37
  Merge: 7d2b6ef 89522f0f
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 09:20:15 2015 -0700

      Merge tag 'armsoc-multiplatform' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

      Pull ARM SoC multiplatform code changes from Olof Johansson:
       "The changes here belong to two main platforms:

         - Atmel At91 is flipping the bit and going multiplatform.  This
           includes some cleanups and removal of code, and the final flip of
           config dependencies

         - Shmobile has several platforms that are going multiplatform, but
           this branch also contains a bunch of cleanups that they weren't
           able to keep separate in a good way.  THere's also a removal of one
           of their SoCs and the corresponding boards (sh7372 and mackerel)"

      * tag 'armsoc-multiplatform' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
        ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
        ARM: at91/pm: move the standby functions to pm.c
        ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
        ARM: at91: add a Kconfig dependency on multi-platform
        ARM: at91: drop AT91_TIMER_HZ
        ARM: at91: remove hardware.h
        ARM: at91: remove SoC headers
        ARM: at91: remove useless mach/cpu.h
        ARM: at91: remove unused headers
        ARM: at91: switch at91_dt_defconfig to multiplatform
        ARM: at91: switch to multiplatform
        ARM: shmobile: r8a7778: enable multiplatform target
        ARM: shmobile: bockw: add sound to DT
        ARM: shmobile: r8a7778: add sound to DT
        ARM: shmobile: bockw: add devices hooked up to i2c0 to DT
        DT: i2c: add trivial binding for OKI ML86V7667 video decoder
        ARM: shmobile: r8a7778: common clock framework CPG driver
        ARM: shmobile: bockw dts: set extal clock frequency
        ARM: shmobile: bockw dts: Move Ethernet node to BSC
        ARM: shmobile: r8a73a4: Remove legacy code
        ...

  commit 7d2b6ef19cf0f98cef17aa5185de3631a618710a
  Merge: 5c73cc4 7415d97
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 09:18:17 2015 -0700

      Merge tag 'armsoc-drivers' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

      Pull ARM SoC driver updates from Olof Johansson:
       "Driver updates for v4.1.  Some of these are for drivers/soc, where we
        find more and more SoC-specific drivers these days.  Some are for
        other driver subsystems where we have received acks from the
        appropriate maintainers.

        The larger parts of this branch are:

         - MediaTek support for their PMIC wrapper interface, a high-level
           interface for talking to the system PMIC over a dedicated I2C
           interface.

         - Qualcomm SCM driver has been moved to drivers/firmware.  It's used
           for CPU up/down and needs to be in a shared location for arm/arm64
           common code.

         - cleanup of ARM-CCI PMU code.

         - another set of cleanusp to the OMAP GPMC code"

      * tag 'armsoc-drivers' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
        soc/mediatek: Remove unused variables
        clocksource: atmel-st: select MFD_SYSCON
        soc: mediatek: Add PMIC wrapper for MT8135 and MT8173 SoCs
        arm-cci: Fix CCI PMU event validation
        arm-cci: Split the code for PMU vs driver support
        arm-cci: Get rid of secure transactions for PMU driver
        arm-cci: Abstract the CCI400 PMU specific definitions
        arm-cci: Rearrange code for splitting PMU vs driver code
        drivers: cci: reject groups spanning multiple HW PMUs
        ARM: at91: remove useless include
        clocksource: atmel-st: remove mach/hardware dependency
        clocksource: atmel-st: use syscon/regmap
        ARM: at91: time: move the system timer driver to drivers/clocksource
        ARM: at91: properly initialize timer
        ARM: at91: at91rm9200: remove deprecated arm_pm_restart
        watchdog: at91rm9200: implement restart handler
        watchdog: at91rm9200: use the system timer syscon
        mfd: syscon: Add atmel system timer registers definition
        ARM: at91/dt: declare atmel,at91rm9200-st as a syscon
        soc: qcom: gsbi: Add support for ADM CRCI muxing
        ...

  commit 5c73cc4b6c83e88863a5de869cc5df3b913aef4a
  Merge: e6c81cc 8b03655
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 09:09:46 2015 -0700

      Merge tag 'armsoc-dt' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

      Pull ARM DT updates from Olof Johansson:
       "As always, this tends to be one of our bigger branches.  There are
        lots of updates this release, but not that many jumps out as something
        that needs more detailed coverage.  Some of the highlights are:

         - DTs for the new Annapurna Labs Alpine platform

         - more graphics DT pieces falling into place on Exynos, bridges,
           clocks.

         - plenty of DT updates for Qualcomm platforms for various IP blocks

         - some churn on Tegra due to switch-over to tool-generated pinctrl
           data

         - misc fixes and updates for Atmel at91 platforms

         - various DT updates to add IP block support on Broadcom's Cygnus
           platforms

         - more updates for Renesas platforms as DT support is added for
           various IP blocks (IPMMU, display, audio, etc)"

      * tag 'armsoc-dt' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (231 commits)
        ARM: dts: alpine: add internal pci
        Revert "ARM: dts: mt8135: Add pinctrl/GPIO/EINT node for mt8135."
        ARM: mvebu: use 0xf1000000 as internal registers on Armada 370 DB
        ARM: dts: qcom: Add idle state device nodes for 8064
        ARM: dts: qcom: Add idle states device nodes for 8084
        ARM: dts: qcom: Add idle states device nodes for 8974/8074
        ARM: dts: qcom: Update power-controller device node for 8064 Krait CPUs
        ARM: dts: qcom: Add power-controller device node for 8084 Krait CPUs
        ARM: dts: qcom: Add power-controller device node for 8074 Krait CPUs
        devicetree: bindings: Document qcom,idle-states
        devicetree: bindings: Update qcom,saw2 node bindings
        dt-bindings: Add #defines for MSM8916 clocks and resets
        arm: dts: qcom: Add LPASS Audio HW to IPQ8064 device tree
        arm: dts: qcom: Add APQ8084 chipset SPMI PMIC's nodes
        arm: dts: qcom: Add 8x74 chipset SPMI PMIC's nodes
        arm: dts: qcom: Add SPMI PMIC Arbiter nodes for APQ8084 and MSM8974
        arm: dts: qcom: Add LCC nodes
        arm: dts: qcom: Add TCSR support for MSM8960
        arm: dts: qcom: Add TCSR support for MSM8660
        arm: dts: qcom: Add TCSR support for IPQ8064
        ...

  commit e6c81cce5699ec6be3a7533b5ad7a062ab3357f2
  Merge: d0440c5 a018bb2
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 09:08:39 2015 -0700

      Merge tag 'armsoc-soc' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

      Pull ARM SoC platform updates from Olof Johansson:
       "Our SoC branch usually contains expanded support for new SoCs and
        other core platform code.  In this case, that includes:

         - support for the new Annapurna Labs "Alpine" platform

         - a rework greatly simplifying adding new platform support to the
           MCPM subsystem (Multi-cluster power management)

         - cpuidle and PM improvements for Exynos3250

         - misc updates for Renesas, OMAP, Meson, i.MX.  Some of these could
           have gone in other branches but ended up here for various reasons"

      * tag 'armsoc-soc' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (53 commits)
        ARM: alpine: add support for generic pci
        ARM: Exynos: migrate DCSCB to the new MCPM backend abstraction
        ARM: vexpress: migrate DCSCB to the new MCPM backend abstraction
        ARM: vexpress: DCSCB: tighten CPU validity assertion
        ARM: vexpress: migrate TC2 to the new MCPM backend abstraction
        ARM: MCPM: move the algorithmic complexity to the core code
        ARM: EXYNOS: allow cpuidle driver usage on Exynos3250 SoC
        ARM: EXYNOS: add AFTR mode support for Exynos3250
        ARM: EXYNOS: add code for setting/clearing boot flag
        ARM: EXYNOS: fix CPU1 hotplug on Exynos3250
        ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore
        ARM: cygnus: fix const declaration bcm_cygnus_dt_compat
        ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
        ARM: DRA7: hwmod: Add data for GPTimers 13 through 16
        ARM: EXYNOS: Remove left over 'extra_save'
        ARM: EXYNOS: Constify exynos_pm_data array
        ARM: EXYNOS: use static in suspend.c
        ARM: EXYNOS: Use platform device name as power domain name
        ARM: EXYNOS: add support for async-bridge clocks for pm_domains
        ARM: omap-device: add missed callback for suspend-to-disk
        ...

  commit d0440c59f52d31aa7f74ba8e35cc22ee96acea84
  Merge: 38eb1db c4c14f3
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 09:04:39 2015 -0700

      Merge tag 'armsoc-cleanup' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

      Pull ARM SoC cleanups from Olof Johansson:
       "We've got a fairly large cleanup branch this time.  The bulk of this
        is removal of non-DT platforms of several flavors:

         - Atmel at91 platforms go full-DT, with removal of remaining
           board-file based support

         - OMAP removes legacy board files for three more platforms

         - removal of non-DT mach-msm, newer Qualcomm platforms now live in
           mach-qcom

         - Freescale i.MX25 also removes non-DT platform support"

      Most of the rest of the changes here are fallout from the above, i.e. for
      example removal of drivers that now lack platforms, etc.

      * tag 'armsoc-cleanup' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (58 commits)
        mmc: Remove msm_sdcc driver
        gpio: Remove gpio-msm-v1 driver
        ARM: Remove mach-msm and associated ARM architecture code
        ARM: shmobile: cpuidle: Remove the pointless default driver
        ARM: davinci: dm646x: Add interrupt resource for McASPs
        ARM: davinci: irqs: Correct McASP1 TX interrupt definition for DM646x
        ARM: davinci: dm646x: Clean up the McASP DMA resources
        ARM: davinci: devices-da8xx: Add support for McASP2 on da830
        ARM: davinci: devices-da8xx: Clean up and correct the McASP device 
creation
        ARM: davinci: devices-da8xx: Add interrupt resource to McASP structs
        ARM: davinci: devices-da8xx: Add resource name for the McASP DMA request
        ARM: OMAP2+: Remove legacy support for omap3 TouchBook
        ARM: OMAP3: Remove legacy support for devkit8000
        ARM: OMAP3: Remove legacy support for EMA-Tech Stalker board
        ARM: shmobile: Consolidate the pm code for R-Car Gen2
        ARM: shmobile: r8a7791: Correct SYSCIER value
        ARM: shmobile: r8a7790: Correct SYSCIER value
        ARM: at91: remove old setup
        ARM: at91: sama5d4: remove useless map_io
        ARM: at91: sama5 use SoC detection infrastructure
        ...

  commit 38eb1dbb0d7d190bdfe2ea824e94dab19e32737f
  Merge: db4fd9c cdaa8cf
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Wed Apr 22 09:03:30 2015 -0700

      Merge tag 'armsoc-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

      Pull ARM SoC fixes from Olof Johansson:
       "Here's the usual "low-priority fixes that didn't make it into the last
        few -rcs, with a twist: We had a fixes pull request that I didn't send
        in time to get into 4.0, so we'll send some of them to Greg for
        -stable as well.

        Contents here is as usual not all that controversial:

         - a handful of randconfig fixes from Arnd, in particular for older
           Samsung platforms

         - Exynos fixes, !SMP building, DTS updates for MMC and lid switch

         - Kbuild fix to create output subdirectory for DTB files

         - misc minor fixes for OMAP"

      * tag 'armsoc-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
        ARM: at91/dt: sama5d3 xplained: add phy address for macb1
        kbuild: Create directory for target DTB
        ARM: mvebu: Disable CPU Idle on Armada 38x
        ARM: DRA7: Enable Cortex A15 errata 798181
        ARM: dts: am57xx-beagle-x15: Add thermal map to include fan and tmp102
        ARM: dts: DRA7: Add bandgap and related thermal nodes
        bus: ocp2scp: SYNC2 value should be changed to 0x6
        ARM: dts: am4372: Add "ti,am437x-ocp2scp" as compatible string for 
OCP2SCP
        ARM: OMAP2+: remove superfluous NULL pointer check
        ARM: EXYNOS: Fix build breakage cpuidle on !SMP
        ARM: dts: fix lid and power pin-functions for exynos5250-spring
        ARM: dts: fix mmc node updates for exynos5250-spring
        ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688
        MAINTAINERS: add OMAP defconfigs under OMAP SUPPORT
        ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs
        ARM: cns3xxx: don't export static symbol
        ARM: S3C24XX: avoid a Kconfig warning
        ARM: S3C24XX: fix header file inclusions
        ARM: S3C24XX: fix building without PM_SLEEP
        ARM: S3C24XX: use SAMSUNG_WAKEMASK for s3c2416
        ...

  commit f77303bddabf73ebccb60f613b77da391f933cf6
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Wed Apr 22 18:28:13 2015 +0300

      rbd: rbd_wq comment is obsolete

      After the switch to blk-mq rbd_wq processes requests, not devices.

      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit 7c1c4747f28f59f2939687168203863f7e095d10
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Tue Apr 14 23:13:31 2015 +0300

      libceph: announce support for straw2 buckets

      Sync up feature bits and enable CEPH_FEATURE_CRUSH_V4.

      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit 958a27658d94cf212caeb0ffb04ee0b0bc89cc40
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Tue Apr 14 16:54:52 2015 +0300

      crush: straw2 bucket type with an efficient 64-bit crush_ln()

      This is an improved straw bucket that correctly avoids any data movement
      between items A and B when neither A nor B's weights are changed.  Said
      differently, if we adjust the weight of item C (including adding it anew
      or removing it completely), we will only see inputs move to or from C,
      never between other items in the bucket.

      Notably, there is not intermediate scaling factor that needs to be
      calculated.  The mapping function is a simple function of the item 
weights.

      The below commits were squashed together into this one (mostly to avoid
      adding and then yanking a ~6000 lines worth of crush_ln_table):

      - crush: add a straw2 bucket type
      - crush: add crush_ln to calculate nature log efficently
      - crush: improve straw2 adjustment slightly
      - crush: change crush_ln to provide 32 more digits
      - crush: fix crush_get_bucket_item_weight and bucket destroy for straw2
      - crush/mapper: fix divide-by-0 in straw2
        (with div64_s64() for draw = ln / w and INT64_MIN -> S64_MIN - need
         to create a proper compat.h in ceph.git)

      Reflects ceph.git commits 242293c908e923d474910f2b8203fa3b41eb5a53,
                                32a1ead92efcd351822d22a5fc37d159c65c1338,
                                6289912418c4a3597a11778bcf29ed5415117ad9,
                                35fcb04e2945717cf5cfe150b9fa89cb3d2303a1,
                                6445d9ee7290938de1e4ee9563912a6ab6d8ee5f,
                                b5921d55d16796e12d66ad2c4add7305f9ce2353.

      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit 45002267e8d2699bf9b022315bee3dd13b044843
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Tue Apr 14 16:04:23 2015 +0300

      crush: ensuring at most num-rep osds are selected

      Crush temporary buffers are allocated as per replica size configured
      by the user.  When there are more final osds (to be selected as per
      rule) than the replicas, buffer overlaps and it causes crash.  Now, it
      ensures that at most num-rep osds are selected even if more number of
      osds are allowed by the rule.

      Reflects ceph.git commits 6b4d1aa99718e3b367496326c1e64551330fabc0,
                                234b066ba04976783d15ff2abc3e81b6cc06fb10.

      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit 9be6df215a1baa57ccad0c388daeb2ad8f8d99ee
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Tue Apr 14 20:55:13 2015 +0300

      crush: drop unnecessary include from mapper.c

      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit ec137c10e720e5cf085504332ee1bf380241ed69
  Author: Yan, Zheng <zyan@xxxxxxxxxx>
  Date:   Mon Apr 13 11:25:07 2015 +0800

      ceph: fix uninline data function

      For CEPH_OSD_CMPXATTR_MODE_U64, OSD expects the u64 to be encoded
      as string in object's xattr.

      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit 0ea611a3bc5fb8f6a0bb1a76fe2dbf8ebe4bdf77
  Author: Yan, Zheng <zyan@xxxxxxxxxx>
  Date:   Tue Apr 7 15:36:32 2015 +0800

      ceph: rename snapshot support

      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit c0bd50e2eeddf139d8f61e709d7003210301e93a
  Author: Yan, Zheng <zyan@xxxxxxxxxx>
  Date:   Tue Apr 7 15:51:08 2015 +0800

      ceph: fix null pointer dereference in send_mds_reconnect()

      sb->s_root can be null when umounting

      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit 2fa462f826210bbec65f8ed06d5ef4e0cd4f5450
  Merge: 123857a fd1d0dd
  Author: Paolo Bonzini <pbonzini@xxxxxxxxxx>
  Date:   Wed Apr 22 17:08:12 2015 +0200

      Merge tag 'kvm-arm-for-4.1-take2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

      KVM/ARM changes for v4.1, take #2:

      Rather small this time:

      - a fix for a nasty bug with virtual IRQ injection
      - a fix for irqfd

  commit fd1d0ddf2ae92fb3df42ed476939861806c5d785
  Author: Andre Przywara <andre.przywara@xxxxxxx>
  Date:   Fri Apr 10 16:17:59 2015 +0100

      KVM: arm/arm64: check IRQ number on userland injection

      When userland injects a SPI via the KVM_IRQ_LINE ioctl we currently
      only check it against a fixed limit, which historically is set
      to 127. With the new dynamic IRQ allocation the effective limit may
      actually be smaller (64).
      So when now a malicious or buggy userland injects a SPI in that
      range, we spill over on our VGIC bitmaps and bytemaps memory.
      I could trigger a host kernel NULL pointer dereference with current
      mainline by injecting some bogus IRQ number from a hacked kvmtool:
      -----------------
      ....
      DEBUG: kvm_vgic_inject_irq(kvm, cpu=0, irq=114, level=1)
      DEBUG: vgic_update_irq_pending(kvm, cpu=0, irq=114, level=1)
      DEBUG: IRQ #114 still in the game, writing to bytemap now...
      Unable to handle kernel NULL pointer dereference at virtual address 
00000000
      pgd = ffffffc07652e000
      [00000000] *pgd=00000000f658b003, *pud=00000000f658b003, 
*pmd=0000000000000000
      Internal error: Oops: 96000006 [#1] PREEMPT SMP
      Modules linked in:
      CPU: 1 PID: 1053 Comm: lkvm-msi-irqinj Not tainted 4.0.0-rc7+ #3027
      Hardware name: FVP Base (DT)
      task: ffffffc0774e9680 ti: ffffffc0765a8000 task.ti: ffffffc0765a8000
      PC is at kvm_vgic_inject_irq+0x234/0x310
      LR is at kvm_vgic_inject_irq+0x30c/0x310
      pc : [<ffffffc0000ae0a8>] lr : [<ffffffc0000ae180>] pstate: 80000145
      .....

      So this patch fixes this by checking the SPI number against the
      actual limit. Also we remove the former legacy hard limit of
      127 in the ioctl code.

      Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
      Reviewed-by: Christoffer Dall <christoffer.dall@xxxxxxxxxx>
      CC: <stable@xxxxxxxxxxxxxxx> # 4.0, 3.19, 3.18
      [maz: wrap KVM_ARM_IRQ_GIC_MAX with #ifndef __KERNEL__,
      as suggested by Christopher Covington]
      Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>

  commit 0b3289ebc2d50cf5ab778215ed0b4075bbae6629
  Author: Eric Auger <eric.auger@xxxxxxxxxx>
  Date:   Mon Apr 13 15:01:59 2015 +0200

      KVM: arm: irqfd: fix value returned by kvm_irq_map_gsi

      irqfd/arm curently does not support routing. kvm_irq_map_gsi is
      supposed to return all the routing entries associated with the
      provided gsi and return the number of those entries. We should
      return 0 at this point.

      Signed-off-by: Eric Auger <eric.auger@xxxxxxxxxx>
      Acked-by: Christoffer Dall <christoffer.dall@xxxxxxxxxx>
      Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>

  commit cf82f52d3619d2e15c83ec9a03c6ce8cdf6c6b58
  Author: Wolfram Sang <wsa@xxxxxxxxxxxxx>
  Date:   Mon Apr 20 15:51:44 2015 +0200

      watchdog: stmp3xxx_rtc_wdt: fix broken email address

      My Pengutronix address is not valid anymore, redirect people to the 
Pengutronix
      kernel team.

      Reported-by: Harald Geyer <harald@xxxxxxxxx>
      Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxxxxx>
      Acked-by: Robert Schwebel <r.schwebel@xxxxxxxxxxxxxx>
      Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

  commit e8cc53665728860a56dbbd56bfc32ac934efb70a
  Author: Wolfram Sang <wsa@xxxxxxxxxxxxx>
  Date:   Mon Apr 20 15:51:43 2015 +0200

      watchdog: pnx4008_wdt: fix broken email address

      My Pengutronix address is not valid anymore, redirect people to the 
Pengutronix
      kernel team.

      Reported-by: Harald Geyer <harald@xxxxxxxxx>
      Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxxxxx>
      Acked-by: Robert Schwebel <r.schwebel@xxxxxxxxxxxxxx>
      Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

  commit 3a30c07e712df895981deac0782655997942bc75
  Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
  Date:   Sat Mar 28 20:05:40 2015 +0200

      watchdog: octeon: use fixed length string for register names

      Use fixed length string for register names. This saves 416 bytes
      in text size.

      Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
      Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

  commit 8692cf0ad31b3654c798c23de01e4c23c4536dea
  Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
  Date:   Sat Mar 28 20:05:39 2015 +0200

      watchdog: octeon: fix some trivial coding style issues

      Fix some trivial coding style issues to reduce noise from static 
analyzers.

      Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
      Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

  commit 3d588c93c040c4aacca81b15a7aa9761357ecdc4
  Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
  Date:   Sat Mar 28 20:05:38 2015 +0200

      watchdog: octeon: convert to WATCHDOG_CORE API

      Convert OCTEON watchdog to WATCHDOG_CORE API. This enables support
      for multiple watchdogs on OCTEON boards.

      Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
      Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

  commit 6290d8c826023a633da3e675784b5f317a9600f0
  Author: Michal Simek <michal.simek@xxxxxxxxxx>
  Date:   Mon Mar 9 09:50:12 2015 +0100

      watchdog: cadence: Remove Kconfig dependency on ARCH

      Remove Kconfig dependency and enable driver for
      all ARCHs.

      Signed-off-by: Michal Simek <michal.simek@xxxxxxxxxx>
      Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

  commit cf79fb14d09f8a9aaadfce59d01cfedf4f96d99d
  Author: Mathieu Olivari <mathieu@xxxxxxxxxxxxxx>
  Date:   Fri Feb 20 18:19:36 2015 -0800

      ARM: msm: add watchdog entries to DT timer binding doc

      The watchdog has been reworked to use the same DT node as the timer.
      This change is updating the device tree doc accordingly.

      Signed-off-by: Mathieu Olivari <mathieu@xxxxxxxxxxxxxx>
      Acked-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

  commit 4ba1c98b552c58b1a29bd943aef51b1788465b2d
  Author: Mathieu Olivari <mathieu@xxxxxxxxxxxxxx>
  Date:   Fri Feb 20 18:19:35 2015 -0800

      ARM: qcom: add description of KPSS WDT for IPQ8064

      Add the watchdog related entries to the Krait Processor Sub-system
      (KPSS) timer IPQ8064 devicetree section. Also, add a fixed-clock
      description of SLEEP_CLK, which will do for now.

      Signed-off-by: Josh Cartwright <joshc@xxxxxxxxxxxxxx>
      Signed-off-by: Mathieu Olivari <mathieu@xxxxxxxxxxxxxx>
      Reviewed-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
      Acked-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

  commit 0dfd582e026af8a37917164aaba7227fa812e5c2
  Author: Mathieu Olivari <mathieu@xxxxxxxxxxxxxx>
  Date:   Fri Feb 20 18:19:34 2015 -0800

      watchdog: qcom: use timer devicetree binding

      MSM watchdog configuration happens in the same register block as the
      timer, so we'll use the same binding as the existing timer.

      The qcom-wdt will now be probed when devicetree has an entry compatible
      with "qcom,kpss-timer" or "qcom-scss-timer".

      Signed-off-by: Mathieu Olivari <mathieu@xxxxxxxxxxxxxx>
      Reviewed-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
      Acked-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

  commit e1dbde29609a4f829589f0e48361470327ae3f62
  Author: Joe Perches <joe@xxxxxxxxxxx>
  Date:   Sat Feb 21 18:53:48 2015 -0800

      watchdog: bcm281xx: Remove use of seq_printf return value

      The seq_printf return value, because it's frequently misused,
      will eventually be converted to void.

      See: commit 1f33c41c03da ("seq_file: Rename seq_overflow() to
           seq_has_overflowed() and make public")

      Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
      Acked-by: Guenter Roeck <linux~roeck-us.net>
      Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>

  commit 4a3893d069b788f3570c19c12d9e986e8e15870f
  Author: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
  Date:   Mon Apr 20 10:20:40 2015 +0930

      modpost: don't emit section mismatch warnings for compiler optimizations

      Currently an allyesconfig build [gcc-4.9.1] can generate the following:

         WARNING: vmlinux.o(.text.unlikely+0x3864): Section mismatch in
         reference from the function cpumask_empty.constprop.3() to the
         variable .init.data:nmi_ipi_mask

      which comes from the cpumask_empty usage in 
arch/x86/kernel/nmi_selftest.c.

      Normally we would not see a symbol entry for cpumask_empty since it is:

        static inline bool cpumask_empty(const struct cpumask *srcp)

      however in this case, the variant of the symbol gets emitted when GCC does
      constant propagation optimization.

      Fix things up so that any locally optimized constprop variants don't warn
      when accessing variables that live in the __init sections.

      Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
      Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>

  commit 09c20c032b0f753969ae778d9783d946f054d7fe
  Author: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
  Date:   Mon Apr 20 10:20:26 2015 +0930

      modpost: expand pattern matching to support substring matches

      Currently the match() function supports a leading * to match any
      prefix and a trailing * to match any suffix.  However there currently
      is not a combination of both that can be used to target matches of
      whole families of functions that share a common substring.

      Here we expand the *foo and foo* match to also support *foo* with
      the goal of targeting compiler generated symbol names that contain
      strings like ".constprop." and ".isra."

      Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
      Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>

  commit c5c3439af0f9c08e253d2a703a7eb3deba7d8591
  Author: Quentin Casasnovas <quentin.casasnovas@xxxxxxxxxx>
  Date:   Thu Apr 16 13:16:41 2015 +0930

      modpost: do not try to match the SHT_NUL section.

      Trying to match the SHT_NUL section isn't useful and causes build failures
      on parisc and mn10300 since the addition of section strict white-listing
      and __ex_table sanitizing.

      Signed-off-by: Quentin Casasnovas <quentin.casasnovas@xxxxxxxxxx>
      Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Fixes: 050e57fd5936 ("modpost: add strict white-listing when 
referencing....")
      Fixes: 52dc0595d540 ("modpost: handle relocations mismatch in 
__ex_table.")
      Tested-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>

  commit e84048aa173f2403fa468cb189f101b57fece539
  Author: Quentin Casasnovas <quentin.casasnovas@xxxxxxxxxx>
  Date:   Thu Apr 16 13:05:36 2015 +0930

      modpost: fix extable entry size calculation.

      As Guenter pointed out, we were never really calculating the extable entry
      size because the pointer arithmetic was simply wrong.  We want to check
      we're handling the second relocation in __ex_table to infer an entry size,
      but we were using (void*) pointers instead of Elf_Rel[a]* ones.

      This fixes the problem by moving that check in the caller (since we can
      deal with different types of relocations) and add 
is_second_extable_reloc()
      to make the whole thing more readable.

      Signed-off-by: Quentin Casasnovas <quentin.casasnovas@xxxxxxxxxx>
      Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      CC: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
      Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>

  commit d3df4de7eb095cc4334759a5e65bf3bfb4be04f1
  Author: Quentin Casasnovas <quentin.casasnovas@xxxxxxxxxx>
  Date:   Thu Apr 16 13:03:32 2015 +0930

      modpost: fix inverted logic in is_extable_fault_address().

      As Guenter pointed out, we want to assert that extable_entry_size has been
      discovered and not the other way around.  Moreover, this sanity check is
      only valid when we're not dealing with the first relocation in __ex_table,
      since we have not discovered the extable entry size at that point.

      This was leading to a divide-by-zero on some architectures and make the
      build fail.

      Signed-off-by: Quentin Casasnovas <quentin.casasnovas@xxxxxxxxxx>
      Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      CC: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
      Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>

  commit 6c730bfc894f5d4989c2c1493512d3330402be94
  Author: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
  Date:   Wed Apr 15 13:28:08 2015 +0930

      modpost: handle -ffunction-sections

      52dc0595d540 introduced OTHER_TEXT_SECTIONS for identifying what
      sections could validly have __ex_table entries.  Unfortunately, it
      wasn't tested with -ffunction-sections, which some architectures
      use.

      Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx>
      Cc: Quentin Casasnovas <quentin.casasnovas@xxxxxxxxxx>
      Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>

  commit d7e0abcf4c6d9fc4ebb948c9bbc880b2483434b4
  Author: Thierry Reding <thierry.reding@xxxxxxxxx>
  Date:   Wed Apr 15 13:23:48 2015 +0930

      modpost: Whitelist .text.fixup and .exception.text

      32-bit and 64-bit ARM use these sections to store executable code, so
      they must be whitelisted in modpost's table of valid text sections.

      Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
      Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>

  commit cdde0e61cf2d41123604c6c9d8f09ef5c23464ee
  Author: Vinod Koul <vinod.koul@xxxxxxxxx>
  Date:   Wed Apr 22 12:24:13 2015 +0530

      dmaengine: dw: don't prompt for DW_DMAC_CORE

      DW_DMAC_CORE is slected by PCI or Platform driver, so this symbol 
shouldn't
      be user selectable, so remove the prompt

      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit 0140e6141e4f1d4b15fb469e6912b0e71b7d1cc2
  Author: Sonny Rao <sonnyrao@xxxxxxxxxxxx>
  Date:   Tue Apr 21 12:33:11 2015 -0700

      perf/x86/intel/uncore: Move PCI IDs for IMC to uncore driver

      This keeps all the related PCI IDs together in the driver where
      they are used.

      Signed-off-by: Sonny Rao <sonnyrao@xxxxxxxxxxxx>
      Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
      Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
      Cc: Paul Mackerras <paulus@xxxxxxxxx>
      Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
      Cc: Stephane Eranian <eranian@xxxxxxxxxx>
      Link: 
http://lkml.kernel.org/r/1429644791-25724-1-git-send-email-sonnyrao@xxxxxxxxxxxx
      Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>

  commit 80bcffb376a6890dd7452b12c1ba032f8f24fef6
  Author: Sonny Rao <sonnyrao@xxxxxxxxxxxx>
  Date:   Mon Apr 20 15:34:07 2015 -0700

      perf/x86/intel/uncore: Add support for Intel Haswell ULT (lower power 
Mobile Processor) IMC uncore PMUs

      This uncore is the same as the Haswell desktop part but uses a
      different PCI ID.

      Signed-off-by: Sonny Rao <sonnyrao@xxxxxxxxxxxx>
      Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
      Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
      Cc: Paul Mackerras <paulus@xxxxxxxxx>
      Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
      Cc: Stephane Eranian <eranian@xxxxxxxxxx>
      Link: 
http://lkml.kernel.org/r/1429569247-16697-1-git-send-email-sonnyrao@xxxxxxxxxxxx
      Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>

  commit 3b6e042188994466ec257b71296b5f85b894dcd9
  Author: Jiri Olsa <jolsa@xxxxxxxxxx>
  Date:   Tue Apr 21 17:26:23 2015 +0200

      perf/x86/intel: Add cpu_(prepare|starting|dying) for core_pmu

      The core_pmu does not define cpu_* callbacks, which handles
      allocation of 'struct cpu_hw_events::shared_regs' data,
      initialization of debug store and PMU_FL_EXCL_CNTRS counters.

      While this probably won't happen on bare metal, virtual CPU can
      define x86_pmu.extra_regs together with PMU version 1 and thus
      be using core_pmu -> using shared_regs data without it being
      allocated. That could could leave to following panic:

        BUG: unable to handle kernel NULL pointer dereference at (null)
        IP: [<ffffffff8152cd4f>] _spin_lock_irqsave+0x1f/0x40

        SNIP

         [<ffffffff81024bd9>] __intel_shared_reg_get_constraints+0x69/0x1e0
         [<ffffffff81024deb>] intel_get_event_constraints+0x9b/0x180
         [<ffffffff8101e815>] x86_schedule_events+0x75/0x1d0
         [<ffffffff810586dc>] ? check_preempt_curr+0x7c/0x90
         [<ffffffff810649fe>] ? try_to_wake_up+0x24e/0x3e0
         [<ffffffff81064ba2>] ? default_wake_function+0x12/0x20
         [<ffffffff8109eb16>] ? autoremove_wake_function+0x16/0x40
         [<ffffffff810577e9>] ? __wake_up_common+0x59/0x90
         [<ffffffff811a9517>] ? __d_lookup+0xa7/0x150
         [<ffffffff8119db5f>] ? do_lookup+0x9f/0x230
         [<ffffffff811a993a>] ? dput+0x9a/0x150
         [<ffffffff8119c8f5>] ? path_to_nameidata+0x25/0x60
         [<ffffffff8119e90a>] ? __link_path_walk+0x7da/0x1000
         [<ffffffff8101d8f9>] ? x86_pmu_add+0xb9/0x170
         [<ffffffff8101d7a7>] x86_pmu_commit_txn+0x67/0xc0
         [<ffffffff811b07b0>] ? mntput_no_expire+0x30/0x110
         [<ffffffff8119c731>] ? path_put+0x31/0x40
         [<ffffffff8107c297>] ? current_fs_time+0x27/0x30
         [<ffffffff8117d170>] ? mem_cgroup_get_reclaim_stat_from_page+0x20/0x70
         [<ffffffff8111b7aa>] group_sched_in+0x13a/0x170
         [<ffffffff81014a29>] ? sched_clock+0x9/0x10
         [<ffffffff8111bac8>] ctx_sched_in+0x2e8/0x330
         [<ffffffff8111bb7b>] perf_event_sched_in+0x6b/0xb0
         [<ffffffff8111bc36>] perf_event_context_sched_in+0x76/0xc0
         [<ffffffff8111eb3b>] perf_event_comm+0x1bb/0x2e0
         [<ffffffff81195ee9>] set_task_comm+0x69/0x80
         [<ffffffff81195fe1>] setup_new_exec+0xe1/0x2e0
         [<ffffffff811ea68e>] load_elf_binary+0x3ce/0x1ab0

      Adding cpu_(prepare|starting|dying) for core_pmu to have
      shared_regs data allocated for core_pmu. AFAICS there's no harm
      to initialize debug store and PMU_FL_EXCL_CNTRS either for
      core_pmu.

      Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
      Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
      Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
      Cc: Paul Mackerras <paulus@xxxxxxxxx>
      Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
      Cc: Stephane Eranian <eranian@xxxxxxxxxx>
      Link: http://lkml.kernel.org/r/20150421152623.GC13169@xxxxxxxxxxxxxxxx
      Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>

  commit db4fd9c5d072a20ea6b7e40276a9822e04732610
  Merge: 8aaa51b 0edfad5
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 23:21:34 2015 -0700

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

      Pull sparc fixes from David Miller:

       1) ldc_alloc_exp_dring() can be called from softints, so use
          GFP_ATOMIC.  From Sowmini Varadhan.

       2) Some minor warning/build fixups for the new iommu-common code on
          certain archs and with certain debug options enabled.  Also from
          Sowmini Varadhan.

      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: Use GFP_ATOMIC in ldc_alloc_exp_dring() as it can be called in 
softirq context
        sparc64: Use M7 PMC write on all chips T4 and onward.
        iommu-common: rename iommu_pool_hash to iommu_hash_common
        iommu-common: fix x86_64 compiler warnings

  commit 8aaa51b63cc3c5f3b2e72d2f0e193d9c2e00fe46
  Merge: f614c81 fab9adf
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 22:37:27 2015 -0700

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

      Pull networking fixes from David Miller:
       "Just a few fixes trickling in at this point.

        1) If we see an attached socket on an skb in the ipv4 forwarding path,
           bail.  This can happen due to races with FIB rule addition, and
           deletion, and we should just drop such frames.  From Sebastian
           Pöhn.

        2) pppoe receive should only accept packets destined for this hosts's
           MAC address.  From Joakim Tjernlund.

        3) Handle checksum unwrapping properly in ppp receive properly when
           it's encapsulated in UDP in some way, fix from Tom Herbert.

        4) Fix some bugs in mv88e6xxx DSA driver resulting from the conversion
           from register offset constants to mnenomic macros.  From Vivien
           Didelot.

        5) Fix handling of HCA max message size in mlx4 adapters, from Eran
           Ben ELisha"

      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        net/mlx4_core: Fix reading HCA max message size in mlx4_QUERY_DEV_CAP
        tcp: add memory barriers to write space paths
        altera tse: Error-Bit on tx-avalon-stream always set.
        net: dsa: mv88e6xxx: use PORT_DEFAULT_VLAN
        net: dsa: mv88e6xxx: fix setup of port control 1
        ppp: call skb_checksum_complete_unset in ppp_receive_frame
        net: add skb_checksum_complete_unset
        pppoe: Lacks DST MAC address check
        ip_forward: Drop frames with attached skb->sk

  commit 48c1078509b47b38802329028ccfd77783bcff99
  Merge: 30ecc84 da4d814
  Author: Olof Johansson <olof@xxxxxxxxx>
  Date:   Tue Apr 21 21:45:15 2015 -0700

      Merge tag 'omap-for-v4.1/prcm-dts-mfd-syscon-fix' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/late

      Merge "urgent omap boot fix for v4.1 if MFD_SYSCON is not set" from Tony
      Lindgren:

      Urgent pull request for v4.1 to booting for custom kernel
      .config files that do not have MFD_SYSCON set.

      Omaps now have a dependency to MFD_SYSCON for system control
      module generic register area and some clocks with the changes
      done in omap-for-v4.1/prcm-dts branch.

      This can be pulled on top of omap-for-v4.1/prcm-dts, or into
      fixes for v4.1.

      We already do have a slight MFD_SYSCON dependency for
      REGULATOR_PBIAS for dual voltage MMC cards on the first MMC
      bus for many devices, so from that point of view this can
      also be merged separately from omap-for-v4.1/prcm-dts.

      * tag 'omap-for-v4.1/prcm-dts-mfd-syscon-fix' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: Fix booting with configs that don't have MFD_SYSCON

      Signed-off-by: Olof Johansson <olof@xxxxxxxxx>

  commit 6b5eab54691956b27669ce726cbd8ef2d8ec1e50
  Author: Chris Bainbridge <chris.bainbridge@xxxxxxxxx>
  Date:   Wed Apr 22 00:25:36 2015 +0100

      ACPI / EC: fix NULL pointer dereference in acpi_ec_remove_query_handler()

      Use list_for_each_entry_safe for iterating because handler may be freed
      in the loop.

      BUG: unable to handle kernel NULL pointer dereference at 000000000000002c
      IP: [<ffffffff814d69c8>] acpi_ec_put_query_handler+0x7/0x1a
      Call Trace:
       acpi_ec_remove_query_handler+0x87/0x97
       acpi_smbus_hc_remove+0x2a/0x44 [sbshc]
       acpi_device_remove+0x7b/0x9a
       __device_release_driver+0x7e/0x110
       driver_detach+0xb0/0xc0
       bus_remove_driver+0x54/0xe0
       driver_unregister+0x2b/0x60
       acpi_bus_unregister_driver+0x10/0x12
       acpi_smb_hc_driver_exit+0x10/0x12 [sbshc]
       SyS_delete_module+0x1b8/0x210
       system_call_fastpath+0x12/0x6a

      Signed-off-by: Chris Bainbridge <chris.bainbridge@xxxxxxxxx>
      Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit f614c8178b0696d070b23f36a2a27b5128f6c372
  Merge: b8ce8d7 c19edb6
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 17:57:28 2015 -0700

      Merge branch 'parisc-4.1-1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

      Pull parisc fixes from Helge Deller:
       "The patch by Guenter Roeck fixes the build on parisc which got broken
        because of commit f24ffde43237 ("parisc: expose number of page table
        levels on Kconfig level") and the patch from Matthew Wilcox converts
        our code to use the generic scatterlist.h header file"

      * 'parisc-4.1-1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Replace PT_NLEVELS with CONFIG_PGTABLE_LEVELS
        parisc: Eliminate sg_virt_addr() and private scatterlist.h

  commit 9ffc8f7cb9647b13dfe4d1ad0d5e1427bb8b46d6
  Author: Eric Mei <eric.mei@xxxxxxxxxxx>
  Date:   Wed Mar 18 23:39:11 2015 -0600

      md/raid5: don't do chunk aligned read on degraded array.

      When array is degraded, read data landed on failed drives will result in
      reading rest of data in a stripe. So a single sequential read would
      result in same data being read twice.

      This patch is to avoid chunk aligned read for degraded array. The
      downside is to involve stripe cache which means associated CPU overhead
      and extra memory copy.

      Test Results:
      Following test are done on a enterprise storage node with Seagate 6T SAS
      drives and Xeon E5-2648L CPU (10 cores, 1.9Ghz), 10 disks MD RAID6 8+2,
      chunk size 128 KiB.

      I use FIO, using direct-io with various bs size, enough queue depth,
      tested sequential and 100% random read against 3 array config:
       1) optimal, as baseline;
       2) degraded;
       3) degraded with this patch.
      Kernel version is 4.0-rc3.

      Each individual test I only did once so there might be some variations,
      but we just focus on big trend.

      Sequential Read:
        bs=(KiB)  optimal(MiB/s)  degraded(MiB/s)  degraded-with-patch (MiB/s)
         1024       1608            656              995
          512       1624            710              956
          256       1635            728              980
          128       1636            771              983
           64       1612           1119             1000
           32       1580           1420             1004
           16       1368            688              986
            8        768            647              953
            4        411            413              850

      Random Read:
        bs=(KiB)  optimal(IOPS)  degraded(IOPS)  degraded-with-patch (IOPS)
         1024        163            160              156
          512        274            273              272
          256        426            428              424
          128        576            592              591
           64        726            724              726
           32        849            848              837
           16        900            970              971
            8        927            940              929
            4        948            940              955

      Some notes:
        * In sequential + optimal, as bs size getting smaller, the FIO thread
      become CPU bound.
        * In sequential + degraded, there's big increase when bs is 64K and
      32K, I don't have explanation.
        * In sequential + degraded-with-patch, the MD thread mostly become CPU
      bound.

      If you want to we can discuss specific data point in those data. But in
      general it seems with this patch, we have more predictable and in most
      cases significant better sequential read performance when array is
      degraded, and almost no noticeable impact on random read.

      Performance is a complicated thing, the patch works well for this
      particular configuration, but may not be universal. For example I
      imagine testing on all SSD array may have very different result. But I
      personally think in most cases IO bandwidth is more scarce resource than
      CPU.


      Signed-off-by: Eric Mei <eric.mei@xxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit edbe83ab4c27ea6669eb57adb5ed7eaec1118ceb
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Thu Feb 26 12:47:56 2015 +1100

      md/raid5: allow the stripe_cache to grow and shrink.

      The default setting of 256 stripe_heads is probably
      much too small for many configurations.  So it is best to make it
      auto-configure.

      Shrinking the cache under memory pressure is easy.  The only
      interesting part here is that we put a fairly high cost
      ('seeks') on shrinking the cache as the cost is greater than
      just having to read more data, it reduces parallelism.

      Growing the cache on demand needs to be done carefully.  If we allow
      fast growth, that can upset memory balance as lots of dirty memory can
      quickly turn into lots of memory queued in the stripe_cache.
      It is important for the raid5 block device to appear congested to
      allow write-throttling to work.

      So we only add stripes slowly. We set a flag when an allocation
      fails because all stripes are in use, allocate at a convenient
      time when that flag is set, and don't allow it to be set again
      until at least one stripe_head has been released for re-use.

      This means that a spurt of requests will only cause one stripe_head
      to be allocated, but a steady stream of requests will slowly
      increase the cache size - until memory pressure puts it back again.

      It could take hours to reach a steady state.

      The value written to, and displayed in, stripe_cache_size is
      used as a minimum.  The cache can grow above this and shrink back
      down to it.  The actual size is not directly visible, though it can
      be deduced to some extent by watching stripe_cache_active.

      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 5423399a84ee1d92d29d763029ed40e4905cf50f
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Thu Feb 26 12:21:04 2015 +1100

      md/raid5: change ->inactive_blocked to a bit-flag.

      This allows us to easily add more (atomic) flags.

      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 486f0644c3482cbf64fe804499836e1f05abec14
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Wed Feb 25 12:10:35 2015 +1100

      md/raid5: move max_nr_stripes management into grow_one_stripe and 
drop_one_stripe

      Rather than adjusting max_nr_stripes whenever {grow,drop}_one_stripe()
      succeeds, do it inside the functions.

      Also choose the correct hash to handle next inside the functions.

      This removes duplication and will help with future new uses of
      {grow,drop}_one_stripe.

      This also fixes a minor bug where the "md/raid:%md: allocate XXkB"
      message always said "0kB".

      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit a9683a795bcca6d0e7fe4c4c00e071218f3f4428
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Wed Feb 25 12:02:51 2015 +1100

      md/raid5: pass gfp_t arg to grow_one_stripe()

      This is needed for future improvement to stripe cache management.

      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit d06f191f8ecaef4d524e765fdb455f96392fbd42
  Author: Markus Stockhausen <stockhausen@xxxxxxxxxxx>
  Date:   Mon Dec 15 12:57:05 2014 +1100

      md/raid5: introduce configuration option rmw_level

      Depending on the available coding we allow optimized rmw logic for write
      operations. To support easier testing this patch allows manual control
      of the rmw/rcw descision through the interface 
/sys/block/mdX/md/rmw_level.

      The configuration can handle three levels of control.

      rmw_level=0: Disable rmw for all RAID types. Hardware assisted P/Q
      calculation has no implementation path yet to factor in/out chunks of
      a syndrome. Enforcing this level can be benefical for slow CPUs with
      hardware syndrome support and fast SSDs.

      rmw_level=1: Estimate rmw IOs and rcw IOs. Execute rmw only if we will
      save IOs. This equals the "old" unpatched behaviour and will be the
      default.

      rmw_level=2: Execute rmw even if calculated IOs for rmw and rcw are
      equal. We might have higher CPU consumption because of calculating the
      parity twice but it can be benefical otherwise. E.g. RAID4 with fast
      dedicated parity disk/SSD. The option is implemented just to be
      forward-looking and will ONLY work with this patch!

      Signed-off-by: Markus Stockhausen <stockhausen@xxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 584acdd49cd2472ca0f5a06adbe979db82d0b4af
  Author: Markus Stockhausen <stockhausen@xxxxxxxxxxx>
  Date:   Mon Dec 15 12:57:05 2014 +1100

      md/raid5: activate raid6 rmw feature

      Glue it altogehter. The raid6 rmw path should work the same as the
      already existing raid5 logic. So emulate the prexor handling/flags
      and split functions as needed.

      1) Enable xor_syndrome() in the async layer.

      2) Split ops_run_prexor() into RAID4/5 and RAID6 logic. Xor the syndrome
      at the start of a rmw run as we did it before for the single parity.

      3) Take care of rmw run in ops_run_reconstruct6(). Again process only
      the changed pages to get syndrome back into sync.

      4) Enhance set_syndrome_sources() to fill NULL pages if we are in a rmw
      run. The lower layers will calculate start & end pages from that and
      call the xor_syndrome() correspondingly.

      5) Adapt the several places where we ignored Q handling up to now.

      Performance numbers for a single E5630 system with a mix of 10 7200k
      desktop/server disks. 300 seconds random write with 8 threads onto a
      3,2TB (10*400GB) RAID6 64K chunk without spare (group_thread_cnt=4)

      bsize   rmw_level=1   rmw_level=0   rmw_level=1   rmw_level=0
              skip_copy=1   skip_copy=1   skip_copy=0   skip_copy=0
         4K      115 KB/s      141 KB/s      165 KB/s      140 KB/s
         8K      225 KB/s      275 KB/s      324 KB/s      274 KB/s
        16K      434 KB/s      536 KB/s      640 KB/s      534 KB/s
        32K      751 KB/s    1,051 KB/s    1,234 KB/s    1,045 KB/s
        64K    1,339 KB/s    1,958 KB/s    2,282 KB/s    1,962 KB/s
       128K    2,673 KB/s    3,862 KB/s    4,113 KB/s    3,898 KB/s
       256K    7,685 KB/s    7,539 KB/s    7,557 KB/s    7,638 KB/s
       512K   19,556 KB/s   19,558 KB/s   19,652 KB/s   19,688 Kb/s

      Signed-off-by: Markus Stockhausen <stockhausen@xxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit a582564b24bec0443b5c5ff43ee6d1258f8bd658
  Author: Markus Stockhausen <stockhausen@xxxxxxxxxxx>
  Date:   Mon Dec 15 12:57:05 2014 +1100

      md/raid6 algorithms: xor_syndrome() for SSE2

      The second and (last) optimized XOR syndrome calculation. This version
      supports right and left side optimization. All CPUs with architecture
      older than Haswell will benefit from it.

      It should be noted that SSE2 movntdq kills performance for memory areas
      that are read and written simultaneously in chunks smaller than cache
      line size. So use movdqa instead for P/Q writes in sse21 and sse22 XOR
      functions.

      Signed-off-by: Markus Stockhausen <stockhausen@xxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 9a5ce91d053961b7cc8fa56bd083819a9fc92734
  Author: Markus Stockhausen <stockhausen@xxxxxxxxxxx>
  Date:   Mon Dec 15 12:57:04 2014 +1100

      md/raid6 algorithms: xor_syndrome() for generic int

      Start the algorithms with the very basic one. It is left and right
      optimized. That means we can avoid all calculations for unneeded pages
      above the right stop offset. For pages below the left start offset we
      still need the syndrome multiplication but without reading data pages.

      Signed-off-by: Markus Stockhausen <stockhausen@xxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 7e92e1d7629b00578cef22b1f4c6ada726663701
  Author: Markus Stockhausen <stockhausen@xxxxxxxxxxx>
  Date:   Mon Dec 15 12:57:04 2014 +1100

      md/raid6 algorithms: improve test program

      It is always helpful to have a test tool in place if we implement
      new data critical algorithms. So add some test routines to the raid6
      checker that can prove if the new xor_syndrome() works as expected.

      Run through all permutations of start/stop pages per algorithm and
      simulate a xor_syndrome() assisted rmw run. After each rmw check if
      the recovery algorithm still confirms that the stripe is fine.

      Signed-off-by: Markus Stockhausen <stockhausen@xxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit fe5cbc6e06c7d8b3a86f6f5491d74766bb5c2827
  Author: Markus Stockhausen <stockhausen@xxxxxxxxxxx>
  Date:   Mon Dec 15 12:57:04 2014 +1100

      md/raid6 algorithms: delta syndrome functions

      v3: s-o-b comment, explanation of performance and descision for
      the start/stop implementation

      Implementing rmw functionality for RAID6 requires optimized syndrome
      calculation. Up to now we can only generate a complete syndrome. The
      target P/Q pages are always overwritten. With this patch we provide
      a framework for inplace P/Q modification. In the first place simply
      fill those functions with NULL values.

      xor_syndrome() has two additional parameters: start & stop. These
      will indicate the first and last page that are changing during a
      rmw run. That makes it possible to avoid several unneccessary loops
      and speed up calculation. The caller needs to implement the following
      logic to make the functions work.

      1) xor_syndrome(disks, start, stop, ...): "Remove" all data of source
      blocks inside P/Q between (and including) start and end.

      2) modify any block with start <= block <= stop

      3) xor_syndrome(disks, start, stop, ...): "Reinsert" all data of
      source blocks into P/Q between (and including) start and end.

      Pages between start and stop that won't be changed should be filled
      with a pointer to the kernel zero page. The reasons for not taking NULL
      pages are:

      1) Algorithms cross the whole source data line by line. Thus avoid
      additional branches.

      2) Having a NULL page avoids calculating the XOR P parity but still
      need calulation steps for the Q parity. Depending on the algorithm
      unrolling that might be only a difference of 2 instructions per loop.

      The benchmark numbers of the gen_syndrome() functions are displayed in
      the kernel log. Do the same for the xor_syndrome() functions. This
      will help to analyze performance problems and give an rough estimate
      how well the algorithm works. The choice of the fastest algorithm will
      still depend on the gen_syndrome() performance.

      With the start/stop page implementation the speed can vary a lot in real
      life. E.g. a change of page 0 & page 15 on a stripe will be harder to
      compute than the case where page 0 & page 1 are XOR candidates. To be not
      to enthusiatic about the expected speeds we will run a worse case test
      that simulates a change on the upper half of the stripe. So we do:

      1) calculation of P/Q for the upper pages

      2) continuation of Q for the lower (empty) pages

      Signed-off-by: Markus Stockhausen <stockhausen@xxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit dabc4ec6ba72418ebca6bf1884f344bba40c8709
  Author: shli@xxxxxxxxxx <shli@xxxxxxxxxx>
  Date:   Mon Dec 15 12:57:04 2014 +1100

      raid5: handle expansion/resync case with stripe batching

      expansion/resync can grab a stripe when the stripe is in batch list. 
Since all
      stripes in batch list must be in the same state, we can't allow some 
stripes
      run into expansion/resync. So we delay expansion/resync for stripe in 
batch
      list.

      Signed-off-by: Shaohua Li <shli@xxxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 72ac733015bbdc0356ba3e92c52137a265910a91
  Author: shli@xxxxxxxxxx <shli@xxxxxxxxxx>
  Date:   Mon Dec 15 12:57:03 2014 +1100

      raid5: handle io error of batch list

      If io error happens in any stripe of a batch list, the batch list will be
      split, then normal process will run for the stripes in the list.

      Signed-off-by: Shaohua Li <shli@xxxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 59fc630b8b5f9f21c8ce3ba153341c107dce1b0c
  Author: shli@xxxxxxxxxx <shli@xxxxxxxxxx>
  Date:   Mon Dec 15 12:57:03 2014 +1100

      RAID5: batch adjacent full stripe write

      stripe cache is 4k size. Even adjacent full stripe writes are handled in 
4k
      unit. Idealy we should use big size for adjacent full stripe writes. 
Bigger
      stripe cache size means less stripes runing in the state machine so can 
reduce
      cpu overhead. And also bigger size can cause bigger IO size dispatched to 
under
      layer disks.

      With below patch, we will automatically batch adjacent full stripe write
      together. Such stripes will be added to the batch list. Only the first 
stripe
      of the list will be put to handle_list and so run handle_stripe(). Some 
steps
      of handle_stripe() are extended to cover all stripes of the list, 
including
      ops_run_io, ops_run_biodrain and so on. With this patch, we have less 
stripes
      running in handle_stripe() and we send IO of whole stripe list together to
      increase IO size.

      Stripes added to a batch list have some limitations. A batch list can only
      include full stripe write and can't cross chunk boundary to make sure 
stripes
      have the same parity disks. Stripes in a batch list must be in the same 
state
      (no written, toread and so on). If a stripe is in a batch list, all new
      read/write to add_stripe_bio will be blocked to overlap conflict till the 
batch
      list is handled. The limitations will make sure stripes in a batch list 
be in
      exactly the same state in the life circly.

      I did test running 160k randwrite in a RAID5 array with 32k chunk size 
and 6
      PCIe SSD. This patch improves around 30% performance and IO size to under 
layer
      disk is exactly 32k. I also run a 4k randwrite test in the same array to 
make
      sure the performance isn't changed with the patch.

      Signed-off-by: Shaohua Li <shli@xxxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 7a87f43405e91ca12b8770eb689dd9886f217091
  Author: shli@xxxxxxxxxx <shli@xxxxxxxxxx>
  Date:   Mon Dec 15 12:57:03 2014 +1100

      raid5: track overwrite disk count

      Track overwrite disk count, so we can know if a stripe is a full stripe 
write.

      Signed-off-by: Shaohua Li <shli@xxxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit da41ba65972532a04f73927c903029a7ec3bc2ed
  Author: shli@xxxxxxxxxx <shli@xxxxxxxxxx>
  Date:   Mon Dec 15 12:57:03 2014 +1100

      raid5: add a new flag to track if a stripe can be batched

      A freshly new stripe with write request can be batched. Any time the 
stripe is
      handled or new read is queued, the flag will be cleared.

      Signed-off-by: Shaohua Li <shli@xxxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 46d5b785621ad10a373e292f9101ccfc626466e0
  Author: shli@xxxxxxxxxx <shli@xxxxxxxxxx>
  Date:   Mon Dec 15 12:57:02 2014 +1100

      raid5: use flex_array for scribble data

      Use flex_array for scribble data. Next patch will batch several stripes
      together, so scribble data should be able to cover several stripes, so 
this
      patch also allocates scribble data for stripes across a chunk.

      Signed-off-by: Shaohua Li <shli@xxxxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 753f2856cda2a130d38ebc3db97bff66c1ef3ca7
  Author: Heinz Mauelshagen <heinzm@xxxxxxxxxx>
  Date:   Fri Feb 13 19:48:01 2015 +0100

      md raid0: access mddev->queue (request queue member) conditionally 
because it is not set when accessed from dm-raid

      The patch makes 3 references to mddev->queue in the raid0 personality
      conditional in order to allow for it to be accessed from dm-raid.
      Mandatory, because md instances underneath dm-raid don't manage
      a request queue of their own which'd lead to oopses without the patch.

      Signed-off-by: Heinz Mauelshagen <heinzm@xxxxxxxxxx>
      Tested-by: Heinz Mauelshagen <heinzm@xxxxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit ac8fa4196d205ac8fff3f8932bddbad4f16e4110
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Thu Feb 19 16:55:00 2015 +1100

      md: allow resync to go faster when there is competing IO.

      When md notices non-sync IO happening while it is trying
      to resync (or reshape or recover) it slows down to the
      set minimum.

      The default minimum might have made sense many years ago
      but the drives have become faster.  Changing the default
      to match the times isn't really a long term solution.

      This patch changes the code so that instead of waiting until the speed
      has dropped to the target, it just waits until pending requests
      have completed.
      This means that the delay inserted is a function of the speed
      of the devices.

      Testing shows that:
       - for some loads, the resync speed is unchanged.  For those loads
         increasing the minimum doesn't change the speed either.
         So this is a good result.  To increase resync speed under such
         loads we would probably need to increase the resync window
         size.

       - for other loads, resync speed does increase to a reasonable
         fraction (e.g. 20%) of maximum possible, and throughput of
         the load only drops a little bit (e.g. 10%)

       - for other loads, throughput of the non-sync load drops quite a bit
         more.  These seem to be latency-sensitive loads.

      So it isn't a perfect solution, but it is mostly an improvement.

      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 09314799e4f0589e52bafcd0ca3556c60468bc0e
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Thu Feb 19 16:04:40 2015 +1100

      md: remove 'go_faster' option from ->sync_request()

      This option is not well justified and testing suggests that
      it hardly ever makes any difference.

      The comment suggests there might be a need to wait for non-resync
      activity indicated by ->nr_waiting, however raise_barrier()
      already waits for all of that.

      So just remove it to simplify reasoning about speed limiting.

      This allows us to remove a 'FIXME' comment from raid5.c as that
      never used the flag.

      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 50c37b136a3807eda44afe16529b5af701ec49f5
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Mon Mar 23 17:36:38 2015 +1100

      md: don't require sync_min to be a multiple of chunk_size.

      There is really no need for sync_min to be a multiple of
      chunk_size, and values read from here often aren't.
      That means you cannot read a value and expect to be able
      to write it back later.

      So remove the chunk_size check, and round down to a multiple
      of 4K, to be sure everything works with 4K-sector devices.

      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit d51e4fe6d68098d4361a6b6d41d8da727b1f1af4
  Merge: 47d6897 97f6cd3
  Author: NeilBrown <neilb@xxxxxxx>
  Date:   Wed Apr 22 08:00:20 2015 +1000

      Merge branch 'cluster' into for-next

  commit 97f6cd39da227459cb46ed4088d37d5d8db51c50
  Author: Goldwyn Rodrigues <rgoldwyn@xxxxxxx>
  Date:   Tue Apr 14 10:45:42 2015 -0500

      md-cluster: re-add capabilities

      When "re-add" is writted to /sys/block/mdXX/md/dev-YYY/state,
      the clustered md:

      1. Sends RE_ADD message with the desc_nr. Nodes receiving the message
         clear the Faulty bit in their respective rdev->flags.
      2. The node initiating re-add, gathers the bitmaps of all nodes
         and copies them into the local bitmap. It does not clear the bitmap
         from which it is copying.
      3. Initiating node schedules a md recovery to sync the devices.

      Signed-off-by: Guoqing Jiang <gqjiang@xxxxxxxx>
      Signed-off-by: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit a6da4ef85cef0382244fc588c901e133a2ec5109
  Author: Goldwyn Rodrigues <rgoldwyn@xxxxxxx>
  Date:   Tue Apr 14 10:45:22 2015 -0500

      md: re-add a failed disk

      This adds the capability of re-adding a failed disk by
      writing "re-add" to /sys/block/mdXX/md/dev-YYY/state.

      This facilitates adding disks which have encountered a temporary
      error such as a network disconnection/hiccup in an iSCSI device,
      or a SAN cable disconnection which has been restored. In such
      a situation, you do not need to remove and re-add the device.
      Writing re-add to the failed device's state would add it again
      to the array and perform the recovery of only the blocks which
      were written after the device failed.

      This works for generic md, and is not related to clustering. However,
      this patch is to ease re-add operations listed above in clustering
      environments.

      Signed-off-by: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 88bcfef7be513e8bf5448e0025330fdd97c4c708
  Author: Goldwyn Rodrigues <rgoldwyn@xxxxxxx>
  Date:   Tue Apr 14 10:44:44 2015 -0500

      md-cluster: remove capabilities

      This adds "remove" capabilities for the clustered environment.
      When a user initiates removal of a device from the array, a
      REMOVE message with disk number in the array is sent to all
      the nodes which kick the respective device in their own array.

      This facilitates the removal of failed devices.

      Signed-off-by: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 57d051dccaef395e0d8c0fff02cfc3a77bacc88c
  Author: Goldwyn Rodrigues <rgoldwyn@xxxxxxx>
  Date:   Tue Apr 14 10:43:55 2015 -0500

      md: Export and rename find_rdev_nr_rcu

      This is required by the clustering module (patches to follow) to
      find the device to remove or re-add.

      Signed-off-by: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit fb56dfef4e31f214cfbfa0eb8a1949591c20b118
  Author: Goldwyn Rodrigues <rgoldwyn@xxxxxxx>
  Date:   Tue Apr 14 10:43:24 2015 -0500

      md: Export and rename kick_rdev_from_array

      This export is required for clustering module in order to
      co-ordinate remove/readd a rdev from all nodes.

      Signed-off-by: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit 8c58f02e244d5b35fa38aa308007715d4957d4c7
  Author: Guoqing Jiang <gqjiang@xxxxxxxx>
  Date:   Tue Apr 21 11:25:52 2015 -0500

      md-cluster: correct the num for comparison


      Since the node num of md-cluster is from zero, and
      cinfo->slot_number represents the slot num of dlm,
      no need to check for equality.

      Signed-off-by: Guoqing Jiang <gqjiang@xxxxxxxx>
      Signed-off-by: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx>
      Signed-off-by: NeilBrown <neilb@xxxxxxx>

  commit fab9adfb71fc8690e20c3c280d39d49c8f4a3f0a
  Author: Eran Ben Elisha <eranbe@xxxxxxxxxxxx>
  Date:   Tue Apr 21 15:46:34 2015 +0300

      net/mlx4_core: Fix reading HCA max message size in mlx4_QUERY_DEV_CAP

      Currently we parse max_msg_sz from the wrong offset in QUERY_DEV_CAP,
      fix to use the right offset.

      Fixes: 0b131561a7d6 ('net/mlx4_en: Add Flow control statistics [..]')
      Signed-off-by: Eran Ben Elisha <eranbe@xxxxxxxxxxxx>
      Signed-off-by: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 9fbbda5c8e0ab9c391e4160a0eb3a06260f9f668
  Author: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
  Date:   Tue Apr 21 14:57:26 2015 -0500

      ia64/PCI: Treat all host bridge Address Space Descriptors (even 
consumers) as windows

      Prior to c770cb4cb505 ("PCI: Mark invalid BARs as unassigned"), if we 
tried
      to claim a PCI BAR but could not find an upstream bridge window that
      matched it, we complained but still allowed the device to be enabled.

      c770cb4cb505 broke devices that previously worked (mptsas and igb in the
      case Tony reported, but it could be any devices) because it marks those
      BARs as IORESOURCE_UNSET, which makes pci_enable_device() complain and
      return failure:

        igb 0000:81:00.0: can't enable device: BAR 0 [mem size 0x00020000] not 
assigned
        igb: probe of 0000:81:00.0 failed with error -22

      The underlying cause is an ACPI Address Space Descriptor for a PCI host
      bridge window that is marked as "consumer".  This is a firmware defect:
      resources that are produced on the downstream side of a bridge should be
      marked "producer".  But rejecting these BARs that we previously allowed is
      a functionality regression, and firmware has not used the 
producer/consumer
      bit consistently, so we can't rely on it anyway.

      Stop checking the producer/consumer bit, and assume all bridge Address
      Space Descriptors are for bridge windows.

      Note that this change does not affect I/O Port or Fixed Location I/O Port
      Descriptors, which are commonly used for the [io 0x0cf8-0x0cff] config
      access range.  That range is a "consumer" range and should not be treated
      as a window.

      Fixes: c770cb4cb505 ("PCI: Mark invalid BARs as unassigned")
      Link: https://bugzilla.kernel.org/show_bug.cgi?id=96961
      Reported-and-tested-by: Tony Luck <tony.luck@xxxxxxxxx>
      Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
      Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

  commit 0edfad5959df7379c9e554fbe8ba264ae232d321
  Author: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
  Date:   Tue Apr 21 10:30:41 2015 -0400

      sparc: Use GFP_ATOMIC in ldc_alloc_exp_dring() as it can be called in 
softirq context

      Since it is possible for vnet_event_napi to end up doing
      vnet_control_pkt_engine -> ... -> vnet_send_attr ->
      vnet_port_alloc_tx_ring -> ldc_alloc_exp_dring -> kzalloc()
      (i.e., in softirq context), kzalloc() should be called with
      GFP_ATOMIC from ldc_alloc_exp_dring.

      Signed-off-by: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit bff175238a2416110e2258989c462234baeb5f46
  Author: Andreas Gruenbacher <andreas.gruenbacher@xxxxxxxxx>
  Date:   Fri Mar 27 17:50:00 2015 +0100

      uapi: Remove kernel internal declaration

      The enum nfs4_acl_whotype is only used in nfs4d's internal nfs4 acl
      representation. No longer expose it to user space.

      Signed-off-by: Andreas Gruenbacher <agruenba@xxxxxxxxxx>
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit bb7ffbf29e76b89a86ca4c3ee0d4690641f2f772
  Author: Giuseppe Cantavenera <giuseppe.cantavenera.ext@xxxxxxxxx>
  Date:   Mon Apr 20 18:00:08 2015 +0200

      nfsd: fix nsfd startup race triggering BUG_ON

      nfsd triggered a BUG_ON in net_generic(...) when rpc_pipefs_event(...)
      in fs/nfsd/nfs4recover.c was called before assigning ntfsd_net_id.
      The following was observed on a MIPS 32-core processor:
      kernel: Call Trace:
      kernel: [<ffffffffc00bc5e4>] rpc_pipefs_event+0x7c/0x158 [nfsd]
      kernel: [<ffffffff8017a2a0>] notifier_call_chain+0x70/0xb8
      kernel: [<ffffffff8017a4e4>] __blocking_notifier_call_chain+0x4c/0x70
      kernel: [<ffffffff8053aff8>] rpc_fill_super+0xf8/0x1a0
      kernel: [<ffffffff8022204c>] mount_ns+0xb4/0xf0
      kernel: [<ffffffff80222b48>] mount_fs+0x50/0x1f8
      kernel: [<ffffffff8023dc00>] vfs_kern_mount+0x58/0xf0
      kernel: [<ffffffff802404ac>] do_mount+0x27c/0xa28
      kernel: [<ffffffff80240cf0>] SyS_mount+0x98/0xe8
      kernel: [<ffffffff80135d24>] handle_sys64+0x44/0x68
      kernel:
      kernel:
              Code: 0040f809  00000000  2e020001 <00020336> 3c12c00d
                      3c02801a  de100000 6442eb98  0040f809
      kernel: ---[ end trace 7471374335809536 ]---

      Fixed this behaviour by calling register_pernet_subsys(&nfsd_net_ops) 
before
      registering rpc_pipefs_event(...) with the notifier chain.

      Signed-off-by: Giuseppe Cantavenera <giuseppe.cantavenera.ext@xxxxxxxxx>
      Signed-off-by: Lorenzo Restelli <lorenzo.restelli.ext@xxxxxxxxx>
      Reviewed-by: Kinlong Mee <kinglongmee@xxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit 135dd002c23054aaa056ea3162c1e0356905c195
  Author: Mark Salter <msalter@xxxxxxxxxx>
  Date:   Mon Apr 6 09:46:00 2015 -0400

      nfsd: eliminate NFSD_DEBUG

      Commit f895b252d4edf ("sunrpc: eliminate RPC_DEBUG") introduced
      use of IS_ENABLED() in a uapi header which leads to a build
      failure for userspace apps trying to use <linux/nfsd/debug.h>:

         linux/nfsd/debug.h:18:15: error: missing binary operator before token 
"("
        #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
                      ^

      Since this was only used to define NFSD_DEBUG if CONFIG_SUNRPC_DEBUG
      is enabled, replace instances of NFSD_DEBUG with CONFIG_SUNRPC_DEBUG.

      Cc: stable@xxxxxxxxxxxxxxx
      Fixes: f895b252d4edf "sunrpc: eliminate RPC_DEBUG"
      Signed-off-by: Mark Salter <msalter@xxxxxxxxxx>
      Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit 6e4891dc289cd191d46ab7ba1dcb29646644f9ca
  Author: J. Bruce Fields <bfields@xxxxxxxxxx>
  Date:   Fri Apr 3 17:19:41 2015 -0400

      nfsd4: fix READ permission checking

      In the case we already have a struct file (derived from a stateid), we
      still need to do permission-checking; otherwise an unauthorized user
      could gain access to a file by sniffing or guessing somebody else's
      stateid.

      Cc: stable@xxxxxxxxxxxxxxx
      Fixes: dc97618ddda9 "nfsd4: separate splice and readv cases"
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit 980608fb50aea34993ba956b71cd4602aa42b14b
  Author: J. Bruce Fields <bfields@xxxxxxxxxx>
  Date:   Tue Apr 21 15:25:39 2015 -0400

      nfsd4: disallow SEEK with special stateids

      If the client uses a special stateid then we'll pass a NULL file to
      vfs_llseek.

      Fixes: 24bab491220f " NFSD: Implement SEEK"
      Cc: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Reported-by: Christoph Hellwig <hch@xxxxxxxxxxxxx>
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit df386375ffa8c2262a52db64a5b6446e11896978
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Tue Apr 21 13:14:53 2015 -0700

      sparc64: Use M7 PMC write on all chips T4 and onward.

      They both work equally well, and the M7 implementation is
      simpler and cheaper (less register writes).

      With help from David Ahern.

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit af539e985b3fbe3b602313f317506a2a9e73f5bf
  Author: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
  Date:   Tue Apr 21 14:57:45 2015 -0500

      MAINTAINERS: Remove Mohit Kumar (email bounces)

      Email to Mohit Kumar <mohit.kumar@xxxxxx> has been bouncing, so remove the
      address from MAINTAINERS and add an entry in CREDITS.

      Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>

  commit c19edb6946d250db6d4a3dbd6146f7b23bf3468b
  Author: Guenter Roeck <linux@xxxxxxxxxxxx>
  Date:   Wed Apr 15 13:34:28 2015 -0700

      parisc: Replace PT_NLEVELS with CONFIG_PGTABLE_LEVELS

      The following warning is seen when compiling parisc images

      ./arch/parisc/include/asm/pgalloc.h: In function 'pgd_alloc':
      ./arch/parisc/include/asm/pgalloc.h:29:5: warning: "PT_NLEVELS" is not 
defined

      Some definitions of PT_NLEVELS were missed with the conversion to
      CONFIG_PGTABLE_LEVELS.

      Fixes: f24ffde43237 ("parisc: expose number of page table levels
        on Kconfig level")
      Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
      Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Acked-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
      Signed-off-by: Helge Deller <deller@xxxxxx>

  commit 8bf8a1d1c13c687eda599c827d713eb70764a79f
  Author: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
  Date:   Fri Mar 20 13:37:59 2015 -0400

      parisc: Eliminate sg_virt_addr() and private scatterlist.h

      The only reason to keep parisc's private asm/scatterlist.h was that it
      had the macro sg_virt_addr().  Convert all callers to use something else
      (sometimes just sg->offset was enough, others should use sg_virt()), and
      we can just use the asm-generic scatterlist.h instead.

      Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
      Signed-off-by: Dave Anglin <dave.anglin@xxxxxxxx>
      Signed-off-by: Helge Deller <deller@xxxxxx>

  commit 3c7151275c0c9a80c3375f9874b1c7129a105eea
  Author: jbaron@xxxxxxxxxx <jbaron@xxxxxxxxxx>
  Date:   Mon Apr 20 20:05:07 2015 +0000

      tcp: add memory barriers to write space paths

      Ensure that we either see that the buffer has write space
      in tcp_poll() or that we perform a wakeup from the input
      side. Did not run into any actual problem here, but thought
      that we should make things explicit.

      Signed-off-by: Jason Baron <jbaron@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit b8ce8d7222b52200e61ea29523993e20751baaaa
  Merge: 1d11437 4885338
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 12:54:08 2015 -0700

      Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

      Pull more input subsystem updates from Dmitry Torokhov:

       - an update to Atmel MXT driver that makes it functional on Google
         Pixel 2 boxes (both touchpad and touchscreen)

       - a new VMware VMMouse driver that should allow us drop X vmmouse
         driver that requires root privileges (since it accesses ioports)

       - XBox One controllers now support force feedback (rumble)

      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: lm8333 - fix broken email address
        Input: cyapa - fix setting suspend scan rate
        Input: elan_i2c - fix calculating number of x and y traces.
        Input: elan_i2c - report hovering contacts
        Input: elants_i2c - zero-extend hardware ID in firmware name
        Input: alps - document separate pointstick button bits for V2 devices
        Input: atmel_mxt_ts - add support for Google Pixel 2
        Input: xpad - add rumble support for Xbox One controller
        Input: ff-core - use new debug macros
        Input: add vmmouse driver
        Input: elan_i2c - adjust for newer firmware pressure reporting

  commit 1d11437f4fd02f9b5d3749675a1232216787dcc6
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 12:49:33 2015 -0700

      media: remove unused variable that causes a warning

      My 'allmodconfig' build is _almost_ free of warnings, and most of the
      remaining ones are for legacy drivers that just do bad things that I
      can't find it in my black heart to care too much about.  But this one
      was just annoying me:

         drivers/media/v4l2-core/videobuf2-core.c:3256:26: warning: unused 
variable â??fileioâ?? [-Wunused-variable]

      because commit 0e661006370b ("[media] vb2: fix 'UNBALANCED' warnings
      when calling vb2_thread_stop()") removed all users of 'fileio' and
      instead calls "__vb2_cleanup_fileio(q)" to clean up q->fileio.  But the
      now unused 'fileio' variable was left around.

      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 5ba4a25ab7b13be528b23f85182f4d09cf7f71ad
  Author: J. Bruce Fields <bfields@xxxxxxxxxx>
  Date:   Fri Apr 3 16:24:27 2015 -0400

      nfsd4: disallow ALLOCATE with special stateids

      vfs_fallocate will hit a NULL dereference if the client tries an
      ALLOCATE or DEALLOCATE with a special stateid.  Fix that.  (We also
      depend on the open to have broken any conflicting leases or delegations
      for us.)

      (If it turns out we need to allow special stateid's then we could do a
      temporary open here in the special-stateid case, as we do for read and
      write.  For now I'm assuming it's not necessary.)

      Fixes: 95d871f03cae "nfsd: Add ALLOCATE support"
      Cc: stable@xxxxxxxxxxxxxxx
      Cc: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
      Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>

  commit 48853389f206b689260ddfd3006816779ca7a52a
  Merge: 85a3685 c9eeb50
  Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
  Date:   Tue Apr 21 11:12:42 2015 -0700

      Merge branch 'next' into for-linus

      Prepare second round of updates for 4.1 merge window.

  commit 123857a705603a1d10d2adc02e9dcd065b0e1cb1
  Merge: 085e68e 66feed6
  Author: Paolo Bonzini <pbonzini@xxxxxxxxxx>
  Date:   Tue Apr 21 20:04:41 2015 +0200

      Merge tag 'signed-kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into 
kvm-master

      Patch queue for ppc - 2015-04-21

      This is the latest queue for KVM on PowerPC changes. Highlights this
      time around:

        - Book3S HV: Debugging aids
        - Book3S HV: Minor performance improvements
        - Book3S HV: Cleanups

  commit 085e68eeafbf76e21848ad5bafaecec88a11dd64
  Author: Ben Serebrin <serebrin@xxxxxxxxxx>
  Date:   Thu Apr 16 11:58:05 2015 -0700

      KVM: VMX: Preserve host CR4.MCE value while in guest mode.

      The host's decision to enable machine check exceptions should remain
      in force during non-root mode.  KVM was writing 0 to cr4 on VCPU reset
      and passed a slightly-modified 0 to the vmcs.guest_cr4 value.

      Tested: Built.
      On earlier version, tested by injecting machine check
      while a guest is spinning.

      Before the change, if guest CR4.MCE==0, then the machine check is
      escalated to Catastrophic Error (CATERR) and the machine dies.
      If guest CR4.MCE==1, then the machine check causes VMEXIT and is
      handled normally by host Linux. After the change, injecting a machine
      check causes normal Linux machine check handling.

      Signed-off-by: Ben Serebrin <serebrin@xxxxxxxxxx>
      Reviewed-by: Venkatesh Srinivas <venkateshs@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx
      Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>

  commit 0c8027d50c070859314a88aaff42453ff4f71819
  Merge: 1fc1499 64131a8
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 10:01:27 2015 -0700

      Merge tag 'media/v4.1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

      Pull media updates from Mauro Carvalho Chehab:

       - a new frontend driver for new ATSC devices: lgdt3306a

       - a new sensor driver: ov2659

       - a new platform driver: xilinx

       - the m88ts2022 tuner driver was merged at ts2020 driver

       - the media controller gained experimental support for DVB and hybrid
         devices

       - lots of random cleanups, fixes and improvements on media drivers

      * tag 'media/v4.1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (404 commits)
        [media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
        [media] uvcvideo: fix cropcap v4l2-compliance failure
        [media] media: omap3isp: remove unused clkdev
        [media] coda: Add tracing support
        [media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
        [media] coda: fix fill bitstream errors in nonstreaming case
        [media] coda: call SEQ_END when the first queue is stopped
        [media] coda: fail to start streaming if userspace set invalid formats
        [media] coda: remove duplicate error messages for buffer allocations
        [media] coda: move parameter buffer in together with context buffer 
allocation
        [media] coda: allocate bitstream buffer from REQBUFS, size depends on 
the format
        [media] coda: allocate per-context buffers from REQBUFS
        [media] coda: use strlcpy instead of snprintf
        [media] coda: bitstream payload is unsigned
        [media] coda: fix double call to debugfs_remove
        [media] coda: check kasprintf return value in coda_open
        [media] coda: bitrate can only be set in kbps steps
        [media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and 
v4l2_m2m_buf_remove
        [media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
        [media] coda: set allow_zero_bytesused flag for vb2_queue_init
        ...

  commit 1fc149933fd49a5b0e7738dc0853dbfbac4ae0e1
  Merge: 41d5e08 ea5505f
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 09:42:58 2015 -0700

      Merge tag 'char-misc-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

      Pull char/misc driver updates from Greg KH:
       "Here's the big char/misc driver patchset for 4.1-rc1.

        Lots of different driver subsystem updates here, nothing major, full
        details are in the shortlog.

        All of this has been in linux-next for a while"

      * tag 'char-misc-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (133 commits)
        mei: trace: remove unused TRACE_SYSTEM_STRING
        DTS: ARM: OMAP3-N900: Add lis3lv02d support
        Documentation: DT: lis302: update wakeup binding
        lis3lv02d: DT: add wakeup unit 2 and wakeup threshold
        lis3lv02d: DT: use s32 to support negative values
        Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case
        Drivers: hv: hv_balloon: correctly handle val.freeram<num_pages case
        mei: replace check for connection instead of transitioning
        mei: use mei_cl_is_connected consistently
        mei: fix mei_poll operation
        hv_vmbus: Add gradually increased delay for retries in vmbus_post_msg()
        Drivers: hv: hv_balloon: survive ballooning request with num_pages=0
        Drivers: hv: hv_balloon: eliminate jumps in piecewiese linear floor 
function
        Drivers: hv: hv_balloon: do not online pages in offline blocks
        hv: remove the per-channel workqueue
        hv: don't schedule new works in vmbus_onoffer()/vmbus_onoffer_rescind()
        hv: run non-blocking message handlers in the dispatch tasklet
        coresight: moving to new "hwtracing" directory
        coresight-tmc: Adding a status interface to sysfs
        coresight: remove the unnecessary configuration coresight-default-sink
        ...

  commit 41d5e08ea86af3359239d5a6f7021cdc61beaa49
  Merge: 8d582b9 5dbc32a
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 09:33:10 2015 -0700

      Merge tag 'tty-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

      Pull tty/serial updates from Greg KH:
       "Here's the big tty/serial driver update for 4.1-rc1.

        It was delayed for a bit due to some questions surrounding some of the
        console command line parsing changes that are in here.  There's still
        one tiny regression for people who were previously putting multiple
        console command lines and expecting them all to be ignored for some
        odd reason, but Peter is working on fixing that.  If not, I'll send a
        revert for the offending patch, but I have faith that Peter can
        address it.

        Other than the console work here, there's the usual serial driver
        updates and changes, and a buch of 8250 reworks to try to make that
        driver easier to maintain over time, and have it support more devices
        in the future.

        All of these have been in linux-next for a while"

      * tag 'tty-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (119 commits)
        n_gsm: Drop unneeded cast on netdev_priv
        sc16is7xx: expose RTS inversion in RS-485 mode
        serial: 8250_pci: port failed after wakeup from S3
        earlycon: 8250: Document kernel command line options
        earlycon: 8250: Fix command line regression
        earlycon: Fix __earlycon_table stride
        tty: clean up the tty time logic a bit
        serial: 8250_dw: only get the clock rate in one place
        serial: 8250_dw: remove useless ACPI ID check
        dmaengine: hsu: move memory allocation to GFP_NOWAIT
        dmaengine: hsu: remove redundant pieces of code
        serial: 8250_pci: add Intel Tangier support
        dmaengine: hsu: add Intel Tangier PCI ID
        serial: 8250_pci: replace switch-case by formula for Intel MID
        serial: 8250_pci: replace switch-case by formula
        tty: cpm_uart: replace CONFIG_8xx by CONFIG_CPM1
        serial: jsm: some off by one bugs
        serial: xuartps: Fix check in console_setup().
        serial: xuartps: Get rid of register access macros.
        serial: xuartps: Fix iobase use.
        ...

  commit 8d582b94291b40dbb5961f99172ee8ebfafd4c9c
  Merge: e98bf5c b99e6fb
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 09:31:26 2015 -0700

      Merge tag 'pinctrl-v4.1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

      Pull pincontrol Kconfig fix from Linus Walleij:
       "This fixes the annoying Kconfig noise from pin control.  Mea Culpa"

      * tag 'pinctrl-v4.1-2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: fix allmodconfig noise

  commit e98bf5cedf25eb32f8f224e8dff9845f0856d18f
  Merge: 8f443e2 03bc10a
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 09:24:09 2015 -0700

      Merge tag 'clk-for-linus-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

      Pull clock framework updates from Michael Turquette:
       "The changes to the common clock framework for 4.0 are mostly new clock
        drivers and updates to existing ones for feature enhancements and bug
        fixes.

        There is more churn than usual in the framework core due to the change
        to introduce per-user unique struct clk pointers in 4.0.  This caused
        several regressions to surface, some of which were sent as fixes to
        4.0.  New generic clock drivers were added for GPIO- and PWM-based
        clock controllers.

        Additionally the common clk-divider code recieved several fixes to the
        way it rounds rates"

      * tag 'clk-for-linus-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (91 commits)
        clk: check ->determine/round_rate() return value in clk_calc_new_rates
        clk: at91: usb: propagate rate modification to the parent clk
        clk: samsung: exynos4: Disable ARMCLK down feature on Exynos4210 SoC
        clk: don't use __initconst for non-const arrays
        clk: at91: change to using endian agnositc IO
        clk: clk-gpio-gate: Fix active low
        clk: Add PWM clock driver
        clk: Add clock driver for mb86s7x
        clk: pxa: pxa3xx: add missing os timer clock
        clk: tegra: Use the proper parent for plld_dsi
        clk: tegra: Use generic tegra_osc_clk_init() on Tegra114
        clk: tegra: Model oscillator as clock
        clk: tegra: Add peripheral registers for bank Y
        clk: tegra: Register the proper number of resets
        clk: tegra: Remove needless initializations
        clk: tegra: Use consistent indentation
        clk: tegra: Various whitespace cleanups
        clk: tegra: Enable HDA to HDMI clocks on Tegra124
        clk: tegra: Fix a bunch of sparse warnings
        clk: tegra: Fix typo tabel -> table
        ...

  commit 8f443e2372ba23d51ee365974f54507acd6f69d1
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 09:17:28 2015 -0700

      Revert "ocfs2: incorrect check for debugfs returns"

      This reverts commit e2ac55b6a8e337fac7cc59c6f452caac92ab5ee6.

      Huang Ying reports that this causes a hang at boot with debugfs disabled.

      It is true that the debugfs error checks are kind of confusing, and this
      code certainly merits more cleanup and thinking about it, but there's
      something wrong with the trivial "check not just for NULL, but for error
      pointers too" patch.

      Yes, with debugfs disabled, we will end up setting the o2hb_debug_dir
      pointer variable to an error pointer (-ENODEV), and then continue as if
      everything was fine.  But since debugfs is disabled, all the _users_ of
      that pointer end up being compiled away, so even though the pointer can
      not be dereferenced, that's still fine.

      So it's confusing and somewhat questionable, but the "more correct"
      error checks end up causing more trouble than they fix.

      Reported-by: Huang Ying <ying.huang@xxxxxxxxx>
      Acked-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Acked-by: Chengyu Song <csong84@xxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit f80f6531b47c538b69769ada5e9fbacad085b34d
  Author: Nathan Lynch <nathan_lynch@xxxxxxxxxx>
  Date:   Sat Apr 18 00:39:16 2015 +0100

      ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile

      When CONFIG_VDSO=n, the build normally does not enter arch/arm/vdso/
      because arch/arm/Makefile does not add it to core-y.

      However, if the user runs 'make arch/arm/vdso/' the VDSO targets will
      get visited.  This is because the VDSO Makefile itself does not
      consider the value of CONFIG_VDSO.

      It is arguably better and more consistent behavior to generate an
      empty built-in.o when CONFIG_VDSO=n and the user attempts to build
      arch/arm/vdso/.  It's nicer because it doesn't try to build things
      that Kconfig dependencies are there to prevent (e.g. the dependency on
      AEABI), and it's less confusing than building objects that won't be
      used in the final image.

      Signed-off-by: Nathan Lynch <nathan_lynch@xxxxxxxxxx>
      Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

  commit 2b507a2d9c7fdea3215aedf0a0e3660309f319e1
  Author: Nathan Lynch <nathan_lynch@xxxxxxxxxx>
  Date:   Sat Apr 18 00:39:00 2015 +0100

      ARM: 8343/1: VDSO: add build artifacts to .gitignore

      vdsomunge and vdso.so.raw are outputs that don't get matched by the
      normal ignore rules.

      Signed-off-by: Nathan Lynch <nathan_lynch@xxxxxxxxxx>
      Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

  commit 0a9024e80e85552b21076542355a4f4a7c0b9472
  Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
  Date:   Sun Apr 19 20:28:53 2015 +0100

      ARM: Fix nommu booting

      Commit bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with
      relative offset") broke booting on nommu platforms as it didn't update
      the nommu boot code.  This patch fixes that oversight.

      Fixes: bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with 
relative offset")
      Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

  commit 66feed61cdf6ee65fd551d3460b1efba6bee55b8
  Author: Paul Mackerras <paulus@xxxxxxxxx>
  Date:   Sat Mar 28 14:21:12 2015 +1100

      KVM: PPC: Book3S HV: Use msgsnd for signalling threads on POWER8

      This uses msgsnd where possible for signalling other threads within
      the same core on POWER8 systems, rather than IPIs through the XICS
      interrupt controller.  This includes waking secondary threads to run
      the guest, the interrupts generated by the virtual XICS, and the
      interrupts to bring the other threads out of the guest when exiting.

      Aggregated statistics from debugfs across vcpus for a guest with 32
      vcpus, 8 threads/vcore, running on a POWER8, show this before the
      change:

       rm_entry:     3387.6ns (228 - 86600, 1008969 samples)
        rm_exit:     4561.5ns (12 - 3477452, 1009402 samples)
        rm_intr:     1660.0ns (12 - 553050, 3600051 samples)

      and this after the change:

       rm_entry:     3060.1ns (212 - 65138, 953873 samples)
        rm_exit:     4244.1ns (12 - 9693408, 954331 samples)
        rm_intr:     1342.3ns (12 - 1104718, 3405326 samples)

      for a test of booting Fedora 20 big-endian to the login prompt.

      The time taken for a H_PROD hcall (which is handled in the host
      kernel) went down from about 35 microseconds to about 16 microseconds
      with this change.

      The noinline added to kvmppc_run_core turned out to be necessary for
      good performance, at least with gcc 4.9.2 as packaged with Fedora 21
      and a little-endian POWER8 host.

      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit eddb60fb1443f85c5728f1b1cd4be608c6832a79
  Author: Paul Mackerras <paulus@xxxxxxxxx>
  Date:   Sat Mar 28 14:21:11 2015 +1100

      KVM: PPC: Book3S HV: Translate kvmhv_commence_exit to C

      This replaces the assembler code for kvmhv_commence_exit() with C code
      in book3s_hv_builtin.c.  It also moves the IPI sending code that was
      in book3s_hv_rm_xics.c into a new kvmhv_rm_send_ipi() function so it
      can be used by kvmhv_commence_exit() as well as icp_rm_set_vcpu_irq().

      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit 6af27c847ad1b889c29a641dfc41f2d78c46a048
  Author: Paul Mackerras <paulus@xxxxxxxxx>
  Date:   Sat Mar 28 14:21:10 2015 +1100

      KVM: PPC: Book3S HV: Streamline guest entry and exit

      On entry to the guest, secondary threads now wait for the primary to
      switch the MMU after loading up most of their state, rather than before.
      This means that the secondary threads get into the guest sooner, in the
      common case where the secondary threads get to kvmppc_hv_entry before
      the primary thread.

      On exit, the first thread out increments the exit count and interrupts
      the other threads (to get them out of the guest) before saving most
      of its state, rather than after.  That means that the other threads
      exit sooner and means that the first thread doesn't spend so much
      time waiting for the other threads at the point where the MMU gets
      switched back to the host.

      This pulls out the code that increments the exit count and interrupts
      other threads into a separate function, kvmhv_commence_exit().
      This also makes sure that r12 and vcpu->arch.trap are set correctly
      in some corner cases.

      Statistics from /sys/kernel/debug/kvm/vm*/vcpu*/timings show the
      improvement.  Aggregating across vcpus for a guest with 32 vcpus,
      8 threads/vcore, running on a POWER8, gives this before the change:

       rm_entry:     avg 4537.3ns (222 - 48444, 1068878 samples)
        rm_exit:     avg 4787.6ns (152 - 165490, 1010717 samples)
        rm_intr:     avg 1673.6ns (12 - 341304, 3818691 samples)

      and this after the change:

       rm_entry:     avg 3427.7ns (232 - 68150, 1118921 samples)
        rm_exit:     avg 4716.0ns (12 - 150720, 1119477 samples)
        rm_intr:     avg 1614.8ns (12 - 522436, 3850432 samples)

      showing a substantial reduction in the time spent per guest entry in
      the real-mode guest entry code, and smaller reductions in the real
      mode guest exit and interrupt handling times.  (The test was to start
      the guest and boot Fedora 20 big-endian to the login prompt.)

      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit 7d6c40da198ac18bd5dd2cd18628d5b4c615d842
  Author: Paul Mackerras <paulus@xxxxxxxxx>
  Date:   Sat Mar 28 14:21:09 2015 +1100

      KVM: PPC: Book3S HV: Use bitmap of active threads rather than count

      Currently, the entry_exit_count field in the kvmppc_vcore struct
      contains two 8-bit counts, one of the threads that have started entering
      the guest, and one of the threads that have started exiting the guest.
      This changes it to an entry_exit_map field which contains two bitmaps
      of 8 bits each.  The advantage of doing this is that it gives us a
      bitmap of which threads need to be signalled when exiting the guest.
      That means that we no longer need to use the trick of setting the
      HDEC to 0 to pull the other threads out of the guest, which led in
      some cases to a spurious HDEC interrupt on the next guest entry.

      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit fd6d53b12410b4b73e3996629350dee3f4a7994f
  Author: Paul Mackerras <paulus@xxxxxxxxx>
  Date:   Sat Mar 28 14:21:08 2015 +1100

      KVM: PPC: Book3S HV: Use decrementer to wake napping threads

      This arranges for threads that are napping due to their vcpu having
      ceded or due to not having a vcpu to wake up at the end of the guest's
      timeslice without having to be poked with an IPI.  We do that by
      arranging for the decrementer to contain a value no greater than the
      number of timebase ticks remaining until the end of the timeslice.
      In the case of a thread with no vcpu, this number is in the hypervisor
      decrementer already.  In the case of a ceded vcpu, we use the smaller
      of the HDEC value and the DEC value.

      Using the DEC like this when ceded means we need to save and restore
      the guest decrementer value around the nap.

      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit ccc07772c99befeda7a7a4b1d05a6f3b762518c2
  Author: Paul Mackerras <paulus@xxxxxxxxx>
  Date:   Sat Mar 28 14:21:07 2015 +1100

      KVM: PPC: Book3S HV: Don't wake thread with no vcpu on guest IPI

      When running a multi-threaded guest and vcpu 0 in a virtual core
      is not running in the guest (i.e. it is busy elsewhere in the host),
      thread 0 of the physical core will switch the MMU to the guest and
      then go to nap mode in the code at kvm_do_nap.  If the guest sends
      an IPI to thread 0 using the msgsndp instruction, that will wake
      up thread 0 and cause all the threads in the guest to exit to the
      host unnecessarily.  To avoid the unnecessary exit, this arranges
      for the PECEDP bit to be cleared in this situation.  When napping
      due to a H_CEDE from the guest, we still set PECEDP so that the
      thread will wake up on an IPI sent using msgsndp.

      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit 5d5b99cd6818bdbea287d23ef055bba1a8a9e648
  Author: Paul Mackerras <paulus@xxxxxxxxx>
  Date:   Sat Mar 28 14:21:06 2015 +1100

      KVM: PPC: Book3S HV: Get rid of vcore nap_count and n_woken

      We can tell when a secondary thread has finished running a guest by
      the fact that it clears its kvm_hstate.kvm_vcpu pointer, so there
      is no real need for the nap_count field in the kvmppc_vcore struct.
      This changes kvmppc_wait_for_nap to poll the kvm_hstate.kvm_vcpu
      pointers of the secondary threads rather than polling vc->nap_count.
      Besides reducing the size of the kvmppc_vcore struct by 8 bytes,
      this also means that we can tell which secondary threads have got
      stuck and thus print a more informative error message.

      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit 25fedfca94cfbf2461314c6c34ef58e74a31b025
  Author: Paul Mackerras <paulus@xxxxxxxxx>
  Date:   Sat Mar 28 14:21:05 2015 +1100

      KVM: PPC: Book3S HV: Move vcore preemption point up into kvmppc_run_vcpu

      Rather than calling cond_resched() in kvmppc_run_core() before doing
      the post-processing for the vcpus that we have just run (that is,
      calling kvmppc_handle_exit_hv(), kvmppc_set_timer(), etc.), we now do
      that post-processing before calling cond_resched(), and that post-
      processing is moved out into its own function, post_guest_process().

      The reschedule point is now in kvmppc_run_vcpu() and we define a new
      vcore state, VCORE_PREEMPT, to indicate that that the vcore's runner
      task is runnable but not running.  (Doing the reschedule with the
      vcore in VCORE_INACTIVE state would be bad because there are potentially
      other vcpus waiting for the runner in kvmppc_wait_for_exec() which
      then wouldn't get woken up.)

      Also, we make use of the handy cond_resched_lock() function, which
      unlocks and relocks vc->lock for us around the reschedule.

      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit 1f09c3ed86287d40fef90611cbbee055313f52cf
  Author: Paul Mackerras <paulus@xxxxxxxxx>
  Date:   Sat Mar 28 14:21:04 2015 +1100

      KVM: PPC: Book3S HV: Minor cleanups

      * Remove unused kvmppc_vcore::n_busy field.
      * Remove setting of RMOR, since it was only used on PPC970 and the
        PPC970 KVM support has been removed.
      * Don't use r1 or r2 in setting the runlatch since they are
        conventionally reserved for other things; use r0 instead.
      * Streamline the code a little and remove the ext_interrupt_to_host
        label.
      * Add some comments about register usage.
      * hcall_try_real_mode doesn't need to be global, and can't be
        called from C code anyway.

      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit d911f0beddc2a9248dbf375fc50a4bbf30947822
  Author: Paul Mackerras <paulus@xxxxxxxxx>
  Date:   Sat Mar 28 14:21:03 2015 +1100

      KVM: PPC: Book3S HV: Simplify handling of VCPUs that need a VPA update

      Previously, if kvmppc_run_core() was running a VCPU that needed a VPA
      update (i.e. one of its 3 virtual processor areas needed to be pinned
      in memory so the host real mode code can update it on guest entry and
      exit), we would drop the vcore lock and do the update there and then.
      Future changes will make it inconvenient to drop the lock, so instead
      we now remove it from the list of runnable VCPUs and wake up its
      VCPU task.  This will have the effect that the VCPU task will exit
      kvmppc_run_vcpu(), go around the do loop in kvmppc_vcpu_run_hv(), and
      re-enter kvmppc_run_vcpu(), whereupon it will do the necessary call
      to kvmppc_update_vpas() and then rejoin the vcore.

      The one complication is that the runner VCPU (whose VCPU task is the
      current task) might be one of the ones that gets removed from the
      runnable list.  In that case we just return from kvmppc_run_core()
      and let the code in kvmppc_run_vcpu() wake up another VCPU task to be
      the runner if necessary.

      This all means that the VCORE_STARTING state is no longer used, so we
      remove it.

      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit b6c295df3131c6fa25f8f29625ee0609506150ad
  Author: Paul Mackerras <paulus@xxxxxxxxx>
  Date:   Sat Mar 28 14:21:02 2015 +1100

      KVM: PPC: Book3S HV: Accumulate timing information for real-mode code

      This reads the timebase at various points in the real-mode guest
      entry/exit code and uses that to accumulate total, minimum and
      maximum time spent in those parts of the code.  Currently these
      times are accumulated per vcpu in 5 parts of the code:

      * rm_entry - time taken from the start of kvmppc_hv_entry() until
        just before entering the guest.
      * rm_intr - time from when we take a hypervisor interrupt in the
        guest until we either re-enter the guest or decide to exit to the
        host.  This includes time spent handling hcalls in real mode.
      * rm_exit - time from when we decide to exit the guest until the
        return from kvmppc_hv_entry().
      * guest - time spend in the guest
      * cede - time spent napping in real mode due to an H_CEDE hcall
        while other threads in the same vcore are active.

      These times are exposed in debugfs in a directory per vcpu that
      contains a file called "timings".  This file contains one line for
      each of the 5 timings above, with the name followed by a colon and
      4 numbers, which are the count (number of times the code has been
      executed), the total time, the minimum time, and the maximum time,
      all in nanoseconds.

      The overhead of the extra code amounts to about 30ns for an hcall that
      is handled in real mode (e.g. H_SET_DABR), which is about 25%.  Since
      production environments may not wish to incur this overhead, the new
      code is conditional on a new config symbol,
      CONFIG_KVM_BOOK3S_HV_EXIT_TIMING.

      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit e23a808b1681d398a983ebc51179efc51c4a1eaf
  Author: Paul Mackerras <paulus@xxxxxxxxx>
  Date:   Sat Mar 28 14:21:01 2015 +1100

      KVM: PPC: Book3S HV: Create debugfs file for each guest's HPT

      This creates a debugfs directory for each HV guest (assuming debugfs
      is enabled in the kernel config), and within that directory, a file
      by which the contents of the guest's HPT (hashed page table) can be
      read.  The directory is named vmnnnn, where nnnn is the PID of the
      process that created the guest.  The file is named "htab".  This is
      intended to help in debugging problems in the host's management
      of guest memory.

      The contents of the file consist of a series of lines like this:

        3f48 4000d032bf003505 0000000bd7ff1196 00000003b5c71196

      The first field is the index of the entry in the HPT, the second and
      third are the HPT entry, so the third entry contains the real page
      number that is mapped by the entry if the entry's valid bit is set.
      The fourth field is the guest's view of the second doubleword of the
      entry, so it contains the guest physical address.  (The format of the
      second through fourth fields are described in the Power ISA and also
      in arch/powerpc/include/asm/mmu-hash64.h.)

      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit 6e0365b782739eb41b03bcfd23abeefacbf0817a
  Author: Suresh Warrier <warrier@xxxxxxxxxxxxxxxxxx>
  Date:   Fri Mar 20 20:39:48 2015 +1100

      KVM: PPC: Book3S HV: Add ICP real mode counters

      Add two counters to count how often we generate real-mode ICS resend
      and reject events. The counters provide some performance statistics
      that could be used in the future to consider if the real mode functions
      need further optimizing. The counters are displayed as part of IPC and
      ICP state provided by /sys/debug/kernel/powerpc/kvm* for each VM.

      Also added two counters that count (approximately) how many times we
      don't find an ICP or ICS we're looking for. These are not currently
      exposed through sysfs, but can be useful when debugging crashes.

      Signed-off-by: Suresh Warrier <warrier@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit b0221556dbd3c31c47f37703f856aeeffc78abd3
  Author: Suresh Warrier <warrier@xxxxxxxxxxxxxxxxxx>
  Date:   Fri Mar 20 20:39:47 2015 +1100

      KVM: PPC: Book3S HV: Move virtual mode ICP functions to real-mode

      Interrupt-based hypercalls return H_TOO_HARD to inform KVM that it needs
      to switch to the host to complete the rest of hypercall function in
      virtual mode. This patch ports the virtual mode ICS/ICP reject and resend
      functions to be runnable in hypervisor real mode, thus avoiding the need
      to switch to the host to execute these functions in virtual mode. However,
      the hypercalls continue to return H_TOO_HARD for vcpu_wakeup and notify
      events - these events cannot be done in real mode and they will still need
      a switch to host virtual mode.

      There are sufficient differences between the real mode code and the
      virtual mode code for the ICS/ICP resend and reject functions that
      for now the code has been duplicated instead of sharing common code.
      In the future, we can look at creating common functions.

      Signed-off-by: Suresh Warrier <warrier@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit 34cb7954c0aa7c8ad1591cb6cceae36432f55bb5
  Author: Suresh Warrier <warrier@xxxxxxxxxxxxxxxxxx>
  Date:   Fri Mar 20 20:39:46 2015 +1100

      KVM: PPC: Book3S HV: Convert ICS mutex lock to spin lock

      Replaces the ICS mutex lock with a spin lock since we will be porting
      these routines to real mode. Note that we need to disable interrupts
      before we take the lock in anticipation of the fact that on the guest
      side, we are running in the context of a hard irq and interrupts are
      disabled (EE bit off) when the lock is acquired. Again, because we
      will be acquiring the lock in hypervisor real mode, we need to use
      an arch_spinlock_t instead of a normal spinlock here as we want to
      avoid running any lockdep code (which may not be safe to execute in
      real mode).

      Signed-off-by: Suresh Warrier <warrier@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit 878610fe9884a34a282cd4431237343864324d23
  Author: Suresh E. Warrier <warrier@xxxxxxxxxxxxxxxxxx>
  Date:   Fri Mar 20 20:39:45 2015 +1100

      KVM: PPC: Book3S HV: Add guest->host real mode completion counters

      Add counters to track number of times we switch from guest real mode
      to host virtual mode during an interrupt-related hyper call because the
      hypercall requires actions that cannot be completed in real mode. This
      will help when making optimizations that reduce guest-host transitions.

      It is safe to use an ordinary increment rather than an atomic operation
      because there is one ICP per virtual CPU and kvmppc_xics_rm_complete()
      only works on the ICP for the current VCPU.

      The counters are displayed as part of IPC and ICP state provided by
      /sys/debug/kernel/powerpc/kvm* for each VM.

      Signed-off-by: Suresh Warrier <warrier@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit a4bd6eb07ca72d21a7a34499ad34cfef6f527d4e
  Author: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
  Date:   Fri Mar 20 20:39:43 2015 +1100

      KVM: PPC: Book3S HV: Add helpers for lock/unlock hpte

      This adds helper routines for locking and unlocking HPTEs, and uses
      them in the rest of the code.  We don't change any locking rules in
      this patch.

      Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit 31037ecad275e9ad9bc671c34f72b495cf708ca3
  Author: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
  Date:   Fri Mar 20 20:39:42 2015 +1100

      KVM: PPC: Book3S HV: Remove RMA-related variables from code

      We don't support real-mode areas now that 970 support is removed.
      Remove the remaining details of rma from the code.  Also rename
      rma_setup_done to hpte_setup_done to better reflect the changes.

      Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit e928e9cb3601ce240189bfea05b67ebd391c85ae
  Author: Michael Ellerman <michael@xxxxxxxxxxxxxx>
  Date:   Fri Mar 20 20:39:41 2015 +1100

      KVM: PPC: Book3S HV: Add fast real-mode H_RANDOM implementation.

      Some PowerNV systems include a hardware random-number generator.
      This HWRNG is present on POWER7+ and POWER8 chips and is capable of
      generating one 64-bit random number every microsecond.  The random
      numbers are produced by sampling a set of 64 unstable high-frequency
      oscillators and are almost completely entropic.

      PAPR defines an H_RANDOM hypercall which guests can use to obtain one
      64-bit random sample from the HWRNG.  This adds a real-mode
      implementation of the H_RANDOM hypercall.  This hypercall was
      implemented in real mode because the latency of reading the HWRNG is
      generally small compared to the latency of a guest exit and entry for
      all the threads in the same virtual core.

      Userspace can detect the presence of the HWRNG and the H_RANDOM
      implementation by querying the KVM_CAP_PPC_HWRNG capability.  The
      H_RANDOM hypercall implementation will only be invoked when the guest
      does an H_RANDOM hypercall if userspace first enables the in-kernel
      H_RANDOM implementation using the KVM_CAP_PPC_ENABLE_HCALL capability.

      Signed-off-by: Michael Ellerman <michael@xxxxxxxxxxxxxx>
      Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit 99342cf8044420eebdf9297ca03a14cb6a7085a1
  Author: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Feb 5 11:53:25 2015 +1100

      kvmppc: Implement H_LOGICAL_CI_{LOAD,STORE} in KVM

      On POWER, storage caching is usually configured via the MMU - attributes
      such as cache-inhibited are stored in the TLB and the hashed page table.

      This makes correctly performing cache inhibited IO accesses awkward when
      the MMU is turned off (real mode).  Some CPU models provide special
      registers to control the cache attributes of real mode load and stores but
      this is not at all consistent.  This is a problem in particular for SLOF,
      the firmware used on KVM guests, which runs entirely in real mode, but
      which needs to do IO to load the kernel.

      To simplify this qemu implements two special hypercalls, H_LOGICAL_CI_LOAD
      and H_LOGICAL_CI_STORE which simulate a cache-inhibited load or store to
      a logical address (aka guest physical address).  SLOF uses these for IO.

      However, because these are implemented within qemu, not the host kernel,
      these bypass any IO devices emulated within KVM itself.  The simplest way
      to see this problem is to attempt to boot a KVM guest from a virtio-blk
      device with iothread / dataplane enabled.  The iothread code relies on an
      in kernel implementation of the virtio queue notification, which is not
      triggered by the IO hcalls, and so the guest will stall in SLOF unable to
      load the guest OS.

      This patch addresses this by providing in-kernel implementations of the
      2 hypercalls, which correctly scan the KVM IO bus.  Any access to an
      address not handled by the KVM IO bus will cause a VM exit, hitting the
      qemu implementation as before.

      Note that a userspace change is also required, in order to enable these
      new hcall implementations with KVM_CAP_PPC_ENABLE_HCALL.

      Signed-off-by: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
      [agraf: fix compilation]
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit ae75116efdc29bb42f1d99f8c51b5c52965b2413
  Author: Suresh E. Warrier <warrier@xxxxxxxxxxxxxxxxxx>
  Date:   Wed Feb 25 17:23:53 2015 -0600

      powerpc: Export __spin_yield

      Export __spin_yield so that the arch_spin_unlock() function can
      be invoked from a module. This will be required for modules where
      we want to take a lock that is also is acquired in hypervisor
      real mode. Because we want to avoid running any lockdep code
      (which may not be safe in real mode), this lock needs to be
      an arch_spinlock_t instead of a normal spinlock.

      Signed-off-by: Suresh Warrier <warrier@xxxxxxxxxxxxxxxxxx>
      Acked-by: Paul Mackerras <paulus@xxxxxxxxx>
      Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
      Signed-off-by: Alexander Graf <agraf@xxxxxxx>

  commit 64131a87f2aae2ed9e05d8227c5b009ca6c50d98
  Merge: 676ee36 2c33ce0
  Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 06:33:03 2015 -0300

      Merge branch 'drm-next-merged' of 
git://people.freedesktop.org/~airlied/linux into v4l_for_linus

      * 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 
commits)
        media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus 
format
        hexdump: avoid warning in test function
        fs: take i_mutex during prepare_binprm for set[ug]id executables
        smp: Fix error case handling in smp_call_function_*()
        iommu-common: Fix PARISC compile-time warnings
        sparc: Make LDC use common iommu poll management functions
        sparc: Make sparc64 use scalable lib/iommu-common.c functions
        Break up monolithic iommu table/lock into finer graularity pools and 
lock
        sparc: Revert generic IOMMU allocator.
        tools/power turbostat: correct dumped pkg-cstate-limit value
        tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
        tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
        tools/power turbostat: Initial Skylake support
        tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support 
for O= option in Makefile
        tools/power turbostat: modprobe msr, if needed
        tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
        tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
        Bluetooth: hidp: Fix regression with older userspace and flags 
validation
        config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
        perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
        ...

      That solves several merge conflicts:
        Documentation/DocBook/media/v4l/subdev-formats.xml
        Documentation/devicetree/bindings/vendor-prefixes.txt
        drivers/staging/media/mn88473/mn88473.c
        include/linux/kconfig.h
        include/uapi/linux/media-bus-format.h

      The ones at subdev-formats.xml and media-bus-format.h are not trivial.
      That's why we opted to merge from DRM.

  commit 72449cb47b0104c32ff8fb9380ade9113375d8d1
  Author: Sumit Semwal <sumit.semwal@xxxxxxxxxx>
  Date:   Sat Feb 21 09:00:17 2015 +0530

      staging: android: ion: fix wrong init of dma_buf_export_info

      Fixes: 817bd7253291 ("dma-buf: cleanup dma_buf_export() to make it
      easily extensible")

      Stupid copy-paste from me in the above patch leads to the following static
      checker warning:

              drivers/staging/android/ion/ion.c:1112 ion_share_dma_buf()
              error: potentially dereferencing uninitialized 'buffer'.

      drivers/staging/android/ion/ion.c
        1103  struct dma_buf *ion_share_dma_buf(struct ion_client *client,
        1104                                                  struct
      ion_handle *handle)
        1105  {
        1106          struct ion_buffer *buffer;
                                         ^^^^^^
        1107          struct dma_buf *dmabuf;
        1108          bool valid_handle;
        1109          DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
        1110
        1111          exp_info.ops = &dma_buf_ops;
        1112          exp_info.size = buffer->size;
                                      ^^^^^^
        1113          exp_info.flags = O_RDWR;
        1114          exp_info.priv = buffer;
                                      ^^^^^^
      And here also.

        1115

      This patch corrects this stupidity.

      Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
      Reviewed-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
      Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Sumit Semwal <sumit.semwal@xxxxxxxxxx>

  commit d8fbe341beb617ebb22b98fb893e4aa32ae2d864
  Author: Sumit Semwal <sumit.semwal@xxxxxxxxxx>
  Date:   Fri Jan 23 12:53:43 2015 +0530

      dma-buf: cleanup dma_buf_export() to make it easily extensible

      At present, dma_buf_export() takes a series of parameters, which
      makes it difficult to add any new parameters for exporters, if required.

      Make it simpler by moving all these parameters into a struct, and pass
      the struct * as parameter to dma_buf_export().

      While at it, unite dma_buf_export_named() with dma_buf_export(), and
      change all callers accordingly.

      Reviewed-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx>
      Reviewed-by: Daniel Thompson <daniel.thompson@xxxxxxxxxx>
      Acked-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
      Acked-by: Dave Airlie <airlied@xxxxxxxxxx>
      Signed-off-by: Sumit Semwal <sumit.semwal@xxxxxxxxxx>

  commit 676ee36be04985062522804c2de04f0764212be6
  Merge: b18042a e183201
  Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
  Date:   Tue Apr 21 06:12:35 2015 -0300

      Merge branch 'patchwork' into v4l_for_linus

      * patchwork: (404 commits)
        [media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
        [media] uvcvideo: fix cropcap v4l2-compliance failure
        [media] media: omap3isp: remove unused clkdev
        [media] coda: Add tracing support
        [media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
        [media] coda: fix fill bitstream errors in nonstreaming case
        [media] coda: call SEQ_END when the first queue is stopped
        [media] coda: fail to start streaming if userspace set invalid formats
        [media] coda: remove duplicate error messages for buffer allocations
        [media] coda: move parameter buffer in together with context buffer 
allocation
        [media] coda: allocate bitstream buffer from REQBUFS, size depends on 
the format
        [media] coda: allocate per-context buffers from REQBUFS
        [media] coda: use strlcpy instead of snprintf
        [media] coda: bitstream payload is unsigned
        [media] coda: fix double call to debugfs_remove
        [media] coda: check kasprintf return value in coda_open
        [media] coda: bitrate can only be set in kbps steps
        [media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and 
v4l2_m2m_buf_remove
        [media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
        [media] coda: set allow_zero_bytesused flag for vb2_queue_init
        ...

  commit 7d1b6e29327428993ba568bdd8c66734070f45e0
  Author: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
  Date:   Tue Apr 21 10:48:46 2015 +0200

      ALSA: hda - fix "num_steps = 0" error on ALC256

      The ALC256 does not have a mixer nid at 0x0b, and there's no
      loopback path (the output pins are directly connected to the DACs).

      This commit fixes an "num_steps = 0 for NID=0xb (ctl = Beep Playback 
Volume)"
      error (and as a result, problems with amixer/alsamixer).

      If there's pcbeep functionality, it certainly isn't controlled by setting 
an
      amp on 0x0b, so disable beep functionality (at least for now).

      Cc: stable@xxxxxxxxxxxxxxx
      BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1446517
      Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 6d1f2f605601ec701b561eca143c03e2a22d6489
  Author: Takamichi Horikawa <takamichiho@xxxxxxxxx>
  Date:   Tue Apr 21 11:23:57 2015 +0900

      ALSA: usb-audio: Fix audio output on Roland SC-D70 sound module

      Roland SC-D70 reports its device class as vendor specific class and
      the quirk QUIRK_AUDIO_FIXED_ENDPOINT was used for audio output.

      In the quirks table the sampling rate was hard-coded to 44100 Hz
      and therefore not worked when the sound module was in 48000 Hz mode.

      In this change the quirk is changed to QUIRK_AUDIO_STANDARD_INTERFACE
      but as the sound module reports incorrect bSubframeSize in its
      descriptors, additional change is made in format.c to detect it and
      to override it (which uses the existing code for Edirol SD-90).

      Tested both when the sound module was in 44100 Hz mode and 48000 Hz
      mode and both audio input and output. MIDI related part of the driver
      is not touched.

      Signed-off-by: Takamichi Horikawa <takamichiho@xxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 40cc2392f4b144197d05eec73c1560f42fc25def
  Author: Mengdong Lin <mengdong.lin@xxxxxxxxx>
  Date:   Tue Apr 21 13:12:23 2015 +0800

      ALSA: hda - add AZX_DCAPS_I915_POWERWELL to Baytrail

      This patch addes AZX_DCAPS_I915_POWERWELL to BYT (Baytrail).

      Like Braswell and Skylake, the HDMI codec on Bytrail is also in the shared
      power well with GPU. This power well must be turned on before we reset 
link
      to probe the codec, to avoid communication failure with the codec.

      The side effect is that this power is always ON in S0 because the BYT HDMI
      codec does not support EPSS or D3ClkStop and so the controller doesn't 
enter
      D3 at runtime, and the HDMI codec and analog codec share a single physical
      HD-A link and so we cannot reset the HD-A link freely when we re-enable 
the
      power to use the HDMI codec.

      Next step is to test if an AGP reset or double AGP reset on BYT HDMI 
codec is
      okay to bring the HDMI codec back to a functional state after restoring 
the
      power. If okay, we can bind the power on/off with the HDMI codec PM 
without
      interrupting the analog audio.

      Signed-off-by: Mengdong Lin <mengdong.lin@xxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 71cd26e76a9514715df7880db0a8f7c37c17149a
  Author: Andreas Oetken <ennoerlangen@xxxxxxxxx>
  Date:   Tue Apr 21 00:16:38 2015 +0200

      altera tse: Error-Bit on tx-avalon-stream always set.

      The Error-Bit on the avalon streaming interface of the
      tx-dma-channel was always set. In SGMII configurations
      this leads to error-symbols on the PCS and packet-rejection
      on the receiver side (e.g. SGMII/1000Base-X connected switch).

      This only applies to the tse-configuration with MSGDMA.

      This issue was detected and fixed on a custom board with
      a direct connection to a Marvell switch in SGMII-PHY-Mode.
      (incl. custom patches for SGMII-PCS).

      According to the datasheet if ff_tx_err (avalon-streaming)
      is set it is forwarded to gm_tx_err. As a result the PCS
      is forwarding the error by sending a "/V/"-caracter.

      Signed-off-by: Andreas Oetken <ennoerlangen@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 47cf1e659e0f44c29788a96345862c44c6a48c89
  Author: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 17:43:26 2015 -0400

      net: dsa: mv88e6xxx: use PORT_DEFAULT_VLAN

      Minor, use the explicit PORT_DEFAULT_VLAN define instead of 0x07.

      Signed-off-by: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
      Acked-by: Andrew Lunn <andrew@xxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 614f03fc6a897d212546a93f50d449409215dfd4
  Author: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 17:19:23 2015 -0400

      net: dsa: mv88e6xxx: fix setup of port control 1

      mv88e6xxx_setup_port_common was writing to PORT_DEFAULT_VLAN (port
      offset 0x07) instead of PORT_CONTROL_1 (port offset 0x05).

      Fixes: cca8b1337541 ("net: dsa: Use mnemonics rather than register 
numbers")
      Signed-off-by: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
      Acked-by: Andrew Lunn <andrew@xxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 91f5bd8437d39feecfee215e032f440b1faa25f8
  Merge: a068833 3dfb053
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Mon Apr 20 21:57:26 2015 -0400

      Merge branch 'ppp_csum_unset'

      Tom Herbert says:

      ====================
      net: Fix "hw csum failure" message flood for ppp tunnel

      This patch set addresses bug "Bug 95171 - "hw csum failure" message
      flood for ppp tunnel since upgrade to 3.16". The problem is that pppoe
      is being used over UDP with UDP checksusm enabled. On receive
      checksum conversion turns checksum-unnecessary in checksum-
      complete. The PPP receive functions do not properly pull
      the checksum over its headers, so that when an encapsulated
      checksums is considered the checksum-complete value is incorrect.

      This patch adds skb_checksum_complete_unset which can be called
      in the receive path in lieu of pulling checksum complete in
      layer. This is useful when the packet is being modified (e.g.
      decompressed) and the checksum-complete value is no longer
      relevant.

      In the ppp_receive_frame we call skb_checksum_complete_unset to toss
      out checksum-complete. This should eliminate the reported messages.
      Alternatively, we could add skb_postpull_rcsum and probably
      special case handling for VJ compression if maintaining the
      checksum-complete is needed (not clear to me this is worth the
      effort).

      I haven't tested this since setting up the failure scenario doesn't
      seem trivial to configure.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 3dfb05340ec6676e6fc71a9ae87bbbe66d3c2998
  Author: Tom Herbert <tom@xxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 14:10:05 2015 -0700

      ppp: call skb_checksum_complete_unset in ppp_receive_frame

      Call checksum_complete_unset in PPP receive to discard checksum-complete
      value. PPP does not pull checksum for headers and also modifies packet
      as in VJ compression.

      Signed-off-by: Tom Herbert <tom@xxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 4e18b9adf2f910ec4d30b811a74a5b626e6c6125
  Author: Tom Herbert <tom@xxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 14:10:04 2015 -0700

      net: add skb_checksum_complete_unset

      This function changes ip_summed to CHECKSUM_NONE if CHECKSUM_COMPLETE
      is set. This is called to discard checksum-complete when packet
      is being modified and checksum is not pulled for headers in a layer.

      Signed-off-by: Tom Herbert <tom@xxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 646da63172f660ba84f195c1165360a9b73583ee
  Merge: 8f49309 315491e
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 15:40:10 2015 -0700

      Merge tag 'remoteproc-4.1-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc

      Pull remoteproc update from Ohad Ben-Cohen:
       "Suman Anna is adding remoteproc support for processors not behind
        IOMMUs"

      * tag 'remoteproc-4.1-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
        remoteproc: add IOMMU hardware capability flag

  commit 8f49309a261dbe9b5217908e0e8ee8da7f148695
  Merge: b153f1d 3323641
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 15:31:49 2015 -0700

      Merge branch 'misc' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

      Pull misc kbuild updates:
       "This is the remaining part of kbuild stuff for v4.1-rc1:

         - One wew coccinelle script and a clarification of the proposed fix
           in bugon.coccinelle

         - CONFIG_KERNEL_LZ4 support for extract-ikconfig"

      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        scripts/coccinelle/misc/bugon.cocci: update bug_on conversion warning
        scripts/extract-ikconfig: Support LZ4-compressed images.
        irqf_oneshot.cocci: add check of devm_request_threaded_irq()

  commit b153f1d37a7d469501482bb3b38f398d4e778616
  Merge: bf2ae5d 56cbd0c
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 15:25:19 2015 -0700

      Merge tag 'scsi-misc' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

      Pull SCSI fixes from James Bottomley:
       "I'd like to say these were a set of regressions for the recent merge
        window code.  Unfortunately, they all predate the merge window code
        (stable cc'd).

        There are two fixes for data integrity (mostly only showing up on
        module removal), an mvsas crash with expander attached SATA devices
        which goes back to the dawn of the driver but is only just being
        picked up as sas expanders become a standard item in low end server
        hardware, an am53c974 one because the interrupt data isn't fully
        initialised before the line is and a megaraid_sas one because it uses
        smp_processor_id() to select MSI-X queues and that now triggers a
        WARN_ON()"

      * tag 'scsi-misc' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        mvsas: fix panic on expander attached SATA devices
        am53c974: Fix crash during modprobe
        megaraid_sas: use raw_smp_processor_id()
        sd: Fix missing ATO tag check
        sd: Unregister integrity profile

  commit bf2ae5d337cd09dfee3041364a36c5214cc7faf9
  Merge: 14aa024 6b75b54
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 15:16:25 2015 -0700

      Merge tag 'fbdev-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

      Pull fbdev updates from Tomi Valkeinen:
       "Small fixes and improvements to various fbdev drivers"

      * tag 'fbdev-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (24 commits)
        omapdss: extend pm notifier to handle hibernation
        OMAPDSS: Correct video ports description file path in DT binding doc
        OMAPDSS: disable VT switch
        fbdev: sh_mobile_lcdc: Fix destruction of uninitialized mutex
        video: fbdev: sh_mobile_lcdcfb: Fix ROP3 sysfs attribute parsing
        fbdev: pm3fb: cleanup some confusing indenting
        hyperv: hyperv_fb: match wait_for_completion_timeout return type
        video: fbdev: use msecs_to_jiffies for time conversions
        fbdev: via/via_clock: fix sparse warning
        video: fbdev: make of_device_id array const
        fbdev: sm501fb: use memset_io
        OMAPDSS: workaround for MFLAG + NV12 issue
        OMAPDSS: Add support for MFLAG
        OMAPDSS: setup default fifo thresholds
        OMAPDSS: DISPC: lock access to DISPC_CONTROL & DISPC_CONFIG
        OMAPDSS: DISPC: fix div by zero issue in overlay scaling
        OMAPDSS: DISPC: change sync_pclk_edge default value
        OMAPDSS: change signal_level & signal_edge enum values
        OMAPDSS: DISPC: explicit handling for sync and de levels
        OMAPDSS: DISPC: remove OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES
        ...

  commit 14aa02449064541217836b9f3d3295e241d5ae9c
  Merge: 79319a0 2c33ce0
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 14:06:06 2015 -0700

      Merge branch 'drm-next-merged' of 
git://people.freedesktop.org/~airlied/linux

      Pull drm updates from Dave Airlie:
       "Highlights:

        Core:
         - Virtual GEM layer merged, this has been around for a long time, and
           it provides a software backed device that allows userspace to use
           it as a GEM shared memory handler.  This makes it a lot easier to
           do certain things when you have no GPU but still have to deal with
           DRI expectations.
         - atomic helper updates.
         - framebuffer modifier interface added.
         - i2c over auxch displayport fixes.
         - fb width/height confusion fixes.
         - new driver for ps8622/ps8625 bridge chips
         - lots of new panels

        i915:
         - more plane atomic conversion
         - vGPU guest support for XenGT
         - Skylake workarounds and fixes
         - Y-tiling support
         - work on dynamic pagetable allocation
         - EU count report param for gen9+
         - CHV fixes (no longer prelim)
         - remove ilk rc6
         - frontbuffer tracking for fbc
         - Displayport link rate refactoring
         - sprite colorkey refactor

        radeon:
         - Displayport MST support (not enabled by default)
         - non-ATOM native hw auxch support (DCE5+)
         - output csc support
         - new queries for userspace debug support
         - new VCE packet

        nouveau:
         - gk20a iommu support
         - gm107 graphics support
         - more gm20x bringup (waiting on signed nvidia fw).

        amdkfd:
         - multiple kgd instance support
         - use 64-bit time accessors

        msm:
         - stolen memory support
         - DSI and dual-DSI support
         - snapdragon 410 support

        exynos:
         - cleanups for atomic and pageflip

        imx-drm:
         - more media-bus formats
         - TV output prep
         - drm panel support

        tegra:
         - hw vblank counter using host1x syncpoints

        omap:
         - universal plane support
         - prep work for atomic modesetting

        rcar-du:
         - ported to atomic modesetting

        atmel-hlcdc:
         - ported to atomic modesetting
         - added suspend/resume support

        sti:
         - ported to atomic modesetting

        dwhdmi:
         - more compliant audio support
         - update rockchip phy support

        tda998x:
         - DT probing for attached crtcs
         - simplified EDID reading

        rockchip:
         - fixes

        adv7511:
         - fixes"

      * 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (689 
commits)
        media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus 
format
        drm/i915: Dont enable CS_PARSER_ERROR interrupts at all
        drm/i915: Move drm_framebuffer_unreference out of struct_mutex for 
takeover
        drm: fix trivial typo mistake
        drm: Make integer overflow checking cover universal cursor updates (v2)
        drm/nouveau/bios: fix fetching from acpi on certain systems
        drm/nouveau/gr/gm206: initial init+ctx code
        drm/nouveau/ce/gm206: enable support via gm204 code
        drm/nouveau/fifo/gm206: enable support via gm204 code
        drm/nouveau/gr/gm204: initial init+ctx code
        drm/nouveau: support for buffer moves via MaxwellDmaCopyA
        drm/nouveau/ce/gm204: initial support
        drm/nouveau: add support for gm20x fifo channels
        drm/nouveau/fifo/gm204: initial support
        drm/nouveau/gr/gk104-: prevent reading non-existent regs in intr handler
        drm/nouveau/gr/gm107: very slightly demagic part of attrib cb setup
        drm/nouveau/gr/gk104-: correct crop/zrop num_active_fbps setting
        drm/nouveau/gr/gf100-: add symbolic names for classes
        drm/nouveau/gr/gm107: support tpc "strand" ctxsw in gpccs ucode
        drm/nouveau/gr/gf100-: support mmio access with gpc offset from gpccs 
ucode
        ...

  commit a068833bbf0ede9203410f8fd186178c758ade9b
  Author: Joakim Tjernlund <Joakim.Tjernlund@xxxxxxxxxxxx>
  Date:   Mon Apr 20 21:07:48 2015 +0200

      pppoe: Lacks DST MAC address check

      A pppoe session is identified by its session ID and MAC address.
      Currently pppoe does not check if the received pkg has the correct
      MAC address. This is a problem when the eth I/F is in promisc mode
      as then any DST MAC address is accepted.

      Signed-off-by: Joakim Tjernlund <joakim.tjernlund@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit b53c7582805b10d6a32e88e22d16dc469e66a37a
  Merge: 7d3beab 3cd44dcd
  Author: Vinod Koul <vinod.koul@xxxxxxxxx>
  Date:   Tue Apr 21 00:21:14 2015 +0530

      Merge branch 'topic/sh' into for-linus

  commit 4113756603db46cec464b39100770979e982bd4c
  Merge: 64fb1d0 7b3372d
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Mon Apr 20 14:09:55 2015 -0400

      Merge branch 'iommu-common-fixes'

      Sowmini Varadhan says:

      ====================
      iommu-common build warning fixes.

      This patchset has fixes for 2 architectures
      - Part 1: x86_64 warnings generated by sparse
      - Part 2: allmodconfig build error for powerpc, identified by Guenter 
Roeck.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 7b3372d4c2bced80598771aab8fea87c40ebb52a
  Author: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
  Date:   Sun Apr 19 13:13:31 2015 -0400

      iommu-common: rename iommu_pool_hash to iommu_hash_common

      When CONFIG_DEBUG_FORCE_WEAK_PER_CPU is set, the DEFINE_PER_CPU_SECTION
      macro will define an extern __pcpu_unique_##name variable that could
      conflict with the same definition in powerpc at this time. Avoid that
      conflict by renaming iommu_pool_hash in iommu-common.c

      Thanks to Guenter Roeck for catching this, and helping to test the fix.

      Signed-off-by: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
      Tested-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit b0cc836d306c12462a60e72aae8f6d2318f10817
  Author: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
  Date:   Sun Apr 19 13:13:30 2015 -0400

      iommu-common: fix x86_64 compiler warnings

      Declare iommu_large_alloc as static. Remove extern definition  for
      iommu_tbl_pool_init().

      Signed-off-by: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
      Tested-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 2ab957492d13bb819400ac29ae55911d50a82a13
  Author: Sebastian Pöhn <sebastian.poehn@xxxxxxxxx>
  Date:   Mon Apr 20 09:19:20 2015 +0200

      ip_forward: Drop frames with attached skb->sk

      Initial discussion was:
      [FYI] xfrm: Don't lookup sk_policy for timewait sockets

      Forwarded frames should not have a socket attached. Especially
      tw sockets will lead to panics later-on in the stack.

      This was observed with TPROXY assigning a tw socket and broken
      policy routing (misconfigured). As a result frame enters
      forwarding path instead of input. We cannot solve this in
      TPROXY as it cannot know that policy routing is broken.

      v2:
      Remove useless comment

      Signed-off-by: Sebastian Poehn <sebastian.poehn@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 79319a052cb0ae862954fe9f6e606417f1698ddb
  Merge: 6496edf 7f65ef0
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 10:50:05 2015 -0700

      Merge tag 'iommu-updates-v4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

      Pull IOMMU updates from Joerg Roedel:
       "Not much this time, but the changes include:

         - moving domain allocation into the iommu drivers to prepare for the
           introduction of default domains for devices

         - fixing the IO page-table code in the AMD IOMMU driver to correctly
           encode large page sizes

         - extension of the PCI support in the ARM-SMMU driver

         - various fixes and cleanups"

      * tag 'iommu-updates-v4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (34 commits)
        iommu/amd: Correctly encode huge pages in iommu page tables
        iommu/amd: Optimize amd_iommu_iova_to_phys for new fetch_pte interface
        iommu/amd: Optimize alloc_new_range for new fetch_pte interface
        iommu/amd: Optimize iommu_unmap_page for new fetch_pte interface
        iommu/amd: Return the pte page-size in fetch_pte
        iommu/amd: Add support for contiguous dma allocator
        iommu/amd: Don't allocate with __GFP_ZERO in alloc_coherent
        iommu/amd: Ignore BUS_NOTIFY_UNBOUND_DRIVER event
        iommu/amd: Use BUS_NOTIFY_REMOVED_DEVICE
        iommu/tegra: smmu: Compute PFN mask at runtime
        iommu/tegra: gart: Set aperture at domain initialization time
        iommu/tegra: Setup aperture
        iommu: Remove domain_init and domain_free iommu_ops
        iommu/fsl: Make use of domain_alloc and domain_free
        iommu/rockchip: Make use of domain_alloc and domain_free
        iommu/ipmmu-vmsa: Make use of domain_alloc and domain_free
        iommu/shmobile: Make use of domain_alloc and domain_free
        iommu/msm: Make use of domain_alloc and domain_free
        iommu/tegra-gart: Make use of domain_alloc and domain_free
        iommu/tegra-smmu: Make use of domain_alloc and domain_free
        ...

  commit e0e2674b92056c24c69940d5f405ea4aef5e4010
  Author: Peter Griffin <peter.griffin@xxxxxxxxxx>
  Date:   Mon Apr 20 14:41:05 2015 +0100

      ata: ahci_st: fixup layering violations / drvdata errors

      Brian noticed while working on another SATA driver that uses 
libahci_platform,
      an error in this driver; it tries to the the driver data for its
      device, while libata also thinks it can set the driver data. See:

        ahci_platform_init_host()
        -> ata_host_alloc_pinfo()
           -> ata_host_alloc()
              -> dev_set_drvdata()

      So instead of sticking the IP-specific platform data into drvdata, let's
      use the plat_data variable that is reserved for this use.

      Addtionally plat_data isn't set until ahci_platform_init_host() has been
      called further down in probe(). So re-work the st_ahci_probe_resets and
      st_ahci_deassert_resets functions to take ahci_host_priv *hpriv as a
      parameter.

      Signed-off-by: Peter Griffin <peter.griffin@xxxxxxxxxx>
      Suggested-by: Brian Norris <computersforpeace@xxxxxxxxx>
      Cc: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxx>
      Cc: Maxime Coquelin <maxime.coquelin@xxxxxx>
      Cc: Patrice Chotard <patrice.chotard@xxxxxx>
      Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>

  commit da4d81453cf1eedfcd8b2cd1e7bfab230084bd87
  Author: Tony Lindgren <tony@xxxxxxxxxxx>
  Date:   Mon Apr 20 10:36:31 2015 -0700

      ARM: OMAP2+: Fix booting with configs that don't have MFD_SYSCON

      With the recent changes omaps have developed a dependency to MFD_SYSCON.
      This is used for system control module generic register area and some
      clocks.

      We do have it selected in omap2plus_defconfig, but targeted config
      files may not have it selected. Let's make sure it's selected like
      few other ARM platforms are already doing.

      Reported-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
      Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

  commit c9eeb5084b27ffede2709e8775827729d0c7c46c
  Author: Wolfram Sang <wsa@xxxxxxxxxxxxx>
  Date:   Mon Apr 20 10:23:38 2015 -0700

      Input: lm8333 - fix broken email address

      My Pengutronix address is not valid anymore, redirect people to the
      Pengutronix kernel team.

      Reported-by: Harald Geyer <harald@xxxxxxxxx>
      Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxxxxx>
      Acked-by: Robert Schwebel <r.schwebel@xxxxxxxxxxxxxx>
      Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>

  commit a333a03ce969c18f97f1eafa3dc1072caa33454e
  Author: Dudley Du <dudl@xxxxxxxxxxx>
  Date:   Mon Apr 20 10:00:05 2015 -0700

      Input: cyapa - fix setting suspend scan rate

      The suspend scan rate value should not exceed 1000, unfortunately when
      implementing the limit we used max_t instead of min_t, causing the value 
to
      be at least 1000.

      Signed-off-by: Dudley Du <dudl@xxxxxxxxxxx>
      Reviewed-by: Benson Leung <bleung@xxxxxxxxxxxx>
      Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>

  commit 9f423801c9e849df56b37833df895685c9d8a940
  Author: Duson Lin <dusonlin@xxxxxxxxxx>
  Date:   Mon Apr 20 10:19:24 2015 -0700

      Input: elan_i2c - fix calculating number of x and y traces.

      According to Elan's firmware engineers we should not be subtracting 1 form
      the raw number of x and y traces so that the pitch size is correct. For
      example, if the touchpad x resolution is 2800 and x trace number is 20,
      the pitch size of x should be 2800/20 = 140, not 2800/19 = 147.36.

      Signed-off-by: Duson Lin <dusonlin@xxxxxxxxxx>
      Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>

  commit 090ad325068810a9edb09dfe8fec97a724c5743f
  Author: Duson Lin <dusonlin@xxxxxxxxxx>
  Date:   Mon Apr 20 09:59:04 2015 -0700

      Input: elan_i2c - report hovering contacts

      When hover is detected report ABS_MT_DISTANCE as 1; for active contacts
      the distance is reported as 0.

      Signed-off-by: Duson Lin <dusonlin@xxxxxxxxxx>
      Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>

  commit 8c0776a8f046d5fb1804e525c3b6e9f897fe0d3f
  Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
  Date:   Fri Apr 17 20:42:47 2015 -0700

      Input: elants_i2c - zero-extend hardware ID in firmware name

      Let's zero-extend hardware id number when forming firmware file name,
      to avoid kernel requesting firmware like "elants_i2c_   0.bin", which
      is quite unexpected.

      Acked-by: Charlie Mooney<charliemooney@xxxxxxxxxxxx>
      Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>

  commit 6496edfce95f943e1da43631c2f437509e56af7f
  Merge: b19a42e e4afa12
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 10:19:03 2015 -0700

      Merge tag 'cpumask-next-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

      Pull final removal of deprecated cpus_* cpumask functions from Rusty 
Russell:
       "This is the final removal (after several years!) of the obsolete
        cpus_* functions, prompted by their mis-use in staging.

        With these function removed, all cpu functions should only iterate to
        nr_cpu_ids, so we finally only allocate that many bits when cpumasks
        are allocated offstack"

      * tag 'cpumask-next-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (25 commits)
        cpumask: remove __first_cpu / __next_cpu
        cpumask: resurrect CPU_MASK_CPU0
        linux/cpumask.h: add typechecking to cpumask_test_cpu
        cpumask: only allocate nr_cpumask_bits.
        Fix weird uses of num_online_cpus().
        cpumask: remove deprecated functions.
        mips: fix obsolete cpumask_of_cpu usage.
        x86: fix more deprecated cpu function usage.
        ia64: remove deprecated cpus_ usage.
        powerpc: fix deprecated CPU_MASK_CPU0 usage.
        CPU_MASK_ALL/CPU_MASK_NONE: remove from deprecated region.
        staging/lustre/o2iblnd: Don't use cpus_weight
        staging/lustre/libcfs: replace deprecated cpus_ calls with cpumask_
        staging/lustre/ptlrpc: Do not use deprecated cpus_* functions
        blackfin: fix up obsolete cpu function usage.
        parisc: fix up obsolete cpu function usage.
        tile: fix up obsolete cpu function usage.
        arm64: fix up obsolete cpu function usage.
        mips: fix up obsolete cpu function usage.
        x86: fix up obsolete cpu function usage.
        ...

  commit b19a42e3cb9e73cad59e60ab7403e5afe7f4b262
  Merge: 5ca08a8 80ed156
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 10:15:33 2015 -0700

      Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

      Pull more s390 updates from Martin Schwidefsky:
       "The big thing in this second merge for s390 is the new eBPF JIT from
        Michael which replaces the old 32-bit backend.

        The remaining commits are bug fixes"

      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/pci: add locking for fmb access
        s390/pci: extract software counters from fmb
        s390/dasd: Fix unresumed device after suspend/resume having no paths
        s390/dasd: fix unresumed device after suspend/resume
        s390/dasd: fix inability to set a DASD device offline
        s390/mm: Fix memory hotplug for unaligned standby memory
        s390/bpf: Add s390x eBPF JIT compiler backend
        s390: Use bool function return values of true/false not 1/0

  commit 5ca08a82a75c9109f8207cbcbef8705334b4713a
  Merge: f4d03bd 6e42061
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 10:12:29 2015 -0700

      Merge branch 'for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

      Pull m68k fixes from Greg Ungerer:
       "Nothing big, spelling fixes and fix/cleanup for ColdFire eth device 
setup"

      * 'for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: fix fec setup warning for ColdFire 5271 builds
        m68knommu: ColdFire 5271 only has a single FEC controller
        m68k: Fix trivial typos in comments

  commit f4d03bd143c628b00f66cc2ec2c013767bdd1518
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Mon Apr 20 09:08:49 2015 -0700

      smp: don't use 16-bit words for atomic accesses

      Yes, it should work, but it's a bad idea.  Not only did ARM64 not have
      the 16-bit access code (there's a separate patch to add it), it's just
      not a good atomic type.  Some architectures fundamentally don't do
      atomic accesses in them (alpha), and it's not like it saves any space
      here anyway because of structure packing issues.

      We normally should aim for flags to be "unsigned int" or "unsigned
      long".  And if space is at a premium, use a single byte (although that
      causes problems on alpha again).  There might be very special cases
      where a 16-byte entity is really wanted, but this is not one of them.

      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 32ec4397756d072873ee778cbf41b9f6a335b953
  Author: Yan, Zheng <zyan@xxxxxxxxxx>
  Date:   Thu Mar 26 19:06:00 2015 +0800

      ceph: hold on to exclusive caps on complete directories

      If a directory is complete, we want to keep the exclusive
      cap. So that MDS does not end up revoking the shared cap
      on every create/unlink operation.

      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit 9571eb4f9617e89b3f979a3856b1296eba277bb1
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Wed Mar 25 21:15:17 2015 +0300

      libceph: simplify our debugfs attr macro

      No need to do single_open()'s job ourselves.

      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit ff7eeb82cc16f25203b69f817cbbb85845c817fe
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Wed Mar 25 21:10:09 2015 +0300

      ceph: show non-default options only

      Don't pollute /proc/mounts with default options (presently these are
      dcache, nofsc and acl).  Leave the acl/noacl however - it's a bit of
      a special case due to CONFIG_CEPH_FS_POSIX_ACL.

      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit 5cf7bd30120ead3db43ef9074be38018d9acf22f
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Wed Mar 25 21:07:41 2015 +0300

      libceph: expose client options through debugfs

      Add a client_options attribute for showing libceph options.

      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit ff40f9ae95917b72b6acb6057471c99054b6ee24
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Wed Mar 25 21:02:16 2015 +0300

      libceph, ceph: split ceph_show_options()

      Split ceph_show_options() into two pieces and move the piece
      responsible for printing client (libceph) options into net/ceph.  This
      way people adding a libceph option wouldn't have to remember to update
      code in fs/ceph.

      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit d8a2c89c8636405ad0b234f111d22c00c37e452b
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Tue Mar 24 16:15:17 2015 +0300

      rbd: mark block queue as non-rotational

      Set QUEUE_FLAG_NONROT.  Following commit b277da0a8a59 ("block: disable
      entropy contributions for nonrot devices") we should also clear
      QUEUE_FLAG_ADD_RANDOM, but it's off by default for blk-mq drivers, so
      just note it in the comment.

      Also remove physical block size assignment - no sense in repeating
      defaults that are not going to change.

      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit 67c64eb742a49d3d3f5dcef75d0c32a3394e5519
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Mon Mar 23 14:52:40 2015 +0300

      libceph: don't overwrite specific con error msgs

      - specific con->error_msg messages (e.g. "protocol version mismatch")
        end up getting overwritten by a catch-all "socket error on read
        / write", introduced in commit 3a140a0d5c4b ("libceph: report socket
        read/write error message")
      - "bad message sequence # for incoming message" loses to "bad crc" due
        to the fact that -EBADMSG is used for both

      Fix it, and tidy up con->error_msg assignments and pr_errs while at it.

      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit 1c841a96b5f369cbb0b169d13825c7ff7d0fba8d
  Author: Yan, Zheng <zyan@xxxxxxxxxx>
  Date:   Tue Mar 24 20:15:36 2015 +0800

      ceph: cleanup unsafe requests when reconnecting is denied

      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit a9f6eb61850e1599f9aa5141f25ccc1d8248e174
  Author: Yan, Zheng <zyan@xxxxxxxxxx>
  Date:   Tue Mar 24 15:49:36 2015 +0800

      ceph: don't zero i_wrbuffer_ref when reconnecting is denied

      remove_session_caps_cb() does not truncate dirty data in page
      cache, but zeros i_wrbuffer_ref/i_wrbuffer_ref_head. This will
      result negtive i_wrbuffer_ref/i_wrbuffer_ref_head

      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit 571ade336ac89f5db602f7df992152e4f4b945bc
  Author: Yan, Zheng <zyan@xxxxxxxxxx>
  Date:   Tue Mar 24 11:36:08 2015 +0800

      ceph: don't mark dirty caps when there is no auth cap

      No i_auth_cap means reconnecting to MDS was denied. So don't
      add new dirty caps.

      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit db40cc1702d6a7049740d269cf6c1a42f979c7a7
  Author: Yan, Zheng <zyan@xxxxxxxxxx>
  Date:   Mon Mar 23 20:12:20 2015 +0800

      ceph: keep i_snap_realm while there are writers

      when reconnecting to MDS is denied, we remove session caps
      forcibly. But it's possible there are ongoing write, the
      write code needs to reference i_snap_realm. So if there are
      ongoing write, we keep i_snap_realm.

      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit 3ef650d3989677bd460497f9c3b0d58caaba0116
  Author: Joe Perches <joe@xxxxxxxxxxx>
  Date:   Mon Mar 23 13:35:03 2015 -0700

      libceph: osdmap.h: Add missing format newlines

      To avoid possible interleaving, add missing '\n' to formats.

      Convert pr_warning to pr_warn while there.

      Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit a149bb9a281c5c2904cf6fcdf9ed386340032ce3
  Author: Sanidhya Kashyap <sanidhya.gatech@xxxxxxxxx>
  Date:   Sat Mar 21 12:54:58 2015 -0400

      ceph: kstrdup() memory handling

      Currently, there is no check for the kstrdup() for r_path2,
      r_path1 and snapdir_name as various locations as there is a
      possibility of failure during memory pressure. Therefore,
      returning ENOMEM where the checks have been missed.

      Signed-off-by: Sanidhya Kashyap <sanidhya.gatech@xxxxxxxxx>
      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit c1d00b2d9c4fc821e33c5cdfbdbc32677cb0e2e0
  Author: Taesoo Kim <tsgatesv@xxxxxxxxx>
  Date:   Fri Mar 20 17:36:56 2015 -0400

      ceph: properly release page upon error

      When ceph_update_writeable_page fails (including -EAGAIN), it
      unlocks (w/ unlock_page) the page but does not 'release'
      (w/ page_cache_release) properly.

      Upon error, properly set *pagep to NULL, indicating an error.

      Signed-off-by: Taesoo Kim <tsgatesv@xxxxxxxxx>
      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit 1fe480235ad7236e8ea6c167af5a5d1ac24f8a88
  Author: Ilya Dryomov <idryomov@xxxxxxxxx>
  Date:   Thu Mar 5 10:47:22 2015 +0300

      rbd: be more informative on -ENOENT failures

      pr_info what exactly was the culprit: missing pool, image or snap.

      Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>

  commit f4c1a311d8dc55c90c39e9cf7b003254a769574d
  Author: Mengdong Lin <mengdong.lin@xxxxxxxxx>
  Date:   Mon Apr 20 17:33:57 2015 +0800

      ALSA: hda - only sync BCLK to the display clock for Haswell & Broadwell

      Only Intel Haswell and Broadwell have a separate HD-A controller (PCI 
device 3)
      for display audio, which needs to get 24MHz HD-A link BCLK from the 
variable
      display core clock through vendor specific registers EM4 & EM5. Other 
platforms
      (Baytrail, Braswell and Skylake) don't have this feature.

      So this patch checks the PCI device ID of the controller in 
haswell_set_bclk()
      and only sync BCLK for HSW and BDW.

      Signed-off-by: Mengdong Lin <mengdong.lin@xxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit cdaa8cf34863028dab238e1498555bf12d693244
  Merge: 30a5c18 98b8098
  Author: Olof Johansson <olof@xxxxxxxxx>
  Date:   Mon Apr 20 07:59:04 2015 -0700

      Merge branch 'fixes' into next/fixes-non-critical

      Merge a set of fixes that we missed sending in before v4.0 release. These
      will also be sent to -stable.

      * fixes: (659 commits)
        ARM: at91/dt: sama5d3 xplained: add phy address for macb1
        kbuild: Create directory for target DTB
        ARM: mvebu: Disable CPU Idle on Armada 38x
        arm64: juno: Fix misleading name of UART reference clock
        ARM: dts: sunxi: Remove overclocked/overvoltaged OPP
        ARM: dts: sun4i: a10-lime: Override and remove 1008MHz OPP setting
        ARM: socfpga: dts: fix spi1 interrupt
        ARM: dts: Fix gpio interrupts for dm816x
        ARM: dts: dra7: remove ti,hwmod property from pcie phy
        ARM: EXYNOS: Fix build breakage cpuidle on !SMP
        ARM: OMAP: dmtimer: disable pm runtime on remove
        ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure
        ARM: dts: fix lid and power pin-functions for exynos5250-spring
        ARM: dts: fix mmc node updates for exynos5250-spring
        ARM: OMAP2+: Fix socbus family info for AM33xx devices
        ARM: dts: omap3: Add missing dmas for crypto
        + Linux 4.0-rc4

      Signed-off-by: Olof Johansson <olof@xxxxxxxxx>

  commit 57e95460f0b360c4d29c0320922b46b55dd2b79f
  Author: Nicholas Mc Guire <hofrat@xxxxxxxxx>
  Date:   Tue Mar 10 11:18:15 2015 -0400

      ceph: match wait_for_completion_timeout return type

      return type of wait_for_completion_timeout is unsigned long not int. An
      appropriately named unsigned long is added and the assignment fixed up.

      Signed-off-by: Nicholas Mc Guire <hofrat@xxxxxxxxx>
      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit 3563dbdd99603d4339467ddffafe3851aae2e398
  Author: Nicholas Mc Guire <hofrat@xxxxxxxxx>
  Date:   Fri Feb 6 06:52:17 2015 -0500

      ceph: use msecs_to_jiffies for time conversion

      This is only an API consolidation and should make things more readable
      it replaces var * HZ / 1000 by msecs_to_jiffies(var).

      Signed-off-by: Nicholas Mc Guire <hofrat@xxxxxxxxx>
      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit e1eba3ea02dbd2a4b6be1a5708af31dc9b9aaaa6
  Author: Fabian Frederick <fabf@xxxxxxxxx>
  Date:   Tue Mar 3 18:57:49 2015 +0100

      ceph: remove redundant declaration

      ceph_aops was already defined extern in addr.c section

      Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit e2c3de046c5a1f3525772b4cacc7731cb626ab61
  Author: Yan, Zheng <zyan@xxxxxxxxxx>
  Date:   Wed Mar 4 16:05:04 2015 +0800

      ceph: fix dcache/nocache mount option

      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit 6e6f09231a134e7523514ed504380f5caafc9334
  Author: Yan, Zheng <zyan@xxxxxxxxxx>
  Date:   Fri Feb 27 08:54:08 2015 +0800

      ceph: drop cap releases in requests composed before cap reconnect

      These cap releases are stale because MDS will re-establish client
      caps according to the cap reconnect messages.

      Note: MDS can detect stale cap messages, so these stale cap
      releases are harmless even we don't drop them.

      Signed-off-by: Yan, Zheng <zyan@xxxxxxxxxx>

  commit d8f6ad85cbb740b7e8ca5275b12838fab685540c
  Author: Vineet Gupta <vgupta@xxxxxxxxxxxx>
  Date:   Mon Apr 20 16:49:30 2015 +0530

      ARC: perf: don't add code for impossible case

      Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>

  commit 30fdd373f24cc50e250c71a6e2df89505e267804
  Author: Vineet Gupta <vgupta@xxxxxxxxxxxx>
  Date:   Wed Apr 15 16:35:38 2015 +0530

      ARC: perf: Rename DT binding to not confuse with power mgmt

      Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>

  commit 22f6b899125063c5dc955dd378c408b14d80b020
  Author: Vineet Gupta <vgupta@xxxxxxxxxxxx>
  Date:   Fri Jul 12 15:55:54 2013 +0200

      ARC: perf: add user space attribution in callchains

      The actual user space unwinding is more involved, so simply capture the
      user space PC

      Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>

  commit 389e3160b9b0002f8e7c95e9c0af5da6da311892
  Author: Vineet Gupta <vgupta@xxxxxxxxxxxx>
  Date:   Tue Nov 12 11:00:03 2013 +0100

      ARC: perf: Add kernel callchain support

      Signed-off-by: Mischa Jonker <mjonker@xxxxxxxxxxxx>
      Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>

  commit 0a8a47679351f00145ddeaa0a05b510e67b780be
  Author: Vineet Gupta <vgupta@xxxxxxxxxxxx>
  Date:   Wed Jan 7 13:14:07 2015 +0530

      ARC: perf: support cache hit/miss ratio

      Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>

  commit bde80c237e49983e2b26dfa9925325a070b71de7
  Author: Vineet Gupta <vgupta@xxxxxxxxxxxx>
  Date:   Wed Apr 15 19:44:07 2015 +0530

      ARC: perf: Add some comments/debug stuff

      Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>

  commit 03c94fcf954d6bc5e23460e200d23a2c0fe5cd2e
  Author: Vineet Gupta <vgupta@xxxxxxxxxxxx>
  Date:   Mon Nov 17 17:13:03 2014 +0530

      ARC: perf: make @arc_pmu static global

      Signed-off-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>

  commit 5eb8f4d74204864d8a4154772206ad747274d12d
  Author: Johannes Berg <johannes.berg@xxxxxxxxx>
  Date:   Mon Apr 13 14:56:51 2015 +0200

      mac80211: don't warn when stopping VLAN with stations

      Stations assigned to an AP_VLAN type interface are flushed
      when the interface is stopped, but then we warn about it.
      Suppress the warning since there's nothing else that would
      ensure those stations are already removed at this point.

      Reported-by: Jouni Malinen <j@xxxxx>
      Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>

  commit 6b75b54c841a18ef114704aa5cf2cdf43487b0ae
  Merge: 7374ccc aa977f6
  Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
  Date:   Mon Apr 20 12:09:31 2015 +0300

      Merge omapdss topic branch for fbdev 4.1

  commit aa977f62dff4fb41e89b473c9831c292c01d8bfc
  Author: Grygorii Strashko <Grygorii.Strashko@xxxxxxxxxx>
  Date:   Wed Feb 25 19:03:56 2015 +0200

      omapdss: extend pm notifier to handle hibernation

      Add handling of missed events in omap_dss_pm_notif which are
      needed to support hibernation (suspend to disk).

      Signed-off-by: Grygorii Strashko <Grygorii.Strashko@xxxxxxxxxx>
      Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxx>

  commit 34260a79b2b3063d7a8b8208f7d5d8cc0e1826f4
  Author: Javier Martinez Canillas <javier.martinez@xxxxxxxxxxxxxxx>
  Date:   Sat Mar 7 17:08:03 2015 +0100

      OMAPDSS: Correct video ports description file path in DT binding doc

      The doc refers to Documentation/devicetree/bindings/video/video-ports.txt
      which does not exist. The documentation seems to be outdated and wants to
      refer to Documentation/devicetree/bindings/graph.txt instead.

      Signed-off-by: Javier Martinez Canillas <javier.martinez@xxxxxxxxxxxxxxx>
      Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxx>

  commit cb17a4ae3bbf1daa3b179147b6d476ea2482e2d3
  Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
  Date:   Wed Feb 25 12:08:14 2015 +0200

      OMAPDSS: disable VT switch

      We don't need VT switch when suspending/resuming, so disable it. This
      speeds up suspend/resume.

      Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
      Cc: NeilBrown <neil@xxxxxxxxxx>

  commit 9476d369d7b39348945c297da5f2935904229813
  Author: Gabriele Mazzotta <gabriele.mzt@xxxxxxxxx>
  Date:   Sun Apr 19 19:00:40 2015 +0200

      ALSA: hda - Mute headphone pin on suspend on XPS13 9333

      Muting the headphone output pin right before the codec suspension
      prevents pop noises when headphones are plugged in (except for a
      barely audible click noise).
      This solution allows to truly save some power when headphones are
      plugged in unlike the previous solution (033b0a7ca9c:
      "ALSA: hda - Pop noises fix for XPS13 9333")

      Signed-off-by: Gabriele Mazzotta <gabriele.mzt@xxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 94d4b4765b7ddb8478b0d57663cf7a08e2263bbf
  Author: Ingo Molnar <mingo@xxxxxxxxxx>
  Date:   Fri Nov 23 19:19:07 2012 +0100

      x86/mm: Clean up types in xlate_dev_mem_ptr()

      Pavel Machek reported the following compiler warning on
      x86/32 CONFIG_HIGHMEM64G=y builds:

        arch/x86/mm/ioremap.c:344:10: warning: cast to pointer from integer of 
different size [-Wint-to-pointer-cast]

      Clean up the types in this function by using a single natural type for
      internal calculations (unsigned long), to make it more apparent what's
      happening, and also to remove fragile casts.

      Reported-by: Pavel Machek <pavel@xxxxxx>
      Cc: jgross@xxxxxxxx
      Cc: roland@xxxxxxxxxxxxxxx
      Link: http://lkml.kernel.org/r/20150416080440.GA507@amd
      Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>

  commit 553452e5ffc0ed13214a287549627d02d9d7fbdc
  Author: Liad Kaufman <liad.kaufman@xxxxxxxxx>
  Date:   Thu Apr 16 17:21:12 2015 +0300

      iwlwifi: pcie: prevent using unmapped memory in fw monitor

      In the case of a DMA mapping error on the last iteration of
      the loop of the allocation of memory of the FW monitor we
      indeed free the pages, but don't NULL out the page variable
      thus allowing for the possibility of setting the FW monitor
      variables with invalid data to use.

      Fixes: c2d202017da1 ("iwlwifi: pcie: add firmware monitor capabilities")
      Signed-off-by: Liad Kaufman <liad.kaufman@xxxxxxxxx>
      Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>

  commit 68d4cef3bab3fb9bb0dbac690ba35a96cb5a16d9
  Author: Andy Grover <agrover@xxxxxxxxxx>
  Date:   Tue Apr 14 17:30:05 2015 -0700

      target: Put TCMU under a new config option

      Conceptually version 2 should be viewed as an entirely new, incompatible
      version of TCMU, so emphasize this by changing the config option and
      Kconfig text.

      Signed-off-by: Andy Grover <agrover@xxxxxxxxxx>
      Signed-off-by: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>

  commit 0ad46af8a618fc38e0cdc3927cfa9f7b42cc9423
  Author: Andy Grover <agrover@xxxxxxxxxx>
  Date:   Tue Apr 14 17:30:04 2015 -0700

      target: Version 2 of TCMU ABI

      The initial version of TCMU (in 3.18) does not properly handle
      bidirectional SCSI commands -- those with both an in and out buffer. In
      looking to fix this it also became clear that TCMU's support for adding
      new types of entries (opcodes) to the command ring was broken. We need
      to fix this now, so that future issues can be handled properly by adding
      new opcodes.

      We make the most of this ABI break by enabling bidi cmd handling within
      TCMP_OP_CMD opcode. Add an iov_bidi_cnt field to tcmu_cmd_entry.req.
      This enables TCMU to describe bidi commands, but further kernel work is
      needed for full bidi support.

      Enlarge tcmu_cmd_entry_hdr by 32 bits by pulling in cmd_id and __pad1. 
Turn
      __pad1 into two 8 bit flags fields, for kernel-set and userspace-set 
flags,
      "kflags" and "uflags" respectively.

      Update version fields so userspace can tell the interface is changed.

      Update tcmu-design.txt with details of how new stuff works:
      - Specify an additional requirement for userspace to set UNKNOWN_OP
        (bit 0) in hdr.uflags for unknown/unhandled opcodes.
      - Define how Data-In and Data-Out fields are described in req.iov[]

      Changed in v2:
      - Change name of SKIPPED bit to UNKNOWN bit
      - PAD op does not set the bit any more
      - Change len_op helper functions to take just len_op, not the whole struct
      - Change version to 2 in missed spots, and use defines
      - Add 16 unused bytes to cmd_entry.req, in case additional SAM cmd
        parameters need to be included
      - Add iov_dif_cnt field to specify buffers used for DIF info in iov[]
      - Rearrange fields to naturally align cdb_off
      - Handle if userspace sets UNKNOWN_OP by indicating failure of the cmd
      - Wrap some overly long UPDATE_HEAD lines

      (Add missing req.iov_bidi_cnt + req.iov_dif_cnt zeroing - Ilias)

      Signed-off-by: Andy Grover <agrover@xxxxxxxxxx>
      Reviewed-by: Ilias Tsitsimpis <iliastsi@xxxxxxxxxxx>
      Signed-off-by: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>

  commit baa54ab93c2e1ced7e54f9c021fe102c0d39c090
  Author: Ley Foon Tan <lftan@xxxxxxxxxx>
  Date:   Thu Apr 16 15:19:01 2015 +0800

      nios2: rework trap handler

      Redefine trap handler as below:

       0  N/A        reserved for system calls
       1  SIGUSR1    user-defined signal 1
       2  SIGUSR2    user-defined signal 2
       3  SIGILL     illegal instruction
       4..29         reserved (but implemented to raise SIGILL instead of being 
undefined)
      30  SIGTRAP    KGDB
      31  SIGTRAP    trace/breakpoint trap

      Signed-off-by: Ley Foon Tan <lftan@xxxxxxxxxx>

  commit 2c33ce009ca2389dbf0535d0672214d09738e35e
  Merge: cec32a4 09d5160
  Author: Dave Airlie <airlied@xxxxxxxxxx>
  Date:   Mon Apr 20 11:32:26 2015 +1000

      Merge Linus master into drm-next

      The merge is clean, but the arm build fails afterwards,
      due to API changes in the regulator tree.

      I've included the patch into the merge to fix the build.

      Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>

  commit 170c381f6bcd9ad3235654988aabddb612b34a39
  Author: Ley Foon Tan <lftan@xxxxxxxxxx>
  Date:   Wed Apr 15 10:45:49 2015 +0800

      nios2: remove end address checking for initda

      Remove the end address checking for initda function. We need to invalidate
      each address line for initda instruction, from start to end address.

      Signed-off-by: Ley Foon Tan <lftan@xxxxxxxxxx>

  commit cec32a47010647e8b0603726ebb75b990a4057a4
  Author: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
  Date:   Fri Apr 17 19:12:41 2015 +0200

      media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format

      Change the constant values for RGB444_1X12, RGB565_1X16, and YUV8_1X24 
media
      bus formats in anticipation of a merge conflict with the media tree, where
      the old values are already taken by RBG888_1X24, RGB888_1X32_PADHI, and
      VUY8_1X24, respectively.

      Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
      Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>

  commit 3ea68922fc4148abc97557df43d4ba9a136b1c8d
  Author: Heiko Stuebner <heiko@xxxxxxxxx>
  Date:   Mon Apr 20 01:00:53 2015 +0200

      drm/rockchip: fix error check when getting irq

      platform_get_irq() can return negative error values and we already test 
for
      these. Therefore the variable holding this value should be signed to not
      loose possible error values.

      Reported-by: David Binderman <dcb314@xxxxxxxxxxx>
      Signed-off-by: Heiko Stuebner <heiko@xxxxxxxxx>
      Reviewed-By: Daniel Kurtz <djkurtz@xxxxxxxxxxxx>

  commit 625e03461ba51592ac785214b2254af7bd630077
  Author: Heiko Stuebner <heiko@xxxxxxxxx>
  Date:   Mon Apr 20 00:59:50 2015 +0200

      MAINTAINERS: add entry for Rockchip drm drivers

      Mark Yao looks after the Rockchip drm drivers and should thus also get
      patches touching these.

      Signed-off-by: Heiko Stuebner <heiko@xxxxxxxxx>

  commit 09d51602cf84a1264946711dd4ea0dddbac599a1
  Merge: 6162e4b e9257f5
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 19 14:31:41 2015 -0700

      Merge branch 'turbostat' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

      Pull turbostat update from Len Brown:
       "Updates to the turbostat utility.

        Just one kernel dependency in this batch -- added a #define to
        msr-index.h"

      * 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
        tools/power turbostat: correct dumped pkg-cstate-limit value
        tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
        tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
        tools/power turbostat: Initial Skylake support
        tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support 
for O= option in Makefile
        tools/power turbostat: modprobe msr, if needed
        tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
        tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
        x86 msr-index: define MSR_TURBO_RATIO_LIMIT,1,2
        tools/power turbostat: label base frequency
        tools/power turbostat: update PERF_LIMIT_REASONS decoding
        tools/power turbostat: simplify default output

  commit 6162e4b0bedeb3dac2ba0a5e1b1f56db107d97ec
  Merge: 17974c0 6ddb244
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 19 14:26:31 2015 -0700

      Merge tag 'ext4_for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

      Pull ext4 updates from Ted Ts'o:
       "A few bug fixes and add support for file-system level encryption in
        ext4"

      * tag 'ext4_for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (31 commits)
        ext4 crypto: enable encryption feature flag
        ext4 crypto: add symlink encryption
        ext4 crypto: enable filename encryption
        ext4 crypto: filename encryption modifications
        ext4 crypto: partial update to namei.c for fname crypto
        ext4 crypto: insert encrypted filenames into a leaf directory block
        ext4 crypto: teach ext4_htree_store_dirent() to store decrypted 
filenames
        ext4 crypto: filename encryption facilities
        ext4 crypto: implement the ext4 decryption read path
        ext4 crypto: implement the ext4 encryption write path
        ext4 crypto: inherit encryption policies on inode and directory create
        ext4 crypto: enforce context consistency
        ext4 crypto: add encryption key management facilities
        ext4 crypto: add ext4 encryption facilities
        ext4 crypto: add encryption policy and password salt support
        ext4 crypto: add encryption xattr support
        ext4 crypto: export ext4_empty_dir()
        ext4 crypto: add ext4 encryption Kconfig
        ext4 crypto: reserve codepoints used by the ext4 encryption feature
        ext4 crypto: add ext4_mpage_readpages()
        ...

  commit 17974c054db3030b714b7108566bf5208d965a19
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 19 13:48:40 2015 -0700

      hexdump: avoid warning in test function

      The test_data_1_le[] array is a const array of const char *.  To avoid
      dropping any const information, we need to use "const char * const *",
      not just "const char **".

      I'm not sure why the different test arrays end up having different
      const'ness, but let's make the pointer we use to traverse them as const
      as possible, since we modify neither the array of pointers _or_ the
      pointers we find in the array.

      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 8b01fc86b9f425899f8a3a8fc1c47d73c2c20543
  Author: Jann Horn <jann@xxxxxxxxx>
  Date:   Sun Apr 19 02:48:39 2015 +0200

      fs: take i_mutex during prepare_binprm for set[ug]id executables

      This prevents a race between chown() and execve(), where chowning a
      setuid-user binary to root would momentarily make the binary setuid
      root.

      This patch was mostly written by Linus Torvalds.

      Signed-off-by: Jann Horn <jann@xxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 5224b9613b91d937c6948fe977023247afbcc04e
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sun Apr 19 04:56:03 2015 -0400

      smp: Fix error case handling in smp_call_function_*()

      Commit 8053871d0f7f ("smp: Fix smp_call_function_single_async()
      locking") fixed the locking for the asynchronous smp-call case, but in
      the process of moving the lock handling around, one of the error cases
      ended up not unlocking the call data at all.

      This went unnoticed on x86, because this is a "caller is buggy" case,
      where the caller is trying to call a non-existent CPU.  But apparently
      ARM does that (at least under qemu-arm).  Bindly doing cross-cpu calls
      to random CPU's that aren't even online seems a bit fishy, but the error
      handling was clearly not correct.

      Simply add the missing "csd_unlock()" to the error path.

      Reported-and-tested-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Analyzed-by: Rabin Vincent <rabin@xxxxxx>
      Acked-by: Ingo Molnar <mingo@xxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 2363ccb505c15328580d5f64b5e9ea5c1c8a1462
  Merge: 0f5abd4 64df1fd 5fa0fa4 06b230e
  Author: Rafael J. Wysocki <rjw@xxxxxxxxxxxxx>
  Date:   Sun Apr 19 21:19:27 2015 +0200

      Merge branches 'pm-cpufreq', 'powercap' and 'pm-tools'

      * pm-cpufreq:
        cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning
        intel_pstate: Change the setpoint for Atom params

      * powercap:
        powercap / RAPL: Add support for Intel Skylake processors

      * pm-tools:
        cpupower: fix breakage from libpci API change

  commit 8047cc0c584844817fbf3bf57cb18c1f762a7136
  Author: Alexander Bondar <alexander.bondar@xxxxxxxxx>
  Date:   Thu Mar 26 13:15:03 2015 +0200

      iwlwifi: mvm: Avoid signal based decisions if ave beacon RSSI is 0

      If for some reason statistics notification received from the firmware
      reports 0 in average beacon RSSI value, then skip it and avoid signal
      based decisions.

      Signed-off-by: Alexander Bondar <alexander.bondar@xxxxxxxxx>
      Reviewed-by: Johannes Berg <johannes.berg@xxxxxxxxx>
      Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>

  commit 1083fd7391e989be52022f0f338e9dadc048b063
  Author: Avraham Stern <avraham.stern@xxxxxxxxx>
  Date:   Tue Mar 31 16:14:41 2015 +0300

      iwlwifi: mvm: fix scan iteration complete notification handling

      Scan iteration complete notification handling uses the wrong FW API
      version (version 2 instead of version 3).
      Fix that by removing version 2 API which is no longer used, and using
      only the updated version.

      Signed-off-by: Avraham Stern <avraham.stern@xxxxxxxxx>
      Reviewed-by: David Spinadel <david.spinadel@xxxxxxxxx>
      Reviewed-by: Johannes Berg <johannes.berg@xxxxxxxxx>
      Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>

  commit 145d90b6b3a3f00d8b66d0e118b4995b64b74fef
  Author: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
  Date:   Mon Apr 13 12:05:48 2015 +0300

      iwlwifi: mvm: don't stop the FW monitor too early

      When the delay paramatere is provided, we need to stop
      the collection only after the delay has elapsed.

      Reviewed-by: Johannes Berg <johannes.berg@xxxxxxxxx>
      Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>

  commit d44c3fe68cc7e435ebc06d5b6ac260a5c1b495f8
  Author: Avri Altman <avri.altman@xxxxxxxxx>
  Date:   Sat Apr 18 22:16:42 2015 +0300

      iwlwifi: mvm: fix Tx Power firmware API

      The firmware doesn't relate the scan to a vif. The scan is
      run by a separate entity called auxiliary MAC (aka AUX MAC).
      This AUX MAC needs to get Tx power limitations that are
      not applied on a specific vif, but on the device as a whole.

      This can be implemented by using the minimum of all the
      values set by the user for all the MACs. But then we need
      to ignore the limitations that come from the AP or
      regulatory for a specific vif: a specific vif might have
      regulatory limitations because of the channel is works on.
      This limit is irrelevant for the AUX MAC.
      Use the new API from mac80211: the user_power_level in
      bss_conf to achieve this.

      Firmware -13.ucode has already moved to this API.

      Change-Id: Ifba83660f378e91b93bd46d29fe8ba35a7c168a4
      Signed-off-by: Avri Altman <avri.altman@xxxxxxxxx>
      Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>

  commit aae013d646aae8787b76255d1a1cadd7f64a47dd
  Author: Jie Yang <yang.jie@xxxxxxxxx>
  Date:   Sun Apr 19 09:45:48 2015 +0800

      ASoC: add static inline funcs to fix a compiling issue

      When CONFIG_PM_SLEEP is not selected, calling funcs
      snd_soc_suspend and _resume will generate a compiling
      issue.

      Here add static inline stub functions to fix it.

      Signed-off-by: Jie Yang <yang.jie@xxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit e4afa120c98252e44390067c3a6cc775cde30659
  Author: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 11:18:27 2015 +0930

      cpumask: remove __first_cpu / __next_cpu

      They were for use by the deprecated first_cpu() and next_cpu() wrappers,
      but sparc used them directly.

      They're now replaced by cpumask_first / cpumask_next.  And __next_cpu_nr
      is completely obsolete.

      Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
      Acked-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 64fb1d0e975e92e012802d371e417266d6531676
  Merge: dba94f2 ccb3018
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 18:01:29 2015 -0400

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

      Pull sparc fixes from David Miller
       "Unfortunately, I brown paper bagged the generic iommu pool allocator
        by applying the wrong revision of the patch series.

        This reverts the bad one, and puts the right one in"

      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        iommu-common: Fix PARISC compile-time warnings
        sparc: Make LDC use common iommu poll management functions
        sparc: Make sparc64 use scalable lib/iommu-common.c functions
        Break up monolithic iommu table/lock into finer graularity pools and 
lock
        sparc: Revert generic IOMMU allocator.

  commit dba94f2155f581395ef9608418778e3491b3d470
  Merge: 34a984f f569d3e
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 17:45:30 2015 -0400

      Merge tag 'for-linus-4.1-merge-window' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

      Pull 9pfs updates from Eric Van Hensbergen:
       "Some accumulated cleanup patches for kerneldoc and unused variables as
        well as some lock bug fixes and adding privateport option for RDMA"

      * tag 'for-linus-4.1-merge-window' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        net/9p: add a privport option for RDMA transport.
        fs/9p: Initialize status in v9fs_file_do_lock.
        net/9p: Initialize opts->privport as it should be.
        net/9p: use memcpy() instead of snprintf() in p9_mount_tag_show()
        9p: use unsigned integers for nwqid/count
        9p: do not crash on unknown lock status code
        9p: fix error handling in v9fs_file_do_lock
        9p: remove unused variable in p9_fd_create()
        9p: kerneldoc warning fixes

  commit ccb301862aa51ea7c10c10b440f3e8bbeac5b720
  Merge: c12f048 2f0c0fd
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Sat Apr 18 12:35:09 2015 -0700

      Merge branch 'iommu-generic-allocator'

      Sowmini Varadhan says:

      ====================
      Generic IOMMU pooled allocator

      Investigation of network performance on Sparc shows a high
      degree of locking contention in the IOMMU allocator, and it
      was noticed that the PowerPC code has a better locking model.

      This patch series tries to extract the generic parts of the
      PowerPC code so that it can be shared across multiple PCI
      devices and architectures.

      v10: resend patchv9 without RFC tag, and a new mail Message-Id,
      (previous non-RFC attempt did not show up on the patchwork queue?)

      Full revision history below:
      v2 changes:
        - incorporate David Miller editorial comments: sparc specific
          fields moved from iommu-common into sparc's iommu_64.h
        - make the npools value an input parameter, for the case when
          the iommu map size is not very large
        - cookie_to_index mapping, and optimizations for span-boundary
          check, for use case such as LDC.

      v3: eliminate iommu_sparc, rearrange the ->demap indirection to
          be invoked under the pool lock.

      v4: David Miller review changes:
        - s/IOMMU_ERROR_CODE/DMA_ERROR_CODE
        - page_table_map_base and page_table_shift are unsigned long, not u32.

      v5: removed ->cookie_to_index and ->demap indirection from the
          iommu_tbl_ops The caller needs to call these functions as needed,
          before invoking the generic arena allocator functions.
          Added the "skip_span_boundary" argument to iommu_tbl_pool_init() for
          those callers like LDC which do no care about span boundary checks.

      v6: removed iommu_tbl_ops, and instead pass the ->flush_all as
          an indirection to iommu_tbl_pool_init(); only invoke ->flush_all
          when there is no large_pool, based on the assumption that large-pool
          usage is infrequently encountered

      v7: moved pool_hash initialization to lib/iommu-common.c and cleaned up
          code duplication from sun4v/sun4u/ldc.

      v8: Addresses BenH comments with one exception: I've left the
          IOMMU_POOL_HASH as is, so that powerpc can tailor it to their
          convenience.  Discard trylock for simple spin_lock to acquire pool

      v9: Addresses latest BenH comments: need_flush checks, add support
          for dma mask and align_order.

      v10: resend without RFC tag, and new mail Message-Id.
      ====================

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 2f0c0fdc085c0d415457a1c52344f72e12c4cec6
  Author: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
  Date:   Sat Apr 18 12:33:55 2015 -0700

      iommu-common: Fix PARISC compile-time warnings

      Fixes warnings due to
      - no DMA_ERROR_CODE on PARISC,
      - sizeof (unsigned long) == 4 bytes on PARISC.

      Signed-off-by: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 0ae53ed15d9b87b883b593a9884957cfa4fc2480
  Author: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
  Date:   Thu Apr 9 15:33:32 2015 -0400

      sparc: Make LDC use common iommu poll management functions

      Note that this conversion is only being done to consolidate the
      code and ensure that the common code provides the sufficient
      abstraction. It is not expected to result in any noticeable
      performance improvement, as there is typically one ldc_iommu
      per vnet_port, and each one has 8k entries, with a typical
      request for 1-4 pages.  Thus LDC uses npools == 1.

      Signed-off-by: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
      Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit bb620c3d3925aec0ed4f21010c86df08ec18a8c7
  Author: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
  Date:   Thu Apr 9 15:33:31 2015 -0400

      sparc: Make sparc64 use scalable lib/iommu-common.c functions

      In iperf experiments running linux as the Tx side (TCP client) with
      10 threads results in a severe performance drop when TSO is disabled,
      indicating a weakness in the software that can be avoided by using
      the scalable IOMMU arena DMA allocation.

      Baseline numbers before this patch:
         with default settings (TSO enabled) :    9-9.5 Gbps
         Disable TSO using ethtool- drops badly:  2-3 Gbps.

      After this patch, iperf client with 10 threads, can give a
      throughput of at least 8.5 Gbps, even when TSO is disabled.

      Signed-off-by: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
      Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit ff7d37a502022149655c18035b99a53391be0383
  Author: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
  Date:   Thu Apr 9 15:33:30 2015 -0400

      Break up monolithic iommu table/lock into finer graularity pools and lock

      Investigation of multithreaded iperf experiments on an ethernet
      interface show the iommu->lock as the hottest lock identified by
      lockstat, with something of the order of  21M contentions out of
      27M acquisitions, and an average wait time of 26 us for the lock.
      This is not efficient. A more scalable design is to follow the ppc
      model, where the iommu_map_table has multiple pools, each stretching
      over a segment of the map, and with a separate lock for each pool.
      This model allows for better parallelization of the iommu map search.

      This patch adds the iommu range alloc/free function infrastructure.

      Signed-off-by: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
      Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit c12f048ffdf3a5802239426dc290290929268dc9
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Sat Apr 18 12:31:25 2015 -0700

      sparc: Revert generic IOMMU allocator.

      I applied the wrong version of this patch series, V4 instead
      of V10, due to a patchwork bundling snafu.

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit e9257f5fa48cc296d7eed35acf9f2ad195184122
  Author: Len Brown <len.brown@xxxxxxxxx>
  Date:   Wed Apr 1 21:02:57 2015 -0400

      tools/power turbostat: correct dumped pkg-cstate-limit value

      HSW expanded MSR_PKG_CST_CONFIG_CONTROL.Package-C-State-Limit,
      from bits[2:0] used by previous implementations, to [3:0].
      The value 1000b is unlimited, and is used by BDW and SKL too.

      Signed-off-by: Len Brown <len.brown@xxxxxxxxx>

  commit 8a5bdf41d2c027c1e4ad62bc4f96f3fdf82070ba
  Author: Len Brown <len.brown@xxxxxxxxx>
  Date:   Wed Apr 1 21:02:57 2015 -0400

      tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL

      turbostat --debug
      ...
      CPUID(0x15): eax_crystal: 2 ebx_tsc: 100 ecx_crystal_hz: 0
      TSC: 1200 MHz (24000000 Hz * 100 / 2 / 1000000)

      Signed-off-by: Len Brown <len.brown@xxxxxxxxx>

  commit 40ee8e3b9dc8917e6077dde6a49c7a71d63b0231
  Author: Andrey Semin <andrey.semin@xxxxxxxxx>
  Date:   Fri Dec 5 00:07:00 2014 -0500

      tools/power turbostat: correct DRAM RAPL units on recent Xeon processors

      While not yet documented in the Software Developer's Manual,
      the data-sheet for modern Xeon states that DRAM RAPL ENERGY units
      are fixed at 15.3 uJ, rather than being discovered via MSR.

      Before this patch, DRAM energy on these products is over-stated by 
turbostat
      because the RAPL units are 4x larger.

      ref: "Xeon E5-2600 v3/E5-1600 v3 Datasheet Volume 2"
      
http://www.intel.com/content/dam/www/public/us/en/documents/datasheets/xeon-e5-v3-datasheet-vol-2.pdf

      Signed-off-by: Andrey Semin <andrey.semin@xxxxxxxxx>
      Signed-off-by: Len Brown <len.brown@xxxxxxxxx>

  commit 0b2bb6925eb602eae993a4b5c282a8c18ad1c949
  Author: Len Brown <len.brown@xxxxxxxxx>
  Date:   Thu Mar 26 00:50:30 2015 -0400

      tools/power turbostat: Initial Skylake support

      Skylake adds some additional residency counters.

      Skylake supports a different mix of RAPL registers
      from any previous product.

      In most other ways, Skylake is like Broadwell.

      Signed-off-by: Len Brown <len.brown@xxxxxxxxx>

  commit f82263c6989c31ae9b94cecddffb29dcbec38710
  Author: Thomas D <whissi@xxxxxxxxx>
  Date:   Mon Jan 5 21:37:23 2015 +0100

      tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support 
for O= option in Makefile

      Since commit ee0778a30153
      ("tools/power: turbostat: make Makefile a bit more capable")
      turbostat's Makefile is using

        [...]
        BUILD_OUTPUT    := $(PWD)
        [...]

      which obviously causes trouble when building "turbostat" with

        make -C /usr/src/linux/tools/power/x86/turbostat ARCH=x86 turbostat

      because GNU make does not update nor guarantee that $PWD is set.

      This patch changes the Makefile to use $CURDIR instead, which GNU make
      guarantees to set and update (i.e. when using "make -C ...") and also
      adds support for the O= option (see "make help" in your root of your
      kernel source tree for more details).

      Link: https://bugs.gentoo.org/show_bug.cgi?id=533918
      Fixes: ee0778a30153 ("tools/power: turbostat: make Makefile a bit more 
capable")
      Signed-off-by: Thomas D. <whissi@xxxxxxxxx>
      Cc: Mark Asselstine <mark.asselstine@xxxxxxxxxxxxx>
      Signed-off-by: Len Brown <len.brown@xxxxxxxxx>

  commit a21d38c846fce05ef55ab240f18fb19755bed16a
  Author: Len Brown <len.brown@xxxxxxxxx>
  Date:   Tue Mar 24 16:37:35 2015 -0400

      tools/power turbostat: modprobe msr, if needed

      Some distros (Ubuntu) ship the msr driver as a module.
      If turbosat is run as root on those systems, and discovers
      that there is no /dev/cpu/cpu0/msr, it will now "modprobe msr"
      for the user.

      If not root, the modprobe attempt will fail, and turbostat will exit as 
before:

      turbostat: no /dev/cpu/0/msr, Try "# modprobe msr" : No such file or 
directory

      Signed-off-by: Len Brown <len.brown@xxxxxxxxx>

  commit fcd17211bd807533f6d4be20b1a4644e9191bfe2
  Author: Len Brown <len.brown@xxxxxxxxx>
  Date:   Mon Mar 23 20:29:09 2015 -0400

      tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2

      and up to 18 cores of turbo ratio limit
      when using the turbostat --debug option.

      Signed-off-by: Len Brown <len.brown@xxxxxxxxx>

  commit 12bb43c6150525cd53af77a1a7b9ff2752944cbd
  Author: Len Brown <len.brown@xxxxxxxxx>
  Date:   Mon Apr 13 16:08:18 2015 -0400

      tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names

      s/MSR_NHM_TURBO_RATIO_LIMIT/MSR_TURBO_RATIO_LIMIT/
      s/MSR_IVT_TURBO_RATIO_LIMIT/MSR_TURBO_RATIO_LIMIT1/

      syntax only -- use the documented strings describing these registers.

      Signed-off-by: Len Brown <len.brown@xxxxxxxxx>

  commit 34a984f7b0cc6355a1e0c184251d0d4cc86f44d2
  Merge: 90d1c08 4c1eaa2
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 11:42:49 2015 -0400

      Merge branch 'x86-pmem-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

      Pull PMEM driver from Ingo Molnar:
       "This is the initial support for the pmem block device driver:
        persistent non-volatile memory space mapped into the system's physical
        memory space as large physical memory regions.

        The driver is based on Intel code, written by Ross Zwisler, with fixes
        by Boaz Harrosh, integrated with x86 e820 memory resource management
        and tidied up by Christoph Hellwig.

        Note that there were two other separate pmem driver submissions to
        lkml: but apparently all parties (Ross Zwisler, Boaz Harrosh) are
        reasonably happy with this initial version.

        This version enables minimal support that enables persistent memory
        devices out in the wild to work as block devices, identified through a
        magic (non-standard) e820 flag and auto-discovered if
        CONFIG_X86_PMEM_LEGACY=y, or added explicitly through manipulating the
        memory maps via the "memmap=..." boot option with the new, special '!'
        modifier character.

        Limitations: this is a regular block device, and since the pmem areas
        are not struct page backed, they are invisible to the rest of the
        system (other than the block IO device), so direct IO to/from pmem
        areas, direct mmap() or XIP is not possible yet.  The page cache will
        also shadow and double buffer pmem contents, etc.

        Initial support is for x86"

      * 'x86-pmem-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        drivers/block/pmem: Fix 32-bit build warning in pmem_alloc()
        drivers/block/pmem: Add a driver for persistent memory
        x86/mm: Add support for the non-standard protected e820 type

  commit 90d1c087861dcc3d1175993fc03492c137fd21bb
  Merge: 96b90f2 a6dfa12
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 11:31:11 2015 -0400

      Merge branch 'x86-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

      Pull x86 fixes from Ingo Molnar:
       "This tree includes:

         - an FPU related crash fix

         - a ptrace fix (with matching testcase in tools/testing/selftests/)

         - an x86 Kconfig DMA-config defaults tweak to better avoid
           non-working drivers"

      * 'x86-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
        x86/fpu: Load xsave pointer *after* initialization
        x86/ptrace: Fix the TIF_FORCED_TF logic in handle_signal()
        x86, selftests: Add single_step_syscall test

  commit 96b90f27bcf22f1d06cc16d9475cefa6ea4c4718
  Merge: 396c9df 0c99241
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 11:26:46 2015 -0400

      Merge branch 'perf-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

      Pull perf updates from Ingo Molnar:
       "This update has mostly fixes, but also other bits:

         - perf tooling fixes

         - PMU driver fixes

         - Intel Broadwell PMU driver HW-enablement for LBR callstacks

         - a late coming 'perf kmem' tool update that enables it to also
           analyze page allocation data.  Note, this comes with MM tracepoint
           changes that we believe to not break anything: because it changes
           the formerly opaque 'struct page *' field that uniquely identifies
           pages to 'pfn' which identifies pages uniquely too, but isn't as
           opaque and can be used for other purposes as well"

      * 'perf-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
        perf/x86/intel: Add Broadwell support for the LBR callstack
        perf/x86/intel/rapl: Fix energy counter measurements but supporing per 
domain energy units
        perf/x86/intel: Fix Core2,Atom,NHM,WSM cycles:pp events
        perf/x86: Fix hw_perf_event::flags collision
        perf probe: Fix segfault when probe with lazy_line to file
        perf probe: Find compilation directory path for lazy matching
        perf probe: Set retprobe flag when probe in address-based alternative 
mode
        perf kmem: Analyze page allocator events also
        tracing, mm: Record pfn instead of pointer to struct page

  commit 396c9df2231865ef55aa031e3f5df9d99e036869
  Merge: 8f502d5b 8053871
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 11:23:42 2015 -0400

      Merge branch 'locking-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

      Pull locking fixes from Ingo Molnar:
       "Two fixes: an smp-call fix and a lockdep fix"

      * 'locking-urgent-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        smp: Fix smp_call_function_single_async() locking
        lockdep: Make print_lock() robust against concurrent release

  commit 8f502d5b9e3362971f58dad5d468f070340336e1
  Merge: 06a60de e0c9c0a
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 11:20:31 2015 -0400

      Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

      Pull usernamespace mount fixes from Eric Biederman:
       "Way back in October Andrey Vagin reported that umount(MNT_DETACH)
        could be used to defeat MNT_LOCKED.  As I worked to fix this I
        discovered that combined with mount propagation and an appropriate
        selection of shared subtrees a reference to a directory on an
        unmounted filesystem is not necessary.

        That MNT_DETACH is allowed in user namespace in a form that can break
        MNT_LOCKED comes from my early misunderstanding what MNT_DETACH does.

        To avoid breaking existing userspace the conflict between MNT_DETACH
        and MNT_LOCKED is fixed by leaving mounts that are locked to their
        parents in the mount hash table until the last reference goes away.

        While investigating this issue I also found an issue with
        __detach_mounts.  The code was unnecessarily and incorrectly
        triggering mount propagation.  Resulting in too many mounts going away
        when a directory is deleted, and too many cpu cycles are burned while
        doing that.

        Looking some more I realized that __detach_mounts by only keeping
        mounts connected that were MNT_LOCKED it had the potential to still
        leak information so I tweaked the code to keep everything locked
        together that possibly could be.

        This code was almost ready last cycle but Al invented fs_pin which
        slightly simplifies this code but required rewrites and retesting, and
        I have not been in top form for a while so it took me a while to get
        all of that done.  Similiarly this pull request is late because I have
        been feeling absolutely miserable all week.

        The issue of being able to escape a bind mount has not yet been
        addressed, as the fixes are not yet mature"

      * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        mnt: Update detach_mounts to leave mounts connected
        mnt: Fix the error check in __detach_mounts
        mnt: Honor MNT_LOCKED when detaching mounts
        fs_pin: Allow for the possibility that m_list or s_list go unused.
        mnt: Factor umount_mnt from umount_tree
        mnt: Factor out unhash_mnt from detach_mnt and umount_tree
        mnt: Fail collect_mounts when applied to unmounted mounts
        mnt: Don't propagate unmounts to locked mounts
        mnt: On an unmount propagate clearing of MNT_LOCKED
        mnt: Delay removal from the mount hash.
        mnt: Add MNT_UMOUNT flag
        mnt: In umount_tree reuse mnt_list instead of mnt_hash
        mnt: Don't propagate umounts in __detach_mounts
        mnt: Improve the umount_tree flags
        mnt: Use hlist_move_list in namespace_unlock

  commit 06a60deca87dba8e2c186ea7f12ea87d6785188e
  Merge: d6a24d0 1002755
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 11:17:20 2015 -0400

      Merge tag 'for-f2fs-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs

      Pull f2fs updates from Jaegeuk Kim:
       "New features:
         - in-memory extent_cache
         - fs_shutdown to test power-off-recovery
         - use inline_data to store symlink path
         - show f2fs as a non-misc filesystem

        Major fixes:
         - avoid CPU stalls on sync_dirty_dir_inodes
         - fix some power-off-recovery procedure
         - fix handling of broken symlink correctly
         - fix missing dot and dotdot made by sudden power cuts
         - handle wrong data index during roll-forward recovery
         - preallocate data blocks for direct_io

        ... and a bunch of minor bug fixes and cleanups"

      * tag 'for-f2fs-4.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (71 commits)
        f2fs: pass checkpoint reason on roll-forward recovery
        f2fs: avoid abnormal behavior on broken symlink
        f2fs: flush symlink path to avoid broken symlink after POR
        f2fs: change 0 to false for bool type
        f2fs: do not recover wrong data index
        f2fs: do not increase link count during recovery
        f2fs: assign parent's i_mode for empty dir
        f2fs: add F2FS_INLINE_DOTS to recover missing dot dentries
        f2fs: fix mismatching lock and unlock pages for roll-forward recovery
        f2fs: fix sparse warnings
        f2fs: limit b_size of mapped bh in f2fs_map_bh
        f2fs: persist system.advise into on-disk inode
        f2fs: avoid NULL pointer dereference in f2fs_xattr_advise_get
        f2fs: preallocate fallocated blocks for direct IO
        f2fs: enable inline data by default
        f2fs: preserve extent info for extent cache
        f2fs: initialize extent tree with on-disk extent info of inode
        f2fs: introduce __{find,grab}_extent_tree
        f2fs: split set_data_blkaddr from f2fs_update_extent_cache
        f2fs: enable fast symlink by utilizing inline data
        ...

  commit d6a24d0640d609138a4e40a4ce9fd9fe7859e24c
  Merge: 1f5014d 1971754
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 11:10:49 2015 -0400

      Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6

      Pull documentation updates from Jonathan Corbet:
       "Numerous fixes, the overdue removal of the i2o docs, some new Chinese
        translations, and, hopefully, the README fix that will end the flow of
        identical patches to that file"

      * tag 'docs-for-linus' of git://git.lwn.net/linux-2.6: (34 commits)
        Documentation/memcg: update memcg/kmem status
        Documentation: blackfin: Makefile: Typo building issue
        Documentation/vm/pagemap.txt: correct location of page-types tool
        Documentation/memory-barriers.txt: typo fix
        doc: Add guest_nice column to example output of `cat /proc/stat'
        Documentation/kernel-parameters: Move "eagerfpu" to its right place
        Documentation: gpio: Update ACPI part of the document to mention _DSD
        docs/completion.txt: Various tweaks and corrections
        doc: completion: context, scope and language fixes
        Documentation:Update Documentation/zh_CN/arm64/memory.txt
        Documentation:Update Documentation/zh_CN/arm64/booting.txt
        Documentation: Chinese translation of arm64/legacy_instructions.txt
        DocBook media: fix broken EIA hyperlink
        Documentation: tweak the maintainers entry
        README: Change gzip/bzip2 to xz compression format
        README: Update version number reference
        doc:pci: Fix typo in Documentation/PCI
        Documentation: drm: Use '->' when describing access through pointers.
        Documentation: Remove mentioning of block barriers
        Documentation/email-clients.txt: Fix one grammar mistake, add extra 
info about TB
        ...

  commit 1f5014d6a77513fa7cefe30eb7791d5856c04384
  Author: Marcel Holtmann <marcel@xxxxxxxxxxxx>
  Date:   Fri Apr 17 22:34:18 2015 +0200

      Bluetooth: hidp: Fix regression with older userspace and flags validation

      While it is not used by newer userspace anymore, the older userspace was
      utilizing HIDP_VIRTUAL_CABLE_UNPLUG and HIDP_BOOT_PROTOCOL_MODE flags
      when adding a new HIDP connection.

      The flags validation is important, but we can not break older userspace
      and with that allow providing these flags even if newer userspace does
      not use them anymore.

      Reported-and-tested-by: Jörg Otte <jrg.otte@xxxxxxxxx>
      Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit cb0f3f320d64831afb39940863c5927d6af25514
  Merge: 078838d 8d7dc92
  Author: Ingo Molnar <mingo@xxxxxxxxxx>
  Date:   Sat Apr 18 14:49:41 2015 +0200

      Merge branch 'for-mingo' of 
git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent

      Pull RCU fix from Paul E. McKenney:

       "This series contains a single change that fixes Kconfig asking pointless
        questions."

      Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>

  commit a6dfa128ce5c414ab46b1d690f7a1b8decb8526d
  Author: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
  Date:   Fri Apr 17 15:04:48 2015 -0400

      config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected

      A huge amount of NIC drivers use the DMA API, however if
      compiled under 32-bit an very important part of the DMA API can
      be ommitted leading to the drivers not working at all
      (especially if used with 'swiotlb=force iommu=soft').

      As Prashant Sreedharan explains it: "the driver [tg3] uses
      DEFINE_DMA_UNMAP_ADDR(), dma_unmap_addr_set() to keep a copy of
      the dma "mapping" and dma_unmap_addr() to get the "mapping"
      value. On most of the platforms this is a no-op, but ... with
      "iommu=soft and swiotlb=force" this house keeping is required,
      ... otherwise we pass 0 while calling pci_unmap_/pci_dma_sync_
      instead of the DMA address."

      As such enable this even when using 32-bit kernels.

      Reported-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
      Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
      Acked-by: David S. Miller <davem@xxxxxxxxxxxxx>
      Acked-by: Prashant Sreedharan <prashant@xxxxxxxxxxxx>
      Cc: Borislav Petkov <bp@xxxxxxxxx>
      Cc: H. Peter Anvin <hpa@xxxxxxxxx>
      Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
      Cc: Michael Chan <mchan@xxxxxxxxxxxx>
      Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
      Cc: boris.ostrovsky@xxxxxxxxxx
      Cc: cascardo@xxxxxxxxxxxxxxxxxx
      Cc: david.vrabel@xxxxxxxxxx
      Cc: sanjeevb@xxxxxxxxxxxx
      Cc: siva.kallam@xxxxxxxxxxxx
      Cc: vyasevich@xxxxxxxxx
      Cc: xen-devel@xxxxxxxxxxxxxxxxxxx
      Link: http://lkml.kernel.org/r/20150417190448.GA9462@xxxxxxxxxxxx
      Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>

  commit 7505256626b0b3d11ea5a3ec1a89046d07c3c366
  Merge: 510965d a2166ca
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 08:30:10 2015 -0400

      Merge tag 'devicetree-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux

      Pull devicetree changes from Grant Likely:
       "Here are the devicetree changes queued up for v4.1.  Nothing really
        exciting here.  Rob has another few commits for big-endian attached
        UARTs, but those will be sent in a separate merge request since they
        haven't been as thoroughly tested as this batch.

        Here are the highlights:

         - lots of unittest cleanup from Frank Rowand

         - bugfixes and updates to the of_graph code

         - tighten up of_get_mac_address() code

         - documentation updates"

      * tag 'devicetree-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
        of/unittest: Fix of_platform_depopulate test case
        of/unittest: early return from test skips tests
        of/unittest: breadcrumbs to reduce pain of future maintainers
        of/unittest: reduce checkpatch noise - line after declarations
        of/unittest: typo in error string
        of/unittest: add const where needed
        of_net: factor out repetitive code from of_get_mac_address()
        drivers/of: Add empty ranges quirk for PA-Semi
        of: Allow selection of OF_DYNAMIC and OF_OVERLAY if OF_UNITTEST
        of: Empty node & property flag accessors when !OF
        of: Explicitly include linux/types.h in of_graph.h
        dt-bindings: brcm: rationalize Broadcom documentation naming
        of/unittest: replace 'selftest' with 'unittest'
        Documentation: rename of_selftest.txt to of_unittest.txt
        Documentation: update the of_selftest.txt
        dt: OF_UNITTEST make dependency broken
        MAINTAINERS: Pantelis Antoniou device tree overlay maintainer
        of: Add of_graph_get_port_by_id function
        of: Add for_each_endpoint_of_node helper macro
        of: Decrement refcount of previous endpoint in 
of_graph_get_next_endpoint

  commit 510965dd4a0a59504ba38455f77339ea8b4c6a70
  Merge: 40d7839 03daa6f
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 08:22:10 2015 -0400

      Merge tag 'gpio-v4.1-1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for the v4.1 development cycle:

         - A new GPIO hogging mechanism has been added.  This can be used on
           boards that want to drive some GPIO line high, low, or set it as
           input on boot and then never touch it again.  For some embedded
           systems this is bliss and simplifies things to a great extent.

         - Some API cleanup and closure: gpiod_get_array() and
           gpiod_put_array() has been added to get and put GPIOs in bulk as
           was possible with the non-descriptor API.

         - Encapsulate cross-calls to the pin control subsystem in
           <linux/gpio/driver.h>.  Now this should be the only header any GPIO
           driver needs to include or something is wrong.  Cleanups
           restricting drivers to this include are welcomed if tested.

         - Sort the GPIO Kconfig and split it into submenus, as it was
           becoming and unstructured, illogical and unnavigatable mess.  I
           hope this is easier to follow.  Menus that require a certain
           subsystem like I2C can now be hidden nicely for example, still
           working on others.

         - New drivers:

             - New driver for the Altera Soft GPIO.

             - The F7188x driver now handles the F71869 and F71869A variants.

             - The MIPS Loongson driver has been moved to drivers/gpio for
               consolidation and cleanup.

         - Cleanups:

             - The MAX732x is converted to use the GPIOLIB_IRQCHIP
               infrastructure.

             - The PCF857x is converted to use the GPIOLIB_IRQCHIP
               infrastructure.

             - Radical cleanup of the OMAP driver.

         - Misc:

             - Enable the DWAPB GPIO for all architectures.  This is a "hard
               IP" block from Synopsys which has started to turn up in so
               diverse architectures as X86 Quark, ARC and a slew of ARM
               systems.  So even though it's not an expander, it's generic
               enough to be available for all.

             - We add a mock GPIO on Crystalcove PMIC after a long discussion
               with Daniel Vetter et al, tracing back to the shootout at the
               kernel summit where DRM drivers and sub-componentization was
               discussed.  In this case a mock GPIO is assumed to be the best
               compromise gaining some reuse of infrastructure without making
               DRM drivers overly complex at the same time.  Let's see"

      * tag 'gpio-v4.1-1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (62 commits)
        Revert "gpio: sch: use uapi/linux/pci_ids.h directly"
        gpio: dwapb: remove dependencies
        gpio: dwapb: enable for ARC
        gpio: removing kfree remove functionality
        gpio: mvebu: Fix mask/unmask managment per irq chip type
        gpio: split GPIO drivers in submenus
        gpio: move MFD GPIO drivers under their own comment
        gpio: move BCM Kona Kconfig option
        gpio: arrange SPI Kconfig symbols alphabetically
        gpio: arrange PCI GPIO controllers alphabetically
        gpio: arrange I2C Kconfig symbols alphabetically
        gpio: arrange Kconfig symbols alphabetically
        gpio: ich: Implement get_direction function
        gpio: use (!foo) instead of (foo == NULL)
        gpio: arizona: drop owner assignment from platform_drivers
        gpio: max7300: remove 'ret' variable
        gpio: use devm_kzalloc
        gpio: sch: use uapi/linux/pci_ids.h directly
        gpio: x-gene: fix devm_ioremap_resource() check
        gpio: loongson: Add Loongson-3A/3B GPIO driver support
        ...

  commit 40d7839879b4584f91522d841afb22ed401cf40f
  Merge: afad97e c1c21f4
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 08:19:04 2015 -0400

      Merge branch 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

      Pull i2c fixes from Wolfram Sang:
       "Two buildfixes for I2C based on your tree from the day before
        yesterday.  Sadly, these build errors never reached me while the
        patches were sitting in -next.  Need to fix that"

      * 'i2c/for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: core: Export bus recovery functions
        i2c: jz4780: Fix build for m68k and sparc64

  commit afad97eee47c1f1f242202e2473929b4ef5d9f43
  Merge: 04b7fe6 44c144f
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Sat Apr 18 08:14:18 2015 -0400

      Merge tag 'dm-4.1-changes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

      Pull device mapper updates from Mike Snitzer:

       - the most extensive changes this cycle are the DM core improvements to
         add full blk-mq support to request-based DM.

          - disabled by default but user can opt-in with CONFIG_DM_MQ_DEFAULT
          - depends on some blk-mq changes from Jens' for-4.1/core branch so
            that explains why this pull is built on linux-block.git

       - update DM to use name_to_dev_t() rather than open-coding a less
         capable device parser.

          - includes a couple small improvements to name_to_dev_t() that offer
            stricter constraints that DM's code provided.

       - improvements to the dm-cache "mq" cache replacement policy.

       - a DM crypt crypt_ctr() error path fix and an async crypto deadlock
         fix

       - a small efficiency improvement for DM crypt decryption by leveraging
         immutable biovecs

       - add error handling modes for corrupted blocks to DM verity

       - a new "log-writes" DM target from Josef Bacik that is meant for file
         system developers to test file system integrity at particular points
         in the life of a file system

       - a few DM log userspace cleanups and fixes

       - a few Documentation fixes (for thin, cache, crypt and switch)

      * tag 'dm-4.1-changes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (34 
commits)
        dm crypt: fix missing error code return from crypt_ctr error path
        dm crypt: fix deadlock when async crypto algorithm returns -EBUSY
        dm crypt: leverage immutable biovecs when decrypting on read
        dm crypt: update URLs to new cryptsetup project page
        dm: add log writes target
        dm table: use bool function return values of true/false not 1/0
        dm verity: add error handling modes for corrupted blocks
        dm thin: remove stale 'trim' message documentation
        dm delay: use msecs_to_jiffies for time conversion
        dm log userspace base: fix compile warning
        dm log userspace transfer: match wait_for_completion_timeout return type
        dm table: fall back to getting device using name_to_dev_t()
        init: stricter checking of major:minor root= values
        init: export name_to_dev_t and mark name argument as const
        dm: add 'use_blk_mq' module param and expose in per-device ro sysfs attr
        dm: optimize dm_mq_queue_rq to _not_ use kthread if using pure blk-mq
        dm: add full blk-mq support to request-based DM
        dm: impose configurable deadline for dm_request_fn's merge heuristic
        dm sysfs: introduce ability to add writable attributes
        dm: don't start current request if it would've merged with the previous
        ...

  commit 0c99241c93b8060441f3c8434848e54b5338f922
  Author: Ingo Molnar <mingo@xxxxxxxxxx>
  Date:   Thu Apr 16 12:38:30 2015 +0200

      perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()

      Dan Carpenter reported that pt_event_add() has buggy
      error handling logic: it returns 0 instead of -EBUSY when
      it fails to start a newly added event.

      Furthermore, the control flow in this function is messy,
      with cleanup labels mixed with direct returns.

      Fix the bug and clean up the code by converting it to
      a straight fast path for the regular non-failing case,
      plus a clear sequence of cascading goto labels to do
      all cleanup.

      NOTE: I materially changed the existing clean up logic in the
      pt_event_start() failure case to use the direct
      perf_aux_output_end() path, not pt_event_del(), because
      perf_aux_output_end() is enough here.

      Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
      Acked-by: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
      Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
      Cc: Julia Lawall <julia.lawall@xxxxxxx>
      Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
      Cc: Paul Mackerras <paulus@xxxxxxxxx>
      Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
      Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
      Link: http://lkml.kernel.org/r/20150416103830.GB7847@xxxxxxxxx
      Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>

  commit 7d0ec8b6f40b356f780b79de63eeafd6b907d68c
  Author: Pelle Nilsson <per.nilsson@xxxxxxxxx>
  Date:   Tue Apr 14 15:40:17 2015 +0200

      spi: bitbang: Make setup_transfer() callback optional

      Some controller drivers have no need of this callback (spi-altera even
      causes a NULL pointer dereference because it doesn't register the 
callback,
      falsely assuming that it is already optional).

      Fixes: 30af9b558a56 ("spi/bitbang: Drop empty setup() functions")
      Signed-off-by: Pelle Nilsson <per.nilsson@xxxxxxxxx>
      Reviewed-by: Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit bc26d4d06e337ade069f33d3f4377593b24e6e36
  Author: Alexey Khoroshilov <khoroshilov@xxxxxxxxx>
  Date:   Sat Apr 18 02:53:25 2015 +0300

      sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND)

      A deadlock can be initiated by userspace via ioctl(SNDCTL_SEQ_OUTOFBAND)
      on /dev/sequencer with TMR_ECHO midi event.

      In this case the control flow is:
      sound_ioctl()
      -> case SND_DEV_SEQ:
         case SND_DEV_SEQ2:
           sequencer_ioctl()
           -> case SNDCTL_SEQ_OUTOFBAND:
                spin_lock_irqsave(&lock,flags);
                play_event();
                -> case EV_TIMING:
                     seq_timing_event()
                     -> case TMR_ECHO:
                          seq_copy_to_input()
                          -> spin_lock_irqsave(&lock,flags);

      It seems that spin_lock_irqsave() around play_event() is not necessary,
      because the only other call location in seq_startplay() makes the call
      without acquiring spinlock.

      So, the patch just removes spinlocks around play_event().
      By the way, it removes unreachable code in seq_timing_event(),
      since (seq_mode == SEQ_2) case is handled in the beginning.

      Compile tested only.

      Found by Linux Driver Verification project (linuxtesting.org).

      Signed-off-by: Alexey Khoroshilov <khoroshilov@xxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 43c499dc2778b96e21ed14e1a71e7b117a0b406f
  Author: Vinod Koul <vinod.koul@xxxxxxxxx>
  Date:   Fri Apr 17 22:53:32 2015 +0530

      ALSA: asound.h - use SNDRV_CTL_ELEM_ID_NAME_MAXLEN

      we have defined SNDRV_CTL_ELEM_ID_NAME_MAXLEN as size of name array so use
      this define instead of numeric value

      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit 5d38000b3c97a1079734c0b4c5f87d5b935318cd
  Author: Nathan Lynch <nathan_lynch@xxxxxxxxxx>
  Date:   Fri Apr 17 21:51:38 2015 +0100

      ARM: 8342/1: VDSO: depend on CPU_V7

      When targeting ARMv3 (e.g. rpc) and enabling CONFIG_VDSO we get:

      arch/arm/vdso/datapage.S:13: Error: selected processor does not
      support ARM mode `bx lr'

      One fix considered was to use 'ldr pc,lr' for such configurations, but
      since the VDSO is unlikely to be useful for pre-v7 hardware, just make
      it depend on CONFIG_CPU_V7.

      Reported-by: Arnd Bergmann <arnd@xxxxxxxx>
      Signed-off-by: Nathan Lynch <nathan_lynch@xxxxxxxxxx>
      Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
      Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

  commit 04b7fe6a4a231871ef681bc95e08fe66992f7b1f
  Merge: 388f997 d681f11
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 17 16:36:59 2015 -0400

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

      Pull IDE update from David Miller:
       "Just one change, getting rid of usage of the deprecated PCI DMA
        interfaces in the IDE drivers"

      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: remove deprecated use of pci api

  commit 388f997620cb57372c494a194e9698b28cc179b8
  Merge: e2fdae7 e3122b7
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 17 16:31:08 2015 -0400

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

      Pull networking fixes from David Miller:

       1) Fix verifier memory corruption and other bugs in BPF layer, from
          Alexei Starovoitov.

       2) Add a conservative fix for doing BPF properly in the BPF classifier
          of the packet scheduler on ingress.  Also from Alexei.

       3) The SKB scrubber should not clear out the packet MARK and security
          label, from Herbert Xu.

       4) Fix oops on rmmod in stmmac driver, from Bryan O'Donoghue.

       5) Pause handling is not correct in the stmmac driver because it
          doesn't take into consideration the RX and TX fifo sizes.  From
          Vince Bridgers.

       6) Failure path missing unlock in FOU driver, from Wang Cong.

      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
        net: dsa: use DEVICE_ATTR_RW to declare temp1_max
        netns: remove BUG_ONs from net_generic()
        IB/ipoib: Fix ndo_get_iflink
        sfc: Fix memcpy() with const destination compiler warning.
        altera tse: Fix network-delays and -retransmissions after high 
throughput.
        net: remove unused 'dev' argument from netif_needs_gso()
        act_mirred: Fix bogus header when redirecting from VLAN
        inet_diag: fix access to tcp cc information
        tcp: tcp_get_info() should fetch socket fields once
        net: dsa: mv88e6xxx: Add missing initialization in 
mv88e6xxx_set_port_state()
        skbuff: Do not scrub skb mark within the same name space
        Revert "net: Reset secmark when scrubbing packet"
        bpf: fix two bugs in verification logic when accessing 'ctx' pointer
        bpf: fix bpf helpers to use skb->mac_header relative offsets
        stmmac: Configure Flow Control to work correctly based on rxfifo size
        stmmac: Enable unicast pause frame detect in GMAC Register 6
        stmmac: Read tx-fifo-depth and rx-fifo-depth from the devicetree
        stmmac: Add defines and documentation for enabling flow control
        stmmac: Add properties for transmit and receive fifo sizes
        stmmac: fix oops on rmmod after assigning ip addr
        ...

  commit e2fdae7e7c5a690b10b2d2891ec819e554dc033d
  Merge: 6b6e177 cb97201
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 17 16:19:26 2015 -0400

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

      Pull sparc updates from David Miller:
       "The PowerPC folks have a really nice scalable IOMMU pool allocator
        that we wanted to make use of for sparc.  So here we have a series
        that abstracts out their code into a common layer that anyone can make
        use of.

        Sparc is converted, and the PowerPC folks have reviewed and ACK'd this
        series and plan to convert PowerPC over as well"

      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        iommu-common: Fix PARISC compile-time warnings
        sparc: Make LDC use common iommu poll management functions
        sparc: Make sparc64 use scalable lib/iommu-common.c functions
        sparc: Break up monolithic iommu table/lock into finer graularity pools 
and lock

  commit 6b6e177d632ee251c7c78d8f266a851ab9704879
  Merge: bfaf245 128f3cb
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 17 16:03:05 2015 -0400

      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

      Pull arch/tile updates from Chris Metcalf:
       "These are mostly nohz_full changes, plus a smattering of minor fixes
        (notably a couple for ftrace)"

      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: nohz: warn if nohz_full uses hypervisor shared cores
        tile: ftrace: fix function_graph tracer issues
        tile: map data region shadow of kernel as R/W
        tile: support CONTEXT_TRACKING and thus NOHZ_FULL
        tile: support arch_irq_work_raise
        arch: tile: fix null pointer dereference on pt_regs pointer
        tile/elf: reorganize notify_exec()
        tile: use si_int instead of si_ptr for compat_siginfo

  commit e3122b7fae7b4e3d1d49fa84f6515bcbe6cbc6fc
  Author: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 17 15:12:25 2015 -0400

      net: dsa: use DEVICE_ATTR_RW to declare temp1_max

      Since commit da4759c (sysfs: Use only return value from is_visible for
      the file mode), it is possible to reduce the permissions of a file.

      So declare temp1_max with the DEVICE_ATTR_RW macro and remove the write
      permission in dsa_hwmon_attrs_visible if set_temp_limit isn't provided.

      Signed-off-by: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
      Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit bfaf245022b4b8661af2e35f467cf0e91943c24c
  Merge: 96d928e 3e20a26
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 17 15:50:54 2015 -0400

      Merge branch 'upstream' of 
git://git.linux-mips.org/pub/scm/ralf/upstream-linus

      Pull MIPS updates from Ralf Baechle:
       "This is the main pull request for MIPS for Linux 4.1.  Most
        noteworthy:

         - Add more Octeon-optimized crypto functions
         - Octeon crypto preemption and locking fixes
         - Little endian support for Octeon
         - Use correct CSR to soft reset Octeons
         - Support LEDs on the Octeon-based DSR-1000N
         - Fix PCI interrupt mapping for the Octeon-based DSR-1000N
         - Mark prom_free_prom_memory() as __init for a number of systems
         - Support for Imagination's Pistachio SOC.  This includes arch and
           CLK bits.  I'd like to merge pinctrl bits later
         - Improve parallelism of csum_partial for certain pipelines
         - Organize DTB files in subdirs like other architectures
         - Implement read_sched_clock for all MIPS platforms other than
           Octeon
         - Massive series of 38 fixes and cleanups for the FPU emulator /
           kernel
         - Further FPU remulator work to support new features.  This sits on a
           separate branch which also has been pulled into the 4.1 KVM branch
         - Clean up and fixes for the SEAD3 eval board; remove unused file
         - Various updates for Netlogic platforms
         - A number of small updates for Loongson 3 platforms
         - Increase the memory limit for ATH79 platforms to 256MB
         - A fair number of fixes and updates for BCM47xx platforms
         - Finish the implementation of XPA support
         - MIPS FDC support.  No, not floppy controller but Fast Debug Channel 
:)
         - Detect the R16000 used in SGI legacy platforms
         - Fix Kconfig dependencies for the SSB bus support"

      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: 
(265 commits)
        MIPS: Makefile: Fix MIPS ASE detection code
        MIPS: asm: elf: Set O32 default FPU flags
        MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G
        MIPS: Kconfig: Disable SMP/CPS for 64-bit
        MIPS: Hibernate: flush TLB entries earlier
        MIPS: smp-cps: cpu_set FPU mask if FPU present
        MIPS: lose_fpu(): Disable FPU when MSA enabled
        MIPS: ralink: add missing symbol for RALINK_ILL_ACC
        MIPS: ralink: Fix bad config symbol in PCI makefile.
        SSB: fix Kconfig dependencies
        MIPS: Malta: Detect and fix bad memsize values
        Revert "MIPS: Avoid pipeline stalls on some MIPS32R2 cores."
        MIPS: Octeon: Delete override of cpu_has_mips_r2_exec_hazard.
        MIPS: Fix cpu_has_mips_r2_exec_hazard.
        MIPS: kernel: entry.S: Set correct ISA level for mips_ihb
        MIPS: asm: spinlock: Fix addiu instruction for R10000_LLSC_WAR case
        MIPS: r4kcache: Use correct base register for MIPS R6 cache flushes
        MIPS: Kconfig: Fix typo for the r2-to-r6 emulator kernel parameter
        MIPS: unaligned: Fix regular load/store instruction emulation for EVA
        MIPS: unaligned: Surround load/store macros in do {} while statements
        ...

  commit 96d928ed75c4ba4253e82910a697ec7b06ace8b4
  Merge: e076b7c 2ba9268
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 17 15:32:30 2015 -0400

      Merge tag 'xtensa-20150416' of git://github.com/czankel/xtensa-linux

      Pull Xtensa updates from Chris Zankel:

       - fix linker script transformation for .text / .text.fixup

       - wire bpf and execveat syscalls

       - provide __NR_sync_file_range2 instead of __NR_sync_file_range, as
         that's what xtensa uses.

       - make xtfpgs LCD driver functional and configurable.  This fixes
         hardware lockup on KC705/ML605 boot

       - add audio subsystem bits to xtfpga DTS and provide sample KC705
         config with audio features enabled

       - add CY7C67300 USB controller support to XTFPGA

       - fix locking issues in ISS network driver

       - document PIC and MX interrupt distributor device tree bindings

      * tag 'xtensa-20150416' of git://github.com/czankel/xtensa-linux:
        xtensa: xtfpga: add CY7C67300 USB controller support
        irqchip: xtensa-pic: xtensa-mx: document DT bindings
        xtensa: ISS: fix locking in TAP network adapter
        xtensa: Fix fix linker script transformation for .text / .text.fixup
        xtensa: provide __NR_sync_file_range2 instead of __NR_sync_file_range
        xtensa: wire bpf and execveat syscalls
        xtensa: xtfpga: fix hardware lockup caused by LCD driver
        xtensa: xtfpga: provide defconfig with audio subsystem
        xtensa: xtfpga: add audio card to xtfpga DTS

  commit d681f1166919d6829083c069a83edcd59bfd5e34
  Author: Quentin Lambert <lambert.quentin@xxxxxxxxx>
  Date:   Mon Apr 13 10:26:53 2015 +0200

      ide: remove deprecated use of pci api

      Replace occurences of the pci api by appropriate call to the dma api.

      A simplified version of the semantic patch that finds this problem is as
      follows: (http://coccinelle.lip6.fr)

      @deprecated@
      idexpression id;
      position p;
      @@

      (
        pci_dma_supported@p ( id, ...)
      |
        pci_alloc_consistent@p ( id, ...)
      )

      @bad1@
      idexpression id;
      position deprecated.p;
      @@
      ...when != &id->dev
         when != pci_get_drvdata ( id )
         when != pci_enable_device ( id )
      (
        pci_dma_supported@p ( id, ...)
      |
        pci_alloc_consistent@p ( id, ...)
      )

      @depends on !bad1@
      idexpression id;
      expression direction;
      position deprecated.p;
      @@

      (
      - pci_dma_supported@p ( id,
      + dma_supported ( &id->dev,
      ...
      + , GFP_ATOMIC
        )
      |
      - pci_alloc_consistent@p ( id,
      + dma_alloc_coherent ( &id->dev,
      ...
      + , GFP_ATOMIC
        )
      )

      Signed-off-by: Quentin Lambert <lambert.quentin@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit cb97201cb060d13da0b87fd1bf68208c7389c5b1
  Author: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
  Date:   Thu Apr 16 22:28:04 2015 -0400

      iommu-common: Fix PARISC compile-time warnings

      Fixes warnings due to
      - no DMA_ERROR_CODE on PARISC,
      - sizeof (unsigned long) == 4 bytes on PARISC.

      Signed-off-by: Sowmini Varadhan <sowmini.varadhan@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 2591ffd3085e34a231480efe8f1cac83ebb81725
  Author: Denys Vlasenko <dvlasenk@xxxxxxxxxx>
  Date:   Fri Apr 17 19:06:30 2015 +0200

      netns: remove BUG_ONs from net_generic()

      This inline has ~500 callsites.

      On 04/14/2015 08:37 PM, David Miller wrote:
      > That BUG_ON() was added 7 years ago, and I don't remember it ever
      > triggering or helping us diagnose something, so just remove it and
      > keep the function inlined.

      On x86 allyesconfig build:

          text     data      bss       dec     hex filename
      82447071 22255384 20627456 125329911 77861f7 vmlinux4
      82441375 22255384 20627456 125324215 7784bb7 vmlinux5prime

      Signed-off-by: Denys Vlasenko <dvlasenk@xxxxxxxxxx>
      CC: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
      CC: David S. Miller <davem@xxxxxxxxxxxxx>
      CC: Jan Engelhardt <jengelh@xxxxxxxxxx>
      CC: Jiri Pirko <jpirko@xxxxxxxxxx>
      CC: linux-kernel@xxxxxxxxxxxxxxx
      CC: netdev@xxxxxxxxxxxxxxx
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 2c1539597419df6dfeb8ed774d60198b5830b8f7
  Author: Erez Shitrit <erezsh@xxxxxxxxxxxx>
  Date:   Thu Apr 16 16:34:34 2015 +0300

      IB/ipoib: Fix ndo_get_iflink

      Currently, iflink of the parent interface was always accessed, even
      when interface didn't have a parent and hence we crashed there.

      Handle the interface types properly: for a child interface, return
      the ifindex of the parent, for parent interface, return its ifindex.

      For child devices, make sure to set the parent pointer prior to
      invoking register_netdevice(), this allows the new ndo to be called
      by the stack immediately after the child device is registered.

      Fixes: 5aa7add8f14b ('infiniband/ipoib: implement ndo_get_iflink')
      Reported-by: Honggang Li <honli@xxxxxxxxxx>
      Signed-off-by: Erez Shitrit <erezsh@xxxxxxxxxxxx>
      Signed-off-by: Honggang Li <honli@xxxxxxxxxx>
      Reviewed-By: Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx>+
      Acked-by: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 1d20a16062e771b6e26b843c0cde3b17c1146e00
  Author: David S. Miller <davem@xxxxxxxxxxxxx>
  Date:   Fri Apr 17 15:15:40 2015 -0400

      sfc: Fix memcpy() with const destination compiler warning.

      drivers/net/ethernet/sfc/selftest.c: In function â??efx_iterate_stateâ??:
      drivers/net/ethernet/sfc/selftest.c:388:9: warning: passing argument 1 of 
â??memcpyâ?? discards â??constâ?? qualifier from pointer target type 
[-Wdiscarded-array-qualifiers]

      This is because the msg[] member of struct efx_loopback_payload
      is marked as 'const'.  Remove that.

      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 93ea337852d6c9f292e2ccfc394be0f2859b99ae
  Author: Andreas Oetken <andreas@xxxxxxxxxxx>
  Date:   Thu Apr 16 23:48:08 2015 +0200

      altera tse: Fix network-delays and -retransmissions after high throughput.

      Fix bug which occurs when more than <limit> packets are available during
      napi-poll, leading to "delays" and retransmissions on the network.

      Check for (count < limit) before checking the get_rx_status in 
tse_rx-function.
      Function get_rx_status is reading from the response-fifo.
      If there is currently a response in the fifo,
      reading the last byte of the response pops the value from the fifo.
      If the limit is checked as second condition
      and the limit is reached the fifo is popped but the packet is not 
processed.

      Signed-off-by: Andreas Oetken <ennoerlangen@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit e076b7c1343e0810880e6b909445f06921f31067
  Merge: 0f5abd4 569fd0c
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 17 15:09:51 2015 -0400

      Merge branch 'for-linus' of git://git.kernel.dk/linux-block

      Pull block core fix from Jens Axboe:
       "A commit in the previous pull request introduce a regression.  So far
        only observed on qemu-sparc64, but it's a general bug.  Please pull
        this single fix to rectify that, thanks"

      [ And it turns out that it's been seen outside of that qemu-sparc64
        case, and is easy to trigger with small number of CPUs and blk-mq
        enabled by default - Linus ]

      * 'for-linus' of git://git.kernel.dk/linux-block:
        blk-mq: fix iteration of busy bitmap

  commit 0f5abd4020bfd2b1eec6975b91bd5068aa674a93
  Merge: 54e514b 0ee0d34
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 17 15:01:29 2015 -0400

      Merge tag 'acpica-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

      Pull ACPICA updates from Rafael Wysocki:
       "This updates the kernel's ACPICA code to upstream revision 20150410
        and adds a fix for a GPE handling regression introduced during the
        3.19 cycle on top of that.

        Included are two stable-candidate bug fixes (one of them fixing a 3.16
        regression), multiple other fixes and a bunch of cleanups.

        Specifics:

         - Fix for a GPE handling regression on Dell Latitude D600 that caused
           GPE signaling to stop working on that machine, which appears to be
           due to a hardware glitch, but it used to work and it can be made
           work again in a relativly straightforward way (Rafael J Wysocki).

         - Fix for a mutex unlock regression related to the handling of ACPI
           tables introduced during the 3.16 development cycle (Octavian
           Purdila).

         - _REV modification to always return 2 which has been done by all
           versions of Windows since NT and the firmware people started to use
           it to distinguish between OSes in their AML and do some silly and
           wrong things on that basis (Bob Moore).

         - Fixes and cleanups related to the acpi_physicall_address data type
           including one stable-candidate fix for an issue occasionally
           occuring on 64-bit machines running 32-bit kernels where using
           offsets provided by the firmware may lead to address overflows (Lv
           Zheng).

         - External() opcode support infrastructure needed for recompiling
           disassembled ACPI tables in some cases including interpreter
           modification to ignore that opcode (Bob Moore).

         - Support for the "Windows 2015" string in _OSI (Bob Moore).

         - GPE debug interface change to return values read from hardware
           registers (Lv Zheng).

         - Removal of the __DATE__ macro usage in tools (Rasmus Villemoes).

         - Assorted minor fixes and cleanups (Lv Zheng, Rickard Strandqvist,
           Bob Moore)"

      * tag 'acpica-4.1-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (32 commits)
        ACPICA: Store GPE register enable masks upfront
        ACPICA: Update version to 20150410.
        ACPICA: Fix a couple issues with the local printf module.
        ACPICA: Disassembler: Some cleanup of the table dump module.
        ACPICA: iASL: Add support for MSDM ACPI table.
        ACPICA: Update for SLIC ACPI table.
        ACPICA: Add "//" before ascii output of buffers.
        ACPICA: Remove unused internal AML opcode.
        ACPICA: Permanently set _REV to the value '2'.
        ACPICA: Add "Windows 2015" string to _OSI support.
        ACPICA: Add infrastructure for External() opcode.
        ACPICA: iASL: Enhancement for constant folding.
        ACPICA: iASL/Disassembler: Add option to assume table contains valid 
AML.
        ACPICA: Update AML Debugger global variables.
        ACPICA: Update Resource descriptor dump module.
        ACPICA: Fix a sscanf format string.
        ACPICA: Casting changes around acpi_physical_address/acpi_size.
        ACPICA: Resources: Correct conditional compilation definitions.
        ACPICA: Utilities: Correct conditional compilation definitions.
        ACPICA: Tables: Move an iasl specific table function to iasl source 
file.
        ...

  commit 7d3beab16dd9eee86bb1a4dd05b51159fc7772f0
  Author: Arnd Bergmann <arnd@xxxxxxxx>
  Date:   Sat Apr 11 00:27:58 2015 +0200

      dmaengine: shdmac: avoid unused variable warnings

      This driver uses '#ifdef CONFIG_ARCH_SHMOBILE' and '#ifdef CONFIG_ARM'
      interchangeably in its sh_dmae_probe function, which causes a build
      warning when building for ARM without also enabling shmobile:

      dma/sh/shdmac.c: In function sh_dmae_probe:
      dma/sh/shdmac.c:696:6: warning: unused variable errirq [-Wunused-variable]
      dma/sh/shdmac.c:695:16: warning: unused variable irqflags 
[-Wunused-variable]
      dma/sh/shdmac.c: At top level:
      dma/sh/shdmac.c:447:20: warning: sh_dmae_err defined but not used 
[-Wunused-function]

      This changes all the #ifdef to test for CONFIG_ARCH_SHMOBILE to
      avoid that warning. An earlier patch from Laurent had fixed the warning
      for non-ARM case, but it still remained present in ARM randconfig builds.

      Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
      Fixes: 52d6a5ee101bf ("DMA: shdma: Fix warnings due to declared but 
unused symbols")
      Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit 11ebe4c067c7f95adff73594cb5c23f7a5c6d69e
  Author: kbuild test robot <fengguang.wu@xxxxxxxxx>
  Date:   Sun Apr 12 02:18:34 2015 +0800

      dmaengine: fix platform_no_drv_owner.cocci warnings

      drivers/dma/xgene-dma.c:2079:3-8: No need to set .owner here. The core 
will do it.

       Remove .owner field if calls are used which set it automatically

      Generated by: scripts/coccinelle/api/platform_no_drv_owner.cocci

      CC: Rameshwar Prasad Sahu <rsahu@xxxxxxx>
      Signed-off-by: Fengguang Wu <fengguang.wu@xxxxxxxxx>
      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit 12d7b7a23694b4d3dba58d7ae971ee9120a617e5
  Author: Alexey Khoroshilov <khoroshilov@xxxxxxxxx>
  Date:   Sat Apr 11 01:28:41 2015 +0300

      dmaengine: pch_dma: fix memory leak on failure path in pch_dma_probe()

      Memory allocated for pch_dma is not deallocated in case of failure
      in pch_dma_probe().

      Found by Linux Driver Verification project (linuxtesting.org).

      Signed-off-by: Alexey Khoroshilov <khoroshilov@xxxxxxxxx>
      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit 0434a23198d6a271b70b75221c7568e60482c04e
  Author: Niklas Cassel <niklas.cassel@xxxxxxxx>
  Date:   Tue Apr 7 16:42:45 2015 +0200

      dmaengine: at_xdmac: unlock spin lock before return

      Signed-off-by: Niklas Cassel <niklass@xxxxxxxx>
      Acked-by: Ludovic Desroches <ludovic.desroches@xxxxxxxxx>
      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit 9c361b1afd9b4b2bba7fa1ffb080c9f5de3ff108
  Author: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
  Date:   Thu Apr 9 12:03:31 2015 +0300

      dmaengine: xgene: devm_ioremap() returns NULL on error

      The code here is checking for IS_ERR() but devm_ioremap() returns NULL
      on error and not an error pointer.

      Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit ed1f041842f0c4226a78fcd96ccb8e6a5433ae9d
  Author: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
  Date:   Thu Apr 9 12:05:04 2015 +0300

      dmaengine: xgene: buffer overflow in xgene_dma_init_channels()

      We put 9 characters into the 8 character name[] array.  Let's make the
      array bigger and change the sprintf() to snprintf().

      Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit 128f3cb9398b5eeb4ee04b60bd5e314f5c122821
  Author: Chris Metcalf <cmetcalf@xxxxxxxxxx>
  Date:   Mon Mar 30 16:33:00 2015 -0400

      tile: nohz: warn if nohz_full uses hypervisor shared cores

      The "hypervisor shared" cores are ones that the Tilera hypervisor
      uses to receive interrupts to manage hypervisor-owned devices.
      It's a bad idea to try to use those cores with nohz_full, since
      they will get interrupted unpredictably -- and invisibly to Linux
      tracing tools, since the interrupts are delivered at a higher
      privilege level to the Tilera hypervisor.

      Generate a clear warning at boot up that this doesn't end well
      for the nohz_full cores in question.

      Signed-off-by: Chris Metcalf <cmetcalf@xxxxxxxxxx>

  commit 437d3e124d25daaa671bfecfd4015ecd2503a955
  Author: Tony Lu <zlu@xxxxxxxxxx>
  Date:   Fri Mar 27 14:46:38 2015 -0400

      tile: ftrace: fix function_graph tracer issues

      - Add support for ARCH_SUPPORTS_FTRACE_OPS
      - Replace the instruction in ftrace_call with the bundle {move r10, lr;
      jal ftrace_stub}, so that the lr contains the right value after returning
      from ftrace_stub.  An alternative fix might be to leave the instruction
      in ftrace_call alone when it is being updated with ftrace_stub.

      Signed-off-by: Tony Lu <zlu@xxxxxxxxxx>
      Signed-off-by: Chris Metcalf <cmetcalf@xxxxxxxxxx>

  commit a84f24230c137a4e0ab14185e9175798ca1b0376
  Author: Chris Metcalf <cmetcalf@xxxxxxxxxx>
  Date:   Fri Mar 27 14:35:31 2015 -0400

      tile: map data region shadow of kernel as R/W

      This is necessary for things like reading /proc/kcore, doing ftrace,
      etc.  It happens by default when using huge pages to map the kernel
      data, but not when using small pages.

      Signed-off-by: Chris Metcalf <cmetcalf@xxxxxxxxxx>

  commit 49e4e15619cd7cd9fc275d460fae2a95c1337fcc
  Author: Chris Metcalf <cmetcalf@xxxxxxxxxx>
  Date:   Mon Mar 23 14:23:58 2015 -0400

      tile: support CONTEXT_TRACKING and thus NOHZ_FULL

      Add the TIF_NOHZ flag appropriately.

      Add call to user_exit() on entry to do_work_pending() and on entry
      to syscalls via do_syscall_trace_enter(), and also the top of
      do_syscall_trace_exit() just because it's done in x86.

      Add call to user_enter() at the bottom of do_work_pending() once we
      have no more work to do before returning to userspace.

      Wrap all the trap code in exception_enter() / exception_exit().

      Signed-off-by: Chris Metcalf <cmetcalf@xxxxxxxxxx>
      Acked-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>

  commit d7d8e892aa6fe280a2e2974d9fd1ec9253ee1a05
  Author: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx>
  Date:   Fri Apr 3 20:20:15 2015 +0900

      dmaengine: usb-dmac: Fix dereferencing freed memory 'desc'

      This patch fixes an issue that the usb_dmac_desc_free() is
      dereferencing freed memory 'desc' because it uses list_for_each_entry().
      This function should use list_for_each_entry_safe().

      Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
      Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx>
      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit 28591dfdd96c6289aebbf12d8eb4e5dc5ddbde97
  Author: Dmitry Eremin-Solenikov <dbaryshkov@xxxxxxxxx>
  Date:   Thu Apr 2 18:39:31 2015 +0300

      dmaengine: sa11x0: report slave capabilities to upper layers

      Fix the following warning by initializing necessary fields in the 
dma_device
      structure.

      ------------[ cut here ]------------
      WARNING: CPU: 0 PID: 1 at drivers/dma/dmaengine.c:863 
dma_async_device_register+0x2b4/0x4f0()
      this driver doesn't support generic slave capabilities reporting
      Modules linked in:
      CPU: 0 PID: 1 Comm: swapper Not tainted 4.0.0-rc5+ #10
      Hardware name: Sharp-Collie
      [<c0105cd8>] (unwind_backtrace) from [<c0103ef8>] (show_stack+0x10/0x14)
      [<c0103ef8>] (show_stack) from [<c010e9b8>] 
(warn_slowpath_common+0x74/0xac)
      [<c010e9b8>] (warn_slowpath_common) from [<c010ea20>] 
(warn_slowpath_fmt+0x30/0x40)
      [<c010ea20>] (warn_slowpath_fmt) from [<c02956fc>] 
(dma_async_device_register+0x2b4/0x4f0)
      [<c02956fc>] (dma_async_device_register) from [<c0296a9c>] 
(sa11x0_dma_probe+0x21c/0x358)
      [<c0296a9c>] (sa11x0_dma_probe) from [<c02c52c0>] 
(platform_drv_probe+0x30/0x94)
      [<c02c52c0>] (platform_drv_probe) from [<c02c39bc>] 
(driver_probe_device+0x84/0x234)
      [<c02c39bc>] (driver_probe_device) from [<c02c3c4c>] 
(__driver_attach+0x98/0x9c)
      [<c02c3c4c>] (__driver_attach) from [<c02c1f9c>] 
(bus_for_each_dev+0x74/0xa4)
      [<c02c1f9c>] (bus_for_each_dev) from [<c02c3230>] 
(bus_add_driver+0x13c/0x1e8)
      [<c02c3230>] (bus_add_driver) from [<c02c4260>] 
(driver_register+0x78/0xf8)
      [<c02c4260>] (driver_register) from [<c0100624>] 
(do_one_initcall+0x84/0x1f4)
      [<c0100624>] (do_one_initcall) from [<c0700e1c>] 
(kernel_init_freeable+0xf8/0x1b4)
      [<c0700e1c>] (kernel_init_freeable) from [<c040a920>] 
(kernel_init+0x8/0xf0)
      [<c040a920>] (kernel_init) from [<c01013a8>] (ret_from_fork+0x14/0x2c)
      ---[ end trace e188b8fe0e782e75 ]---

      Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@xxxxxxxxx>
      Acked-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit e60841b441e1b3d176f235f36c79158dd2ed3ed8
  Author: Kedareswara rao Appana <appana.durga.rao@xxxxxxxxxx>
  Date:   Mon Mar 30 18:48:29 2015 +0530

      dmaengine: vdma: Fix compilation warnings

      This patch fixes the following compilation warnings.
      In file included from drivers/dma/xilinx/xilinx_vdma.c:26:0:
      include/linux/dmapool.h:18:4: warning: 'struct device' declared inside 
parameter list
          size_t size, size_t align, size_t allocation);
          ^
      include/linux/dmapool.h:18:4: warning: its scope is only this definition 
or declaration, which is probably not what you want
      include/linux/dmapool.h:31:7: warning: 'struct device' declared inside 
parameter list
             size_t size, size_t align, size_t allocation);
             ^
      drivers/dma/xilinx/xilinx_vdma.c: In function 
'xilinx_vdma_alloc_chan_resources':
      drivers/dma/xilinx/xilinx_vdma.c:501:20: warning: passing argument 2 of 
'dma_pool_create' from incompatible pointer type
        chan->desc_pool = dma_pool_create("xilinx_vdma_desc_pool",
                          ^
      In file included from drivers/dma/xilinx/xilinx_vdma.c:26:0:
      include/linux/dmapool.h:17:18: note: expected 'struct device *' but 
argument is of type 'struct device *'
       struct dma_pool *dma_pool_create(const char *name, struct device *dev, .

      Signed-off-by: Kedareswara rao Appana <appanad@xxxxxxxxxx>
      Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>

  commit 8b86a61da37cbbcf4bd6e87fda494a59b1cf16c4
  Author: Johannes Berg <johannes.berg@xxxxxxxxx>
  Date:   Fri Apr 17 15:45:04 2015 +0200

      net: remove unused 'dev' argument from netif_needs_gso()

      In commit 04ffcb255f22 ("net: Add ndo_gso_check") Tom originally
      added the 'dev' argument to be able to call ndo_gso_check().

      Then later, when generalizing this in commit 5f35227ea34b
      ("net: Generalize ndo_gso_check to ndo_features_check")
      Jesse removed the call to ndo_gso_check() in netif_needs_gso()
      by calling the new ndo_features_check() in a different place.
      This made the 'dev' argument unused.

      Remove the unused argument and go back to the code as before.

      Cc: Tom Herbert <therbert@xxxxxxxxxx>
      Cc: Jesse Gross <jesse@xxxxxxxxxx>
      Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit f40ae91307c275fc8b17420fa74145e9937c3c0b
  Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 17 13:32:09 2015 +0800

      act_mirred: Fix bogus header when redirecting from VLAN

      When you redirect a VLAN device to any device, you end up with
      crap in af_packet on the xmit path because hard_header_len is
      not equal to skb->mac_len.  So the redirected packet contains
      four extra bytes at the start which then gets interpreted as
      part of the MAC address.

      This patch fixes this by only pushing skb->mac_len.  We also
      need to fix ifb because it tries to undo the pushing done by
      act_mirred.

      Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
      Acked-by: Alexei Starovoitov <ast@xxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 521f1cf1dbb9d5ad858dca5dc75d1b45f64b6589
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Thu Apr 16 18:10:35 2015 -0700

      inet_diag: fix access to tcp cc information

      Two different problems are fixed here :

      1) inet_sk_diag_fill() might be called without socket lock held.
         icsk->icsk_ca_ops can change under us and module be unloaded.
         -> Access to freed memory.
         Fix this using rcu_read_lock() to prevent module unload.

      2) Some TCP Congestion Control modules provide information
         but again this is not safe against icsk->icsk_ca_ops
         change and nla_put() errors were ignored. Some sockets
         could not get the additional info if skb was almost full.

      Fix this by returning a status from get_info() handlers and
      using rcu protection as well.

      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Acked-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit fad9dfefea6405039491e7e4fc21fb6e59e7d26c
  Author: Eric Dumazet <edumazet@xxxxxxxxxx>
  Date:   Thu Apr 16 16:12:28 2015 -0700

      tcp: tcp_get_info() should fetch socket fields once

      tcp_get_info() can be called without holding socket lock,
      so any socket fields can change under us.

      Use READ_ONCE() to fetch sk_pacing_rate and sk_max_pacing_rate

      Fixes: 977cb0ecf82e ("tcp: add pacing_rate information into tcp_info")
      Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
      Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

  commit 56cbd0ccc1b508de19561211d7ab9e1c77e6b384
  Author: James Bottomley <JBottomley@xxxxxxxx>
  Date:   Wed Apr 15 22:16:01 2015 -0700

      mvsas: fix panic on expander attached SATA devices

      mvsas is giving a General protection fault when it encounters an expander
      attached ATA device.  Analysis of mvs_task_prep_ata() shows that the 
driver is
      assuming all ATA devices are locally attached and obtaining the phy mask 
by
      indexing the local phy table (in the HBA structure) with the phy id.  
Since
      expanders have many more phys than the HBA, this is causing the index 
into the
      HBA phy table to overflow and returning rubbish as the pointer.

      mvs_task_prep_ssp() instead does the phy mask using the port properties.
      Mirror this in mvs_task_prep_ata() to fix the panic.

      Reported-by: Adam Talbot <ajtalbot1@xxxxxxxxx>
      Tested-by: Adam Talbot <ajtalbot1@xxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: James Bottomley <JBottomley@xxxxxxxx>

  commit 8041708ed4d993c5466c20926210598afa97194e
  Author: Hannes Reinecke <hare@xxxxxxx>
  Date:   Fri Mar 27 14:31:12 2015 +0100

      am53c974: Fix crash during modprobe

      On systems with shared interrupts the interrupt routine might
      be called as soon as the interrupt is enabled.
      As this might happen before pci_set_drvdata() is called the
      system would crash.

      Reported-by: Andreas Brogle <anbro@xxxxx>
      Tested-by: Andreas Brogle <anbro@xxxxx>
      Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
      Signed-off-by: James Bottomley <JBottomley@xxxxxxxx>

  commit b340c656af6317e28b466996a72cca019d97b42d
  Author: Chris Metcalf <cmetcalf@xxxxxxxxxx>
  Date:   Mon Mar 23 11:21:23 2015 -0400

      tile: support arch_irq_work_raise

      Tile includes a hypervisor hook to deliver messages to arbitrary
      tiles, so we can use that to raise an interrupt as soon as
      possible on our own core.  Unfortunately the Tilera hypervisor
      disabled that support on principle in previous releases, but
      it will be available in MDE 4.3.4 and later.

      Signed-off-by: Chris Metcalf <cmetcalf@xxxxxxxxxx>
      Acked-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>

  commit 9088616fb3c4e0d3ec4efb20378691066a218f9c
  Author: Colin Ian King <colin.king@xxxxxxxxxxxxx>
  Date:   Mon Mar 16 16:14:02 2015 -0400

      arch: tile: fix null pointer dereference on pt_regs pointer

      Cppcheck reports the following issue:
      [arch/tile/kernel/stack.c:116]: (error) Possible null
        pointer dereference: p

      In this case, on reporting on an odd fault, p is set to NULL
      and immediately afterwords p is dereferenced iff
      !kbt->profile is false.  Rather than doing this check just
      return NULL rather than falling through to the potential
      null pointer dereference (since the original intentional
      outcome would be to return NULL anyhow) for this odd fault
      case.

      Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
      Signed-off-by: Chris Metcalf <cmetcalf@xxxxxxxxxx> [tweaked lightly]

  commit 5a3b4e8000c1ce476f5e8babd62c580457561f34
  Author: Davidlohr Bueso <dave@xxxxxxxxxxxx>
  Date:   Wed Feb 25 13:58:35 2015 -0800

      tile/elf: reorganize notify_exec()

      In the future mm->exe_file will be done without mmap_sem
      serialization, thus isolate and reorganize the tile elf
      code to make the transition easier. Good users will, make
      use of the more standard get_mm_exe_file(), requiring only
      holding the mmap_sem to read the value, and relying on reference
      counting to make sure that the exe file won't dissappear
      underneath us.

      The visible effects of this patch are:

         o We now take and drop the mmap_sem more often. Instead of
           just in arch_setup_additional_pages(), we also do it in:

           1) get_mm_exe_file()
           2) to get the mm->vm_file and notify the simulator.

          [Note that 1) will disappear once we change the locking
           rules for exe_file.]

         o We avoid getting a free page and doing d_path() while
           holding the mmap_sem. This requires reordering the checks.

      Signed-off-by: Davidlohr Bueso <dbueso@xxxxxxx>
      Signed-off-by: Chris Metcalf <cmetcalf@xxxxxxxxxx>

  commit 89067c2daf3d9e0ce51c768589e79e845e6fda42
  Author: Chris Metcalf <cmetcalf@xxxxxxxxxx>
  Date:   Mon Mar 16 15:04:05 2015 -0400

      tile: use si_int instead of si_ptr for compat_siginfo

      To be compatible with the generic get_compat_sigevent(), the
      copy_siginfo_to_user32() and thus copy_siginfo_from_user32()
      have to use si_int instead of si_ptr.  Using si_ptr means that
      for the case of ILP32 compat code running in big-endian mode,
      we would end up copying the high 32 bits of the pointer value
      into si_int instead of the desired low 32 bits.

      Signed-off-by: Chris Metcalf <cmetcalf@xxxxxxxxxx>
      Cc: Catalin Marinas <catalin.marinas@xxxxxxx>

  commit 98b228f55014870092c15d7d168fecac69f2f12a
  Author: Roy Franz <roy.franz@xxxxxxxxxx>
  Date:   Wed Apr 15 16:32:24 2015 -0700

      x86/efi: Store upper bits of command line buffer address in 
ext_cmd_line_ptr

      Until now, the EFI stub was only setting the 32 bit cmd_line_ptr in
      the setup_header structure, so on 64 bit platforms this could be 
truncated.
      This patch adds setting the upper bits of the buffer address in
      ext_cmd_line_ptr.  This case was likely never hit, as the allocation
      for this buffer is done at the lowest available address.  Only
      x86_64 kernels have this problem, as the 1-1 mapping mandated
      by EFI ensures that all memory is 32 bit addressable on 32 bit
      platforms.  The EFI stub does not support mixed mode, so the
      32 bit kernel on 64 bit firmware case does not need to be handled.

      Signed-off-by: Roy Franz <roy.franz@xxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx>

  commit c57dcb566d3d866a302a1da2e06344bec31d5bcd
  Author: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
  Date:   Thu Apr 2 08:39:00 2015 +0100

      efivarfs: Ensure VariableName is NUL-terminated

      Some buggy firmware implementations update VariableNameSize on success
      such that it does not include the final NUL character which results in
      garbage in the efivarfs name entries.  Use kzalloc on the efivar_entry
      (as is done in efivars.c) to ensure that the name is always
      NUL-terminated.

      The buggy firmware is:
      BIOS Information
              Vendor: Intel Corp.
              Version: S1200RP.86B.02.02.0005.102320140911
              Release Date: 10/23/2014
              BIOS Revision: 4.6
      System Information
              Manufacturer: Intel Corporation
              Product Name: S1200RP_SE

      Signed-off-by: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
      Acked-by: Matthew Garrett <mjg59@xxxxxxxxxx>
      Cc: Jeremy Kerr <jk@xxxxxxxxxx>
      Cc: <stable@xxxxxxxxxxxxxxx>
      Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx>

  commit 3193899d4dd54056f8c2e0b1e40dd6e2f0009f28
  Author: Steven Rostedt (Red Hat) <rostedt@xxxxxxxxxxx>
  Date:   Fri Apr 17 10:27:57 2015 -0400

      tracing: Fix possible out of bounds memory access when parsing enums

      The code that replaces the enum names with the enum values in the
      tracepoints' format files could possible miss the end of string nul
      character. This was caused by processing things like backslashes, quotes
      and other tokens. After processing the tokens, a check for the nul
      character needed to be done before continuing the loop, because the loop
      incremented the pointer before doing the check, which could bypass the nul
      character.

      Link: http://lkml.kernel.org/r/552E661D.5060502@xxxxxxxxxx

      Reported-by: Sasha Levin <sasha.levin@xxxxxxxxxx> # via KASan
      Tested-by: Andrey Ryabinin <a.ryabinin@xxxxxxxxxxx>
      Fixes: 0c564a538aa9 "tracing: Add TRACE_DEFINE_ENUM() macro to map enums 
to their values"
      Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>

  commit 569fd0ce96087283866ab8c438dac4bcf1738846
  Author: Jens Axboe <axboe@xxxxxx>
  Date:   Fri Apr 17 08:28:50 2015 -0600

      blk-mq: fix iteration of busy bitmap

      Commit 889fa31f00b2 was a bit too eager in reducing the loop count,
      so we ended up missing queues in some configurations. Ensure that
      our division rounds up, so that's not the case.

      Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx>
      Fixes: 889fa31f00b2 ("blk-mq: reduce unnecessary software queue looping")
      Signed-off-by: Jens Axboe <axboe@xxxxxx>

  commit d09a6b4a1412149c133a58b53f50e9c05a95e834
  Author: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 16 21:46:29 2015 +0800

      ASoC: Intel: sst_byt: remove kfree for memory allocated with devm_kzalloc

      It's not necessary to free memory allocated with devm_kzalloc
      and using kfree leads to a double free.

      Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
      Acked-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit f4d770317997f89bb6997ee3e8dd495cb8356ae9
  Author: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
  Date:   Fri Apr 17 16:19:46 2015 +0300

      ALSA: hda - potential (but unlikely) uninitialized variable

      This function is a bit unusual because it accepts negative values as
      "conn_len".  It's theoretically possible for both "cache_len" and
      "conn_len" to be -ENOSPC and in that case we would oops trying to run
      memcmp() on the uninitialized "list" pointer.

      Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
      Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

  commit c479163a1b6ab424786fbcd9225b4e3c1c58eb0b
  Author: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 16 20:18:02 2015 +0800

      ASoC: samsung: s3c24xx-i2s: Fix return value check in 
s3c24xx_iis_dev_probe()

      In case of error, the function devm_ioremap_resource() returns
      ERR_PTR() and never returns NULL. The NULL test in the return
      value check should be replaced with IS_ERR().

      Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
      Reviewed-by: Krzysztof Kozlowski <k.kozlowski.k@xxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 427ced4b203dfea4f08b1298cd1f88e19039fca4
  Author: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 16 20:17:46 2015 +0800

      ASoC: tfa9879: Fix return value check in tfa9879_i2c_probe()

      In case of error, the function devm_kzalloc() returns NULL
      not ERR_PTR(). The IS_ERR() test in the return value check
      should be replaced with NULL test.

      Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
      Acked-by: Peter Rosin <peda@xxxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
      Cc: stable@xxxxxxxxxxxxxxx

  commit 28ecc0b658e2ac882faa80e7ff1d72d144299bd0
  Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
  Date:   Wed Apr 15 00:08:15 2015 -0300

      ASoC: fsl_ssi: Fix platform_get_irq() error handling

      We should check whether platform_get_irq() returns a negative number and
      propagate the error in this case.

      Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
      Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>

  commit 54e514b91b95d6441c12a7955addfb9f9d2afc65
  Merge: 4fc8adc 6c8c903
  Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
  Date:   Fri Apr 17 09:04:38 2015 -0400

      Merge branch 'akpm' (patches from Andrew)

      Merge third patchbomb from Andrew Morton:

       - various misc things

       - a couple of lib/ optimisations

       - provide DIV_ROUND_CLOSEST_ULL()

       - checkpatch updates

       - rtc tree

       - befs, nilfs2, hfs, hfsplus, fatfs, adfs, affs, bfs

       - ptrace fixes

       - fork() fixes

       - seccomp cleanups

       - more mmap_sem hold time reductions from Davidlohr

      * emailed patches from Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>: (138 
commits)
        proc: show locks in /proc/pid/fdinfo/X
        docs: add missing and new /proc/PID/status file entries, fix typos
        drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic
        Documentation/spi/spidev_test.c: fix warning
        drivers/rtc/rtc-s5m.c: allow usage on device type different than main 
MFD type
        .gitignore: ignore *.tar
        MAINTAINERS: add Mediatek SoC mailing list
        tomoyo: reduce mmap_sem hold for mm->exe_file
        powerpc/oprofile: reduce mmap_sem hold for exe_file
        oprofile: reduce mmap_sem hold for mm->exe_file
        mips: ip32: add platform data hooks to use DS1685 driver
        lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
        x86: switch to using asm-generic for seccomp.h
        sparc: switch to using asm-generic for seccomp.h
        powerpc: switch to using asm-generic for seccomp.h
        parisc: switch to using asm-generic for seccomp.h
        mips: switch to using asm-generic for seccomp.h
        microblaze: use asm-generic for seccomp.h
        arm: use asm-generic for seccomp.h
        seccomp: allow COMPAT sigreturn overrides
        ...

  commit 6c8c90319c0bb1c9e0b68e721359b89ae4f28465
  Author: Andrey Vagin <avagin@xxxxxxxxxx>
  Date:   Thu Apr 16 12:49:38 2015 -0700

      proc: show locks in /proc/pid/fdinfo/X

      Let's show locks which are associated with a file descriptor in
      its fdinfo file.

      Currently we don't have a reliable way to determine who holds a lock.  We
      can find some information in /proc/locks, but PID which is reported there
      can be wrong.  For example, a process takes a lock, then forks a child and
      dies.  In this case /proc/locks contains the parent pid, which can be
      reused by another process.

      $ cat /proc/locks
      ...
      6: FLOCK  ADVISORY  WRITE 324 00:13:13431 0 EOF
      ...

      $ ps -C rpcbind
        PID TTY          TIME CMD
        332 ?        00:00:00 rpcbind

      $ cat /proc/332/fdinfo/4
      pos:      0
      flags:    0100000
      mnt_id:   22
      lock:     1: FLOCK  ADVISORY  WRITE 324 00:13:13431 0 EOF

      $ ls -l /proc/332/fd/4
      lr-x------ 1 root root 64 Mar  5 14:43 /proc/332/fd/4 -> /run/rpcbind.lock

      $ ls -l /proc/324/fd/
      total 0
      lrwx------ 1 root root 64 Feb 27 14:50 0 -> /dev/pts/0
      lrwx------ 1 root root 64 Feb 27 14:50 1 -> /dev/pts/0
      lrwx------ 1 root root 64 Feb 27 14:49 2 -> /dev/pts/0

      You can see that the process with the 324 pid doesn't hold the lock.

      This information is required for proper dumping and restoring file
      locks.

      Signed-off-by: Andrey Vagin <avagin@xxxxxxxxxx>
      Cc: Jonathan Corbet <corbet@xxxxxxx>
      Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
      Acked-by: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
      Acked-by: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
      Acked-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
      Cc: Pavel Emelyanov <xemul@xxxxxxxxxxxxx>
      Cc: Joe Perches <joe@xxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 15eb42d674de8da66950f78b5c7202accabe026e
  Author: Nathan Scott <nathans@xxxxxxxxxx>
  Date:   Thu Apr 16 12:49:35 2015 -0700

      docs: add missing and new /proc/PID/status file entries, fix typos

      docs: add missing and new /proc/PID/status file entries, fix typos

      Signed-off-by: Nathan Scott <nathans@xxxxxxxxxx>
      Signed-off-by: Chen Hanxiao <chenhanxiao@xxxxxxxxxxxxxx>
      Cc: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx>
      Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 6da7bb1e9cef9ab956e4223125090e4465f51fb2
  Author: Ben Dooks <ben.dooks@xxxxxxxxxxxxxxx>
  Date:   Thu Apr 16 12:49:32 2015 -0700

      drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic

      Change the __raw IO calls to readl/write_relaxed which makes the driver
      endian agnostic to run properly on big endian systems.

      Signed-off-by: Ben Dooks <ben.dooks@xxxxxxxxxxxxxxx>
      Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
      Cc: Andrew Victor <linux@xxxxxxxxxxxx>
      Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
      Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 07eec628ffcea711e14644e14d2c83b4150ba1b7
  Author: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 16 12:49:29 2015 -0700

      Documentation/spi/spidev_test.c: fix warning

      Documentation/spi/spidev_test.c:83:5: warning: no previous prototype for 
'unespcape' [-Wmissing-prototypes]

      fix spelling too.

      Acked-by: Mark Brown <broonie@xxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 94f919225890a1adb3d44bf5b31ff4cb21d8ee7e
  Author: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
  Date:   Thu Apr 16 12:49:27 2015 -0700

      drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD 
type

      The RTC driver supports two flavors of S5M devices: S5M8767-like and
      S2MPS14-like.

      On S2MPS13 and S2MPS14 devices the RTC module is the same so we want to
      re-use the existing support of S2MPS14.  However device type was passed
      from parent MFD driver in platform data structure.  This way for the
      S2MPS13 device the main MFD driver passed device type of 'S2MPS13X'.

      Instead decouple detecting of device type between main MFD and RTC driver.
       This allows adding support for other S2MPS14 variations (like S2MPS11 and
      S2MPS13) easily by adding to mfd/sec-core.c:

      static const struct mfd_cell s2mps13_devs[] = {
        { .name = "s2mps14-rtc", }
      };

      Signed-off-by: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
      Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
      Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
      Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
      Cc: Chanwoo Choi <cw00.choi@xxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit f4ae9497288336e9a1900e8e351edf71e27b6944
  Author: Andrey Skvortsov <andrej.skvortzov@xxxxxxxxx>
  Date:   Thu Apr 16 12:49:24 2015 -0700

      .gitignore: ignore *.tar

      Running make tar-pkg results in following:

       # Untracked files:
       #   (use "git add <file>..." to include in what will be committed)
       #
       #       linux-4.0.0-rc3-next-20150313-150225--x86.tar

      This patch makes git ignore *.tar files.
      Running 'git ls-files -i --exclude-standard' does not show any
      tar files excluded from tracking after the change.

      Signed-off-by: Andrey Skvortsov <andrej.skvortzov@xxxxxxxxx>
      Cc: Michal Marek <mmarek@xxxxxxx>
      Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
      Cc: Boaz Harrosh <boaz@xxxxxxxxxxxxx>
      Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
      Cc: Benjamin Romer <benjamin.romer@xxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 17b199d62d7fd732ba02c13433e438ebb368aac9
  Author: Matthias Brugger <matthias.bgg@xxxxxxxxx>
  Date:   Thu Apr 16 12:49:21 2015 -0700

      MAINTAINERS: add Mediatek SoC mailing list

      Add the new list that Mediatek specific patches should also be
      directed to.

      Signed-off-by: Matthias Brugger <matthias.bgg@xxxxxxxxx>
      Cc: Olof Johansson <olof@xxxxxxxxx>
      Cc: Arnd Bergmann <arnd@xxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit d4144ea6e7cc307e84cd9ca227df7b04a54a2365
  Author: Davidlohr Bueso <dave@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:49:18 2015 -0700

      tomoyo: reduce mmap_sem hold for mm->exe_file

      The mm->exe_file is currently serialized with mmap_sem (shared) in order
      to both safely (1) read the file and (2) compute the realpath by calling
      tomoyo_realpath_from_path, making it an absolute overkill.  Good users
      will, on the other hand, make use of the more standard get_mm_exe_file(),
      requiring only holding the mmap_sem to read the value, and relying on
      reference

      [akpm@xxxxxxxxxxxxxxxxxxxx: coding-style fixes]
      Signed-off-by: Davidlohr Bueso <dbueso@xxxxxxx>
      Acked-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
      Cc: James Morris <jmorris@xxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit fd89a65f155fa890c0130139dfb91684d6da4cfb
  Author: Davidlohr Bueso <dave@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:49:15 2015 -0700

      powerpc/oprofile: reduce mmap_sem hold for exe_file

      In the future mm->exe_file will be done without mmap_sem serialization,
      thus isolate and reorganize the related code to make the transition
      easier.  Good users will, make use of the more standard get_mm_exe_file(),
      requiring only holding the mmap_sem to read the value, and relying on
      reference counting to make sure that the exe file won't dissappear
      underneath us while getting the dcookie.

      Signed-off-by: Davidlohr Bueso <dbueso@xxxxxxx>
      Cc: Arnd Bergmann <arnd@xxxxxxxx>
      Cc: Robert Richter <rric@xxxxxxxxxx>
      Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 11163348a23cdbcdca5fb42485418e75f8566a5c
  Author: Davidlohr Bueso <dave@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:49:12 2015 -0700

      oprofile: reduce mmap_sem hold for mm->exe_file

      sync_buffer() needs the mmap_sem for two distinct operations, both only
      occurring upon user context switch handling:

       1) Dealing with the exe_file.

       2) Adding the dcookie data as we need to lookup the vma that
         backs it. This is done via add_sample() and add_data().

      This patch isolates 1), for it will no longer need the mmap_sem for
      serialization.  However, for now, make of the more standard
      get_mm_exe_file(), requiring only holding the mmap_sem to read the value,
      and relying on reference counting to make sure that the exe file won't
      dissappear underneath us while doing the get dcookie.

      As a consequence, for 2) we move the mmap_sem locking into where we really
      need it, in lookup_dcookie().  The benefits are twofold: reduce mmap_sem
      hold times, and cleaner code.

      [akpm@xxxxxxxxxxxxxxxxxxxx: export get_mm_exe_file for 
arch/x86/oprofile/oprofile.ko]
      Signed-off-by: Davidlohr Bueso <dbueso@xxxxxxx>
      Cc: Robert Richter <rric@xxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 15beb694c66146e1133b9ff81d54e3ef3daa1d7c
  Author: Joshua Kinard <kumba@xxxxxxxxxx>
  Date:   Thu Apr 16 12:49:09 2015 -0700

      mips: ip32: add platform data hooks to use DS1685 driver

      This modifies the IP32 (SGI O2) platform and reset code to utilize the new
      rtc-ds1685 driver.  The old mc146818rtc.h header is removed and 
ip32_defconfig
      is updated as well.

      Signed-off-by: Joshua Kinard <kumba@xxxxxxxxxx>
      Acked-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
      Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 9e522c0d28d1418c2983ffbc3903f7bed3354180
  Author: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
  Date:   Thu Apr 16 12:49:07 2015 -0700

      lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text

      Cc: Yalin Wang <yalin.wang@xxxxxxxxxxxxxx>
      Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 8eb68bf75eb7ea73bce88cb9d42efd3bbcece3cd
  Author: Kees Cook <keescook@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:49:04 2015 -0700

      x86: switch to using asm-generic for seccomp.h

      Switch to using the newly created asm-generic/seccomp.h for the seccomp
      strict mode syscall definitions. The obsolete sigreturn syscall override
      is retained in 32-bit mode, and the ia32 syscall overrides are used in
      the compat case. Remaining definitions were identical.

      Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
      Cc: Ingo Molnar <mingo@xxxxxxxxxx>
      Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
      Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit d0f138b0853e3b0a0bcd83f3019d34842e12951d
  Author: Kees Cook <keescook@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:49:01 2015 -0700

      sparc: switch to using asm-generic for seccomp.h

      Switch to using the newly created asm-generic/seccomp.h for the seccomp
      strict mode syscall definitions. The obsolete sigreturn in COMPAT mode
      is retained as an override. Remaining definitions are identical. Also
      corrected missing #define for header reinclusion protection.

      Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
      Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 1a3aff9ec376666563c7a2223a1d6c19f908919d
  Author: Kees Cook <keescook@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:48:58 2015 -0700

      powerpc: switch to using asm-generic for seccomp.h

      Switch to using the newly created asm-generic/seccomp.h for the seccomp
      strict mode syscall definitions.  The obsolete sigreturn in COMPAT mode is
      retained as an override.  Remaining definitions are identical, though they
      incorrectly appeared in uapi, which has been corrected.

      Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
      Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
      Cc: Paul Mackerras <paulus@xxxxxxxxx>
      Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit cf7a71b602fe2255b5b42162fa39a3090a1ea2c7
  Author: Kees Cook <keescook@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:48:55 2015 -0700

      parisc: switch to using asm-generic for seccomp.h

      Switch to using the newly created asm-generic/seccomp.h for the seccomp
      strict mode syscall definitions. Definitions were identical.

      Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
      Cc: "James E.J. Bottomley" <jejb@xxxxxxxxxxxxxxxx>
      Cc: Helge Deller <deller@xxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 97247fd99da723ce2c87a45e714c332b71e3e003
  Author: Kees Cook <keescook@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:48:53 2015 -0700

      mips: switch to using asm-generic for seccomp.h

      Switch to using the newly created asm-generic/seccomp.h for the seccomp
      strict mode syscall definitions.  COMPAT definitions retain their
      overrides and the remaining definitions were identical.

      Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
      Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit cc2d316fe7b2f39ecacdbd4be04fccbc2476cb7a
  Author: Kees Cook <keescook@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:48:50 2015 -0700

      microblaze: use asm-generic for seccomp.h

      Switch to using the newly created asm-generic/seccomp.h for the seccomp
      strict mode syscall definitions. Since microblaze is 32-bit, the COMPAT
      seccomp defines are unused and can be dropped. The obsolete sigreturn
      for seccomp strict mode is retained as an override. Remaining definitions
      are identical.

      Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
      Cc: Michal Simek <monstr@xxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 6bcf4e9aab9e9f718edebe77712512fc5c4ecd3e
  Author: Kees Cook <keescook@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:48:47 2015 -0700

      arm: use asm-generic for seccomp.h

      Switch to using the newly created asm-generic/seccomp.h for the seccomp
      strict mode syscall definitions. Definitions were identical.

      Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
      Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
      Cc: Laura Abbott <lauraa@xxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit ddaa27ee627fb58d1a68eb1eb196393d64c25d1b
  Author: Kees Cook <keescook@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:48:44 2015 -0700

      seccomp: allow COMPAT sigreturn overrides

      Most architectures don't need to do much special for the strict-mode
      seccomp syscall entries.  Remove the redundant headers and reduce the
      others.

      This patch (of 8):

      Some architectures may need to override the compat sigreturn definition,
      as is already possible in the non-compat case.

      Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
      Cc: Ingo Molnar <mingo@xxxxxxxxxx>
      Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
      Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
      Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
      Cc: Michal Simek <monstr@xxxxxxxxx>
      Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
      Cc: "James E.J. Bottomley" <jejb@xxxxxxxxxxxxxxxx>
      Cc: Helge Deller <deller@xxxxxx>
      Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
      Cc: Paul Mackerras <paulus@xxxxxxxxx>
      Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
      Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
      Cc: Arnd Bergmann <arnd@xxxxxxxx>
      Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
      Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
      Cc: Will Deacon <will.deacon@xxxxxxx>
      Cc: Daniel Borkmann <dborkman@xxxxxxxxxx>
      Cc: Laura Abbott <lauraa@xxxxxxxxxxxxxx>
      Cc: James Hogan <james.hogan@xxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit be2a7fce397d82b7dc3fdbc61fb0bdab118e65ca
  Author: Davidlohr Bueso <dave@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:48:40 2015 -0700

      arc: do not export symbols in troubleshoot.c

      print_task_path_n_nm() is local to this file, its only user being
      show_regs().  Mark the function static and avoid the EXPORT_SYMBOL.

      Signed-off-by: Davidlohr Bueso <dbueso@xxxxxxx>
      Acked-by: Vineet Gupta <vgupta@xxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 02d699f1f464410d5753a034dd38c76a1a1647e0
  Author: Michal Simek <monstr@xxxxxxxxx>
  Date:   Thu Apr 16 12:48:38 2015 -0700

      include/linux/kconfig.h: ese macros which are already defined

      It is better to use macros which are already available because then there
      is just one location which needs to be change.

      [akpm@xxxxxxxxxxxxxxxxxxxx: move IS_ENABLED definition to after the 
IS_BUILTIN and IS_MODULE definitions]
      Signed-off-by: Michal Simek <michal.simek@xxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 13f6b191aaa11c7fd718d35a0c565f3c16bc1d99
  Author: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
  Date:   Thu Apr 16 12:48:35 2015 -0700

      memstick: mspro_block: add missing curly braces

      Using the indenting we can see the curly braces were obviously intended.
      This is a static checker fix, but my guess is that we don't read enough
      bytes, because we don't calculate "t_len" correctly.

      Fixes: f1d82698029b ('memstick: use fully asynchronous request 
processing')
      Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
      Cc: Alex Dubov <oakad@xxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit c3fe5872eb3f5f9e027d61d8a3f5d092168fdbca
  Author: Sanidhya Kashyap <sanidhya.gatech@xxxxxxxxx>
  Date:   Thu Apr 16 12:48:32 2015 -0700

      bfs: correct return values

      In case of failed memory allocation, the return should be ENOMEM instead
      of ENOSPC.

      Return -EIO when sb_bread() fails.

      Signed-off-by: Sanidhya Kashyap <sanidhya.gatech@xxxxxxxxx>
      Cc: Tigran Aivazian <tigran@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 8f7d3f0f1ed5dce6ea7b833ec19cabe61a6e7ff8
  Author: Jiri Slaby <jslaby@xxxxxxx>
  Date:   Thu Apr 16 12:48:29 2015 -0700

      bfs: bfad_worker cleanup

      This kthread is not loop at all due to break at the end of the loop.  Make
      that function linear, with no while loop.

      And remove an unnecessary cast.

      Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
      Cc: Anil Gurumurthy <anil.gurumurthy@xxxxxxxxxx>
      Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit c8f33d0bec999a4f2b5c3f9380361b88ce6f6ab0
  Author: Sanidhya Kashyap <sanidhya.gatech@xxxxxxxxx>
  Date:   Thu Apr 16 12:48:26 2015 -0700

      affs: kstrdup() memory handling

      There is a possibility of kstrdup() failure upon memory pressure.
      Therefore, returning ENOMEM even for new_opts.

      [akpm@xxxxxxxxxxxxxxxxxxxx: cleanup]
      Signed-off-by: Sanidhya Kashyap <sanidhya.gatech@xxxxxxxxx>
      Cc: Taesoo kim <taesoo@xxxxxxxxxx>
      Cc: Fabian Frederick <fabf@xxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 79bda4d510f80e403ef66fee852f8ccb17308581
  Author: Fabian Frederick <fabf@xxxxxxxxx>
  Date:   Thu Apr 16 12:48:24 2015 -0700

      fs/affs: use affs_test_opt()

      Replace mount option test by affs_test_opt().

      Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 34f24835383092098cb4ce5c4eb6e719a9973d68
  Author: Fabian Frederick <fabf@xxxxxxxxx>
  Date:   Thu Apr 16 12:48:21 2015 -0700

      fs/affs/super.c: use affs_set_opt()

      Replace direct mount option assignation by affs_set_opt() macro.

      Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 6bf445ce35353fe865664af0dbaeb848f0a2820f
  Author: Fabian Frederick <fabf@xxxxxxxxx>
  Date:   Thu Apr 16 12:48:18 2015 -0700

      fs/affs/affs.h: add mount option manipulation macros

      Add clear/set/test affs mount option macros.

      Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit a0016ff2867ad25aad9807fb46bd0d85429dd5e8
  Author: Fabian Frederick <fabf@xxxxxxxxx>
  Date:   Thu Apr 16 12:48:15 2015 -0700

      fs/affs: use AFFS_MOUNT prefix for mount options

      Currently, affs still uses direct access on mount_options.  This patch
      prepares to use affs_clear/set/test_opt() like other filesystems.

      Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit b796410630a0f090864d7595c6bffbc0136f0f8c
  Author: Sanidhya Kashyap <sanidhya.gatech@xxxxxxxxx>
  Date:   Thu Apr 16 12:48:13 2015 -0700

      adfs: return correct return values

      Fix the wrong values returned by various functions such as EIO and ENOMEM.

      Signed-off-by: Sanidhya Kashyap <sanidhya.gatech@xxxxxxxxx>
      Cc: Fabian Frederick <fabf@xxxxxxxxx>
      Cc: Joe Perches <joe@xxxxxxxxxxx>
      Cc: Taesoo kim <taesoo@xxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 9d796e66230205cd3366f5660387bd9ecca9d336
  Author: Andrey Ryabinin <a.ryabinin@xxxxxxxxxxx>
  Date:   Thu Apr 16 12:48:10 2015 -0700

      gcov: fix softlockups

      gcov profiling if enabled with other heavy compile-time instrumentation
      like KASan could trigger following softlockups:

        NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [swapper/0:1]
        Modules linked in:
        irq event stamp: 22823276
        hardirqs last  enabled at (22823275): [<ffffffff86e8d10d>] 
mutex_lock_nested+0x7d9/0x930
        hardirqs last disabled at (22823276): [<ffffffff86e9521d>] 
apic_timer_interrupt+0x6d/0x80
        softirqs last  enabled at (22823172): [<ffffffff811ed969>] 
__do_softirq+0x4db/0x729
        softirqs last disabled at (22823167): [<ffffffff811edfcf>] 
irq_exit+0x7d/0x15b
        CPU: 0 PID: 1 Comm: swapper/0 Tainted: G        W       
3.19.0-05245-gbb33326-dirty #3
        Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 
rel-1.7.5.1-0-g8936dbb-20141113_115728-nilsson.home.kraxel.org 04/01/2014
        task: ffff88006cba8000 ti: ffff88006cbb0000 task.ti: ffff88006cbb0000
        RIP: kasan_mem_to_shadow+0x1e/0x1f
        Call Trace:
          strcmp+0x28/0x70
          get_node_by_name+0x66/0x99
          gcov_event+0x4f/0x69e
          gcov_enable_events+0x54/0x7b
          gcov_fs_init+0xf8/0x134
          do_one_initcall+0x1b2/0x288
          kernel_init_freeable+0x467/0x580
          kernel_init+0x15/0x18b
          ret_from_fork+0x7c/0xb0
        Kernel panic - not syncing: softlockup: hung tasks

      Fix this by sticking cond_resched() in gcov_enable_events().

      Signed-off-by: Andrey Ryabinin <a.ryabinin@xxxxxxxxxxx>
      Reported-by: Fengguang Wu <fengguang.wu@xxxxxxxxx>
      Cc: Peter Oberparleiter <oberpar@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 230633d109e35b0a24277498e773edeb79b4a331
  Author: Heinrich Schuchardt <xypron.glpk@xxxxxx>
  Date:   Thu Apr 16 12:48:07 2015 -0700

      kernel/sysctl.c: detect overflows when converting to int

      When converting unsigned long to int overflows may occur.  These currently
      are not detected when writing to the sysctl file system.

      E.g. on a system where int has 32 bits and long has 64 bits
        echo 0x800001234 > /proc/sys/kernel/threads-max
      has the same effect as
        echo 0x1234 > /proc/sys/kernel/threads-max

      The patch adds the missing check in do_proc_dointvec_conv.

      With the patch an overflow will result in an error EINVAL when writing to
      the the sysctl file system.

      Signed-off-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 534b483a86e6b96f1b5cc03bbe4b696f3daead6d
  Author: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
  Date:   Thu Apr 16 12:48:04 2015 -0700

      cpumask: don't perform while loop in cpumask_next_and()

      cpumask_next_and() is looking for cpumask_next() in src1 in a loop and
      tests if found cpu is also present in src2. remove that loop, perform
      cpumask_and() of src1 and src2 first and use that new mask to find
      cpumask_next().

      Apart from removing while loop, ./bloat-o-meter on x86_64 shows
      add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-8 (-8)
      function                                     old     new   delta
      cpumask_next_and                              62      54      -8

      Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
      Cc: Tejun Heo <tj@xxxxxxxxxx>
      Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
      Cc: Amir Vadai <amirv@xxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit dfcce791fb0ad06f3f0b745a23160b9d8858fe39
  Author: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
  Date:   Thu Apr 16 12:48:01 2015 -0700

      fs/exec.c:de_thread: move notify_count write under lock

      We set sig->notify_count = -1 between RELEASE and ACQUIRE operations:

        spin_unlock_irq(lock);
        ...
        if (!thread_group_leader(tsk)) {
                ...
                      for (;;) {
                        sig->notify_count = -1;
                              write_lock_irq(&tasklist_lock);

      There are no restriction on it so other processors may see this STORE
      mixed with other STOREs in both areas limited by the spinlocks.

      Probably, it may be reordered with the above

        sig->group_exit_task = tsk;
        sig->notify_count = zap_other_threads(tsk);

      in some way.

      Set it under tasklist_lock locked to be sure nothing will be reordered.

      Signed-off-by: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
      Acked-by: Oleg Nesterov <oleg@xxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 6e399cd144d8500ffb5d40fa6848890e2580a80a
  Author: Davidlohr Bueso <dave@xxxxxxxxxxxx>
  Date:   Thu Apr 16 12:47:59 2015 -0700

      prctl: avoid using mmap_sem for exe_file serialization

      Oleg cleverly suggested using xchg() to set the new mm->exe_file instead
      of calling set_mm_exe_file() which requires some form of serialization --
      mmap_sem in this case.  For archs that do not have atomic rmw instructions
      we still fallback to a spinlock alternative, so this should always be
      safe.  As such, we only need the mmap_sem for looking up the backing
      vm_file, which can be done sharing the lock.  Naturally, this means we
      need to manually deal with both the new and old file reference counting,
      and we need not worry about the MMF_EXE_FILE_CHANGED bits, which can
      probably be deleted in the future anyway.

      Signed-off-by: Davidlohr Bueso <dbueso@xxxxxxx>
      Suggested-by: Oleg Nesterov <oleg@xxxxxxxxxx>
      Acked-by: Oleg Nesterov <oleg@xxxxxxxxxx>
      Reviewed-by: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 90f31d0ea88880f780574f3d0bb1a227c4c66ca3
  Author: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx>
  Date:   Thu Apr 16 12:47:56 2015 -0700

      mm: rcu-protected get_mm_exe_file()

      This patch removes mm->mmap_sem from mm->exe_file read side.
      Also it kills dup_mm_exe_file() and moves exe_file duplication into
      dup_mmap() where both mmap_sems are locked.

      [akpm@xxxxxxxxxxxxxxxxxxxx: fix comment typo]
      Signed-off-by: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx>
      Cc: Davidlohr Bueso <dbueso@xxxxxxx>
      Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
      Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
      Cc: "Paul E. McKenney" <paulmck@xxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 0ec62afeb143a34ce78143cf442f879ef68382f7
  Author: Heinrich Schuchardt <xypron.glpk@xxxxxx>
  Date:   Thu Apr 16 12:47:53 2015 -0700

      Doc/sysctl/kernel.txt: document threads-max

      File /proc/sys/kernel/threads-max controls the maximum number of threads
      that can be created using fork().

      [akpm@xxxxxxxxxxxxxxxxxxxx: fix typo, per Guenter]
      Signed-off-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
      Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
      Cc: Ingo Molnar <mingo@xxxxxxxxxx>
      Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 16db3d3f1170fb0efca652c9378ce7c5f5cb4232
  Author: Heinrich Schuchardt <xypron.glpk@xxxxxx>
  Date:   Thu Apr 16 12:47:50 2015 -0700

      kernel/sysctl.c: threads-max observe limits

      Users can change the maximum number of threads by writing to
      /proc/sys/kernel/threads-max.

      With the patch the value entered is checked against the same limits that
      apply when fork_init is called.

      Signed-off-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
      Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
      Cc: Ingo Molnar <mingo@xxxxxxxxxx>
      Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit ac1b398de1ef94aeee8ba87b0120763526572a6e
  Author: Heinrich Schuchardt <xypron.glpk@xxxxxx>
  Date:   Thu Apr 16 12:47:47 2015 -0700

      kernel/fork.c: avoid division by zero

      PAGE_SIZE is not guaranteed to be equal to or less than 8 times the
      THREAD_SIZE.

      E.g.  architecture hexagon may have page size 1M and thread size 4096.
      This would lead to a division by zero in the calculation of max_threads.

      With 32-bit calculation there is no solution which delivers valid results
      for all possible combinations of the parameters.  The code is only called
      once.  Hence a 64-bit calculation can be used as solution.

      [akpm@xxxxxxxxxxxxxxxxxxxx: use clamp_t(), per Oleg]
      Signed-off-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
      Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
      Cc: Ingo Molnar <mingo@xxxxxxxxxx>
      Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit ff691f6e03815dc8f99461ea509df863a879fc3a
  Author: Heinrich Schuchardt <xypron.glpk@xxxxxx>
  Date:   Thu Apr 16 12:47:44 2015 -0700

      kernel/fork.c: new function for max_threads

      PAGE_SIZE is not guaranteed to be equal to or less than 8 times the
      THREAD_SIZE.

      E.g.  architecture hexagon may have page size 1M and thread size 4096.
      This would lead to a division by zero in the calculation of max_threads.

      With this patch the buggy code is moved to a separate function
      set_max_threads.  The error is not fixed.

      After fixing the problem in a separate patch the new function can be
      reused to adjust max_threads after adding or removing memory.

      Argument mempages of function fork_init() is removed as totalram_pages is
      an exported symbol.

      The creation of separate patches for refactoring to a new function and for
      fixing the logic was suggested by Ingo Molnar.

      Signed-off-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
      Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
      Cc: Ingo Molnar <mingo@xxxxxxxxxx>
      Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 3ea7f5e25ec271909451b7dc17be37581b888de6
  Author: Jean Delvare <jdelvare@xxxxxxx>
  Date:   Thu Apr 16 12:47:41 2015 -0700

      fork_init: update max_threads comment

      The comment explaining what value max_threads is set to is outdated.  The
      maximum memory consumption ratio for thread structures was 1/2 until
      February 2002, then it was briefly changed to 1/16 before being set to 1/8
      which we still use today.  The comment was never updated to reflect that
      change, it's about time.

      Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 35f71bc0a09a45924bed268d8ccd0d3407bc476f
  Author: Michal Hocko <mhocko@xxxxxxx>
  Date:   Thu Apr 16 12:47:38 2015 -0700

      fork: report pid reservation failure properly

      copy_process will report any failure in alloc_pid as ENOMEM currently
      which is misleading because the pid allocation might fail not only when
      the memory is short but also when the pid space is consumed already.

      The current man page even mentions this case:

      : EAGAIN
      :
      :       A system-imposed limit on the number of threads was encountered.
      :       There are a number of limits that may trigger this error: the
      :       RLIMIT_NPROC soft resource limit (set via setrlimit(2)), which
      :       limits the number of processes and threads for a real user ID, was
      :       reached; the kernel's system-wide limit on the number of processes
      :       and threads, /proc/sys/kernel/threads-max, was reached (see
      :       proc(5)); or the maximum number of PIDs, /proc/sys/kernel/pid_max,
      :       was reached (see proc(5)).

      so the current behavior is also incorrect wrt.  documentation.  POSIX man
      page also suggest returing EAGAIN when the process count limit is reached.

      This patch simply propagates error code from alloc_pid and makes sure we
      return -EAGAIN due to reservation failure.  This will make behavior of
      fork closer to both our documentation and POSIX.

      alloc_pid might alsoo fail when the reaper in the pid namespace is dead
      (the namespace basically disallows all new processes) and there is no
      good error code which would match documented ones. We have traditionally
      returned ENOMEM for this case which is misleading as well but as per
      Eric W. Biederman this behavior is documented in man pid_namespaces(7)

      : If the "init" process of a PID namespace terminates, the kernel
      : terminates all of the processes in the namespace via a SIGKILL signal.
      : This behavior reflects the fact that the "init" process is essential for
      : the correct operation of a PID namespace.  In this case, a subsequent
      : fork(2) into this PID namespace will fail with the error ENOMEM; it is
      : not possible to create a new processes in a PID namespace whose "init"
      : process has terminated.

      and introducing a new error code would be too risky so let's stick to
      ENOMEM for this case.

      Signed-off-by: Michal Hocko <mhocko@xxxxxxx>
      Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
      Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
      Cc: Michael Kerrisk <mtk.manpages@xxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 69828dce7af2cb6d08ef5a03de687d422fb7ec1f
  Author: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
  Date:   Thu Apr 16 12:47:35 2015 -0700

      signal: remove warning about using SI_TKILL in rt_[tg]sigqueueinfo

      Sending SI_TKILL from rt_[tg]sigqueueinfo was deprecated, so now we issue
      a warning on the first attempt of doing it.  We use WARN_ON_ONCE, which is
      not informative and, what is worse, taints the kernel, making the trinity
      syscall fuzzer complain false-positively from time to time.

      It does not look like we need this warning at all, because the behaviour
      changed quite a long time ago (2.6.39), and if an application relies on
      the old API, it gets EPERM anyway and can issue a warning by itself.

      So let us zap the warning in kernel.

      Signed-off-by: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
      Acked-by: Oleg Nesterov <oleg@xxxxxxxxxx>
      Cc: Richard Weinberger <richard@xxxxxx>
      Cc: "Paul E. McKenney" <paulmck@xxxxxxxxxxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit 64a4096c5cdab377b6e1f44008ee8b2636db579d
  Author: Oleg Nesterov <oleg@xxxxxxxxxx>
  Date:   Thu Apr 16 12:47:32 2015 -0700

      ptrace: ptrace_detach() can no longer race with SIGKILL

      ptrace_detach() re-checks ->ptrace under tasklist lock and calls
      release_task() if __ptrace_detach() returns true.  This was needed because
      the __TASK_TRACED tracee could be killed/untraced, and it could even pass
      exit_notify() before we take tasklist_lock.

      But this is no longer possible after 9899d11f6544 "ptrace: ensure
      arch_ptrace/ptrace_request can never race with SIGKILL".  We can turn
      these checks into WARN_ON() and remove release_task().

      While at it, document the setting of child->exit_code.

      Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
      Cc: Pavel Labath <labath@xxxxxxxxxx>
      Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
      Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

  commit b72c186999e689cb0b055ab1c7b3cd8fffbeb5ed
  Author: Oleg Nesterov <oleg@xxxxxxxxxx>
  Date:   Thu Apr 16 12:47:29 2015 -0700

      ptrace: fix race between ptrace_resume() and wait_task_stopped()

      ptrace_resume() is called when the tracee is still __TASK_TRACED.  We set
      tracee->exit_code and then wake_up_state() changes tracee->state.  If the
      tracer's sub-thread does wait() in between, task_stopped_code(ptrace => T)
      wrongly looks like another report from tracee.

      This confuses debugger, and since wait_task_stopped() clears ->exit_code
      the tracee can miss a signal.

      Test-case:

        #include <stdio.h>
        #include <unistd.h>
        #include <sys/wait.h>
        #include <sys/ptrace.h>
        #include <pthread.h>
        #include <assert.h>

        int pid;

        void *waiter(void *arg)
        {
                int stat;

                for (;;) {
                        assert(pid == wait(&stat));
                        assert(WIFSTOPPED(stat));
                        if (WSTOPSIG(stat) == SIGHUP)
                                continue;

                        assert(WSTOPSIG(stat) == SIGCONT);
                        printf("ERR! extra/wrong report:%x\n", stat);
                }
        }

        int main(void)
        {
                pthread_t thread;

                pid = fork();
                if (!pid) {
                        assert(ptrace(PTRACE_TRACEME, 0,0,0) == 0);
                        for (;;)
                                kill(getpid(), SIGHUP);
                }

                assert(pthread_create(&thread, NULL, waiter, NULL) == 0);

                for (;;)
                        ptrace(PTRACE_CONT, pid, 0, SIGCONT);

                return 0;
        }

      Note for stable: the bug is very old, but without 9899d11f6544 "ptrace: