summaryrefslogtreecommitdiff
path: root/include/linux/user.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-09 17:23:43 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-09 17:23:43 (GMT)
commitea44083a7081ac8d9cc84d49525e6041025a7a17 (patch)
treed2ff5f2d3ea257a3386cfcf7073c2bffa6bdce56 /include/linux/user.h
parente15e6119062d20cc96f95c8b345e361589a90244 (diff)
parent4f924b2aa4d3cb30f07e57d6b608838edcbc0d88 (diff)
downloadlinux-fsl-qoriq-ea44083a7081ac8d9cc84d49525e6041025a7a17.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking update from David Miller: 1) Propagate return error values properly in irda, spider_net, sfc, and bfin_mac. From Wei Yongjun. 2) Fix fec driver OOPS on rapid link up/down, from Frank Li. 3) FIX VF resource allocation and chip message payload length errors in be2net driver, from Sathya Perla. 4) Fix inner protocol inspection during GSO from Pravin B Shelar. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: if_cablemodem.h: Add parenthesis around ioctl macros gso: Handle Trans-Ether-Bridging protocol in skb_network_protocol() net: fec: fix kernel oops when plug/unplug cable many times bfin_mac: fix error return code in bfin_mac_probe() sfc: fix return value check in efx_ptp_probe_channel() net/spider_net: fix error return code in spider_net_open() net/irda: fix error return code in bfin_sir_open() net: of_mdio: fix behavior on missing phy device sierra_net: keep status interrupt URB active usbnet: allow status interrupt URB to always be active qmi_wwan/cdc_ether: add device IDs for Dell 5804 (Novatel E371) WWAN card be2net: disable TX in be_close() be2net: fix EQ from getting full while cleaning RX CQ be2net: fix payload_len value for GET_MAC_LIST cmd req be2net: provision VF resources before enabling SR-IOV
Diffstat (limited to 'include/linux/user.h')
0 files changed, 0 insertions, 0 deletions