From: Bjorn Helgaas <helgaas@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Johannes Thumshirn <jthumshirn@suse.de>,
Jens Axboe <axboe@fb.com>
Subject: Re: linux-next: manual merge of the pci tree with Linus' tree
Date: Thu, 23 Jun 2016 11:43:29 -0500 [thread overview]
Message-ID: <20160623164329.GD17987@localhost> (raw)
In-Reply-To: <20160623114429.1815794f@canb.auug.org.au>
On Thu, Jun 23, 2016 at 11:44:29AM +1000, Stephen Rothwell wrote:
> Hi Bjorn,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
> drivers/nvme/host/pci.c
>
> between commit:
>
> edb50a5403d2 ("NVMe: Only release requested regions")
>
> from Linus' tree and commit:
>
> a1f447b35b72 ("NVMe: Use pci_(request|release)_mem_regions")
>
> from the pci tree.
>
> I fixed it up (I just used the pci tree version of this file) and can
> carry the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging. You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
Thanks for the heads-up. I think using the pci tree version is the
correct resolution.
Bjorn
next prev parent reply other threads:[~2016-06-23 16:43 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-23 1:44 linux-next: manual merge of the pci tree with Linus' tree Stephen Rothwell
2016-06-23 16:43 ` Bjorn Helgaas [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-01-13 23:45 Stephen Rothwell
2022-01-14 5:48 ` Sergio Paracuellos
2022-01-14 6:53 ` Stephen Rothwell
2022-01-14 6:57 ` Sergio Paracuellos
2021-08-25 0:57 Stephen Rothwell
2021-02-23 0:19 Stephen Rothwell
2020-05-14 1:02 Stephen Rothwell
2020-03-30 23:49 Stephen Rothwell
2020-03-31 8:37 ` Geert Uytterhoeven
2020-03-24 23:58 Stephen Rothwell
2019-09-19 12:33 Mark Brown
2018-07-20 1:03 Stephen Rothwell
2018-07-20 9:15 ` Lorenzo Pieralisi
2018-07-20 10:49 ` Thomas Petazzoni
2018-04-03 2:29 Stephen Rothwell
2018-03-26 1:23 Stephen Rothwell
2018-03-27 16:19 ` Rob Herring
2017-06-26 0:51 Stephen Rothwell
2017-07-03 2:58 ` Stephen Rothwell
2016-12-08 23:44 Stephen Rothwell
2016-01-20 23:33 Stephen Rothwell
2013-06-17 1:42 Stephen Rothwell
2013-06-04 1:49 Stephen Rothwell
2013-06-04 2:11 ` Bjorn Helgaas
2012-09-04 2:04 Stephen Rothwell
2012-09-04 1:59 Stephen Rothwell
2012-09-04 6:57 ` Yuval Mintz
2012-06-25 2:31 Stephen Rothwell
2012-06-25 6:32 ` huang ying
2012-06-25 14:14 ` Alan Stern
2012-06-19 1:15 Stephen Rothwell
2010-12-20 2:08 Stephen Rothwell
2009-12-07 0:25 Stephen Rothwell
2009-12-07 0:25 Stephen Rothwell
2009-10-14 0:05 Stephen Rothwell
2009-10-14 0:38 ` Jesse Barnes
2009-10-14 2:10 ` Stephen Rothwell
2009-10-14 7:41 ` David Woodhouse
2009-06-30 1:56 Stephen Rothwell
2009-06-30 2:01 ` Jesse Barnes
2009-06-30 2:16 ` Matthew Wilcox
2009-06-30 16:00 ` Jesse Barnes
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=20160623164329.GD17987@localhost \
--to=helgaas@kernel.org \
--cc=axboe@fb.com \
--cc=bhelgaas@google.com \
--cc=jthumshirn@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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).