summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-04-2413-818/+591Star
|\
| * netfilter: conntrack: don't acquire lock during seq_printfFlorian Westphal2016-04-192-14/+2Star
| * 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/+12Star
| * netfilter: ctnetlink: remove unnecessary inliningPablo Neira Ayuso2016-04-141-69/+48Star
| * netfilter: x_tables: introduce and use xt_copy_counters_from_userFlorian Westphal2016-04-145-130/+92Star
| * netfilter: x_tables: remove obsolete checkFlorian Westphal2016-04-143-22/+0Star
| * netfilter: x_tables: remove obsolete overflow check for compat case tooFlorian Westphal2016-04-143-6/+0Star
| * netfilter: x_tables: do compat validation via translate_tableFlorian Westphal2016-04-144-342/+83Star
| * netfilter: x_tables: xt_compat_match_from_user doesn't need a retvalFlorian Westphal2016-04-145-51/+26Star
| * netfilter: arp_tables: simplify translate_compat_table argsFlorian Westphal2016-04-141-46/+36Star
| * netfilter: ip6_tables: simplify translate_compat_table argsFlorian Westphal2016-04-141-35/+24Star
| * netfilter: ip_tables: simplify translate_compat_table argsFlorian Westphal2016-04-141-35/+24Star
| * 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/+24Star
| * 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-2432-109/+178
|\ \
| * | taskstats: use the libnl API to align nlattr on 64-bitNicolas Dichtel2016-04-241-32/+5Star
| * | xfrm: align nlattr properly when neededNicolas Dichtel2016-04-242-4/+7
| * | libnl: add nla_put_u64_64bit() helperNicolas Dichtel2016-04-241-0/+13
| * | libnl: nla_put_msecs(): align on a 64-bit areaNicolas Dichtel2016-04-247-16/+27
| * | libnl: nla_put_s64(): align on a 64-bit areaNicolas Dichtel2016-04-241-4/+7
| * | libnl: nla_put_net64(): align on a 64-bit areaNicolas Dichtel2016-04-243-11/+13
| * | libnl: nla_put_be64(): align on a 64-bit areaNicolas Dichtel2016-04-2418-38/+87
| * | libnl: nla_put_le64(): align on a 64-bit areaNicolas Dichtel2016-04-243-8/+19
| * | libnl: fix help of _64bit functionsNicolas Dichtel2016-04-241-2/+6
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-04-24317-1784/+2913
|\ \
| * \ Merge tag 'rtc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/abello...Linus Torvalds2016-04-222-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
| | * | rtc: s3c: Document in binding that only s3c6410 needs a src clkJavier Martinez Canillas2016-03-291-3/+4
| * | | Merge tag 'pm+acpi-4.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2016-04-212-0/+7
| |\ \ \
| | * \ \ Merge branch 'pm-cpufreq-fixes'Rafael J. Wysocki2016-04-212-0/+7
| | |\ \ \
| | | * | | cpufreq: Abort cpufreq_update_current_freq() for cpufreq_suspended setRafael J. Wysocki2016-04-181-0/+3
| | | * | | intel_pstate: Avoid getting stuck in high P-states when idleRafael J. Wysocki2016-04-101-0/+4
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-04-2184-529/+1009
| |\ \ \ \ \
| | * | | | | openvswitch: use flow protocol when recalculating ipv6 checksumsSimon Horman2016-04-211-2/+2
| | * | | | | Driver: Vmxnet3: set CHECKSUM_UNNECESSARY for IPv6 packetsShrikrishna Khare2016-04-212-6/+10
| | * | | | | atl2: Disable unimplemented scatter/gather featureBen Hutchings2016-04-211-1/+1
| | * | | | | Merge branch 'mlx4-fixes'David S. Miller2016-04-218-22/+89
| | |\ \ \ \ \
| | | * | | | | net/mlx4_en: Split SW RX dropped counter per RX ringEran Ben Elisha2016-04-214-3/+10
| | | * | | | | net/mlx4_core: Don't allow to VF change global pause settingsEugenia Emantayev2016-04-212-0/+15
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-18 09:19:46 +0200