aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mm, vmalloc: use __GFP_HIGHMEM implicitlyMichal Hocko2017-05-081-2/+1
* treewide: use kv[mz]alloc* rather than opencoded variantsMichal Hocko2017-05-082-21/+5
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2017-05-0410-58/+113
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2017-05-039-57/+112
| |\
| | * netfilter: nf_tables: check if same extensions are set when adding elementsPablo Neira Ayuso2017-05-031-0/+5
| | * Merge tag 'ipvs-fixes-for-v4.11' of http://git.kernel.org/pub/scm/linux/kerne...Pablo Neira Ayuso2017-04-281-5/+17
| | |\
| | | * ipvs: explicitly forbid ipv6 service/dest creation if ipv6 mod is disabledPaolo Abeni2017-04-281-5/+17
| | * | netfilter: x_tables: unlock on error in xt_find_table_lock()Dan Carpenter2017-04-281-1/+3
| | |/
| | * netfilter: nft_dynset: continue to next expr if _OP_ADD succeededLiping Zhang2017-04-251-3/+2
| | * netfilter: xt_socket: Fix broken IPv6 handlingPeter Tirsek2017-04-241-1/+1
| | * netfilter: ctnetlink: acquire ct->lock before operating nf_ct_seqadjLiping Zhang2017-04-241-6/+15
| | * netfilter: ctnetlink: make it safer when updating ct->statusLiping Zhang2017-04-241-9/+24
| | * netfilter: ctnetlink: fix deadlock due to acquire _expect_lock twiceLiping Zhang2017-04-241-12/+12
| | * netfilter: ctnetlink: drop the incorrect cthelper module requestLiping Zhang2017-04-241-16/+1
| | * netfilter: nft_set_bitmap: free dummy elements when destroy the setLiping Zhang2017-04-241-0/+5
| | * netfilter: nf_ct_helper: permit cthelpers with different names via nfnetlinkLiping Zhang2017-04-241-5/+21
| | * netfilter: xt_CT: fix refcnt leak on error pathGao Feng2017-04-241-2/+9
| * | netfilter: conntrack: Force inlining of build check to prevent build failureGeert Uytterhoeven2017-05-031-1/+1
* | | Merge branch 'stable-4.12' of git://git.infradead.org/users/pcmoore/auditLinus Torvalds2017-05-031-98/+28
|\ \ \ | |/ / |/| |
| * | audit: normalize NETFILTER_PKTRichard Guy Briggs2017-05-021-97/+27
| * | netfilter: use consistent ipv4 network offset in xt_AUDITRichard Guy Briggs2017-05-021-1/+1
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2017-05-0170-506/+533
|\ \
| * | netfilter: nf_ct_ext: invoke destroy even when ext is not attachedLiping Zhang2017-05-011-6/+2
| * | Merge tag 'ipvs3-for-v4.12' of http://git.kernel.org/pub/scm/linux/kernel/git...Pablo Neira Ayuso2017-05-012-23/+1
| |\ \
| | * | ipvs: change comparison on sync_refresh_periodAaron Conole2017-04-281-1/+1
| | * | ipvs: remove unused function ip_vs_set_state_timeoutAaron Conole2017-04-281-22/+0
| * | | netfilter: nf_queue: only call synchronize_net twice if nf_queue is activeFlorian Westphal2017-05-014-22/+26
| * | | netfilter: nf_log: don't call synchronize_rcu in nf_log_unsetFlorian Westphal2017-05-012-2/+1
| * | | netfilter: batch synchronize_net calls during hook unregisterFlorian Westphal2017-05-011-6/+40
| |/ /
| * | netfilter: don't attach a nat extension by defaultFlorian Westphal2017-04-261-6/+0
| * | netfilter: pptp: attach nat extension when neededFlorian Westphal2017-04-261-2/+10
| * | netfilter: conntrack: handle initial extension alloc via kreallocFlorian Westphal2017-04-261-36/+15
| * | netfilter: conntrack: mark extension structs as constFlorian Westphal2017-04-268-9/+9
| * | netfilter: conntrack: remove prealloc supportFlorian Westphal2017-04-262-46/+4
| * | ipvs: convert to use pernet nf_hook apiFlorian Westphal2017-04-261-10/+9
| * | netfilter: tcp: Use TCP_MAX_WSCALE instead of literal 14Gao Feng2017-04-192-6/+5
| * | netfilter: ipvs: fix incorrect conflict resolutionFlorian Westphal2017-04-191-1/+2
| * | nefilter: eache: reduce struct size from 32 to 24 byteFlorian Westphal2017-04-191-0/+3
| * | netfilter: allow early drop of assured conntracksFlorian Westphal2017-04-194-0/+99
| * | netfilter: conntrack: use u8 for extension sizes againFlorian Westphal2017-04-191-0/+33
| * | netfilter: remove last traces of variable-sized extensionsFlorian Westphal2017-04-191-9/+7
| * | netfilter: helpers: remove data_len usage for inkernel helpersFlorian Westphal2017-04-198-28/+13
| * | netfilter: nfnetlink_cthelper: reject too large userspace allocation requestsFlorian Westphal2017-04-191-2/+8
| * | netfilter: helper: add build-time asserts for helper data sizeFlorian Westphal2017-04-198-0/+16
| * | netfilter: nft_ct: allow to set ctnetlink event types of a connectionFlorian Westphal2017-04-191-1/+24
| * | netfilter: remove nf_ct_is_untrackedFlorian Westphal2017-04-159-27/+13
| * | netfilter: kill the fake untracked conntrack objectsFlorian Westphal2017-04-156-75/+30
| * | netfilter: ecache: Refine the nf_ct_deliver_cached_eventsGao Feng2017-04-151-2/+2
| * | netfilter: nf_nat: Fix return NF_DROP in nfnetlink_parse_nat_setupGao Feng2017-04-151-1/+1
| * | Merge tag 'ipvs2-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/gi...Pablo Neira Ayuso2017-04-152-7/+4
| |\ \