summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2016-07-2924-191/+3232
|\
| * Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux in...James Morris2016-07-0723-190/+3231
| |\
| | * netlabel: Implement CALIPSO config functions for SMACK.Huw Davies2016-06-273-0/+212
| | * calipso: Add a label cache.Huw Davies2016-06-275-7/+341
| | * calipso: Add validation of CALIPSO option.Huw Davies2016-06-272-0/+68
| | * netlabel: Pass a family parameter to netlbl_skbuff_err().Huw Davies2016-06-271-3/+8
| | * calipso: Allow the lsm to label the skbuff directly.Huw Davies2016-06-274-4/+282
| | * ipv6: constify the skb pointer of ipv6_find_tlv().Huw Davies2016-06-271-1/+1
| | * calipso: Allow request sockets to be relabelled by the lsm.Huw Davies2016-06-274-7/+156
| | * ipv6: Allow request socks to contain IPv6 options.Huw Davies2016-06-273-6/+21
| | * calipso: Set the calipso socket label to match the secattr.Huw Davies2016-06-276-9/+715
| | * netlabel: Move bitmap manipulation functions to the NetLabel core.Huw Davies2016-06-272-79/+79
| | * ipv6: Add ipv6_renew_options_kern() that accepts a kernel mem pointer.Huw Davies2016-06-271-0/+49
| | * netlabel: Add support for removing a CALIPSO DOI.Huw Davies2016-06-273-0/+149
| | * netlabel: Add support for creating a CALIPSO protocol domain mapping.Huw Davies2016-06-274-5/+89
| | * netlabel: Add support for enumerating the CALIPSO DOI list.Huw Davies2016-06-273-0/+161
| | * netlabel: Add support for querying a CALIPSO DOI.Huw Davies2016-06-273-0/+189
| | * netlabel: Initial support for the CALIPSO netlink protocol.Huw Davies2016-06-279-2/+500
| | * netlabel: Add an address family to domain hash entries.Huw Davies2016-06-276-58/+192
| | * netlabel: Mark rcu pointers with __rcu.Huw Davies2016-06-272-4/+4
| | * netlabel: handle sparse category maps in netlbl_catmap_getlong()Paul Moore2016-06-091-5/+4
| | * iucv: properly clone LSM attributes to newly created child socketsPaul Moore2016-06-071-1/+4
| | * netlabel: add address family checks to netlbl_{sock,req}_delattr()Paul Moore2016-06-061-2/+10
| * | net: Use ns_capable_noaudit() when determining net sysctl permissionsTyler Hicks2016-06-061-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2016-07-291-4/+4
|\ \ \
| * | | vfs: Pass data, ns, and ns->userns to mount_nsEric W. Biederman2016-06-231-4/+4
| |/ /
* | | Merge branch 'salted-string-hash'Linus Torvalds2016-07-281-1/+1
|\ \ \
| * | | vfs: make the string hashes salt the hashLinus Torvalds2016-06-101-1/+1
| |/ /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2016-07-27401-10103/+23534
|\ \ \
| * | | l2tp: Correctly return -EBADF from pppol2tp_getname.phil.turnbull@oracle.com2016-07-261-5/+2
| * | | net: ipmr/ip6mr: update lastuse on entry changeNikolay Aleksandrov2016-07-262-2/+2
| * | | tipc: dump monitor attributesParthasarathy Bhuvaragan2016-07-265-0/+235
| * | | tipc: add a function to get the bearer nameParthasarathy Bhuvaragan2016-07-262-0/+22
| * | | tipc: get monitor threshold for the clusterParthasarathy Bhuvaragan2016-07-265-0/+67
| * | | tipc: make cluster size threshold for monitoring configurableParthasarathy Bhuvaragan2016-07-266-2/+55
| * | | tipc: introduce constants for tipc address validationParthasarathy Bhuvaragan2016-07-262-6/+3
| * | | net: neigh: disallow transition to NUD_STALE if lladdr is unchanged in neigh_...He Chunhui2016-07-261-6/+1
| * | | net_sched: get rid of struct tcf_commonWANG Cong2016-07-252-77/+72
| * | | net_sched: move tc_action into tcf_commonWANG Cong2016-07-2514-279/+256
| * | | udp: use sk_filter_trim_cap for udp{,6}_queue_rcv_skbDaniel Borkmann2016-07-252-6/+2
| * | | net/sctp: terminate rhashtable walk correctlyVegard Nossum2016-07-251-0/+1
| * | | net/irda: fix NULL pointer dereference on memory allocation failureVegard Nossum2016-07-251-2/+5
| * | | sctp: also point GSO head_skb to the sk when it's availableMarcelo Ricardo Leitner2016-07-251-0/+3
| * | | sctp: fix BH handling on socket backlogMarcelo Ricardo Leitner2016-07-252-2/+2
| * | | kcm: remove redundant -ve error check and return pathColin Ian King2016-07-251-5/+1
| * | | net: ipv6: Always leave anycast and multicast groups on link downMike Manning2016-07-251-0/+4
| * | | sctp: use inet_recvmsg to support sctp RFS wellXin Long2016-07-252-2/+2
| * | | bridge: Fix incorrect re-injection of LLDP packetsIdo Schimmel2016-07-251-0/+8
| * | | sctp: support ipv6 nonlocal bindXin Long2016-07-251-1/+3
| * | | bpf, events: fix offset in skb copy handlerDaniel Borkmann2016-07-251-2/+2