summaryrefslogtreecommitdiff
path: root/staging/cli_dns.c
diff options
context:
space:
mode:
Diffstat (limited to 'staging/cli_dns.c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-19 01:57:45 +0000
e413cd1e042837a8edbdeb'>8fbb89c6fbfd1cda9ae413cd1e042837a8edbdeb (diff)parent272911b889f47aa5bc3e004804fc2382f0ac6ce6 (diff)
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>
Diffstat (limited to 'net/sched/act_vlan.c')