Two minor conflicts in virtio_net driver (bug fix overlapping addition of a helper) and MAINTAINERS (new driver edit overlapping revamp of PHY entry). Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
auxdisplay | ||
blackfin | ||
bpf | ||
configfs | ||
connector | ||
hidraw | ||
hw_breakpoint | ||
kdb | ||
kfifo | ||
kobject | ||
kprobes | ||
livepatch | ||
mei | ||
mic/mpssd | ||
pktgen | ||
rpmsg | ||
seccomp | ||
statx | ||
timers | ||
trace_events | ||
trace_printk | ||
uhid | ||
v4l | ||
vfio-mdev | ||
watchdog | ||
Kconfig | ||
Makefile |