diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-25 00:53:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-25 00:53:40 -0400 |
| commit | d3734b0496f5a310a85bb53310c047b8e42bc440 (patch) | |
| tree | 92ef416d450d407635565e7238bb88522b83f2cc /include/net/caif/cfcnfg.h | |
| parent | 204cd4f4957eaaecf0d55cdb329d488348745540 (diff) | |
| parent | e7e6f6300faaafe05380ca5455b99c2a8f1f51a0 (diff) | |
| download | blackbird-op-linux-d3734b0496f5a310a85bb53310c047b8e42bc440.tar.gz blackbird-op-linux-d3734b0496f5a310a85bb53310c047b8e42bc440.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
The following patchset contains fixes for recently applied
Netfilter/IPVS updates to the net-next tree, most relevantly
they are:
* Fix sparse warnings introduced in the RCU conversion, from
Julian Anastasov.
* Fix wrong endianness in the size field of IPVS sync messages,
from Simon Horman.
* Fix missing if checking in nf_xfrm_me_harder, from Dan Carpenter.
* Fix off by one access in the IPVS SCTP tracking code, again from
Dan Carpenter.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/caif/cfcnfg.h')
0 files changed, 0 insertions, 0 deletions
