2017-12-21 21:45:49

by Stephen Rothwell

Subject: linux-next: manual merge of the omap tree with the keystone tree

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.

--
Cheers,
Stephen Rothwell

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

2017-12-21 23:13:07

by Tony Lindgren

Subject: Re: linux-next: manual merge of the omap tree with the keystone tree

* Stephen Rothwell <[email protected]> [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

2017-12-22 01:59:13

by Santosh Shilimkar

Subject: Re: linux-next: manual merge of the omap tree with the keystone tree

On 12/21/2017 3:12 PM, Tony Lindgren wrote:
> * Stephen Rothwell <[email protected]> [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?
>
I just used savedefconfig so not sure why some of those needed ones
got knocked off. For now, I will drop the v7_defconfig patch and
post it separately later post merge window.

Regards,
Santosh

2017-12-22 06:11:45

by Kishon Vijay Abraham I

Subject: Re: linux-next: manual merge of the omap tree with the keystone tree

On Friday 22 December 2017 04:42 AM, Tony Lindgren wrote:
> * Stephen Rothwell <[email protected]> [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.

omap2plus_defconfig on linux-next looks fine.

Thanks
Kishon

2017-12-22 16:41:53

by Tony Lindgren

Subject: Re: linux-next: manual merge of the omap tree with the keystone tree

* Santosh Shilimkar <[email protected]> [171222 02:01]:
> On 12/21/2017 3:12 PM, Tony Lindgren wrote:
> > * Stephen Rothwell <[email protected]> [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?
> >
> I just used savedefconfig so not sure why some of those needed ones
> got knocked off. For now, I will drop the v7_defconfig patch and
> post it separately later post merge window.

OK thanks for checking. In that case I'll go ahead with Kishon's
changes.

Regards,

Tony