AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-26 00:45:18 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
594ccee6f0
linux_dsm_epyc7002/include/uapi/linux/tc_act
History
David S. Miller 909b27f706 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.

The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/tx.c
	net/ipv4/ip_gre.c
	net/netfilter/nf_conntrack_core.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-15 13:32:48 -04:00
..
Kbuild export tc ife uapi header 2016-05-10 01:08:39 -04:00
tc_bpf.h sched: align nlattr properly when needed 2016-04-26 12:00:49 -04:00
tc_connmark.h sched: align nlattr properly when needed 2016-04-26 12:00:49 -04:00
tc_csum.h sched: align nlattr properly when needed 2016-04-26 12:00:49 -04:00
tc_defact.h sched: align nlattr properly when needed 2016-04-26 12:00:49 -04:00
tc_gact.h sched: align nlattr properly when needed 2016-04-26 12:00:49 -04:00
tc_ife.h sched: align nlattr properly when needed 2016-04-26 12:00:49 -04:00
tc_ipt.h sched: align nlattr properly when needed 2016-04-26 12:00:49 -04:00
tc_mirred.h sched: align nlattr properly when needed 2016-04-26 12:00:49 -04:00
tc_nat.h sched: align nlattr properly when needed 2016-04-26 12:00:49 -04:00
tc_pedit.h sched: align nlattr properly when needed 2016-04-26 12:00:49 -04:00
tc_skbedit.h sched: align nlattr properly when needed 2016-04-26 12:00:49 -04:00
tc_vlan.h sched: align nlattr properly when needed 2016-04-26 12:00:49 -04:00