summaryrefslogtreecommitdiffstats
path: root/Documentation/i2o
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-09-24 15:36:53 -0400
committerDavid S. Miller <davem@davemloft.net>2012-09-24 15:42:04 -0400
commitae4735166ee31e29fbf8615949dac9e56299b1fd (patch)
treeee39087a83e0e6d6aaab87e905ce6d170185e32d /Documentation/i2o
parent2ddc7fe1cd1b2e0502f12b89c60b6e1ca66837dd (diff)
parent6ee584be3ee30f72dec8a8ca87bc10824e27a631 (diff)
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Pablo Neira Ayuso says: ==================== This patchset contains updates for your net-next tree, they are: * Mostly fixes for the recently pushed IPv6 NAT support: - Fix crash while removing nf_nat modules from Patrick McHardy. - Fix unbalanced rcu_read_unlock from Ulrich Weber. - Merge NETMAP and REDIRECT into one single xt_target module, from Jan Engelhardt. - Fix Kconfig for IPv6 NAT, which allows inconsistent configurations, from myself. * Updates for ipset, all of the from Jozsef Kadlecsik: - Add the new "nomatch" option to obtain reverse set matching. - Support for /0 CIDR in hash:net,iface set type. - One non-critical fix for a rare crash due to pass really wrong configuration parameters. - Coding style cleanups. - Sparse fixes. - Add set revision supported via modinfo.i * One extension for the xt_time match, to support matching during the transition between two days with one single rule, from Florian Westphal. * Fix maximum packet length supported by nfnetlink_queue and add NFQA_CAP_LEN attribute, from myself. You can notice that this batch contains a couple of fixes that may go to 3.6-rc but I don't consider them critical to push them: * The ipset fix for the /0 cidr case, which is triggered with one inconsistent command line invocation of ipset. * The nfnetlink_queue maximum packet length supported since it requires the new NFQA_CAP_LEN attribute to provide a full workaround for the described problem. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/i2o')
0 files changed, 0 insertions, 0 deletions