summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* mm: memcontrol: consolidate cgroup socket trackingJohannes Weiner2016-10-073-8/+3
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2016-10-062-3/+29
|\
| * netns: move {inc,dec}_net_namespaces into #ifdefArnd Bergmann2016-09-231-10/+10
| * Merge branch 'nsfs-ioctls' into HEADEric W. Biederman2016-09-221-0/+6
| |\
| | * kernel: add a helper to get an owning user namespace for a namespaceAndrey Vagin2016-09-221-0/+6
| * | userns: When the per user per user namespace limit is reached return ENOSPCEric W. Biederman2016-09-221-1/+1
| * | netns: Add a limit on the number of net namespacesEric W. Biederman2016-08-081-1/+21
| * | sysctl: Stop implicitly passing current into sysctl_table_root.lookupEric W. Biederman2016-08-081-2/+2
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-10-054-16/+26
|\ \
| * | netfilter: nft_limit: fix divided by zero panicLiping Zhang2016-10-041-2/+2
| * | netfilter: fix namespace handling in nf_log_proc_dostringJann Horn2016-10-041-2/+4
| * | netfilter: xt_hashlimit: Fix link error in 32bit arch because of 64bit divisionVishwanath Pai2016-09-301-7/+8
| * | netfilter: accommodate different kconfig in nf_set_hooks_headAaron Conole2016-09-301-4/+11
| * | netfilter: Fix potential null pointer dereferenceAaron Conole2016-09-301-1/+1
* | | Merge remote-tracking branch 'net-next/master' into mac80211-nextJohannes Berg2016-10-04226-2382/+6750
|\ \ \
| * | | net/ncsi: Introduce ncsi_stop_dev()Gavin Shan2016-10-041-13/+24
| * | | net/ncsi: Rework the channel monitoringGavin Shan2016-10-043-23/+35
| * | | net/ncsi: Allow to extend NCSI request propertiesGavin Shan2016-10-044-14/+17
| * | | net/ncsi: Rework request index allocationGavin Shan2016-10-042-8/+10
| * | | net/ncsi: Don't probe on the reserved channel ID (0x1f)Gavin Shan2016-10-041-2/+2
| * | | net/ncsi: Introduce NCSI_RESERVED_CHANNELGavin Shan2016-10-042-7/+8
| * | | net/ncsi: Avoid unused-value build warning from ia64-linux-gccGavin Shan2016-10-042-27/+81
| * | | net: Add netdev all_adj_list refcnt propagation to fix panicAndrew Collins2016-10-041-31/+37
| * | | net: skbuff: Limit skb_vlan_pop/push() to expect skb->data at mac headerShmulik Ladkani2016-10-031-15/+22
| * | | net/sched: act_vlan: Push skb->data to mac_header prior calling skb_vlan_*() ...Shmulik Ladkani2016-10-031-0/+9
| * | | Merge tag 'rxrpc-rewrite-20160930' of git://git.kernel.org/pub/scm/linux/kern...David S. Miller2016-10-0311-92/+110
| |\ \ \
| | * | | rxrpc: Fix the call timer handlingDavid Howells2016-09-302-13/+20
| | * | | rxrpc: Keep the call timeouts as ktimes rather than jiffiesDavid Howells2016-09-307-62/+69
| | * | | rxrpc: Remove error from struct rxrpc_skb_priv as it is unusedDavid Howells2016-09-301-1/+0
| | * | | rxrpc: The offset field in struct rxrpc_skb_priv is unnecessaryDavid Howells2016-09-306-21/+24
| | * | | rxrpc: Reduce ssthresh to peer's receive windowDavid Howells2016-09-301-0/+2
| | * | | rxrpc: Switch to Congestion Avoidance mode at cwnd==ssthreshDavid Howells2016-09-301-3/+3
| | |/ /
| * | | openvswitch: use mpls_hdrJiri Benc2016-10-031-12/+12
| * | | mpls: move mpls_hdr to a common locationJiri Benc2016-10-031-9/+1
| * | | openvswitch: mpls: set network header correctly on key extractJiri Benc2016-10-031-8/+3
| * | | net: rtnl: avoid uninitialized data in IFLA_VF_VLAN_LIST handlingArnd Bergmann2016-10-031-0/+3
| * | | net: pktgen: fix pkt_sizePaolo Abeni2016-10-031-11/+10
| * | | ipv6 addrconf: remove addrconf_sysctl_hop_limit()Maciej Żenczykowski2016-10-021-17/+14
| * | | netfilter: bridge: clarify bridge/netfilter messageStefan Agner2016-10-021-2/+4
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-10-0216-65/+91
| |\ \ \
| | * | | sctp: fix the issue sctp_diag uses lock_sock in rcu_read_lockXin Long2016-09-302-21/+47
| | * | | sctp: change to check peer prsctp_capable when using prsctp policesXin Long2016-09-302-6/+6
| | * | | sctp: remove prsctp_param from sctp_chunkXin Long2016-09-303-19/+9
| | * | | act_ife: Fix false encodingYotam Gigi2016-09-271-2/+2
| | * | | act_ife: Fix external mac header on encodeYotam Gigi2016-09-271-2/+1
| | * | | VSOCK: Don't dec ack backlog twice for rejected connectionsJorgen Hansen2016-09-271-3/+3
| | * | | ipmr, ip6mr: fix scheduling while atomic and a deadlock with ipmr_get_routeNikolay Aleksandrov2016-09-254-5/+10
| | * | | ip6_gre: fix flowi6_proto value in ip6gre_xmit_other()Lance Richardson2016-09-241-1/+0
| | * | | tcp: fix a compile error in DBGUNDO()Eric Dumazet2016-09-231-2/+1
| | * | | tcp: fix wrong checksum calculation on MTU probingDouglas Caetano dos Santos2016-09-231-5/+7