mirror of https://gitee.com/openkylin/linux.git
394efd19d5
Conflicts:
drivers/net/ethernet/emulex/benet/be.h
drivers/net/netconsole.c
net/bridge/br_private.h
Three mostly trivial conflicts.
The net/bridge/br_private.h conflict was a function signature (argument
addition) change overlapping with the extern removals from Joe Perches.
In drivers/net/netconsole.c we had one change adjusting a printk message
whilst another changed "printk(KERN_INFO" into "pr_info(".
Lastly, the emulex change was a new inline function addition overlapping
with Joe Perches's extern removals.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|---|---|---|
| .. | ||
| Makefile | ||
| qlcnic.h | ||
| qlcnic_83xx_hw.c | ||
| qlcnic_83xx_hw.h | ||
| qlcnic_83xx_init.c | ||
| qlcnic_83xx_vnic.c | ||
| qlcnic_ctx.c | ||
| qlcnic_dcb.c | ||
| qlcnic_dcb.h | ||
| qlcnic_ethtool.c | ||
| qlcnic_hdr.h | ||
| qlcnic_hw.c | ||
| qlcnic_hw.h | ||
| qlcnic_init.c | ||
| qlcnic_io.c | ||
| qlcnic_main.c | ||
| qlcnic_minidump.c | ||
| qlcnic_sriov.h | ||
| qlcnic_sriov_common.c | ||
| qlcnic_sriov_pf.c | ||
| qlcnic_sysfs.c | ||