From: Kalle Valo <kvalo@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>,
Brian Norris <briannorris@chromium.org>
Subject: Re: linux-next: manual merge of the net-next tree with the pci tree
Date: Wed, 21 Jun 2017 16:29:29 +0300 [thread overview]
Message-ID: <877f05v58m.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <20170621115443.3e10f0bc@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 21 Jun 2017 11:54:43 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> 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
next prev parent reply other threads:[~2017-06-21 13:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 1:54 linux-next: manual merge of the net-next tree with the pci tree Stephen Rothwell
2017-06-21 13:29 ` Kalle Valo [this message]
2017-06-21 13:32 ` Stephen Rothwell
2017-07-03 1:49 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-08-23 2:35 Stephen Rothwell
2018-04-03 3:14 Stephen Rothwell
2018-04-05 1:40 ` Stephen Rothwell
2017-04-12 0:25 Stephen Rothwell
2015-12-14 0:27 Stephen Rothwell
2013-04-26 3:31 Stephen Rothwell
2012-12-10 1:08 Stephen Rothwell
2012-12-10 6:44 ` Grumbach, Emmanuel
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=877f05v58m.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=bhelgaas@google.com \
--cc=briannorris@chromium.org \
--cc=davem@davemloft.net \
--cc=hch@lst.de \
--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).