Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Mar 4, 2015
  1. Merge tag 'dma-buf-for-4.0-rc3' of git://…

    Pull dma-buf fixes from Sumit Semwal:
     "Minor timeout & other fixes on reservation/fence"
    * tag 'dma-buf-for-4.0-rc3' of git://
      reservation: Remove shadowing local variable 'ret'
      dma-buf/fence: don't wait when specified timeout is zero
      reservation: wait only with non-zero timeout specified (v3)
  2. Merge git://

    Pull KVM fixes from Marcelo Tosatti:
     "KVM bug fixes, including a SVM interrupt injection regression fix,
      MIPS and ARM bug fixes"
    * git://
      KVM: MIPS: Enable after disabling interrupt
      KVM: MIPS: Fix trace event to save PC directly
      KVM: SVM: fix interrupt injection (apic->isr_count always 0)
      KVM: emulate: fix CMPXCHG8B on 32-bit hosts
      KVM: VMX: fix build without CONFIG_SMP
      arm/arm64: KVM: Add exit reaons to kvm_exit event tracing
      ARM: KVM: Fix size check in __coherent_cache_guest_page
  3. Merge tag 'arc-4.0-fixes-1' of git://…

    Pull ARC fixes from Vineet Gupta:
     - Fix for /proc/<pid>/maps "stack" vma annotation
     - sched stats not printing correct sleeping task PC
     - perf not reporting page faults
    * tag 'arc-4.0-fixes-1' of git://
      ARC: Fix thread_saved_pc()
      ARC: Fix KSTK_ESP()
      ARC: perf: Enable generic software events
      ARC: Make arc_unwind_core accessible externally
  4. Merge tag 'powerpc-4.0-2' of git://…

    Pull powerpc fixes from Michael Ellerman:
     - Fix for dynticks.
     - Fix for smpboot bug.
     - Fix for IOMMU group refcounting.
    * tag 'powerpc-4.0-2' of git://
      powerpc/iommu: Remove IOMMU device references via bus notifier
      powerpc/smp: Wait until secondaries are active & online
      powerpc: Re-enable dynticks
  5. Michael Ellerman

    powerpc/iommu: Remove IOMMU device references via bus notifier

    Nishanth Aravamudan authored mpe committed
    After d905c5d ("PPC: POWERNV: move iommu_add_device earlier"), the
    refcnt on the kobject backing the IOMMU group for a PCI device is
    elevated by each call to pci_dma_dev_setup_pSeriesLP() (via
    set_iommu_table_base_and_group). When we go to dlpar a multi-function
    PCI device out:
            iommu_reconfig_notifier ->
                    iommu_free_table ->
    We trip this BUG_ON, because there are still references on the table, so
    it is not freed. Fix this by moving the powernv bus notifier to common
    code and calling it for both powernv and pseries.
    Fixes: d905c5d ("PPC: POWERNV: move iommu_add_device earlier")
    Signed-off-by: Nishanth Aravamudan <>
    Tested-by: Nishanth Aravamudan <>
    Signed-off-by: Michael Ellerman <>
  6. Michael Ellerman

    powerpc/smp: Wait until secondaries are active & online

    mpe authored
    Anton has a busy ppc64le KVM box where guests sometimes hit the infamous
    "kernel BUG at kernel/smpboot.c:134!" issue during boot:
      BUG_ON(td->cpu != smp_processor_id());
    Basically a per CPU hotplug thread scheduled on the wrong CPU. The oops
    output confirms it:
      CPU: 0
      Comm: watchdog/130
    The problem is that we aren't ensuring the CPU active bit is set for the
    secondary before allowing the master to continue on. The master unparks
    the secondary CPU's kthreads and the scheduler looks for a CPU to run
    on. It calls select_task_rq() and realises the suggested CPU is not in
    the cpus_allowed mask. It then ends up in select_fallback_rq(), and
    since the active bit isnt't set we choose some other CPU to run on.
    This seems to have been introduced by 6acbfb9 "sched: Fix hotplug
    vs. set_cpus_allowed_ptr()", which changed from setting active before
    online to setting active after online. However that was in turn fixing a
    bug where other code assumed an active CPU was also online, so we can't
    just revert that fix.
    The simplest fix is just to spin waiting for both active & online to be
    set. We already have a barrier prior to set_cpu_online() (which also
    sets active), to ensure all other setup is completed before online &
    active are set.
    Fixes: 6acbfb9 ("sched: Fix hotplug vs. set_cpus_allowed_ptr()")
    Signed-off-by: Michael Ellerman <>
    Signed-off-by: Anton Blanchard <>
    Signed-off-by: Michael Ellerman <>
Commits on Mar 3, 2015
  1. Merge branch 'for-4.0' of git://

    Pull nfsd fixes from Bruce Fields:
     "Three miscellaneous bugfixes, most importantly the clp->cl_revoked
      bug, which we've seen several reports of people hitting"
    * 'for-4.0' of git://
      sunrpc: integer underflow in rsc_parse()
      nfsd: fix clp->cl_revoked list deletion causing softlock in nfsd
      svcrpc: fix memory leak in gssp_accept_sec_context_upcall
  2. Merge git://

    Pull networking fixes from David Miller:
     1) If an IPVS tunnel is created with a mixed-family destination
        address, it cannot be removed.  Fix from Alexey Andriyanov.
     2) Fix module refcount underflow in netfilter's nft_compat, from Pablo
        Neira Ayuso.
     3) Generic statistics infrastructure can reference variables sitting on
        a released function stack, therefore use dynamic allocation always.
        Fix from Ignacy Gawędzki.
     4) skb_copy_bits() return value test is inverted in ip_check_defrag().
     5) Fix network namespace exit in openvswitch, we have to release all of
        the per-net vports.  From Pravin B Shelar.
     6) Fix signedness bug in CAIF's cfpkt_iterate(), from Dan Carpenter.
     7) Fix rhashtable grow/shrink behavior, only expand during inserts and
        shrink during deletes.  From Daniel Borkmann.
     8) Netdevice names with semicolons should never be allowed, because
        they serve as a separator.  From Matthew Thode.
     9) Use {,__}set_current_state() where appropriate, from Fabian
    10) Revert byte queue limits support in r8169 driver, it's causing
        regressions we can't figure out.
    11) tcp_should_expand_sndbuf() erroneously uses tp->packets_out to
        measure packets in flight, properly use tcp_packets_in_flight()
        instead.  From Neal Cardwell.
    12) Fix accidental removal of support for bluetooth in CSR based Intel
        wireless cards.  From Marcel Holtmann.
    13) We accidently added a behavioral change between native and compat
        tasks, wrt testing the MSG_CMSG_COMPAT bit.  Just ignore it if the
        user happened to set it in a native binary as that was always the
        behavior we had.  From Catalin Marinas.
    14) Check genlmsg_unicast() return valud in hwsim netlink tx frame
        handling, from Bob Copeland.
    15) Fix stale ->radar_required setting in mac80211 that can prevent
        starting new scans, from Eliad Peller.
    16) Fix memory leak in nl80211 monitor, from Johannes Berg.
    17) Fix race in TX index handling in xen-netback, from David Vrabel.
    18) Don't enable interrupts in amx-xgbe driver until all software et al.
        state is ready for the interrupt handler to run.  From Thomas
    19) Add missing netlink_ns_capable() checks to rtnl_newlink(), from Eric
        W Biederman.
    20) The amount of header space needed in macvtap was not calculated
        properly, fix it otherwise we splat past the beginning of the
        packet.  From Eric Dumazet.
    21) Fix bcmgenet TCP TX perf regression, from Jaedon Shin.
    22) Don't raw initialize or mod timers, use setup_timer() and
        mod_timer() instead.  From Vaishali Thakkar.
    23) Fix software maintained statistics in bcmgenet and systemport
        drivers, from Florian Fainelli.
    24) DMA descriptor updates in sh_eth need proper memory barriers, from
        Ben Hutchings.
    25) Don't do UDP Fragmentation Offload on RAW sockets, from Michal
    26) Openvswitch's non-masked set actions aren't constructed properly
        into netlink messages, fix from Joe Stringer.
    * git:// (116 commits)
      openvswitch: Fix serialization of non-masked set actions.
      gianfar: Reduce logging noise seen due to phy polling if link is down
      ibmveth: Add function to enable live MAC address changes
      net: bridge: add compile-time assert for cb struct size
      udp: only allow UFO for packets from SOCK_DGRAM sockets
      sh_eth: Really fix padding of short frames on TX
      Revert "sh_eth: Enable Rx descriptor word 0 shift for r8a7790"
      sh_eth: Fix RX recovery on R-Car in case of RX ring underrun
      sh_eth: Ensure proper ordering of descriptor active bit write/read
      net/mlx4_en: Disbale GRO for incoming loopback/selftest packets
      net/mlx4_core: Fix wrong mask and error flow for the update-qp command
      net: systemport: fix software maintained statistics
      net: bcmgenet: fix software maintained statistics
      rxrpc: don't multiply with HZ twice
      rxrpc: terminate retrans loop when sending of skb fails
      net/hsr: Fix NULL pointer dereference and refcnt bugs when deleting a HSR interface.
      net: pasemi: Use setup_timer and mod_timer
      net: stmmac: Use setup_timer and mod_timer
      net: 8390: axnet_cs: Use setup_timer and mod_timer
      net: 8390: pcnet_cs: Use setup_timer and mod_timer
  3. Joe Stringer davem330

    openvswitch: Fix serialization of non-masked set actions.

    joestringer authored davem330 committed
    Set actions consist of a regular OVS_KEY_ATTR_* attribute nested inside
    of a OVS_ACTION_ATTR_SET action attribute. When converting masked actions
    back to regular set actions, the inner attribute length was not changed,
    ie, double the length being serialized. This patch fixes the bug.
    Fixes: 83d2b9b ("net: openvswitch: Support masked set actions.")
    Signed-off-by: Joe Stringer <>
    Acked-by: Jarno Rajahalme <>
    Signed-off-by: David S. Miller <>
  4. Guenter Roeck davem330

    gianfar: Reduce logging noise seen due to phy polling if link is down

    groeck authored davem330 committed
    Commit 6ce29b0 ("gianfar: Avoid unnecessary reg accesses in adjust_link()")
    eliminates unnecessary calls to adjust_link for phy devices which don't support
    interrupts and need polling. As part of that work, the 'new_state' local flag,
    which was used to reduce logging noise on the console, was eliminated.
    Unfortunately, that means that a 'Link is Down' log message will now be
    issued continuously if a link is configured as UP, the link state is down,
    and the associated phy requires polling. This occurs because priv->oldduplex
    is -1 in this case, which always differs from phydev->duplex. In addition,
    phydev->speed may also differ from priv->oldspeed.  gfar_update_link_state()
    is therefore called each time a phy is polled, even if the link state did not
    Cc: Claudiu Manoil <>
    Signed-off-by: Guenter Roeck <>
    Reviewed-by: Claudiu Manoil <>
    Signed-off-by: David S. Miller <>
  5. Tom Falcon davem330

    ibmveth: Add function to enable live MAC address changes

    tlfalcon authored davem330 committed
    Add a function that will enable changing the MAC address
    of an ibmveth interface while it is still running.
    Signed-off-by: Thomas Falcon <>
    Reviewed-by: Jiri Pirko <>
    Signed-off-by: David S. Miller <>
  6. davem330

    net: bridge: add compile-time assert for cb struct size

    Florian Westphal authored davem330 committed
    make build fail if structure no longer fits into ->cb storage.
    Signed-off-by: Florian Westphal <>
    Signed-off-by: David S. Miller <>
  7. Linux 4.0-rc2

  8. Daniel Vetter

    drm/i915: Fix modeset state confusion in the load detect code

    danvet authored committed
    This is a tricky story of the new atomic state handling and the legacy
    code fighting over each another. The bug at hand is an underrun of the
    framebuffer reference with subsequent hilarity caused by the load
    detect code. Which is peculiar since the the exact same code works
    fine as the implementation of the legacy setcrtc ioctl.
    Let's look at the ingredients:
    - Currently our code is a crazy mix of legacy modeset interfaces to
      set the parameters and half-baked atomic state tracking underneath.
      While this transition is going we're using the transitional plane
      helpers to update the atomic side (drm_plane_helper_disable/update
      and friends), i.e. plane->state->fb. Since the state structure owns
      the fb those functions take care of that themselves.
      The legacy state (specifically crtc->primary->fb) is still managed
      by the old code (and mostly by the drm core), with the fb reference
      counting done by callers (core drm for the ioctl or the i915 load
      detect code). The relevant commit is
      commit ea2c67b
      Author: Matt Roper <>
      Date:   Tue Dec 23 10:41:52 2014 -0800
          drm/i915: Move to atomic plane helpers (v9)
    - drm_plane_helper_disable has special code to handle multiple calls
      in a row - it checks plane->crtc == NULL and bails out. This is to
      match the proper atomic implementation which needs the crtc to get
      at the implied locking context atomic updates always need. See
      commit acf24a3
      Author: Daniel Vetter <>
      Date:   Tue Jul 29 15:33:05 2014 +0200
          drm/plane-helper: transitional atomic plane helpers
    - The universal plane code split out the implicit primary plane from
      the CRTC into it's own full-blown drm_plane object. As part of that
      the setcrtc ioctl (which updated both the crtc mode and primary
      plane) learned to set crtc->primary->crtc on modeset to make sure
      the plane->crtc assignments statate up to date in
      commit e13161a
      Author: Matt Roper <>
      Date:   Tue Apr 1 15:22:38 2014 -0700
          drm: Add drm_crtc_init_with_planes() (v2)
      Unfortunately we've forgotten to update the load detect code. Which
      wasn't a problem since the load detect modeset is temporary and
      always undone before we drop the locks.
    - Finally there is a organically grown history (i.e. don't ask) around
      who sets the legacy plane->fb for the various driver entry points.
      Originally updating that was the drivers duty, but for almost all
      places we've moved that (plus updating the refcounts) into the core.
      Again the exception is the load detect code.
    Taking all together the following happens:
    - The load detect code doesn't set crtc->primary->crtc. This is only
      really an issue on crtcs never before used or when userspace
      explicitly disabled the primary plane.
    - The plane helper glue code short-circuits because of that and leaves
      a non-NULL fb behind in plane->state->fb and plane->fb. The state
      fb isn't a real problem (it's properly refcounted on its own), it's
      just the canary.
    - Load detect code drops the reference for that fb, but doesn't set
      plane->fb = NULL. This is ok since it's still living in that old
      world where drivers had to clear the pointer but the core/callers
      handled the refcounting.
    - On the next modeset the drm core notices plane->fb and takes care of
      refcounting it properly by doing another unref. This drops the
      refcount to zero, leaving state->plane now pointing at freed memory.
    - intel_plane_duplicate_state still assume it owns a reference to that
      very state->fb and bad things start to happen.
    Fix this all by applying the same duct-tape as for the legacy setcrtc
    ioctl code and set crtc->primary->crtc properly.
    Cc: Matt Roper <>
    Cc: Paul Bolle <>
    Cc: Rob Clark <>
    Cc: Paulo Zanoni <>
    Cc: Sean Paul <>
    Cc: Matt Roper <>
    Reported-and-tested-by: Linus Torvalds <>
    Reported-by: Paul Bolle <>
    Signed-off-by: Daniel Vetter <>
    Signed-off-by: Linus Torvalds <>
  9. Michal Kubeček davem330

    udp: only allow UFO for packets from SOCK_DGRAM sockets

    mkubecek authored davem330 committed
    If an over-MTU UDP datagram is sent through a SOCK_RAW socket to a
    UFO-capable device, ip_ufo_append_data() sets skb->ip_summed to
    CHECKSUM_PARTIAL unconditionally as all GSO code assumes transport layer
    checksum is to be computed on segmentation. However, in this case,
    skb->csum_start and skb->csum_offset are never set as raw socket
    transmit path bypasses udp_send_skb() where they are usually set. As a
    result, driver may access invalid memory when trying to calculate the
    checksum and store the result (as observed in virtio_net driver).
    Moreover, the very idea of modifying the userspace provided UDP header
    is IMHO against raw socket semantics (I wasn't able to find a document
    clearly stating this or the opposite, though). And while allowing
    CHECKSUM_NONE in the UFO case would be more efficient, it would be a bit
    too intrusive change just to handle a corner case like this. Therefore
    disallowing UFO for packets from SOCK_DGRAM seems to be the best option.
    Signed-off-by: Michal Kubecek <>
    Signed-off-by: David S. Miller <>
  10. davem330

    Merge branch 'sh_eth'

    davem330 authored
    Ben Hutchings says:
    Fixes for sh_eth #4 v2
    I'm continuing review and testing of Ethernet support on the R-Car H2
    chip, with help from a colleague.  This series fixes a few more issues.
    These are not tested on any of the other supported chips.
    v2: Add note that the revert is not a pure revert.
    Signed-off-by: David S. Miller <>
  11. davem330

    sh_eth: Really fix padding of short frames on TX

    Ben Hutchings authored davem330 committed
    My previous fix to clear padding of short frames used skb->len as the
    DMA length, assuming that skb_padto() extended skb->len to include the
    padding.  That isn't the case; we need to use skb_put_padto() instead.
    (This wasn't immediately obvious because software padding isn't
    actually needed on the R-Car H2.  We could make it conditional on
    which chip is being driven, but it's probably not worth the effort.)
    Reported-by: "Violeta Menéndez González" <>
    Fixes: 612a17a54b50 ("sh_eth: Fix padding of short frames on TX")
    Signed-off-by: Ben Hutchings <>
    Signed-off-by: David S. Miller <>
  12. davem330

    Revert "sh_eth: Enable Rx descriptor word 0 shift for r8a7790"

    Ben Hutchings authored davem330 committed
    This reverts commit fd9af07.
    The hardware manual states that the frame error and multicast bits are
    copied to bits 9:0 of RD0, not bits 25:16.  I've tested that this is
    true for RFS1 (CRC error), RFS3 (frame too short), RFS4 (frame too
    long) and RFS8 (multicast).
    Also adjust a comment to agree with this.
    Signed-off-by: Ben Hutchings <>
    Signed-off-by: David S. Miller <>
  13. davem330

    sh_eth: Fix RX recovery on R-Car in case of RX ring underrun

    Ben Hutchings authored davem330 committed
    In case of RX ring underrun (RDE), we attempt to reset the software
    descriptor pointers (dirty_rx and cur_rx) to match where the hardware
    will read the next descriptor from, as that might not be the first
    dirty descriptor.  This relies on reading RDFAR, but that register
    doesn't exist on all supported chips - specifically, not on the R-Car
    chips.  This will result in unpredictable behaviour on those chips
    after an RDE.
    Make this pointer reset conditional and assume that it isn't needed on
    the R-Car chips.  This fix also assumes that RDFAR is never exposed at
    offset 0 in the memory map - this is currently true, and a subsequent
    commit will fix the ambiguity between offset 0 and no-offset in the
    register offset maps.
    Fixes: 79fba9f ("net: sh_eth: fix the rxdesc pointer when rx ...")
    Signed-off-by: Ben Hutchings <>
    Signed-off-by: David S. Miller <>
  14. davem330

    sh_eth: Ensure proper ordering of descriptor active bit write/read

    Ben Hutchings authored davem330 committed
    When submitting a DMA descriptor, the active bit must be written last.
    When reading a completed DMA descriptor, the active bit must be read
    Add memory barriers to ensure that this ordering is maintained.
    Signed-off-by: Ben Hutchings <>
    Signed-off-by: David S. Miller <>
Commits on Mar 2, 2015
  1. Tapasweni Pathak

    KVM: MIPS: Enable after disabling interrupt

    tapasweni-pathak authored Marcelo Tosatti committed
    Enable disabled interrupt, on unsuccessful operation.
    Found by Coccinelle.
    Signed-off-by: Tapasweni Pathak <>
    Acked-by: Julia Lawall <>
    Reviewed-by: James Hogan <>
    Signed-off-by: Marcelo Tosatti <>
  2. James Hogan

    KVM: MIPS: Fix trace event to save PC directly

    jahogan authored Marcelo Tosatti committed
    Currently the guest exit trace event saves the VCPU pointer to the
    structure, and the guest PC is retrieved by dereferencing it when the
    event is printed rather than directly from the trace record. This isn't
    safe as the printing may occur long afterwards, after the PC has changed
    and potentially after the VCPU has been freed. Usually this results in
    the same (wrong) PC being printed for multiple trace events. It also
    isn't portable as userland has no way to access the VCPU data structure
    when interpreting the trace record itself.
    Lets save the actual PC in the structure so that the correct value is
    accessible later.
    Fixes: 669e846 ("KVM/MIPS32: MIPS arch specific APIs for KVM")
    Signed-off-by: James Hogan <>
    Cc: Paolo Bonzini <>
    Cc: Ralf Baechle <>
    Cc: Marcelo Tosatti <>
    Cc: Gleb Natapov <>
    Cc: Steven Rostedt <>
    Cc: Ingo Molnar <>
    Cc: <> # v3.10+
    Acked-by: Steven Rostedt <>
    Signed-off-by: Marcelo Tosatti <>
  3. Merge tag 'gpio-v4.0-2' of git://…

    Pull GPIO fixes from Linus Walleij:
     "Two GPIO fixes:
       - Fix a translation problem in of_get_named_gpiod_flags()
       - Fix a long standing container_of() mistake in the TPS65912 driver"
    * tag 'gpio-v4.0-2' of git://
      gpio: tps65912: fix wrong container_of arguments
      gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node
  4. Merge branch 'fixes-for-4.0-rc2' of git://…

    Pull thermal management fixes from Eduardo Valentin:
       - Several fixes in tmon tool.
       - Fixes in intel int340x for _ART and _TRT tables.
       - Add id for Avoton SoC into powerclamp driver.
       - Fixes in RCAR thermal driver to remove race conditions and fix fail
       - Fixes in TI thermal driver: removal of unnecessary code and build
         fix if !CONFIG_PM_SLEEP
       - Cleanups in exynos thermal driver
       - Add stubs for include/linux/thermal.h.  Now drivers using thermal
         calls but that also work without CONFIG_THERMAL will be able to
         compile for systems that don't care about thermal.
      Note: I am sending this pull on Rui's behalf while he fixes issues in
      his Linux box"
    * 'fixes-for-4.0-rc2' of git://
      thermal: int340x_thermal: Ignore missing _ART, _TRT tables
      thermal/intel_powerclamp: add id for Avoton SoC
      tools/thermal: tmon: silence 'set but not used' warnings
      tools/thermal: tmon: use pkg-config to determine library dependencies
      tools/thermal: tmon: support cross-compiling
      tools/thermal: tmon: add .gitignore
      tools/thermal: tmon: fixup tui windowing calculations
      tools/thermal: tmon: tui: don't hard-code dialog window size assumptions
      tools/thermal: tmon: add min/max macros
      tools/thermal: tmon: add --target-temp parameter
      thermal: exynos: Clean-up code to use oneline entry for exynos compatible table
      thermal: rcar: Make error and remove paths symmetrical with init
      thermal: rcar: Fix race condition between init and interrupt
      thermal: Introduce dummy functions when thermal is not defined
      ti-soc-thermal: Delete an unnecessary check before the function call "cpufreq_cooling_unregister"
      thermal: ti-soc-thermal: bandgap: Fix build warning if !CONFIG_PM_SLEEP
  5. KVM: SVM: fix interrupt injection (apic->isr_count always 0)

    Radim Krčmář authored Marcelo Tosatti committed
    In commit b4eef9b, we started to use hwapic_isr_update() != NULL
    instead of kvm_apic_vid_enabled(vcpu->kvm).  This didn't work because
    SVM had it defined and "apicv" path in apic_{set,clear}_isr() does not
    change apic->isr_count, because it should always be 1.  The initial
    value of apic->isr_count was based on kvm_apic_vid_enabled(vcpu->kvm),
    which is always 0 for SVM, so KVM could have injected interrupts when it
    Fix it by implicitly setting SVM's hwapic_isr_update to NULL and make the
    initial isr_count depend on hwapic_isr_update() for good measure.
    Fixes: b4eef9b ("kvm: x86: vmx: NULL out hwapic_isr_update() in case of !enable_apicv")
    Reported-and-tested-by: Borislav Petkov <>
    Signed-off-by: Radim Krčmář <>
    Signed-off-by: Marcelo Tosatti <>
  6. Merge tag 'md/4.0-fixes' of git://

    Pull md fixes from Neil Brown:
     "Three md fixes:
       - fix a read-balance problem that was reported 2 years ago, but that
         I never noticed the report :-(
       - fix for rare RAID6 problem causing incorrect bitmap updates when
         two devices fail.
       - add __ATTR_PREALLOC annotation now that it is possible"
    * tag 'md/4.0-fixes' of git://
      md: mark some attributes as pre-alloc
      raid5: check faulty flag for array status during recovery.
      md/raid1: fix read balance when a drive is write-mostly.
  7. Merge tag 'metag-fixes-v4.0-1' of git://…

    Pull arch/metag fix from James Hogan:
     "This is just a single patch to fix the KSTK_EIP() and KSTK_ESP()
      macros for metag which have always been erronously returning the PC
      and stack pointer of the task's kernel context rather than from its
      user context saved at entry from userland into the kernel, which
      affects the contents of /proc/<pid>/maps and /proc/<pid>/stat"
    * tag 'metag-fixes-v4.0-1' of git://
      metag: Fix KSTK_EIP() and KSTK_ESP() macros
  8. davem330

    Merge branch 'mlx4'

    davem330 authored
    Or Gerlitz says:
    Mellanox driver fixes
    Two small fixes, please apply to net.
    Both patches should go to 3.19.y too.
    Signed-off-by: David S. Miller <>
  9. davem330

    net/mlx4_en: Disbale GRO for incoming loopback/selftest packets

    Ido Shamay authored davem330 committed
    Packets which are sent from the selftest (ethtool) flow,
    should not be passed to GRO stack but rather dropped by
    the driver after validation. To achieve that, we disable
    GRO for the duration of the selftest.
    Fixes: dd65bea ("net/mlx4_en: Extend usage of napi_gro_frags")
    Reported-by: Carol Soto <>
    Signed-off-by: Ido Shamay <>
    Signed-off-by: Or Gerlitz <>
    Signed-off-by: David S. Miller <>
  10. davem330

    net/mlx4_core: Fix wrong mask and error flow for the update-qp command

    Or Gerlitz authored davem330 committed
    The bit mask for currently supported driver features (MLX4_UPDATE_QP_SUPPORTED_ATTRS)
    of the update-qp command was defined twice (using enum value and pre-processor
    define directive) and wrong.
    The return value of the call to mlx4_update_qp() from within the SRIOV
    resource-tracker was wrongly voided down.
    Fix both issues.
    issue: none
    Fixes: 09e05c3 ('net/mlx4: Set vlan stripping policy by the right command')
    Fixes: ce8d9e0 ('net/mlx4_core: Add UPDATE_QP SRIOV wrapper support')
    Signed-off-by: Matan Barak <>
    Signed-off-by: Or Gerlitz <>
    Signed-off-by: David S. Miller <>
Commits on Mar 1, 2015
  1. Merge branch 'x86-urgent-for-linus' of git://…

    Pull x86 fixes from Ingo Molnar:
     "A CR4-shadow 32-bit init fix, plus two typo fixes"
    * 'x86-urgent-for-linus' of git://
      x86: Init per-cpu shadow copy of CR4 on 32-bit CPUs too
      x86/platform/intel-mid: Fix trivial printk message typo in intel_mid_arch_setup()
      x86/cpu/intel: Fix trivial typo in intel_tlb_table[]
  2. Merge branch 'timers-urgent-for-linus' of git://…

    Pull timer fixes from Ingo Molnar:
     "Three clockevents/clocksource driver fixes"
    * 'timers-urgent-for-linus' of git://
      clocksource: pxa: Fix section mismatch
      clocksource: mtk: Fix race conditions in probe code
      clockevents: asm9260: Fix compilation error with sparc/sparc64 allyesconfig
  3. Merge branch 'perf-urgent-for-linus' of git://…

    Pull perf fixes from Ingo Molnar:
     "Two kprobes fixes and a handful of tooling fixes"
    * 'perf-urgent-for-linus' of git://
      perf tools: Make sparc64 arch point to sparc
      perf symbols: Define EM_AARCH64 for older OSes
      perf top: Fix SIGBUS on sparc64
      perf tools: Fix probing for PERF_FLAG_FD_CLOEXEC flag
      perf tools: Fix pthread_attr_setaffinity_np build error
      perf tools: Define _GNU_SOURCE on pthread_attr_setaffinity_np feature check
      perf bench: Fix order of arguments to memcpy_alloc_mem
      kprobes/x86: Check for invalid ftrace location in __recover_probed_insn()
      kprobes/x86: Use 5-byte NOP when the code might be modified by ftrace
  4. Merge branch 'locking-urgent-for-linus' of git://…

    Pull locking fix from Ingo Molnar:
     "An rtmutex deadlock path fixlet"
    * 'locking-urgent-for-linus' of git://
      locking/rtmutex: Set state back to running on error
  5. davem330

    Merge branch 'bcmgenet_systemport_stats'

    davem330 authored
    Florian Fainelli says:
    net: bcmgenet and systemport statistics fixes
    This two patches fix a similar problem in the GENET and SYSTEMPORT drivers
    for software maintained statistics used to track DMA mapping and SKB
    re-allocation failures.
    Signed-off-by: David S. Miller <>
Something went wrong with that request. Please try again.