From: David Miller <davem@davemloft.net>
To: sean.wang@mediatek.com
Cc: john@phrozen.org, nbd@openwrt.org, netdev@vger.kernel.org,
linux-mediatek@lists.infradead.org, keyhaede@gmail.com,
objelf@gmail.com
Subject: Re: [PATCH net-next] net: ethernet: mediatek: fix missing changes merged for conflicts overlapping commits
Date: Thu, 22 Sep 2016 02:05:26 -0400 (EDT) [thread overview]
Message-ID: <20160922.020526.1971593537856081147.davem@davemloft.net> (raw)
In-Reply-To: <1474386804-11728-1-git-send-email-sean.wang@mediatek.com>
From: <sean.wang@mediatek.com>
Date: Tue, 20 Sep 2016 23:53:24 +0800
> From: Sean Wang <sean.wang@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@mediatek.com>
Applied, thanks for fixing this up for me.
prev parent reply other threads:[~2016-09-22 6:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 15:53 [PATCH net-next] net: ethernet: mediatek: fix missing changes merged for conflicts overlapping commits sean.wang
2016-09-22 6:05 ` David Miller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160922.020526.1971593537856081147.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=john@phrozen.org \
--cc=keyhaede@gmail.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=nbd@openwrt.org \
--cc=netdev@vger.kernel.org \
--cc=objelf@gmail.com \
--cc=sean.wang@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).