From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bjorn Helgaas <bhelgaas@google•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the pci tree.
Date: Mon, 20 Feb 2017 09:40:56 +1100 [thread overview]
Message-ID: <20170220094056.449c28c4@canb.auug.org.au> (raw)
Hi Bjorn,
Today's linux-next merge of the pci tree got conflicts in:
drivers/pci/dwc/pcie-designware-host.c
I have no idea why? I see this file has been split out from another that
was itself moved from another directory, but that all happened in the
pci tree.
I fixed it up (I just used the pci tree version) 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.
OK, I checked again ... it may be conflicting with commit
a782b5f986c3 ("PCI: designware: Check for iATU unroll only on platforms that use ATU")
from Linus' tree (merged into v4.10-rc5), so my resolution above may be
incorrect.
--
Cheers,
Stephen Rothwell
next reply other threads:[~2017-02-19 22:41 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-19 22:40 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-01-06 0:54 linux-next: manual merge of the pci tree Stephen Rothwell
2008-12-11 0:53 Stephen Rothwell
2008-10-20 4:00 Stephen Rothwell
2008-10-20 18:36 ` Jesse Barnes
2008-10-16 3:24 Stephen Rothwell
2008-10-16 12:32 ` Jesse Barnes
2008-07-08 1:13 Stephen Rothwell
2008-07-03 2:10 Stephen Rothwell
2008-07-03 2:15 ` Stephen Rothwell
2008-07-03 3:28 ` Greg KH
2008-07-03 19:23 ` Jesse Barnes
2008-07-04 0:09 ` Stephen Rothwell
2008-07-04 0:13 ` Jesse Barnes
2008-07-04 0:14 ` Stephen Rothwell
2008-07-01 3:53 Stephen Rothwell
2008-07-01 5:58 ` Ingo Molnar
2008-07-01 6:29 ` Stephen Rothwell
2008-07-02 1:56 ` Jesse Barnes
2008-07-02 2:09 ` Yinghai Lu
2008-07-02 3:19 ` Stephen Rothwell
2008-06-25 3:01 Stephen Rothwell
2008-06-25 19:28 ` Jesse Barnes
2008-06-25 2:57 Stephen Rothwell
2008-06-25 19:27 ` 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=20170220094056.449c28c4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bhelgaas@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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