summaryrefslogtreecommitdiff
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* tree-wide: replace config_enabled() with IS_ENABLED()Masahiro Yamada2016-07-041-1/+1
* Merge branch 'akpm-current/current'Stephen Rothwell2016-07-041-0/+1
|\
| * af_unix: charge buffers to kmemcgVladimir Davydov2016-06-251-0/+1
* | Merge remote-tracking branch 'userns/for-next'Stephen Rothwell2016-07-041-4/+4
|\ \
| * | vfs: Pass data, ns, and ns->userns to mount_nsEric W. Biederman2016-06-231-4/+4
* | | Merge remote-tracking branch 'tty/tty-next'Stephen Rothwell2016-07-041-8/+0
|\ \ \
| * | | net: ircomm, cleanup TIOCGSERIALJiri Slaby2016-06-251-8/+0
| | |/ | |/|
* | | Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell2016-07-041-1/+22
|\ \ \
| * \ \ Merge branch 'locking/arch-atomic'Ingo Molnar2016-06-271-1/+22
| |\ \ \ | | |/ / | |/| |
| | * | locking/spinlock, netfilter: Fix nf_conntrack_lock() barriersPeter Zijlstra2016-06-141-1/+22
* | | | Merge remote-tracking branch 'selinux/next'Stephen Rothwell2016-07-0423-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
* | | | | Merge remote-tracking branch 'security/next'Stephen Rothwell2016-07-041-1/+1
|\ \ \ \ \
| * | | | | net: Use ns_capable_noaudit() when determining net sysctl permissionsTyler Hicks2016-06-061-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'kspp/for-next/kspp'Stephen Rothwell2016-07-041-2/+2
|\ \ \ \ \
| * | | | | latent_entropy: Mark functions with __latent_entropyEmese Revfy2016-06-221-2/+2
* | | | | | Merge remote-tracking branch 'mac80211-next/master'Stephen Rothwell2016-07-046-55/+103
|\ \ \ \ \ \
| * | | | | | mac80211: fix fq lockdep warningsMichal Kazior2016-06-301-0/+4
| * | | | | | mac80211: use common cleanup for user/!user_mpmBob Copeland2016-06-302-23/+13
| * | | | | | mac80211: Encrypt "Group addressed privacy" action framesMasashi Honma2016-06-302-2/+11
| * | | | | | mac80211: silence an uninitialized variable warningDan Carpenter2016-06-301-0/+1
| * | | | | | nl80211: improve nl80211_parse_mesh_config type checkingArnd Bergmann2016-06-301-30/+74
* | | | | | | Merge remote-tracking branch 'bluetooth/master'Stephen Rothwell2016-07-046-48/+154
|\ \ \ \ \ \ \
| * | | | | | | ieee802154: allow netns create of lowpan interfaceAlexander Aring2016-06-271-2/+1
| * | | | | | | ieee802154: add netns supportAlexander Aring2016-06-273-6/+120
| * | | | | | | 6lowpan: ndisc: add missing 802.15.4 only checkAlexander Aring2016-06-271-0/+3
| * | | | | | | 6lowpan: ndisc: fix double read unlockAlexander Aring2016-06-271-1/+2
| * | | | | | | Bluetooth: Switch SMP to crypto_cipher_encrypt_one()Andy Lutomirski2016-06-271-39/+28
* | | | | | | | Merge remote-tracking branch 'ipvs-next/master'Stephen Rothwell2016-07-043-51/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | ipvs: count pre-established TCP states as activeMichal Kubecek2016-06-131-2/+23