1. 06 May, 2014 9 commits
  2. 05 May, 2014 31 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 2080cee4
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) e1000e computes header length incorrectly wrt vlans, fix from Vlad
          Yasevich.
      
       2) ns_capable() check in sock_diag netlink code, from Andrew
          Lutomirski.
      
       3) Fix invalid queue pairs handling in virtio_net, from Amos Kong.
      
       4) Checksum offloading busted in sxgbe driver due to incorrect
          descriptor layout, fix from Byungho An.
      
       5) Fix build failure with SMC_DEBUG set to 2 or larger, from Zi Shen
          Lim.
      
       6) Fix uninitialized A and X registers in BPF interpreter, from Alexei
          Starovoitov.
      
       7) Fix arch dependencies of candence driver.
      
       8) Fix netlink capabilities checking tree-wide, from Eric W Biederman.
      
       9) Don't dump IFLA_VF_PORTS if netlink request didn't ask for it in
          IFLA_EXT_MASK, from David Gibson.
      
      10) IPV6 FIB dump restart doesn't handle table changes that happen
          meanwhile, causing the code to loop forever or emit dups, fix from
          Kumar Sandararajan.
      
      11) Memory leak on VF removal in bnx2x, from Yuval Mintz.
      
      12) Bug fixes for new Altera TSE driver from Vince Bridgers.
      
      13) Fix route lookup key in SCTP, from Xugeng Zhang.
      
      14) Use BH blocking spinlocks in SLIP, as per a similar fix to CAN/SLCAN
          driver.  From Oliver Hartkopp.
      
      15) TCP doesn't bump retransmit counters in some code paths, fix from
          Eric Dumazet.
      
      16) Clamp delayed_ack in tcp_cubic to prevent theoretical divides by
          zero.  Fix from Liu Yu.
      
      17) Fix locking imbalance in error paths of HHF packet scheduler, from
          John Fastabend.
      
      18) Properly reference the transport module when vsock_core_init() runs,
          from Andy King.
      
      19) Fix buffer overflow in cdc_ncm driver, from Bjørn Mork.
      
      20) IP_ECN_decapsulate() doesn't see a correct SKB network header in
          ip_tunnel_rcv(), fix from Ying Cai.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (132 commits)
        net: macb: Fix race between HW and driver
        net: macb: Remove 'unlikely' optimization
        net: macb: Re-enable RX interrupt only when RX is done
        net: macb: Clear interrupt flags
        net: macb: Pass same size to DMA_UNMAP as used for DMA_MAP
        ip_tunnel: Set network header properly for IP_ECN_decapsulate()
        e1000e: Restrict MDIO Slow Mode workaround to relevant parts
        e1000e: Fix issue with link flap on 82579
        e1000e: Expand workaround for 10Mb HD throughput bug
        e1000e: Workaround for dropped packets in Gig/100 speeds on 82579
        net/mlx4_core: Don't issue PCIe speed/width checks for VFs
        net/mlx4_core: Load the Eth driver first
        net/mlx4_core: Fix slave id computation for single port VF
        net/mlx4_core: Adjust port number in qp_attach wrapper when detaching
        net: cdc_ncm: fix buffer overflow
        Altera TSE: ALTERA_TSE should depend on HAS_DMA
        vsock: Make transport the proto owner
        net: sched: lock imbalance in hhf qdisc
        net: mvmdio: Check for a valid interrupt instead of an error
        net phy: Check for aneg completion before setting state to PHY_RUNNING
        ...
      2080cee4
    • Linus Torvalds's avatar
      Merge tag 'usb-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 783e9e8e
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are some small fixes and device ids for 3.15-rc4.
      
        All have been in linux-next just fine"
      
      * tag 'usb-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: Nokia 5300 should be treated as unusual dev
        USB: Nokia 305 should be treated as unusual dev
        fsl-usb: do not test for PHY_CLK_VALID bit on controller version 1.6
        usb: storage: shuttle_usbat: fix discs being detected twice
        usb: qcserial: add a number of Dell devices
        USB: OHCI: fix problem with global suspend on ATI controllers
        usb: gadget: at91-udc: fix irq and iomem resource retrieval
        usb: phy: fsm: change "|" to "||" for condition OTG_STATE_A_WAIT_BCON at statemachine
        usb: phy: fsm: update OTG HNP state transition
      783e9e8e
    • Linus Torvalds's avatar
      Merge tag 'tty-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · df862f62
      Linus Torvalds authored
      Pull tty/serial fixes from Greg KH:
       "Here are some tty and serial driver fixes for things reported
        recently"
      
      * tag 'tty-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: Fix lockless tty buffer race
        Revert "tty: Fix race condition between __tty_buffer_request_room and flush_to_ldisc"
        drivers/tty/hvc: don't free hvc_console_setup after init
        n_tty: Fix n_tty_write crash when echoing in raw mode
        tty: serial: 8250_core.c Bug fix for Exar chips.
      df862f62
    • Linus Torvalds's avatar
      Merge tag 'staging-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · a1e74464
      Linus Torvalds authored
      Pull staging / iio fixes from Greg KH:
       "Here are some small IIO driver fixes for 3.15-rc4 that resolve some
        reported issues"
      
      * tag 'staging-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        iio: adc: Nothing in ADC should be a bool CONFIG
        iio: exynos_adc: use indio_dev->dev structure to handle child nodes
        iio:imu:mpu6050: Fixed segfault in Invensens MPU driver due to null dereference
        staging:iio:ad2s1200 fix missing parenthesis in a for statment.
      a1e74464
    • Linus Torvalds's avatar
      Merge tag 'xtensa-next-20140503' of git://github.com/czankel/xtensa-linux · 03787ff6
      Linus Torvalds authored
      Pull Xtensa fixes from Chris Zankel:
       - Fixes allmodconfig, allnoconfig builds
       - Adds highmem support
       - Enables build-time exception table sorting.
      
      * tag 'xtensa-next-20140503' of git://github.com/czankel/xtensa-linux:
        xtensa: ISS: don't depend on CONFIG_TTY
        xtensa: xt2000: drop redundant sysmem initialization
        xtensa: add support for KC705
        xtensa: xtfpga: introduce SoC I/O bus
        xtensa: add HIGHMEM support
        xtensa: optimize local_flush_tlb_kernel_range
        xtensa: dump sysmem from the bootmem_init
        xtensa: handle memmap kernel option
        xtensa: keep sysmem banks ordered in mem_reserve
        xtensa: keep sysmem banks ordered in add_sysmem_bank
        xtensa: split bootparam and kernel meminfo
        xtensa: enable sorting extable at build time
        xtensa: export __{invalidate,flush}_dcache_range
        xtensa: Export __invalidate_icache_range
      03787ff6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 5575eeb7
      Linus Torvalds authored
      Pull Ceph fixes from Sage Weil:
       "First, there is a critical fix for the new primary-affinity function
        that went into -rc1.
      
        The second batch of patches from Zheng fix a range of problems with
        directory fragmentation, readdir, and a few odds and ends for cephfs"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        ceph: reserve caps for file layout/lock MDS requests
        ceph: avoid releasing caps that are being used
        ceph: clear directory's completeness when creating file
        libceph: fix non-default values check in apply_primary_affinity()
        ceph: use fpos_cmp() to compare dentry positions
        ceph: check directory's completeness before emitting directory entry
      5575eeb7
    • Soren Brinkmann's avatar
      net: macb: Fix race between HW and driver · c8ea5a22
      Soren Brinkmann authored
      
      
      Under "heavy" RX load, the driver cannot handle the descriptors fast
      enough. In detail, when a descriptor is consumed, its used flag is
      cleared and once the RX budget is consumed all descriptors with a
      cleared used flag are prepared to receive more data. Under load though,
      the HW may constantly receive more data and use those descriptors with a
      cleared used flag before they are actually prepared for next usage.
      
      The head and tail pointers into the RX-ring should always be valid and
      we can omit clearing and checking of the used flag.
      
      Signed-off-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c8ea5a22
    • Soren Brinkmann's avatar
      net: macb: Remove 'unlikely' optimization · 504ad98d
      Soren Brinkmann authored
      
      
      Coverage data suggests that the unlikely case of receiving data while
      the receive handler is running may not be that unlikely.
      Coverage data after running iperf for a while:
          91320:  891:	work_done = bp->macbgem_ops.mog_rx(bp, budget);
          91320:  892:	if (work_done < budget) {
           2362:  893:		napi_complete(napi);
              -:  894:
              -:  895:		/* Packets received while interrupts were disabled */
           4724:  896:		status = macb_readl(bp, RSR);
           2362:  897:		if (unlikely(status)) {
            762:  898:			if (bp->caps & MACB_CAPS_ISR_CLEAR_ON_WRITE)
            762:  899:				macb_writel(bp, ISR, MACB_BIT(RCOMP));
              -:  900:			napi_reschedule(napi);
              -:  901:		} else {
           1600:  902:			macb_writel(bp, IER, MACB_RX_INT_FLAGS);
              -:  903:		}
              -:  904:	}
      
      Signed-off-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      504ad98d
    • Soren Brinkmann's avatar
      net: macb: Re-enable RX interrupt only when RX is done · 02f7a34f
      Soren Brinkmann authored
      
      
      When data is received during the driver processing received data the
      NAPI is re-scheduled. In that case the RX interrupt should not be
      re-enabled.
      
      Signed-off-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      02f7a34f
    • Soren Brinkmann's avatar
      net: macb: Clear interrupt flags · 6a027b70
      Soren Brinkmann authored
      
      
      A few interrupt flags were not cleared in the ISR, resulting in a sytem
      trapped in the ISR in cases one of those interrupts occurred. Clear all
      flags to avoid such situations.
      
      Signed-off-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6a027b70
    • Soren Brinkmann's avatar
      net: macb: Pass same size to DMA_UNMAP as used for DMA_MAP · ccd6d0a9
      Soren Brinkmann authored
      Just as commit "net: macb: DMA-unmap full rx-buffer"
      (48330e08
      
      ), pass the size that
      was used for mapping the memory also to the unmap routine to
      avoid warnings from the DMA_API.
      
      Signed-off-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ccd6d0a9
    • Ying Cai's avatar
      ip_tunnel: Set network header properly for IP_ECN_decapsulate() · e96f2e7c
      Ying Cai authored
      In ip_tunnel_rcv(), set skb->network_header to inner IP header
      before IP_ECN_decapsulate().
      
      Without the fix, IP_ECN_decapsulate() takes outer IP header as
      inner IP header, possibly causing error messages or packet drops.
      
      Note that this skb_reset_network_header() call was in this spot when
      the original feature for checking consistency of ECN bits through
      tunnels was added in eccc1bb8 ("tunnel: drop packet if ECN present
      with not-ECT"). It was only removed from this spot in 3d7b46cd
      ("ip_tunnel: push generic protocol handling to ip_tunnel module.").
      
      Fixes: 3d7b46cd
      
       ("ip_tunnel: push generic protocol handling to ip_tunnel module.")
      Reported-by: default avatarNeal Cardwell <ncardwell@google.com>
      Signed-off-by: default avatarYing Cai <ycai@google.com>
      Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
      Acked-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e96f2e7c
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net · 780ce3a2
      David S. Miller authored
      
      
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates
      
      This series contains updates to e1000e only.
      
      David provides four fixes for e1000e, first is a workaround for a hardware
      erratum on 82579 devices which experienced packet loss in gigabit and 100
      speeds when interconnect between the PHY and MAC is exiting K1 power saving
      state.  Second expands the scope of a workaround to include i217 and i218
      parts as well to address over aggressive transmit behavior when connecting
      at 10Mbs half-duplex.  Next is to resolve a reported link flap issue on
      82579 parts which was root caused as an interoperability problem between
      82579 and at least some Broadcom PHYs in the Energy Efficient Ethernet wake
      mechanism.  Lastly, restricts the workaround of putting the PHY into MDIO
      slow mode to access the PHY id to relevant parts since this issue has been
      fixed on the newer hardware.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      780ce3a2
    • David Ertman's avatar
      e1000e: Restrict MDIO Slow Mode workaround to relevant parts · 2c982624
      David Ertman authored
      
      
      It has been determined that the workaround of putting the PHY into MDIO
      slow mode to access the PHY id is not necessary with Lynx Point and newer
      parts.  The issue that necessitated the workaround has been fixed on the
      newer hardware.
      
      We will maintains, as a last ditch attempt, the conversion to MDIO Slow
      Mode in the failure branch when attempting to access the PHY id so as to
      cover all contingencies.
      
      Signed-off-by: default avatarDave Ertman <davidx.m.ertman@intel.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      2c982624
    • David Ertman's avatar
      e1000e: Fix issue with link flap on 82579 · 7142a55c
      David Ertman authored
      
      
      Several customers have reported a link flap issue on 82579. The symptoms
      are random and intermittent link losses when 82579 is connected to specific
      link partners. Issue has been root caused as interoperability problem
      between 82579 and at least some Broadcom PHYs in the Energy Efficient
      Ethernet wake mechanism.
      
      To fix the issue, we are disabling the Phase Locked Loop shutdown in 100M
      Low Power Idle.  This solution will cause an increase of power in 100M EEE
      link. It will cost additional 28mW in this specific mode.
      
      Cc: Lukasz Adamczuk <lukasz.adamczuk@intel.com>
      Signed-off-by: default avatarDave Ertman <davidx.m.ertman@intel.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      7142a55c
    • David Ertman's avatar
      e1000e: Expand workaround for 10Mb HD throughput bug · fbb9ab10
      David Ertman authored
      In commit 772d05c5
      
       "e1000e: slow performance
      between two 82579 connected via 10Mbit hub", a workaround was put into place
      to address the overaggressive transmit behavior of 82579 parts when connecting
      at 10Mbs half-duplex.
      
      This same behavior is seen on i217 and i218 parts as well.  This patch expands
      the original workaround to encompass these parts.
      
      Signed-off-by: default avatarDave Ertman <davidx.m.ertman@intel.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      fbb9ab10
    • David Ertman's avatar
      e1000e: Workaround for dropped packets in Gig/100 speeds on 82579 · 77e61146
      David Ertman authored
      
      
      This is a workaround for a HW erratum on 82579 devices.
      Erratum is #23 in Intel 6 Series Chipset and Intel C200 Series Chipset
      specification Update June 2013.
      
      Problem: 82579 parts experience packet loss in Gig and 100 speeds
      when interconnect between PHY and MAC is exiting K1 power saving state.
      This was previously believed to only affect 1Gig speed, but has been observed
      at 100Mbs also.
      
      Workaround: Disable K1 for 82579 devices at Gig and 100 speeds.
      
      Signed-off-by: default avatarDave Ertman <davidx.m.ertman@intel.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      77e61146
    • David S. Miller's avatar
      Merge branch 'mlx4' · eaff8292
      David S. Miller authored
      Or Gerlitz says:
      
      ====================
      This series contains fixes for 3.15-rc, mostly around SRIOV. The patches by Jack,
      Matan and myself fix few issues related to mlx4 SRIOV support for RoCE and single
      port VFs, and the patch from Eyal eliminates checking PCI caps for VFs which is misleading.
      
      Patches done against the net tree, commit 014f1b20
      
       "net: bonding: Fix format string
      mismatch in bond_sysfs.c"
      
      We'd be happy to get Eyal's patch queued in your -stable list for 3.14.y
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      eaff8292
    • Eyal Perry's avatar
      net/mlx4_core: Don't issue PCIe speed/width checks for VFs · 83d3459a
      Eyal Perry authored
      Carrying out PCI speed/width checks through pcie_get_minimum_link()
      on VFs yield wrong results, so remove them.
      
      Fixes: b912b2f8
      
       ('net/mlx4_core: Warn if device doesn't have enough PCI bandwidth')
      Signed-off-by: default avatarEyal Perry <eyalpe@mellanox.com>
      Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      83d3459a
    • Or Gerlitz's avatar
      net/mlx4_core: Load the Eth driver first · f24f790f
      Or Gerlitz authored
      
      
      When running in SRIOV mode, VM that is assigned with a non-provisioned
      Ethernet VFs get themselves a random mac when the Eth driver starts. In
      this case, if the IB driver startup code that deals with RoCE runs first,
      it will use a zero mac as the source mac for the Para-Virtual CM MADs
      which is buggy. To handle that, we change the order of loading.
      
      Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f24f790f
    • Matan Barak's avatar
      net/mlx4_core: Fix slave id computation for single port VF · 0254bc82
      Matan Barak authored
      The code that deals with computing the slave id based on a given GID
      gave wrong results when the number of single port VFs wasn't the
      same for port 1 vs. port 2 and the relevant VF is single ported on
      port 2. As a result, incoming CM MADs were dispatched to the wrong VF.
      Fixed that and added documentation to clarify the computation steps.
      
      Fixes: 449fc488
      
       ('net/mlx4: Adapt code for N-Port VF')
      Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
      Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0254bc82
    • Jack Morgenstein's avatar
      net/mlx4_core: Adjust port number in qp_attach wrapper when detaching · 531d9014
      Jack Morgenstein authored
      When using single ported VFs and the VF is using port 2, we need
      to adjust the port accordingly (change it from 1 to 2).
      
      Fixes: 449fc488
      
       ('net/mlx4: Adapt code for N-Port VF')
      Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
      Signed-off-by: default avatarJack Morgenstein <jackm@mellanox.com>
      Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      531d9014
    • Bjørn Mork's avatar
      net: cdc_ncm: fix buffer overflow · 9becd707
      Bjørn Mork authored
      Commit 4d619f62 ("net: cdc_ncm: no point in filling up the NTBs
      if we send ZLPs") changed the padding logic for devices with the ZLP
      flag set.  This meant that frames of any size will be sent without
      additional padding, except for the single byte added if the size is
      a multiple of the USB packet size. But if the unpadded size is
      identical to the maximum frame size, and the maximum size is a
      multiplum of the USB packet size, then this one-byte padding will
      overflow the buffer.
      
      Prevent padding if already at maximum frame size, letting usbnet
      transmit a ZLP instead in this case.
      
      Fixes: 4d619f62
      
       ("net: cdc_ncm: no point in filling up the NTBs if we send ZLPs")
      Reported by: Yu-an Shih <yshih@nvidia.com>
      Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9becd707
    • Geert Uytterhoeven's avatar
      Altera TSE: ALTERA_TSE should depend on HAS_DMA · 9d4619c4
      Geert Uytterhoeven authored
      
      
      If NO_DMA=y:
      
      drivers/built-in.o: In function `altera_tse_probe':
      altera_tse_main.c:(.text+0x25ec2e): undefined reference to `dma_set_mask'
      altera_tse_main.c:(.text+0x25ec78): undefined reference to `dma_supported'
      altera_tse_main.c:(.text+0x25ecb6): undefined reference to `dma_supported'
      drivers/built-in.o: In function `sgdma_async_read':
      altera_sgdma.c:(.text+0x25f620): undefined reference to `dma_sync_single_for_cpu'
      drivers/built-in.o: In function `sgdma_uninitialize':
      (.text+0x25f678): undefined reference to `dma_unmap_single'
      drivers/built-in.o: In function `sgdma_uninitialize':
      (.text+0x25f696): undefined reference to `dma_unmap_single'
      drivers/built-in.o: In function `sgdma_initialize':
      (.text+0x25f6f0): undefined reference to `dma_map_single'
      drivers/built-in.o: In function `sgdma_initialize':
      (.text+0x25f702): undefined reference to `dma_mapping_error'
      drivers/built-in.o: In function `sgdma_tx_buffer':
      (.text+0x25f92a): undefined reference to `dma_sync_single_for_cpu'
      drivers/built-in.o: In function `sgdma_rx_status':
      (.text+0x25fa24): undefined reference to `dma_sync_single_for_cpu'
      make[3]: *** [vmlinux] Error 1
      
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: default avatarVince Bridgers <vbridgers2013@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9d4619c4
    • Andy King's avatar
      vsock: Make transport the proto owner · 2c4a336e
      Andy King authored
      
      
      Right now the core vsock module is the owner of the proto family. This
      means there's nothing preventing the transport module from unloading if
      there are open sockets, which results in a panic. Fix that by allowing
      the transport to be the owner, which will refcount it properly.
      
      Includes version bump to 1.0.1.0-k
      
      Passes checkpatch this time, I swear...
      
      Acked-by: default avatarDmitry Torokhov <dtor@vmware.com>
      Signed-off-by: default avatarAndy King <acking@vmware.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2c4a336e
    • David S. Miller's avatar
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · b8dff4e6
      David S. Miller authored
      
      
      John W. Linville says:
      
      ====================
      pull request: wireless 2014-05-01
      
      Please pull the following batch of fixes intended for the 3.15 stream!
      
      For the Bluetooth bits, Gustavo says:
      
      "Some fixes for 3.15. There is a revert for the intel driver, a new
      device id, and two important SSP fixes from Johan."
      
      On top of that...
      
      Ben Hutchings gives us a fix for an unbalanced irq enable in an
      rtl8192cu error path.
      
      Colin Ian King provides an rtlwifi fix for an uninitialized variable.
      
      Felix Fietkau brings a pair of ath9k fixes, one that corrects a
      hardware initialization value and another that removes an (unnecessary)
      flag that was being used in a way that led to a software tx queue
      hang in ath9k.
      
      Gertjan van Wingerde pushes a MAINTAINERS change to remove himself
      from the rt2x00 maintainer team.
      
      Hans de Goede fixes a brcmfmac firmware load hang.
      
      Larry Finger changes rtlwifi to use the correct queue for V0 traffic
      on rtl8192se.
      
      Rajkumar Manoharan corrects a race in ath9k driver initialization.
      
      Stanislaw Gruszka fixes an rt2x00 bug in which disabling beaconing
      once on USB devices led to permanently disabling beaconing for those
      devices.
      
      Tim Harvey provides fixes for a pair of ath9k issues that can lead
      to soft lockups in that driver.
      
      Please let me know if there are problems!
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b8dff4e6
    • Max Filippov's avatar
      xtensa: ISS: don't depend on CONFIG_TTY · 55b441be
      Max Filippov authored
      
      
      Build console support only when CONFIG_TTY is selected.
      This restores ISS as the default platform for allnoconfig builds.
      
      Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
      Signed-off-by: default avatarChris Zankel <chris@zankel.net>
      55b441be
    • Christoph Hellwig's avatar
      fix quoting of Ted's name in MAINTAINERS · 0624bcaa
      Christoph Hellwig authored
      
      
      Unpaired quotes really confuse mutt when copy & pasting it into the To:
      form.
      
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      [ I'm going to remove all silly quotes entirely one day, but that day is
        not today.  So I'll just apply this  - Linus ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0624bcaa
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.15-rc5' of git://git.infradead.org/linux-ubifs · cae1d2ca
      Linus Torvalds authored
      Pull ubifs fixes from Artem Bityutskiy:
       "This includes the following fixes:
      
         - two real bug-fixes from Tanya for the still "experimental" UBI
           fastmap feature
         - a one-liner from Kees which hardens kernel security
         - a small error-path fix, where we forget to free various resources
           in case of failure - spotted by the 'smatch' tool"
      
      * tag 'upstream-3.15-rc5' of git://git.infradead.org/linux-ubifs:
        UBI: avoid workqueue format string leak
        UBI: fix ubi free PEBs count calculation
        UBI: fix error path in __wl_get_peb
        UBIFS: fix remount error path
      cae1d2ca
    • Matthew Daley's avatar
      floppy: don't write kernel-only members to FDRAWCMD ioctl output · 2145e15e
      Matthew Daley authored
      
      
      Do not leak kernel-only floppy_raw_cmd structure members to userspace.
      This includes the linked-list pointer and the pointer to the allocated
      DMA space.
      
      Signed-off-by: default avatarMatthew Daley <mattd@bugfuzz.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2145e15e
    • Matthew Daley's avatar
      floppy: ignore kernel-only members in FDRAWCMD ioctl input · ef87dbe7
      Matthew Daley authored
      
      
      Always clear out these floppy_raw_cmd struct members after copying the
      entire structure from userspace so that the in-kernel version is always
      valid and never left in an interdeterminate state.
      
      Signed-off-by: default avatarMatthew Daley <mattd@bugfuzz.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ef87dbe7