summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ip_tunnel, bpf: ip_tunnel_info_opts_{get, set} depends on CONFIG_INETDaniel Borkmann2016-03-081-0/+11
* Merge branch 'bpf-map-prealloc'David S. Miller2016-03-0820-179/+514
|\
| * samples/bpf: test both pre-alloc and normal mapsAlexei Starovoitov2016-03-081-1/+9
| * samples/bpf: add map_flags to bpf loaderAlexei Starovoitov2016-03-088-15/+23
| * samples/bpf: move ksym_search() into libraryAlexei Starovoitov2016-03-083-66/+69
| * samples/bpf: make map creation more verboseAlexei Starovoitov2016-03-081-1/+4
| * bpf: convert stackmap to pre-allocationAlexei Starovoitov2016-03-083-18/+71
| * bpf: check for reserved flag bits in array and stack mapsAlexei Starovoitov2016-03-082-1/+4
| * bpf: pre-allocate hash map elementsAlexei Starovoitov2016-03-084-74/+186
| * bpf: introduce percpu_freelistAlexei Starovoitov2016-03-083-1/+132
| * bpf: prevent kprobe+bpf deadlocksAlexei Starovoitov2016-03-083-2/+16
|/
* Merge branch 'ipv6-per-netns-gc'David S. Miller2016-03-082-43/+51
|\
| * ipv6: per netns FIB garbage collectionMichal Kubeček2016-03-082-5/+5
| * ipv6: per netns fib6 walkersMichal Kubeček2016-03-082-32/+38
| * ipv6: replace global gc_args with local variableMichal Kubeček2016-03-081-6/+8
|/
* Merge branch 'bnxt_en-next'David S. Miller2016-03-083-52/+344
|\
| * bnxt_en: Enable AER support.Satish Baddipadige2016-03-081-0/+109
| * bnxt_en: Include hardware port statistics in ethtool -S.Michael Chan2016-03-081-2/+103
| * bnxt_en: Include some hardware port statistics in ndo_get_stats64().Michael Chan2016-03-081-0/+16
| * bnxt_en: Add port statistics support.Michael Chan2016-03-082-1/+60
| * bnxt_en: Extend autoneg to all speeds.Michael Chan2016-03-082-14/+4
| * bnxt_en: Use common function to get ethtool supported flags.Michael Chan2016-03-081-20/+9
| * bnxt_en: Add reporting of link partner advertisement.Michael Chan2016-03-083-2/+23
| * bnxt_en: Refactor bnxt_fw_to_ethtool_advertised_spds().Michael Chan2016-03-081-13/+20
|/
* net_sched: dsmark: use qdisc_dequeue_peeked()Kyeong Yoo2016-03-081-1/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-03-0832-353/+626
|\
| * netfilter: nft_masq: support port rangePablo Neira Ayuso2016-03-025-14/+59
| * netfilter: don't call hooks unless neededFlorian Westphal2016-03-021-18/+11
| * netfilter: bridge: register hooks only when bridge interface is addedFlorian Westphal2016-03-021-3/+65
| * netfilter: xtables: don't hook tables by defaultFlorian Westphal2016-03-0216-208/+361
| * netfilter: xtables: prepare for on-demand hook registerFlorian Westphal2016-03-0217-88/+107
| * netfilter: nf_defrag_ipv4: Drop redundant ip_send_check()Joe Stringer2016-03-021-3/+1
| * Merge tag 'ipvs-for-v4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/...Pablo Neira Ayuso2016-03-022-17/+8
| |\
| | * netfilter: ipvs: avoid unused variable warningsArnd Bergmann2016-02-182-15/+8
| | * netfilter: ipvs: Remove noisy debug print from ip_vs_del_serviceYannick Brosseau2016-02-181-2/+0
| * | netfilter: xt_osf: remove unused variableSudip Mukherjee2016-02-291-2/+0
| * | netfilter: meta: add PRANDOM supportFlorian Westphal2016-02-293-0/+14
* | | Merge branch 'bpf-next'David S. Miller2016-03-087-45/+165
|\ \ \
| * | | vxlan: allow setting ipv6 traffic classDaniel Borkmann2016-03-081-5/+9
| * | | bpf, vxlan, geneve, gre: fix usage of dst_cache on xmitDaniel Borkmann2016-03-085-21/+36
| * | | bpf: support for access to tunnel optionsDaniel Borkmann2016-03-083-8/+90
| * | | bpf: allow to propagate df in bpf_skb_set_tunnel_keyDaniel Borkmann2016-03-082-1/+6
| * | | bpf: make helper function protos staticDaniel Borkmann2016-03-081-9/+9
| * | | bpf: add flags to bpf_skb_store_bytes for clearing hashDaniel Borkmann2016-03-082-1/+4
| * | | bpf: allow bpf_csum_diff to feed bpf_l3_csum_replace as wellDaniel Borkmann2016-03-082-0/+11
|/ / /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-03-08435-3136/+4497
|\ \ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-03-07101-399/+783
| |\ \ \
| | * | | ppp: release rtnl mutex when interface creation failsGuillaume Nault2016-03-071-0/+1
| | * | | cdc_ncm: do not call usbnet_link_change from cdc_ncm_bindBjørn Mork2016-03-071-15/+5
| | * | | tcp: fix tcpi_segs_in after connection establishmentEric Dumazet2016-03-071-1/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 02:32:48 +0000