-
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net由 Jakub Kicinski 提交于
Minor conflict in drivers/s390/net/qeth_l2_main.c, kept the lock from commit c8183f54 ("s390/qeth: fix potential deadlock on workqueue flush"), removed the code which was removed by commit 9897d583 ("s390/qeth: consolidate some duplicated HW cmd code"). Signed-off-by: NJakub Kicinski <jakub.kicinski@netronome.com>
a9f852e9