tree 9f284a8d4e8c0fbce21031a27efab4fdac4cec9f
parent 10cc1bdd5ef65f60f570b594c4c066d763c128fb
parent 283283c4da91adc44b03519f434ee1e7e91d6fdb
author David S. Miller <davem@davemloft.net> 1342520373 -0700
committer David S. Miller <davem@davemloft.net> 1342520373 -0700

Merge branch 'master' of git://1984.lsi.us.es/nf

Pablo Neira Ayuso says:

====================
I know that we're in fairly late stage to request pulls, but the IPVS people
pinged me with little patches with oops fixes last week.

One of them was recently introduced (during the 3.4 development cycle) while
cleaning up the IPVS netns support. They are:

* Fix one regression introduced in 3.4 while cleaning up the
  netns support for IPVS, from Julian Anastasov.

* Fix one oops triggered due to resetting the conntrack attached to the skb
  instead of just putting it in the forward hook, from Lin Ming. This problem
  seems to be there since 2.6.37 according to Simon Horman.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>