linux-stable/drivers/infiniband/hw
Linus Torvalds 388f997620 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
  ...
2015-04-17 16:31:08 -04:00
..
amso1100 IB/core: Replace ib_umem's offset field with a full address 2014-12-15 18:13:35 -08:00
cxgb3 RDMA/cxgb3: Remove a couple unneeded conditions 2014-05-28 10:04:00 -07:00
cxgb4 cxgb4: drop __GFP_NOFAIL allocation 2015-04-16 12:03:01 -04:00
ehca IB/core: Replace ib_umem's offset field with a full address 2014-12-15 18:13:35 -08:00
ipath infinibad: weird APIs switched to ->write_iter() 2015-04-11 22:29:42 -04:00
mlx4 net/mlx4: Add SET_PORT opcode modifiers enumeration 2015-04-02 16:25:03 -04:00
mlx5 net/mlx5_core: Extend struct mlx5_interface to support multiple protocols 2015-04-02 16:33:43 -04:00
mthca IB/mad: add new ioctl to ABI to support new registration options 2014-08-10 20:36:00 -07:00
nes net: rename vlan_tx_* helpers since "tx" is misleading there 2015-01-13 17:51:08 -05:00
ocrdma RDMA/ocrdma: Fix off by one in ocrdma_query_gid() 2015-02-18 08:31:06 -08:00
qib infinibad: weird APIs switched to ->write_iter() 2015-04-11 22:29:42 -04:00
usnic IOMMU Updates for Linux v3.18 2014-10-15 07:23:49 +02:00
Makefile IB: Allow build of hw/ and ulp/ subdirectories independently 2014-06-02 14:51:12 -07:00