git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: db268d4 e241137)
Merge tag 'ipvs2-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms...
authorPablo Neira Ayuso <pablo@netfilter.org>
Sat, 15 Apr 2017 08:54:40 +0000 (10:54 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Sat, 15 Apr 2017 08:54:40 +0000 (10:54 +0200)
commita702ece3b186dcf3577c33747359be13352951b6
treefbf388cd39a254bfda8e667603f1a1a522440725tree
parentdb268d4dfdb9025eaf98ec88c99b38fbba172c43commit | diff
parente24113769960980579610ecfd657bb17f19373a3commit | diff
Merge tag 'ipvs2-for-v4.12' of https://git./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
net/netfilter/ipvs/ip_vs_ftp.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.