]> git.baikalelectronics.ru Git - kernel.git/commit
net: ethernet: mediatek: fix missing changes merged for conflicts overlapping commits
authorSean Wang <sean.wang@mediatek.com>
Tue, 20 Sep 2016 15:53:24 +0000 (23:53 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Sep 2016 06:05:03 +0000 (02:05 -0400)
commit01c2bab5d859c6f209daed888912c5a7fb191597
tree8f482b230ba29ca34b43be519cb824d7d3bb347a
parent0c061b69c55a2b94061d740fab40da2d4a5cafde
net: ethernet: mediatek: fix missing changes merged for conflicts overlapping commits

add the missing commits about
1)
Commit 0a2a696504c5c6f320a275e2eac80b12cbd8b26a
("remove redundant free_irq for devm_request_ir allocated irq")
2)
Commit 8dbc93dbc7b3ac45e7e0832f43f65fb480e190f2
("fix logic unbalance between probe and remove")

during merge for conflicts overlapping commits by
Commit 6590ef1dee01009357d726812479c79fc1a6c005
("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mediatek/mtk_eth_soc.c