summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* inet: kill unused skb_free opFlorian Westphal2016-01-065-13/+1Star
* include/uapi/linux/sockios.h: mark SIOCRTMSG unusedxypron.glpk@gmx.de2016-01-051-1/+1
* Merge branch 'mlx5e-tstamp'David S. Miller2016-01-0512-42/+467
|\
| * net/mlx5e: Add PTP Hardware Clock (PHC) supportEran Ben Elisha2016-01-054-1/+106
| * net/mlx5e: Add HW timestamping (TS) supportEran Ben Elisha2016-01-057-2/+279
| * net/mlx5_core: Introduce access function to read internal timerEran Ben Elisha2016-01-054-6/+34
| * net/mlx5e: Do not modify the TX SKBAchiad Shochat2016-01-053-34/+49
|/
* Merge branch 'sctp-transport-rhashtable'David S. Miller2016-01-059-315/+331
|\
| * sctp: remove the local_bh_disable/enable in sctp_endpoint_lookup_assocXin Long2016-01-051-16/+1Star
| * sctp: drop the old assoc hashtable of sctpXin Long2016-01-056-122/+3Star
| * sctp: apply rhashtable api to sctp procfsXin Long2016-01-051-143/+173
| * sctp: apply rhashtable api to send/recv pathXin Long2016-01-054-56/+29Star
| * sctp: add the rhashtable apis for sctp global transport hashtableXin Long2016-01-053-0/+147
|/
* Merge branch 'faster-soreuseport'David S. Miller2016-01-0529-69/+1076
|\
| * soreuseport: BPF selection functional testCraig Gallek2016-01-053-1/+469
| * soreuseport: setsockopt SO_ATTACH_REUSEPORT_[CE]BPFCraig Gallek2016-01-0522-44/+282
| * soreuseport: fast reuseport UDP socket selectionCraig Gallek2016-01-055-35/+141
| * soreuseport: define reuseport groupsCraig Gallek2016-01-054-1/+196
|/
* Merge branch 'mlxsw-fixes'David S. Miller2016-01-052-17/+23
|\
| * mlxsw: spectrum: Change bridge port attributes only when bridgedIdo Schimmel2016-01-052-6/+14
| * mlxsw: spectrum: Set bridge status in appropriate functionsIdo Schimmel2016-01-051-10/+5Star
| * mlxsw: spectrum: Return NOTIFY_BAD on bridge failureIdo Schimmel2016-01-051-3/+7
| * mlxsw: spectrum: Initialize PVID only onceIdo Schimmel2016-01-051-1/+0Star
|/
* chelsio: constify cphy_ops structuresJulia Lawall2016-01-058-14/+14
* fsl/fman: allow modular buildArnd Bergmann2016-01-051-1/+2
* net: make ip6tunnel_xmit definition conditionalArnd Bergmann2016-01-051-0/+2
* Merge tag 'nfc-next-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s...David S. Miller2016-01-0534-181/+1862
|\
| * NFC: nci: memory leak in nci_core_conn_create()Dan Carpenter2015-12-291-3/+3
| * nfc: pn544: Remove i2c client gpio irq configurationChristophe Ricard2015-12-291-34/+1Star
| * nfc: nxp-nci: Remove i2c client gpio irq configurationChristophe Ricard2015-12-291-19/+2Star
| * nfc: microread: Fix header commentChristophe Ricard2015-12-291-1/+1
| * nfc: microread: Remove useless irq fieldChristophe Ricard2015-12-291-2/+0Star
| * nfc: fdp: Move i2c client irq checkingChristophe Ricard2015-12-291-6/+6
| * MAINTAINERS: nfc: Add missing platform_data files referencesChristophe Ricard2015-12-291-0/+5
| * nfc: st21nfca: Add support for HCI event connectivityChristophe Ricard2015-12-291-0/+1
| * nfc: st-nci: Add support for HCI event connectivityChristophe Ricard2015-12-291-1/+1
| * nfc: netlink: HCI event connectivity implementationChristophe Ricard2015-12-294-0/+52
| * NFC: st21nfca: Auto-select core moduleChristophe Ricard2015-12-291-9/+4Star
| * NFC: st-nci: Auto-select core moduleChristophe Ricard2015-12-291-11/+7Star
| * NFC: nci: Fix error check of nci_hci_create_pipe() resultChristophe Ricard2015-12-291-1/+1
| * nfc: st21nfca: Remove useless pr_info in st21nfca_hci_i2c_disableChristophe Ricard2015-12-291-1/+0Star
| * nfc: st21nfca: Code cleanupChristophe Ricard2015-12-292-3/+2Star
| * nfc: st-nci: Code cleanupChristophe Ricard2015-12-293-4/+1Star
| * nfc: st21nfca: Add support for acpi probing for i2c device.Christophe Ricard2015-12-291-1/+50
| * nfc: st-nci: Add support for acpi probing for spi device.Christophe Ricard2015-12-291-0/+52
| * nfc: st-nci: Add support for acpi probing for i2c device.Christophe Ricard2015-12-291-0/+53
| * nfc: st21nfca: Add macro for gpio nameChristophe Ricard2015-12-291-2/+5
| * nfc: st-nci: Add macro for gpio nameChristophe Ricard2015-12-292-4/+9
| * nfc: st21nfca: Group device table togetherChristophe Ricard2015-12-291-7/+6Star
| * nfc: st-nci: Group device table togetherChristophe Ricard2015-12-292-11/+12