linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-11 03:48:00 +00:00

History

WANG Cong 6c80563c2f net_sched: act: pick a different type for act_xt

In tcf_register_action() we check either ->type or ->kind to see if
there is an existing action registered, but ipt action registers two
actions with same type but different kinds. They should have different
types too.

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2014-01-16 17:24:11 -08:00

acpi

Merge branches 'acpi-pci-pm' and 'acpi-pci-hotplug'

2013-12-31 22:03:37 +01:00

asm-generic

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-01-06 17:37:45 -05:00

clocksource

…

crypto

crypto: scatterwalk - Use sg_chain_ptr on chain entries

2013-12-09 19:58:52 +08:00