From: Sinan Kaya <okaya@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Bjorn Helgaas <bhelgaas@google.com>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Ding Tianhong <dingtianhong@huawei.com>,
Casey Leedom <leedom@chelsio.com>
Subject: Re: linux-next: manual merge of the pci tree with the net tree
Date: Tue, 5 Sep 2017 18:54:38 -0400 [thread overview]
Message-ID: <22fb2201-6ecd-bfc9-9f65-4807d7bf36a1@codeaurora.org> (raw)
In-Reply-To: <20170904145427.60b35b0c@canb.auug.org.au>
On 9/4/2017 12:54 AM, Stephen Rothwell wrote:
> Just a reminder that this conflict still exists.
I suppose this was a message for Bjorn, right?
I looked at the change and it looked good to me.
--
Sinan Kaya
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
next prev parent reply other threads:[~2017-09-05 22:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-15 23:51 linux-next: manual merge of the pci tree with the net tree Stephen Rothwell
2017-09-04 4:54 ` Stephen Rothwell
2017-09-05 22:54 ` Sinan Kaya [this message]
2017-09-05 23:10 ` Stephen Rothwell
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=22fb2201-6ecd-bfc9-9f65-4807d7bf36a1@codeaurora.org \
--to=okaya@codeaurora.org \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=dingtianhong@huawei.com \
--cc=leedom@chelsio.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).