summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: sched: further simplify handle_ingDaniel Borkmann2015-05-113-61/+31
* net: sched: consolidate handle_ing and ing_filterDaniel Borkmann2015-05-111-30/+16
* test: bpf: extend "load 64-bit immediate" testcaseXi Wang2015-05-111-1/+2
* Merge branch 'bonding_netlink_lacp'David S. Miller2015-05-1110-9/+328
|\
| * bonding: add netlink support for sys prio, actor sys mac, and port keyAndy Gospodarek2015-05-113-9/+74
| * bonding: Implement user key part of port_key in an AD system.Mahesh Bandewar2015-05-117-7/+123
| * bonding: Allow userspace to set actors' macaddr in an AD-system.Mahesh Bandewar2015-05-118-1/+70
| * bonding: Allow userspace to set actors' system_priority in AD systemMahesh Bandewar2015-05-118-2/+71
|/
* Merge branch 'kernel_socket_netns'David S. Miller2015-05-1172-238/+166
|\
| * net: kill sk_change_net and sk_release_kernelEric W. Biederman2015-05-112-36/+0
| * netlink: Create kernel netlink sockets in the proper network namespaceEric W. Biederman2015-05-111-8/+6
| * net: Modify sk_alloc to not reference count the netns of kernel sockets.Eric W. Biederman2015-05-118-45/+30
| * net: Pass kern from net_proto_family.create to sk_allocEric W. Biederman2015-05-1159-108/+109
| * net: Add a struct net parameter to sock_create_kernEric W. Biederman2015-05-1113-26/+26
| * tun: Utilize the normal socket network namespace refcounting.Eric W. Biederman2015-05-113-24/+4
|/
* codel: add ce_threshold attributeEric Dumazet2015-05-114-4/+42
* ethernet: qualcomm: use spi instead of spi_deviceVarka Bhadram2015-05-101-23/+23
* Merge branch 'pktgen-next'David S. Miller2015-05-102-5/+89
|\
| * pktgen: introduce xmit_mode '<start_xmit|netif_receive>'Alexei Starovoitov2015-05-102-5/+84
| * pktgen: adjust flag NO_TIMESTAMP to be more pktgen compliantJesper Dangaard Brouer2015-05-102-0/+5
|/
* Merge branch 'netns-scalability'David S. Miller2015-05-107-82/+170
|\
| * netlink: allow to listen "all" netnsNicolas Dichtel2015-05-105-6/+61
| * netlink: rename private flags and statesNicolas Dichtel2015-05-101-29/+30
| * netns: use a spin_lock to protect nsid managementNicolas Dichtel2015-05-101-13/+44
| * netns: notify new nsid outside __peernet2id()Nicolas Dichtel2015-05-101-14/+27
| * netns: rename peernet2id() to peernet2id_alloc()Nicolas Dichtel2015-05-104-5/+5
| * netns: always provide the id to rtnl_net_fill()Nicolas Dichtel2015-05-101-20/+11
| * netns: returns always an id in __peernet2id()Nicolas Dichtel2015-05-101-11/+8
|/
* Merge tag 'linux-can-next-for-4.2-20150506' of git://git.kernel.org/pub/scm/l...David S. Miller2015-05-107-59/+159
|\
| * can: flexcan: replace open coded "mailbox code" by proper defineMarc Kleine-Budde2015-05-061-2/+1
| * can: flexcan: rename struct flexcan_regs::crl2 -> ctrl2Marc Kleine-Budde2015-05-061-12/+12
| * can: flexcan: add documentation about mailbox organizationMarc Kleine-Budde2015-05-061-0/+10
| * can: flexcan: add MB/FIFO specific column to comment table of IP versionsDavid Jander2015-05-061-8/+8
| * can: janz-ican3: add support for CAL/CANopen firmwareAndreas Gröger2015-05-063-37/+101
| * can: janz-ican3: add documentation for existing sysfs entriesAndreas Gröger2015-05-062-0/+18
| * can.h: make padding given by gcc explicitShawn Landden2015-05-062-0/+9
* | net: macb: Add change_mtu callback with jumbo supportHarini Katakam2015-05-091-1/+23
* | net: macb: Add support for jumbo framesHarini Katakam2015-05-092-4/+27
* | net: macb: Add compatible string for Zynq Ultrascale+ MPSoCHarini Katakam2015-05-091-0/+8
* | devicetree: Add compatible string for Zynq Ultrascale+ MPSoCHarini Katakam2015-05-091-0/+1
* | tcp: set SOCK_NOSPACE under memory pressureJason Baron2015-05-091-1/+5
* | gianfar: Enable changing mac addr when if upClaudiu Manoil2015-05-091-1/+12
* | gianfar: Move TxFIFO underrun handling to reset pathClaudiu Manoil2015-05-091-30/+10
* | Merge branch 'bpf_seccomp'David S. Miller2015-05-093-71/+91
|\ \
| * | seccomp, filter: add and use bpf_prog_create_from_user from seccompDaniel Borkmann2015-05-093-39/+66
| * | net: filter: add __GFP_NOWARN flag for larger kmem allocsDaniel Borkmann2015-05-091-3/+6
| * | seccomp: simplify seccomp_prepare_filter and reuse bpf_prepare_filterNicolas Schichan2015-05-093-54/+26
| * | net: filter: add a callback to allow classic post-verifier transformationsNicolas Schichan2015-05-092-3/+21
|/ /
* | Merge tag 'mac80211-next-for-davem-2015-05-06' of git://git.kernel.org/pub/sc...David S. Miller2015-05-0976-843/+1429
|\ \
| * | mac80211: add missing documentation for rate_ctrl_lockJohannes Berg2015-05-061-0/+2