summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ovs: use nla_put_u64_64bit()Nicolas Dichtel2016-04-252-1/+3
* ipv6: use nla_put_u64_64bit()Nicolas Dichtel2016-04-253-7/+12
* sched: use nla_put_u64_64bit()Nicolas Dichtel2016-04-254-5/+13
* rtnl: use nla_put_u64_64bit()Nicolas Dichtel2016-04-252-18/+19
* soreuseport: Resolve merge conflict for v4/v6 ordering fixCraig Gallek2016-04-252-2/+10
* sock: relax WARN_ON() in sock_owned_by_user()Eric Dumazet2016-04-251-1/+1
* hv_netvsc: Fix the list processing for network change eventHaiyang Zhang2016-04-241-1/+1
* tcp-tso: do not split TSO packets at retransmit timeEric Dumazet2016-04-244-40/+34
* tipc: fix stale links after re-enabling bearerParthasarathy Bhuvaragan2016-04-241-2/+1
* Merge branch 'tcp-tcstamp_ack-frag-coalesce'David S. Miller2016-04-241-0/+4
|\
| * tcp: Merge txstamp_ack in tcp_skb_collapse_tstampMartin KaFai Lau2016-04-241-0/+2
| * tcp: Carry txstamp_ack in tcp_fragment_tstampMartin KaFai Lau2016-04-241-0/+2
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-04-2413-818/+591
|\
| * netfilter: conntrack: don't acquire lock during seq_printfFlorian Westphal2016-04-192-14/+2
| * netfilter: ctnetlink: restore inlining for netlink message size calculationPablo Neira Ayuso2016-04-181-5/+5
| * netfilter: connlabels: change nf_connlabels_get bit arg to 'highest used'Florian Westphal2016-04-185-8/+11
| * netfilter: labels: don't emit ct event if labels were not changedFlorian Westphal2016-04-181-6/+10
| * netfilter: connlabels: move helpers to xt_connlabelFlorian Westphal2016-04-183-20/+12
| * netfilter: ctnetlink: remove unnecessary inliningPablo Neira Ayuso2016-04-141-69/+48
| * netfilter: x_tables: introduce and use xt_copy_counters_from_userFlorian Westphal2016-04-145-130/+92
| * netfilter: x_tables: remove obsolete checkFlorian Westphal2016-04-143-22/+0
| * netfilter: x_tables: remove obsolete overflow check for compat case tooFlorian Westphal2016-04-143-6/+0
| * netfilter: x_tables: do compat validation via translate_tableFlorian Westphal2016-04-144-342/+83
| * netfilter: x_tables: xt_compat_match_from_user doesn't need a retvalFlorian Westphal2016-04-145-51/+26
| * netfilter: arp_tables: simplify translate_compat_table argsFlorian Westphal2016-04-141-46/+36
| * netfilter: ip6_tables: simplify translate_compat_table argsFlorian Westphal2016-04-141-35/+24
| * netfilter: ip_tables: simplify translate_compat_table argsFlorian Westphal2016-04-141-35/+24
| * netfilter: x_tables: validate all offsets and sizes in a ruleFlorian Westphal2016-04-141-5/+76
| * netfilter: x_tables: check for bogus target offsetFlorian Westphal2016-04-145-10/+26
| * netfilter: x_tables: check standard target size tooFlorian Westphal2016-04-141-0/+15
| * netfilter: x_tables: add compat version of xt_check_entry_offsetsFlorian Westphal2016-04-145-3/+31
| * netfilter: x_tables: assert minimum target sizeFlorian Westphal2016-04-141-0/+3
| * netfilter: x_tables: kill check_entry helperFlorian Westphal2016-04-143-35/+24
| * netfilter: x_tables: add and use xt_check_entry_offsetsFlorian Westphal2016-04-145-32/+41
| * netfilter: x_tables: validate targets of jumpsFlorian Westphal2016-04-143-0/+48
| * netfilter: x_tables: don't move to non-existent next ruleFlorian Westphal2016-04-143-3/+13
* | Merge branch 'nla_align-more'David S. Miller2016-04-2332-109/+178
|\ \
| * | taskstats: use the libnl API to align nlattr on 64-bitNicolas Dichtel2016-04-231-32/+5
| * | xfrm: align nlattr properly when neededNicolas Dichtel2016-04-232-4/+7
| * | libnl: add nla_put_u64_64bit() helperNicolas Dichtel2016-04-231-0/+13
| * | libnl: nla_put_msecs(): align on a 64-bit areaNicolas Dichtel2016-04-237-16/+27
| * | libnl: nla_put_s64(): align on a 64-bit areaNicolas Dichtel2016-04-231-4/+7
| * | libnl: nla_put_net64(): align on a 64-bit areaNicolas Dichtel2016-04-233-11/+13
| * | libnl: nla_put_be64(): align on a 64-bit areaNicolas Dichtel2016-04-2318-38/+87
| * | libnl: nla_put_le64(): align on a 64-bit areaNicolas Dichtel2016-04-233-8/+19
| * | libnl: fix help of _64bit functionsNicolas Dichtel2016-04-231-2/+6
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-04-23317-1784/+2913
|\ \
| * \ Merge tag 'rtc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/abello...Linus Torvalds2016-04-212-6/+7
| |\ \
| | * | rtc: ds1307: Use irq when available for wakeup-source deviceNishanth Menon2016-04-211-1/+1
| | * | rtc: ds1307: ds3231 temperature s16 overflowZhuang Yuyao2016-04-211-2/+2
OpenPOWER on IntegriCloud