summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh_eth-RPADIR-related-clean-ups'David S. Miller2018-06-262-10/+2
|\
| * sh_eth: remove sh_eth_cpu_data::rpadir_valueSergei Shtylyov2018-06-262-8/+1
| * sh_eth: fix *enum* RPADIR_BITSergei Shtylyov2018-06-261-2/+1
|/
* r8169: reject unsupported WoL optionsHeiner Kallweit2018-06-261-1/+4
* selftests: net: Test headroom handling of ip6_gre devicesPetr Machata2018-06-261-0/+65
* Merge branch 'l2tp-trivial-cleanups'David S. Miller2018-06-264-32/+5
|\
| * l2tp: make l2tp_xmit_core() return voidGuillaume Nault2018-06-261-4/+2
| * l2tp: avoid duplicate l2tp_pernet() callsGuillaume Nault2018-06-261-2/+1
| * l2tp: don't export l2tp_tunnel_closeall()Guillaume Nault2018-06-262-3/+1
| * l2tp: don't export l2tp_session_queue_purge()Guillaume Nault2018-06-262-3/+1
| * l2tp: remove l2tp_tunnel_priv()Guillaume Nault2018-06-261-7/+0
| * l2tp: remove .show from struct l2tp_tunnelGuillaume Nault2018-06-262-6/+0
| * l2tp: remove pppol2tp_session_close()Guillaume Nault2018-06-261-7/+0
|/
* Merge branch 'DPAA-PTP-clock-and-timestamping'David S. Miller2018-06-2626-115/+361
|\
| * dpaa_eth: add the get_ts_info interface for ethtoolYangbo Lu2018-06-261-0/+39
| * dpaa_eth: add support for hardware timestampingYangbo Lu2018-06-262-5/+86
| * fsl/fman: define frame description command UPDYangbo Lu2018-06-261-0/+1
| * fsl/fman_port: support getting timestampYangbo Lu2018-06-262-0/+14
| * fsl/fman: add set_tstamp interfaceYangbo Lu2018-06-268-0/+60
| * arm64: dts: fsl: move ptp timer out of fmanYangbo Lu2018-06-261-6/+8
| * powerpc/mpc85xx: move ptp timer out of fman in dtsYangbo Lu2018-06-265-30/+40
| * dt-binding: ptp_qoriq: add DPAA FMan supportYangbo Lu2018-06-262-27/+13
| * ptp: support DPAA FMan 1588 timer in ptp_qoriqYangbo Lu2018-06-263-46/+98
| * fsl/fman: share the event interruptYangbo Lu2018-06-261-1/+2
|/
* Merge branch 'mlxsw-Support-bridge-router-interfaces-with-non-default-VLAN'David S. Miller2018-06-265-14/+323
|\
| * selftests: forwarding: Test routed bridge interfacePetr Machata2018-06-262-0/+245
| * mlxsw: spectrum_switchdev: Ban PVID change if bridge has a RIFPetr Machata2018-06-261-2/+45
| * mlxsw: spectrum_router: Add mlxsw_sp_rif_fid()Petr Machata2018-06-262-0/+6
| * mlxsw: spectrum_router: Publish mlxsw_sp_rif_find_by_dev()Petr Machata2018-06-262-5/+3
| * mlxsw: spectrum_router: Allocate FID according to PVIDPetr Machata2018-06-261-1/+14
| * mlxsw: spectrum_router: Propagate extack to .fid_get()Petr Machata2018-06-261-6/+10
|/
* tcp: add SNMP counter for zero-window dropsYafang Shao2018-06-263-2/+8
* Merge branch 'NAPI-gro-hash'David S. Miller2018-06-2624-150/+196
|\
| * net: Convert NAPI gro list into a small hash table.David Miller2018-06-262-27/+81
| * net: Convert GRO SKB handling to list_head.David Miller2018-06-2624-141/+133
|/
* Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-06-26251-1069/+2947
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-06-2540-165/+190
| |\
| | * sfc: make function efx_rps_hash_bucket staticColin Ian King2018-06-241-0/+1
| | * strparser: Corrected typo in documentation.Vakul Garg2018-06-241-1/+1
| | * qmi_wwan: add support for the Dell Wireless 5821e moduleAleksander Morgado2018-06-241-0/+1
| | * cxgb4: when disabling dcb set txq dcb priority to 0Ganesh Goudar2018-06-241-1/+1
| | * net_sched: remove a bogus warning in hfscCong Wang2018-06-231-2/+2
| | * Merge branch 'dccp-fixes-around-rx_tstamp_last_feedback'David S. Miller2018-06-231-7/+9
| | |\
| | | * net: dccp: switch rx_tstamp_last_feedback to monotonic clockEric Dumazet2018-06-231-4/+7
| | | * net: dccp: avoid crash in ccid3_hc_rx_send_feedback()Eric Dumazet2018-06-231-3/+2
| | |/
| | * net: Remove depends on HAS_DMA in case of platform dependencyGeert Uytterhoeven2018-06-2312-19/+12
| | * MAINTAINERS: Add file patterns for dsa device tree bindingsGeert Uytterhoeven2018-06-231-0/+1
| | * net: mscc: make sparse happyAntoine Tenart2018-06-231-1/+2
| | * net: mvneta: fix the Rx desc DMA address in the Rx pathAntoine Tenart2018-06-231-1/+1
| | * Documentation: e1000: Fix docs build errorTobin C. Harding2018-06-231-37/+38