[PATCH net-next] net: ethernet: mediatek: fix missing changes merged for conflicts overlapping commits

David Miller davem at davemloft.net
Wed Sep 21 23:05:26 PDT 2016


From: <sean.wang at mediatek.com>
Date: Tue, 20 Sep 2016 23:53:24 +0800

> From: Sean Wang <sean.wang at mediatek.com>
> 
> add the missing commits about
> 1)
> Commit d3bd1ce4db8e843dce421e2f8f123e5251a9c7d3
> ("remove redundant free_irq for devm_request_ir allocated irq")
> 2)
> Commit 7c6b0d76fa02213393815e3b6d5e4a415bf3f0e2
> ("fix logic unbalance between probe and remove")
> 
> during merge for conflicts overlapping commits by
> Commit b20b378d49926b82c0a131492fa8842156e0e8a9
> ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
> 
> Signed-off-by: Sean Wang <sean.wang at mediatek.com>

Applied, thanks for fixing this up for me.



More information about the Linux-mediatek mailing list