]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2b8c281 5ba4ecf)
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)
commit6a7e445aff6e907344f8262d76f1154ad8796189
tree683001bde3d4df6b9eaa463bf050d530d92ed511tree | snapshot
parent2b8c281563f065070b0680dded8cd4a3049756eecommit | diff
parent5ba4ecffebef84e285de72cfc5aeb6eaa2ca9bc1commit | 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.