mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
![]() Conflicts: net/ipv6/xfrm6_output.c net/openvswitch/flow_netlink.c net/openvswitch/vport-gre.c net/openvswitch/vport-vxlan.c net/openvswitch/vport.c net/openvswitch/vport.h The openvswitch conflicts were overlapping changes. One was the egress tunnel info fix in 'net' and the other was the vport ->send() op simplification in 'net-next'. The xfrm6_output.c conflicts was also a simplification overlapping a bug fix. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
clock.c | ||
core.c | ||
core.h | ||
dsp.h | ||
dsp_audio.c | ||
dsp_biquad.h | ||
dsp_blowfish.c | ||
dsp_cmx.c | ||
dsp_core.c | ||
dsp_dtmf.c | ||
dsp_ecdis.h | ||
dsp_hwec.c | ||
dsp_hwec.h | ||
dsp_pipeline.c | ||
dsp_tones.c | ||
fsm.c | ||
fsm.h | ||
hwchannel.c | ||
Kconfig | ||
l1oip.h | ||
l1oip_codec.c | ||
l1oip_core.c | ||
layer1.c | ||
layer1.h | ||
layer2.c | ||
layer2.h | ||
Makefile | ||
socket.c | ||
stack.c | ||
tei.c | ||
timerdev.c |