summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nfp-ethtool-flash-updates'David S. Miller2017-12-153-17/+110
|\
| * nfp: implement firmware flashingDirk van der Merwe2017-12-153-0/+67
| * nfp: extend NSP infrastructure for configurable timeoutsDirk van der Merwe2017-12-151-17/+43
|/
* Merge branch 'ipvlan-packet-scrub'David S. Miller2017-12-151-6/+2
|\
| * ipvlan: remove excessive packet scrubbingMahesh Bandewar2017-12-151-2/+2
| * Revert "ipvlan: add L2 check for packets arriving via virtual devices"Mahesh Bandewar2017-12-151-4/+0
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2017-12-157-5/+144
|\
| * xfrm: Remove redundant state assignment in xfrm_input()Aviv Heller2017-12-011-1/+0
| * xfrm: Fix xfrm_dev_state_add to fail for unsupported HW SA optionYossef Efraim2017-12-011-1/+1
| * xfrm: Fix xfrm_replay_overflow_offload_esnYossef Efraim2017-12-011-2/+1
| * xfrm: add documentation for xfrm device offload apiShannon Nelson2017-11-302-0/+134
| * net: xfrm: allow clearing socket xfrm policies.Lorenzo Colitti2017-11-302-1/+8
* | net: dsa: bcm_sf2: Update compatible string for 7278B0Florian Fainelli2017-12-152-1/+7
* | Merge branch 'hnx3-vf'David S. Miller2017-12-1519-122/+3132
|\ \
| * | net: hns3: Add mailbox interrupt handling to PF driverSalil Mehta2017-12-152-8/+68
| * | net: hns3: Change PF to add ring-vect binding & resetQ to mailboxSalil Mehta2017-12-153-92/+159
| * | net: hns3: Add mailbox support to PF driverSalil Mehta2017-12-154-1/+309
| * | net: hns3: Unified HNS3 {VF|PF} Ethernet Driver for hip08 SoCSalil Mehta2017-12-159-12/+46
| * | net: hns3: Add HNS3 VF driver to kernel build frameworkSalil Mehta2017-12-153-9/+30
| * | net: hns3: Add HNS3 VF HCL(Hardware Compatibility Layer) SupportSalil Mehta2017-12-152-0/+1653
| * | net: hns3: Add mailbox support to VF driverSalil Mehta2017-12-152-0/+269
| * | net: hns3: Add HNS3 VF IMP(Integrated Management Proc) cmd interfaceSalil Mehta2017-12-152-0/+598
|/ /
* | Merge branch 'dsa-MT7530-vlan'David S. Miller2017-12-154-16/+400
|\ \
| * | net: dsa: mediatek: update MAINTAINERS entry with MediaTek switch driverSean Wang2017-12-151-0/+7
| * | net: dsa: mediatek: combine MediaTek tag with VLAN tagSean Wang2017-12-151-9/+29
| * | net: dsa: mediatek: add VLAN support for MT7530Sean Wang2017-12-152-7/+364
|/ /
* | net: dsa: lan9303: Introduce lan9303_read_waitEgil Hjelmeland2017-12-131-32/+27
* | Merge branch 'hv_netvsc-minor-changes'David S. Miller2017-12-134-68/+47
|\ \
| * | hv_netvsc: empty current transmit aggregation if flow blockedStephen Hemminger2017-12-134-10/+17
| * | hv_netvsc: remove open_cnt reference countStephen Hemminger2017-12-133-10/+4
| * | hv_netvsc: pass netvsc_device to receive callbackStephen Hemminger2017-12-133-14/+8
| * | hv_netvsc: simplify function args in receive status pathStephen Hemminger2017-12-134-19/+7
| * | hv_netvsc: track memory allocation failures in ethtool statsStephen Hemminger2017-12-132-2/+4
| * | hv_netvsc: copy_to_send buf can be voidStephen Hemminger2017-12-131-14/+8
|/ /
* | Merge branch 'phylink-dsa-prep'David S. Miller2017-12-132-9/+52
|\ \
| * | net: phy: phylink: Report MoCA as PORT_BNCFlorian Fainelli2017-12-131-1/+4
| * | net: phy: phylink: Allow setting a custom link state callbackFlorian Fainelli2017-12-132-2/+35
| * | net: phy: phylink: Remove error messageFlorian Fainelli2017-12-131-3/+1
| * | net: phy: phylink: Use PHY device interface if N/AFlorian Fainelli2017-12-131-0/+6
| * | net: phy: phylink: Allow specifying PHY device flagsFlorian Fainelli2017-12-132-3/+6
|/ /
* | tcp: pause Fast Open globally after third consecutive timeoutYuchung Cheng2017-12-135-33/+25
* | net: ethernet: ti: cpdma: correct error handling for chan createIvan Khoronzhuk2017-12-133-6/+19
* | cxgb4: Add support for ethtool i2c dumpArjun Vynipadath2017-12-135-0/+182
* | net: avoid skb_warn_bad_offload on IS_ERRWillem de Bruijn2017-12-131-1/+1
* | net: sk_pacing_shift_update() helperEric Dumazet2017-12-131-0/+11
* | net: bridge: use rhashtable for fdbsNikolay Aleksandrov2017-12-135-219/+211
* | net: phy: marvell10g: remove XGMII as an option for 88x3310Russell King2017-12-131-1/+0
* | Merge branch 'r8169-device-managed'David S. Miller2017-12-133-67/+46
|\ \
| * | r8169: remove netif_napi_del in probe error pathHeiner Kallweit2017-12-131-10/+3
| * | r8169: switch to device-managed functions in probeHeiner Kallweit2017-12-131-60/+20