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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20160922.020526.1971593537856081147.davem@davemloft.net>
Date:   Thu, 22 Sep 2016 02:05:26 -0400 (EDT)
From:   David Miller <davem@...emloft.net>
To:     sean.wang@...iatek.com
Cc:     john@...ozen.org, nbd@...nwrt.org, netdev@...r.kernel.org,
        linux-mediatek@...ts.infradead.org, keyhaede@...il.com,
        objelf@...il.com
Subject: Re: [PATCH net-next] net: ethernet: mediatek: fix missing changes
 merged for conflicts overlapping commits

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

> From: Sean Wang <sean.wang@...iatek.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@...iatek.com>

Applied, thanks for fixing this up for me.