summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'net-improve-the-process-of-redirect-and-toobig-for-ipv6-tunnels'David S. Miller2017-11-132-50/+34
|\
| * ip6_tunnel: clean up ip4ip6 and ip6ip6's err_handlersXin Long2017-11-131-28/+14
| * ip6_tunnel: process toobig in a better wayXin Long2017-11-131-4/+3
| * ip6_tunnel: add the process for redirect in ip6_tnl_errXin Long2017-11-131-5/+10
| * ip6_gre: process toobig in a better wayXin Long2017-11-131-13/+2
| * ip6_gre: add the process for redirect in ip6gre_errXin Long2017-11-131-0/+5
|/
* forcedeth: remove redudant assignments in xmitZhu Yanjun2017-11-131-8/+20
* Merge tag 'nfc-next-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2017-11-1317-42/+64
|\
| * NFC: Add NFC_CMD_DEACTIVATE_TARGET supportMark Greer2017-11-102-0/+31
| * NFC: digital: Abort cmd when deactivating targetMark Greer2017-11-101-0/+1
| * NFC: Convert timers to use timer_setup()Allen Pais2017-11-064-31/+21
| * NFC: fdp: make struct nci_ops staticColin Ian King2017-11-061-1/+1
| * nfc: s3fwrn5: make array match static constColin Ian King2017-11-061-1/+1
| * nfc: st21nfca: constify i2c_device_idArvind Yadav2017-11-061-1/+1
| * nfc: st-nci: constify i2c_device_idArvind Yadav2017-11-061-1/+1
| * nfc: s3fwrn5: constify i2c_device_idArvind Yadav2017-11-061-1/+1
| * nfc: pn544: constify i2c_device_idArvind Yadav2017-11-061-1/+1
| * nfc: pn533: constify i2c_device_idArvind Yadav2017-11-061-1/+1
| * nfc: nxp-nci: constify i2c_device_idArvind Yadav2017-11-061-1/+1
| * nfc: nfcmrvl: constify i2c_device_idArvind Yadav2017-11-061-1/+1
| * nfc: microread: constify i2c_device_idArvind Yadav2017-11-061-1/+1
| * NFC: fix device-allocation error returnJohan Hovold2017-11-061-1/+1
* | Merge branch 'Openvswitch-meter-action'David S. Miller2017-11-138-31/+772
|\ \
| * | openvswitch: Add meter action supportAndy Zhou2017-11-134-0/+16
| * | openvswitch: Add meter infrastructureAndy Zhou2017-11-135-2/+674
| * | openvswitch: export get_dp() API.Andy Zhou2017-11-132-29/+31
| * | openvswitch: Add meter netlink definitionsAndy Zhou2017-11-131-0/+51
|/ /
* | Merge branch 'dsa-b53-Support-prepended-Broadcom-tags'David S. Miller2017-11-1318-44/+109
|\ \
| * | net: dsa: b53: Support prepended Broadcom tagsFlorian Fainelli2017-11-132-4/+11
| * | net: dsa: Support prepended Broadcom tagFlorian Fainelli2017-11-136-7/+41
| * | net: dsa: tag_brcm: Prepare for supporting prepended tagFlorian Fainelli2017-11-131-11/+34
| * | net: dsa: Pass a port to get_tag_protocol()Florian Fainelli2017-11-1312-31/+32
|/ /
* | net/sched/sch_red.c: work around gcc-4.4.4 anon union initializer issueAndrew Morton2017-11-131-5/+9
* | net/mlx4: Use Kconfig flag to remove support of old gen2 Mellanox devicesSlava Shwartsman2017-11-132-0/+10
* | af_netlink: ensure that NLMSG_DONE never fails in dumpsJason A. Donenfeld2017-11-132-6/+12
* | Merge branch 'netem-add-nsec-scheduling-and-slot-feature'David S. Miller2017-11-132-29/+121
|\ \
| * | netem: support delivering packets in delayed time slotsDave Taht2017-11-132-3/+79
| * | netem: add uapi to express delay and jitter in nanosecondsDave Taht2017-11-132-0/+16
| * | netem: convert to qdisc_watchdog_schedule_nsDave Taht2017-11-131-28/+28
|/ /
* | ipv6: try not to take rtnl_lock in ip6mr_sk_doneFrancesco Ruggeri2017-11-131-0/+4
* | net: realtek: r8169: remove redundant assignment to giga_ctrlColin Ian King2017-11-131-2/+0
* | net: dsa: lan9303: Documentation: Add missing word "Mbps"Egil Hjelmeland2017-11-131-3/+3
* | net: dsa: lan9303: Fix lan9303_alr_del_port()Egil Hjelmeland2017-11-131-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-11-1237-105/+180
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2017-11-1115-34/+68
| |\ \
| | * \ Merge tag 'linux-can-fixes-for-4.14-20171110' of git://git.kernel.org/pub/scm...David S. Miller2017-11-115-9/+25
| | |\ \
| | | * | can: ifi: Fix transmitter delay calculationMarek Vasut2017-11-101-3/+3
| | | * | can: peak: Add support for new PCIe/M2 CAN FD interfacesStephane Grosjean2017-11-101-2/+12
| | | * | can: sun4i: handle overrun in RX FIFOGerhard Bertelsmann2017-11-101-2/+10
| | | * | can: c_can: don't indicate triple sampling support for D_CANRichard Schütz2017-11-102-2/+0