summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into nextJames Morris2014-08-022-131/+243
|\
| * netlabel: shorter names for the NetLabel catmap funcs/structsPaul Moore2014-08-012-76/+68
| * netlabel: fix the catmap walking functionsPaul Moore2014-08-011-48/+54
| * netlabel: fix the horribly broken catmap functionsPaul Moore2014-08-012-62/+166
| * netlabel: fix a problem when setting bits below the previously lowest bitPaul Moore2014-08-012-11/+21
* | Merge branch 'keys-fixes' into keys-nextDavid Howells2014-07-221-0/+1
|\ \
| * | KEYS: Allow special keys (eg. DNS results) to be invalidated by CAP_SYS_ADMINDavid Howells2014-07-171-0/+1
* | | KEYS: RxRPC: Use key preparsingDavid Howells2014-07-221-68/+97
* | | KEYS: DNS: Use key preparsingDavid Howells2014-07-221-18/+25
* | | KEYS: Ceph: Use user_match()David Howells2014-07-221-6/+2
* | | KEYS: Ceph: Use key preparsingDavid Howells2014-07-221-9/+15
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pendingLinus Torvalds2014-06-281-55/+0
|\ \
| * | iovec: move memcpy_from/toiovecend to lib/iovec.cMichael S. Tsirkin2014-06-271-55/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-06-2520-128/+219
|\ \ \
| * | | net: fix setting csum_start in skb_segment()Tom Herbert2014-06-251-1/+1
| * | | ipv4: fix dst race in sk_dst_get()Eric Dumazet2014-06-252-14/+16
| * | | net: filter: Use kcalloc/kmalloc_array to allocate arraysTobias Klauser2014-06-251-2/+2
| * | | trivial: net: filter: Change kerneldoc parameter orderTobias Klauser2014-06-251-1/+1
| * | | trivial: net: filter: Fix typo in commentTobias Klauser2014-06-251-1/+1
| * | | 8021q: fix a potential memory leakLi RongQing2014-06-211-1/+4
| * | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2014-06-196-65/+85
| |\ \ \
| | * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-06-186-65/+85
| | |\ \ \
| | | * \ \ Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-06-176-65/+85
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Bluetooth: Allow change security level on ATT_CID in slave roleMarcin Kraglak2014-06-131-5/+0
| | | | * | Bluetooth: Fix locking of hdev when calling into SMP codeJohan Hedberg2014-06-131-1/+6
| | | | * | Bluetooth: Fix deadlock in l2cap_conn_del()Jukka Taimisto2014-06-131-1/+7
| | | | * | Bluetooth: Reuse hci_stop_discovery function when cleaning up HCI stateJohan Hedberg2014-06-131-3/+1
| | | | * | Bluetooth: Refactor discovery stopping into its own functionJohan Hedberg2014-06-131-44/+49
| | | | * | Bluetooth: Fix indicating discovery state when canceling inquiryJohan Hedberg2014-06-131-0/+4
| | | | * | Bluetooth: Fix setting correct authentication information for SMP STKJohan Hedberg2014-06-131-2/+7
| | | | * | Bluetooth: Add clarifying comment for conn->auth_typeJohan Hedberg2014-06-131-1/+5
| | | | * | Bluetooth: Fix SSP acceptor just-works confirmation without MITMJohan Hedberg2014-06-131-2/+5
| | | | * | Bluetooth: Fix check for connection encryptionJohan Hedberg2014-06-131-1/+1
| | | | * | Bluetooth: Fix incorrectly overriding conn->src_typeJohan Hedberg2014-06-131-5/+0
| * | | | | net: sctp: check proc_dointvec result in proc_sctp_do_authDaniel Borkmann2014-06-191-2/+1
| * | | | | tcp: fix tcp_match_skb_to_sack() for unaligned SACK at end of an skbNeal Cardwell2014-06-191-1/+1
| * | | | | Revert "net: return actual error on register_queue_kobjects"David S. Miller2014-06-191-2/+2
| * | | | | net: filter: fix upper BPF instruction limitKees Cook2014-06-181-1/+1
| * | | | | net: sctp: propagate sysctl errors from proc_do* properlyDaniel Borkmann2014-06-181-20/+23
| * | | | | net: return actual error on register_queue_kobjectsJie Liu2014-06-181-2/+2
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2014-06-186-18/+82
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | netfilter: nf_nat: fix oops on netns removalFlorian Westphal2014-06-161-1/+34
| | * | | | netfilter: ctnetlink: add zone size to lengthKen-ichirou MATSUZAWA2014-06-161-0/+6
| | * | | | Merge branch 'ipvs'Pablo Neira Ayuso2014-06-161-1/+1
| | |\ \ \ \
| | | * | | | ipvs: stop tot_stats estimator only under CONFIG_SYSCTLJulian Anastasov2014-06-131-1/+1
| | * | | | | netfilter: nft_nat: don't dump port information if unsetPablo Neira Ayuso2014-06-161-6/+8
| | * | | | | netfilter: nf_tables: indicate family when dumping set elementsPablo Neira Ayuso2014-06-161-1/+1
| | * | | | | netfilter: nft_compat: call {target, match}->destroy() to cleanup entryPablo Neira Ayuso2014-06-161-0/+18
| | * | | | | netfilter: nf_tables: fix wrong type in transaction when replacing rulesPablo Neira Ayuso2014-06-161-1/+1
| | * | | | | netfilter: nf_tables: decrement chain use counter when replacing rulesPablo Neira Ayuso2014-06-161-0/+2