diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-04-15 10:54:40 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-04-15 10:54:40 +0200 |
| commit | a702ece3b186dcf3577c33747359be13352951b6 (patch) | |
| tree | fbf388cd39a254bfda8e667603f1a1a522440725 /tools/perf/scripts/python/event_analyzing_sample.py | |
| parent | db268d4dfdb9025eaf98ec88c99b38fbba172c43 (diff) | |
| parent | e24113769960980579610ecfd657bb17f19373a3 (diff) | |
Merge tag 'ipvs2-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next
Simon Horman says:
====================
Second Round of IPVS Updates for v4.12
please consider these clean-ups and enhancements to IPVS for v4.12.
* Removal unused variable
* Use kzalloc where appropriate
* More efficient detection of presence of NAT extension
====================
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Conflicts:
net/netfilter/ipvs/ip_vs_ftp.c
Diffstat (limited to 'tools/perf/scripts/python/event_analyzing_sample.py')
0 files changed, 0 insertions, 0 deletions