OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
02388bf
7f4f7dd
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
author
David S. Miller
<davem@davemloft.net>
Wed, 20 Sep 2017 23:08:23 +0000
(16:08 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 20 Sep 2017 23:08:23 +0000
(16:08 -0700)
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>
Trivial merge