From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Santosh Shilimkar <santosh.shilimkar@oracle.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kishon Vijay Abraham I <kishon@ti.com>
Subject: Re: linux-next: manual merge of the omap tree with the keystone tree
Date: Thu, 21 Dec 2017 15:12:53 -0800 [thread overview]
Message-ID: <20171221231253.GX3875@atomide.com> (raw)
In-Reply-To: <20171222084545.5bab63b5@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [171221 21:48]:
> Hi Tony,
>
> Today's linux-next merge of the omap tree got a conflict in:
>
> arch/arm/configs/multi_v7_defconfig
>
> between commit:
>
> d3b15c54ed7e ("ARM: config: sync multi-v7 config with keystone peripherals")
>
> from the keystone tree and commit:
>
> d03366dcbffc ("ARM: multi_v7_defconfig: Enable CONFIG_PCI_DRA7XX (Host & Device modes)")
>
> from the omap tree.
>
> I fixed it up (see below) 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 I'll wait on this one so Kishon can check the resulting next.
Santosh, the removal of CONFIG_PCI in multi_v7_defconfig looks a bit
suspcicious to me, care to check if commit d3b15c54ed7e is correct?
Regards,
Tony
> diff --cc arch/arm/configs/multi_v7_defconfig
> index c4f4f6682ea5,6faecd55ccbd..000000000000
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@@ -105,13 -113,24 +105,18 @@@ CONFIG_ARCH_VEXPRESS=
> CONFIG_ARCH_VEXPRESS_TC2_PM=y
> CONFIG_ARCH_WM8850=y
> CONFIG_ARCH_ZYNQ=y
> -CONFIG_TRUSTED_FOUNDATIONS=y
> -CONFIG_PCI=y
> -CONFIG_PCI_HOST_GENERIC=y
> + CONFIG_PCI_DRA7XX=y
> + CONFIG_PCI_DRA7XX_EP=y
> CONFIG_PCI_KEYSTONE=y
> -CONFIG_PCI_MSI=y
> CONFIG_PCI_MVEBU=y
> CONFIG_PCI_TEGRA=y
> CONFIG_PCI_RCAR_GEN2=y
> CONFIG_PCIE_RCAR=y
> -CONFIG_PCIEPORTBUS=y
> + CONFIG_PCI_ENDPOINT=y
> + CONFIG_PCI_ENDPOINT_CONFIGFS=y
> + CONFIG_PCI_EPF_TEST=m
> CONFIG_SMP=y
> CONFIG_NR_CPUS=16
> -CONFIG_HIGHPTE=y
> CONFIG_CMA=y
> CONFIG_SECCOMP=y
> CONFIG_ARM_APPENDED_DTB=y
next prev parent reply other threads:[~2017-12-21 23:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-21 21:45 linux-next: manual merge of the omap tree with the keystone tree Stephen Rothwell
2017-12-21 23:12 ` Tony Lindgren [this message]
2017-12-22 1:58 ` Santosh Shilimkar
2017-12-22 16:41 ` Tony Lindgren
2017-12-22 6:11 ` Kishon Vijay Abraham I
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=20171221231253.GX3875@atomide.com \
--to=tony@atomide.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=santosh.shilimkar@oracle.com \
--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).