From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752218AbdFUN3j (ORCPT ); Wed, 21 Jun 2017 09:29:39 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:37898 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751166AbdFUN3g (ORCPT ); Wed, 21 Jun 2017 09:29:36 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org EDDB26084E Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kvalo@codeaurora.org From: Kalle Valo To: Stephen Rothwell Cc: David Miller , Networking , Bjorn Helgaas , Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig , Brian Norris Subject: Re: linux-next: manual merge of the net-next tree with the pci tree References: <20170621115443.3e10f0bc@canb.auug.org.au> Date: Wed, 21 Jun 2017 16:29:29 +0300 In-Reply-To: <20170621115443.3e10f0bc@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 21 Jun 2017 11:54:43 +1000") Message-ID: <877f05v58m.fsf@kamboji.qca.qualcomm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell writes: > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/wireless/marvell/mwifiex/pcie.c > > between commit: > > c336cc0ee4eb ("PCI: Split ->reset_notify() method into > ->reset_prepare() and ->reset_done()") > > from the pci tree and commit: > > 68efd0386988 ("mwifiex: pcie: stop setting/clearing 'surprise_removed'") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary. Thanks, the fix looks good to me. I guess there's nothing I can do at the moment and Linus needs to fix this when he pulls from Dave (or Bjorn, whichever is the last)? -- Kalle Valo