[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <22fb2201-6ecd-bfc9-9f65-4807d7bf36a1@codeaurora.org>
Date: Tue, 5 Sep 2017 18:54:38 -0400
From: Sinan Kaya <okaya@...eaurora.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
Bjorn Helgaas <bhelgaas@...gle.com>,
David Miller <davem@...emloft.net>,
Networking <netdev@...r.kernel.org>
Cc: Linux-Next Mailing List <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Ding Tianhong <dingtianhong@...wei.com>,
Casey Leedom <leedom@...lsio.com>
Subject: Re: linux-next: manual merge of the pci tree with the net tree
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.
Powered by blists - more mailing lists