]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 17daac8 d804631)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Wed, 20 Sep 2017 23:08:23 +0000 (16:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Sep 2017 23:08:23 +0000 (16:08 -0700)
commitb87a855829177ab19278ff011181b247d7589cb9
tree683001bde3d4df6b9eaa463bf050d530d92ed511tree | snapshot
parent17daac8de18e157505f236a61f7daf0d317d3216commit | diff
parentd804631a49b686e17505a9b34993cf9f215686eccommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains two Netfilter fixes for your net tree,
they are:

1) Fix NAt compilation with UP, from Geert Uytterhoeven.

2) Fix incorrect number of entries when dumping a set, from
   Vishwanath Pai.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Linux Kernel Source Tree.