Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the tegra tree with the arm-soc tree
@ 2020-03-26 22:27 Stephen Rothwell
  2020-03-27 13:18 ` Thierry Reding
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2020-03-26 22:27 UTC (permalink / raw)
  To: Colin Cross, Olof Johansson, Thierry Reding, Arnd Bergmann, ARM
  Cc: JC Kuo, Linux Next Mailing List, Nagarjuna Kristam,
	Linux Kernel Mailing List, Corentin Labbe

[-- Attachment #1.1: Type: text/plain, Size: 1328 bytes --]

Hi all,

Today's linux-next merge of the tegra tree got conflicts in:

  drivers/phy/tegra/Kconfig
  drivers/phy/tegra/xusb.c

between commits:

  5a00c7c7604f ("phy: tegra: xusb: Add usb-role-switch support")
  23babe30fb45 ("phy: tegra: xusb: Add usb-phy support")
  d74ce0954cb2 ("phy: tegra: xusb: Add support to get companion USB 3 port")
  58e7bd08b569 ("phy: tegra: xusb: Add Tegra194 support")

from the arm-soc tree and commit:

  f67213cee2b3 ("phy: tegra: xusb: Add usb-role-switch support")
  e8f7d2f409a1 ("phy: tegra: xusb: Add usb-phy support")
  5a40fc4b934c ("phy: tegra: xusb: Add support to get companion USB 3 port")
  1ef535c6ba8e ("phy: tegra: xusb: Add Tegra194 support")

from the tegra tree.

These are slightly different patches (the latter has been rebased).
Also there are further commits affecting these files in the tegra tree.

I fixed it up (I just used the version from the tegra tree) 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

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: linux-next: manual merge of the tegra tree with the arm-soc tree
  2020-03-26 22:27 linux-next: manual merge of the tegra tree with the arm-soc tree Stephen Rothwell
@ 2020-03-27 13:18 ` Thierry Reding
  2020-03-27 13:50   ` Arnd Bergmann
  0 siblings, 1 reply; 19+ messages in thread
From: Thierry Reding @ 2020-03-27 13:18 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann
  Cc: Stephen Rothwell, JC Kuo, Linux Kernel Mailing List,
	Linux Next Mailing List, Nagarjuna Kristam, Corentin Labbe,
	Colin Cross, ARM

[-- Attachment #1.1: Type: text/plain, Size: 2180 bytes --]

On Fri, Mar 27, 2020 at 09:27:41AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tegra tree got conflicts in:
> 
>   drivers/phy/tegra/Kconfig
>   drivers/phy/tegra/xusb.c
> 
> between commits:
> 
>   5a00c7c7604f ("phy: tegra: xusb: Add usb-role-switch support")
>   23babe30fb45 ("phy: tegra: xusb: Add usb-phy support")
>   d74ce0954cb2 ("phy: tegra: xusb: Add support to get companion USB 3 port")
>   58e7bd08b569 ("phy: tegra: xusb: Add Tegra194 support")
> 
> from the arm-soc tree and commit:
> 
>   f67213cee2b3 ("phy: tegra: xusb: Add usb-role-switch support")
>   e8f7d2f409a1 ("phy: tegra: xusb: Add usb-phy support")
>   5a40fc4b934c ("phy: tegra: xusb: Add support to get companion USB 3 port")
>   1ef535c6ba8e ("phy: tegra: xusb: Add Tegra194 support")
> 
> from the tegra tree.
> 
> These are slightly different patches (the latter has been rebased).
> Also there are further commits affecting these files in the tegra tree.
> 
> I fixed it up (I just used the version from the tegra tree) 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.

Olof, Arnd,

There was a bit of back and forth on this because there happened to be a
conflict with the USB tree. I tried to clarify this as replies to the PR
request:

	http://patchwork.ozlabs.org/patch/1254523/

But I suspect you may have missed those replies. The bottom line is,
there is a v2 of the pull request that has the patches that are now in
the Tegra tree. That's already part of a PR that went in through the USB
tree as a dependency to resolve the conflict.

So as a result there should be no need for ARM SoC to carry that PR. But
if you still want to merge it, please pull v2, which is here:

	git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-5.7-phy-v2

Sorry for the confusion,
Thierry

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 19+ messages in thread

* Re: linux-next: manual merge of the tegra tree with the arm-soc tree
  2020-03-27 13:18 ` Thierry Reding
@ 2020-03-27 13:50   ` Arnd Bergmann
  0 siblings, 0 replies; 19+ messages in thread
From: Arnd Bergmann @ 2020-03-27 13:50 UTC (permalink / raw)
  To: Thierry Reding
  Cc: Stephen Rothwell, JC Kuo, Linux Kernel Mailing List,
	Linux Next Mailing List, Nagarjuna Kristam, Corentin Labbe,
	Colin Cross, Olof Johansson, ARM

On Fri, Mar 27, 2020 at 2:18 PM Thierry Reding <treding@nvidia.com> wrote:
> On Fri, Mar 27, 2020 at 09:27:41AM +1100, Stephen Rothwell wrote:
> > I fixed it up (I just used the version from the tegra tree) 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.
>
> Olof, Arnd,
>
> There was a bit of back and forth on this because there happened to be a
> conflict with the USB tree. I tried to clarify this as replies to the PR
> request:
>
>         http://patchwork.ozlabs.org/patch/1254523/
>
> But I suspect you may have missed those replies. The bottom line is,
> there is a v2 of the pull request that has the patches that are now in
> the Tegra tree. That's already part of a PR that went in through the USB
> tree as a dependency to resolve the conflict.
>
> So as a result there should be no need for ARM SoC to carry that PR. But
> if you still want to merge it, please pull v2, which is here:
>
>         git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-5.7-phy-v2
>

It was almost at the top of the branch, so I ended up just taking it out now, it
should be gone from the soc tree by tomorrow.

I think I managed to skip it as you asked on my first pass, but then failed to
reread the message when I went through the remaining entries in patchwork.

Clearly my tooling still needs  a bit of improvement.

      Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
@ 2019-06-25  0:12 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2019-06-25  0:12 UTC (permalink / raw)
  To: Colin Cross, Olof Johansson, Thierry Reding, Arnd Bergmann, ARM
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Krzysztof Kozlowski, Vidya Sagar

[-- Attachment #1.1: Type: text/plain, Size: 1166 bytes --]

Hi all,

Today's linux-next merge of the tegra tree got a conflict in:

  arch/arm64/configs/defconfig

between commit:

  39bab7bfb7d9 ("arm64: configs: Remove useless UEVENT_HELPER_PATH")

from the arm-soc tree and commit:

  01d6fb565b4a ("arm64: defconfig: Add Tegra194 PCIe driver")

from the tegra 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/arm64/configs/defconfig
index 3fb84219817a,6a9dc67bbfac..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -192,6 -191,8 +192,7 @@@ CONFIG_PCIE_QCOM=
  CONFIG_PCIE_ARMADA_8K=y
  CONFIG_PCIE_KIRIN=y
  CONFIG_PCIE_HISI_STB=y
+ CONFIG_PCIE_TEGRA194=m
 -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_HISILICON_LPC=y

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
@ 2015-12-02 11:46 Mark Brown
  0 siblings, 0 replies; 19+ messages in thread
From: Mark Brown @ 2015-12-02 11:46 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the tegra tree got a conflict in arch/arm64/configs/defconfig between commit e324654294907a4 ("ARM: use "depends on" for SoC configs instead of "if" after prompt") from the arm-soc tree and commit 099a6644f5be4 ("soc/tegra: Provide per-SoC Kconfig symbols") from the tegra tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc arch/arm/mach-tegra/Kconfig
index a90f3556017f,6f7bec07cda6..000000000000
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -1,6 -1,5 +1,6 @@@
- menuconfig ARCH_TEGRA
+ config ARCH_TEGRA
 -	bool "NVIDIA Tegra" if ARCH_MULTI_V7
 +	bool "NVIDIA Tegra"
 +	depends on ARCH_MULTI_V7
  	select ARCH_REQUIRE_GPIOLIB
  	select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
  	select ARM_AMBA
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151202/b5c6a326/attachment.sig>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
  2013-03-18 15:23 ` Stephen Warren
@ 2013-03-18 15:49   ` Arnd Bergmann
  0 siblings, 0 replies; 19+ messages in thread
From: Arnd Bergmann @ 2013-03-18 15:49 UTC (permalink / raw)
  To: linux-arm-kernel

On Monday 18 March 2013, Stephen Warren wrote:
> On 03/17/2013 10:31 PM, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the tegra tree got a conflict in 
> > drivers/clocksource/tegra20_timer.c between commit 1d16cfb3aeba 
> > ("clocksource: tegra20: use the device_node pointer passed to
> > init") from the arm-soc tree and commit 6f88fb8af6c6 ("clocksource:
> > tegra: move to of_clk_get") from the tegra tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary (no
> > action is required).
> 
> Thanks. This resolution looks fine.
> 
> Arnd/Olof, do you want me to rebase the Tegra branch onto some arm-soc
> branch to resolve this conflict, or are you happy to simply resolve it
> as below when pulling the Tegra branches into arm-soc for 3.10?

No need to rebase. We can resolve this by merging the clksrc/cleanup
into your branch when we pull it, or you can merge it yourself.

	Arnd

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
  2013-03-18  4:31 Stephen Rothwell
@ 2013-03-18 15:23 ` Stephen Warren
  2013-03-18 15:49   ` Arnd Bergmann
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Warren @ 2013-03-18 15:23 UTC (permalink / raw)
  To: linux-arm-kernel

On 03/17/2013 10:31 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tegra tree got a conflict in 
> drivers/clocksource/tegra20_timer.c between commit 1d16cfb3aeba 
> ("clocksource: tegra20: use the device_node pointer passed to
> init") from the arm-soc tree and commit 6f88fb8af6c6 ("clocksource:
> tegra: move to of_clk_get") from the tegra tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no
> action is required).

Thanks. This resolution looks fine.

Arnd/Olof, do you want me to rebase the Tegra branch onto some arm-soc
branch to resolve this conflict, or are you happy to simply resolve it
as below when pulling the Tegra branches into arm-soc for 3.10?

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
@ 2013-03-18  4:31 Stephen Rothwell
  2013-03-18 15:23 ` Stephen Warren
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2013-03-18  4:31 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
drivers/clocksource/tegra20_timer.c between commit 1d16cfb3aeba
("clocksource: tegra20: use the device_node pointer passed to init") from
the arm-soc tree and commit 6f88fb8af6c6 ("clocksource: tegra: move to
of_clk_get") from the tegra tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc drivers/clocksource/tegra20_timer.c
index 2e4d8a6,bc4b8ad..0000000
--- a/drivers/clocksource/tegra20_timer.c
+++ b/drivers/clocksource/tegra20_timer.c
@@@ -218,34 -259,12 +218,34 @@@ static void __init tegra20_init_timer(s
  	tegra_clockevent.irq = tegra_timer_irq.irq;
  	clockevents_config_and_register(&tegra_clockevent, 1000000,
  					0x1, 0x1fffffff);
 -#ifdef CONFIG_HAVE_ARM_TWD
 -	twd_local_timer_of_register();
 -#endif
 +}
 +CLOCKSOURCE_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer);
 +
 +static void __init tegra20_init_rtc(struct device_node *np)
 +{
 +	struct clk *clk;
 +
 +	rtc_base = of_iomap(np, 0);
 +	if (!rtc_base) {
 +		pr_err("Can't map RTC registers");
 +		BUG();
 +	}
 +
 +	/*
 +	 * rtc registers are used by read_persistent_clock, keep the rtc clock
 +	 * enabled
 +	 */
- 	clk = clk_get_sys("rtc-tegra", NULL);
++	clk = of_clk_get(np, 0);
 +	if (IS_ERR(clk))
 +		pr_warn("Unable to get rtc-tegra clock\n");
 +	else
 +		clk_prepare_enable(clk);
 +
 +	of_node_put(np);
 +
  	register_persistent_clock(NULL, tegra_read_persistent_clock);
  }
 -CLOCKSOURCE_OF_DECLARE(tegra20, "nvidia,tegra20-timer", tegra20_init_timer);
 +CLOCKSOURCE_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc);
  
  #ifdef CONFIG_PM
  static u32 usec_config;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130318/cca713cf/attachment-0001.sig>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
@ 2013-01-23  5:30 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2013-01-23  5:30 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/platsmp.c between commit 520f7bd73354 ("irqchip: Move
ARM gic.h to include/linux/irqchip/arm-gic.h") from the arm-soc tree and
commit 4c6e1ff5b5fe ("ARM: tegra: move tegra_cpu_car.h to
linux/clk/tegra.h") from the tegra tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/mach-tegra/platsmp.c
index 18d7290,3ec7fc4..0000000
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@@ -18,11 -18,13 +18,13 @@@
  #include <linux/jiffies.h>
  #include <linux/smp.h>
  #include <linux/io.h>
 +#include <linux/irqchip/arm-gic.h>
+ #include <linux/clk/tegra.h>
  
  #include <asm/cacheflush.h>
 -#include <asm/hardware/gic.h>
  #include <asm/mach-types.h>
  #include <asm/smp_scu.h>
+ #include <asm/smp_plat.h>
  
  #include <mach/powergate.h>
  
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130123/e1eae94b/attachment.sig>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
@ 2013-01-23  5:25 Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2013-01-23  5:25 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/common.c between commit 0529e315bbda ("ARM: use
common irqchip_init for GIC init") from the arm-soc tree and commit
567f70da22d2 ("ARM: tegra: migrate to new clock code") from the tegra
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/mach-tegra/common.c
index 3599959,87dd69c..0000000
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -21,9 -21,11 +21,10 @@@
  #include <linux/io.h>
  #include <linux/clk.h>
  #include <linux/delay.h>
 -#include <linux/of_irq.h>
 +#include <linux/irqchip.h>
+ #include <linux/clk/tegra.h>
  
  #include <asm/hardware/cache-l2x0.h>
 -#include <asm/hardware/gic.h>
  
  #include <mach/powergate.h>
  
@@@ -56,10 -58,16 +57,11 @@@ u32 tegra_uart_config[4] = 
  };
  
  #ifdef CONFIG_OF
 -static const struct of_device_id tegra_dt_irq_match[] __initconst = {
 -	{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init },
 -	{ }
 -};
 -
  void __init tegra_dt_init_irq(void)
  {
+ 	tegra_clocks_init();
  	tegra_init_irq();
 -	of_irq_init(tegra_dt_irq_match);
 +	irqchip_init();
  }
  #endif
  
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130123/0d84bbac/attachment.sig>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
  2013-01-16 17:08         ` Stephen Warren
@ 2013-01-16 17:35           ` Olof Johansson
  0 siblings, 0 replies; 19+ messages in thread
From: Olof Johansson @ 2013-01-16 17:35 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Jan 16, 2013 at 9:08 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 01/16/2013 09:27 AM, Olof Johansson wrote:
>> Hi,
>>
>> On Tue, Jan 15, 2013 at 8:52 PM, Tony Prisk <linux@prisktech.co.nz> wrote:
>>> On Tue, 2013-01-15 at 21:32 -0700, Stephen Warren wrote:
>>>> On 01/15/2013 08:49 PM, Tony Prisk wrote:
>>>>> On Wed, 2013-01-16 at 14:14 +1100, Stephen Rothwell wrote:
>>>>>> Hi all,
>>>>>>
>>>>>> Today's linux-next merge of the tegra tree got a conflict in
>>>>>> drivers/clocksource/Makefile between commit ff7ec345f0ec ("timer: vt8500:
>>>>>> Move timer code to drivers/clocksource") from the arm-soc tree and commit
>>>>>> ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from
>>>>>> the tegra tree.
>>>>>>
>>>>>> I fixed it up (see below) and can carry the fix as necessary (no action
>>>>>> is required).
>>>>>>
>>>>>
>>>>> I don't know about everyone else, but I feel the preference should be to
>>>>> keep things alphabetized where possible to help avoid with merge
>>>>> conflicts later on. This is always a problem when we start tacking
>>>>> things on the end of lists.
>>>>>
>>>>> I realise this Kconfig is not alphabetized anyway, but it's never too
>>>>> early to start on the 'right' path.
>>>>
>>>> Sounds like a good idea, but the issue is: When to do the initial sort
>>>> so it doesn't conflict with all the adds in a kernel cycle... Post and
>>>> immediately commit a new patch near the end of the merge window?
>>>
>>> Given that the maintainer can quite safely do the patch (sorry
>>> maintainers), I don't see any reason why it couldn't be done at the
>>> point where they stop accepting patches for the merge-window. Once the
>>> patches are stopped, sort the list in one last patch.
>
> That only works well if the one maintainer is the only person taking
> patches for the drivers/clocksource tree. It might be true that the "one
> maintainer" here ends up being arm-soc in this kernel cycle though?

I'll send a patch to Linus at the end of the merge window, no need to
do it through a merge -- that way it's trivial for him to fixup a
merge conflict (and he can refuse to take it if he feels it's silly).

>>> It makes sense to get it done in this window if possible as the Kconfig
>>> will only get bigger as time goes on, making sorting it more time
>>> consuming.
>>
>> Actually, Russell wen through and reordered these not long ago, if I
>> remember correctly. The current ordering is the same as in the
>> structure definition, and should be kept that way.
>
> I think this is talking about Makefile entries rather than struct
> definitions?

Ah, yes, they should be sorted. But definitely not right now since
it'll just make things worse.


-Olof

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
  2013-01-16 16:27       ` Olof Johansson
@ 2013-01-16 17:08         ` Stephen Warren
  2013-01-16 17:35           ` Olof Johansson
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Warren @ 2013-01-16 17:08 UTC (permalink / raw)
  To: linux-arm-kernel

On 01/16/2013 09:27 AM, Olof Johansson wrote:
> Hi,
> 
> On Tue, Jan 15, 2013 at 8:52 PM, Tony Prisk <linux@prisktech.co.nz> wrote:
>> On Tue, 2013-01-15 at 21:32 -0700, Stephen Warren wrote:
>>> On 01/15/2013 08:49 PM, Tony Prisk wrote:
>>>> On Wed, 2013-01-16 at 14:14 +1100, Stephen Rothwell wrote:
>>>>> Hi all,
>>>>>
>>>>> Today's linux-next merge of the tegra tree got a conflict in
>>>>> drivers/clocksource/Makefile between commit ff7ec345f0ec ("timer: vt8500:
>>>>> Move timer code to drivers/clocksource") from the arm-soc tree and commit
>>>>> ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from
>>>>> the tegra tree.
>>>>>
>>>>> I fixed it up (see below) and can carry the fix as necessary (no action
>>>>> is required).
>>>>>
>>>>
>>>> I don't know about everyone else, but I feel the preference should be to
>>>> keep things alphabetized where possible to help avoid with merge
>>>> conflicts later on. This is always a problem when we start tacking
>>>> things on the end of lists.
>>>>
>>>> I realise this Kconfig is not alphabetized anyway, but it's never too
>>>> early to start on the 'right' path.
>>>
>>> Sounds like a good idea, but the issue is: When to do the initial sort
>>> so it doesn't conflict with all the adds in a kernel cycle... Post and
>>> immediately commit a new patch near the end of the merge window?
>>
>> Given that the maintainer can quite safely do the patch (sorry
>> maintainers), I don't see any reason why it couldn't be done at the
>> point where they stop accepting patches for the merge-window. Once the
>> patches are stopped, sort the list in one last patch.

That only works well if the one maintainer is the only person taking
patches for the drivers/clocksource tree. It might be true that the "one
maintainer" here ends up being arm-soc in this kernel cycle though?

>> It makes sense to get it done in this window if possible as the Kconfig
>> will only get bigger as time goes on, making sorting it more time
>> consuming.
> 
> Actually, Russell wen through and reordered these not long ago, if I
> remember correctly. The current ordering is the same as in the
> structure definition, and should be kept that way.

I think this is talking about Makefile entries rather than struct
definitions?

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
  2013-01-16  4:52     ` Tony Prisk
@ 2013-01-16 16:27       ` Olof Johansson
  2013-01-16 17:08         ` Stephen Warren
  0 siblings, 1 reply; 19+ messages in thread
From: Olof Johansson @ 2013-01-16 16:27 UTC (permalink / raw)
  To: linux-arm-kernel

Hi,

On Tue, Jan 15, 2013 at 8:52 PM, Tony Prisk <linux@prisktech.co.nz> wrote:
> On Tue, 2013-01-15 at 21:32 -0700, Stephen Warren wrote:
>> On 01/15/2013 08:49 PM, Tony Prisk wrote:
>> > On Wed, 2013-01-16 at 14:14 +1100, Stephen Rothwell wrote:
>> >> Hi all,
>> >>
>> >> Today's linux-next merge of the tegra tree got a conflict in
>> >> drivers/clocksource/Makefile between commit ff7ec345f0ec ("timer: vt8500:
>> >> Move timer code to drivers/clocksource") from the arm-soc tree and commit
>> >> ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from
>> >> the tegra tree.
>> >>
>> >> I fixed it up (see below) and can carry the fix as necessary (no action
>> >> is required).
>> >>
>> >
>> > I don't know about everyone else, but I feel the preference should be to
>> > keep things alphabetized where possible to help avoid with merge
>> > conflicts later on. This is always a problem when we start tacking
>> > things on the end of lists.
>> >
>> > I realise this Kconfig is not alphabetized anyway, but it's never too
>> > early to start on the 'right' path.
>>
>> Sounds like a good idea, but the issue is: When to do the initial sort
>> so it doesn't conflict with all the adds in a kernel cycle... Post and
>> immediately commit a new patch near the end of the merge window?
>
> Given that the maintainer can quite safely do the patch (sorry
> maintainers), I don't see any reason why it couldn't be done at the
> point where they stop accepting patches for the merge-window. Once the
> patches are stopped, sort the list in one last patch.
>
> It makes sense to get it done in this window if possible as the Kconfig
> will only get bigger as time goes on, making sorting it more time
> consuming.

Actually, Russell wen through and reordered these not long ago, if I
remember correctly. The current ordering is the same as in the
structure definition, and should be kept that way.


-Olof

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
  2013-01-16  4:32   ` Stephen Warren
@ 2013-01-16  4:52     ` Tony Prisk
  2013-01-16 16:27       ` Olof Johansson
  0 siblings, 1 reply; 19+ messages in thread
From: Tony Prisk @ 2013-01-16  4:52 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, 2013-01-15 at 21:32 -0700, Stephen Warren wrote:
> On 01/15/2013 08:49 PM, Tony Prisk wrote:
> > On Wed, 2013-01-16 at 14:14 +1100, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> Today's linux-next merge of the tegra tree got a conflict in
> >> drivers/clocksource/Makefile between commit ff7ec345f0ec ("timer: vt8500:
> >> Move timer code to drivers/clocksource") from the arm-soc tree and commit
> >> ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from
> >> the tegra tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> >>
> > 
> > I don't know about everyone else, but I feel the preference should be to
> > keep things alphabetized where possible to help avoid with merge
> > conflicts later on. This is always a problem when we start tacking
> > things on the end of lists.
> > 
> > I realise this Kconfig is not alphabetized anyway, but it's never too
> > early to start on the 'right' path.
> 
> Sounds like a good idea, but the issue is: When to do the initial sort
> so it doesn't conflict with all the adds in a kernel cycle... Post and
> immediately commit a new patch near the end of the merge window?

Given that the maintainer can quite safely do the patch (sorry
maintainers), I don't see any reason why it couldn't be done at the
point where they stop accepting patches for the merge-window. Once the
patches are stopped, sort the list in one last patch.

It makes sense to get it done in this window if possible as the Kconfig
will only get bigger as time goes on, making sorting it more time
consuming.

Regards
Tony P

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
  2013-01-16  3:49 ` Tony Prisk
@ 2013-01-16  4:32   ` Stephen Warren
  2013-01-16  4:52     ` Tony Prisk
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Warren @ 2013-01-16  4:32 UTC (permalink / raw)
  To: linux-arm-kernel

On 01/15/2013 08:49 PM, Tony Prisk wrote:
> On Wed, 2013-01-16 at 14:14 +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the tegra tree got a conflict in
>> drivers/clocksource/Makefile between commit ff7ec345f0ec ("timer: vt8500:
>> Move timer code to drivers/clocksource") from the arm-soc tree and commit
>> ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from
>> the tegra tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>>
> 
> I don't know about everyone else, but I feel the preference should be to
> keep things alphabetized where possible to help avoid with merge
> conflicts later on. This is always a problem when we start tacking
> things on the end of lists.
> 
> I realise this Kconfig is not alphabetized anyway, but it's never too
> early to start on the 'right' path.

Sounds like a good idea, but the issue is: When to do the initial sort
so it doesn't conflict with all the adds in a kernel cycle... Post and
immediately commit a new patch near the end of the merge window?

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
  2013-01-16  3:14 Stephen Rothwell
@ 2013-01-16  3:49 ` Tony Prisk
  2013-01-16  4:32   ` Stephen Warren
  0 siblings, 1 reply; 19+ messages in thread
From: Tony Prisk @ 2013-01-16  3:49 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, 2013-01-16 at 14:14 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tegra tree got a conflict in
> drivers/clocksource/Makefile between commit ff7ec345f0ec ("timer: vt8500:
> Move timer code to drivers/clocksource") from the arm-soc tree and commit
> ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from
> the tegra tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 

I don't know about everyone else, but I feel the preference should be to
keep things alphabetized where possible to help avoid with merge
conflicts later on. This is always a problem when we start tacking
things on the end of lists.

I realise this Kconfig is not alphabetized anyway, but it's never too
early to start on the 'right' path.

Regards
Tony P

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
@ 2013-01-16  3:14 Stephen Rothwell
  2013-01-16  3:49 ` Tony Prisk
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2013-01-16  3:14 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
drivers/clocksource/Makefile between commit ff7ec345f0ec ("timer: vt8500:
Move timer code to drivers/clocksource") from the arm-soc tree and commit
ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from
the tegra tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc drivers/clocksource/Makefile
index 440449c,b5cc507..0000000
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -17,6 -17,6 +17,7 @@@ obj-$(CONFIG_CLKSRC_DBX500_PRCMU)	+= cl
  obj-$(CONFIG_ARMADA_370_XP_TIMER)	+= time-armada-370-xp.o
  obj-$(CONFIG_ARCH_BCM2835)	+= bcm2835_timer.o
  obj-$(CONFIG_SUNXI_TIMER)	+= sunxi_timer.o
 +obj-$(CONFIG_VT8500_TIMER)	+= vt8500_timer.o
+ obj-$(CONFIG_ARCH_TEGRA)	+= tegra20_timer.o
  
  obj-$(CONFIG_CLKSRC_ARM_GENERIC)	+= arm_generic.o
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130116/ed67163e/attachment.sig>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
  2013-01-16  3:10 Stephen Rothwell
@ 2013-01-16  3:12 ` Stephen Rothwell
  0 siblings, 0 replies; 19+ messages in thread
From: Stephen Rothwell @ 2013-01-16  3:12 UTC (permalink / raw)
  To: linux-arm-kernel

Hi All,

On Wed, 16 Jan 2013 14:10:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tegra tree got a conflict in
> arch/arm/mach-tegra/board-dt-tegra20.c between commit 1d5cc604f42f ("ARM:
> remove mach .handle_irq for GIC users") from the arm-soc tree and commit
> ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from
> the tegra tree.

This also affected arch/arm/mach-tegra/board-dt-tegra30.c.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/mach-tegra/board-dt-tegra30.c
index 12dc2dd,cfe5fc0..0000000
--- a/arch/arm/mach-tegra/board-dt-tegra30.c
+++ b/arch/arm/mach-tegra/board-dt-tegra30.c
@@@ -111,7 -113,8 +112,7 @@@ DT_MACHINE_START(TEGRA30_DT, "NVIDIA Te
  	.map_io		= tegra_map_common_io,
  	.init_early	= tegra30_init_early,
  	.init_irq	= tegra_dt_init_irq,
- 	.init_time	= tegra_init_timer,
 -	.handle_irq	= gic_handle_irq,
+ 	.init_time	= clocksource_of_init,
  	.init_machine	= tegra30_dt_init,
  	.init_late	= tegra_init_late,
  	.restart	= tegra_assert_system_reset,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130116/e1702c0c/attachment-0001.sig>

^ permalink raw reply	[flat|nested] 19+ messages in thread

* linux-next: manual merge of the tegra tree with the arm-soc tree
@ 2013-01-16  3:10 Stephen Rothwell
  2013-01-16  3:12 ` Stephen Rothwell
  0 siblings, 1 reply; 19+ messages in thread
From: Stephen Rothwell @ 2013-01-16  3:10 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/board-dt-tegra20.c between commit 1d5cc604f42f ("ARM:
remove mach .handle_irq for GIC users") from the arm-soc tree and commit
ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from
the tegra tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
index 5ed81bab,171ba3c..0000000
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@@ -200,7 -203,8 +201,7 @@@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegr
  	.smp		= smp_ops(tegra_smp_ops),
  	.init_early	= tegra20_init_early,
  	.init_irq	= tegra_dt_init_irq,
- 	.init_time	= tegra_init_timer,
 -	.handle_irq	= gic_handle_irq,
+ 	.init_time	= clocksource_of_init,
  	.init_machine	= tegra_dt_init,
  	.init_late	= tegra_dt_init_late,
  	.restart	= tegra_assert_system_reset,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130116/b4c2fd46/attachment.sig>

^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, back to index

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-26 22:27 linux-next: manual merge of the tegra tree with the arm-soc tree Stephen Rothwell
2020-03-27 13:18 ` Thierry Reding
2020-03-27 13:50   ` Arnd Bergmann
  -- strict thread matches above, loose matches on Subject: below --
2019-06-25  0:12 Stephen Rothwell
2015-12-02 11:46 Mark Brown
2013-03-18  4:31 Stephen Rothwell
2013-03-18 15:23 ` Stephen Warren
2013-03-18 15:49   ` Arnd Bergmann
2013-01-23  5:30 Stephen Rothwell
2013-01-23  5:25 Stephen Rothwell
2013-01-16  3:14 Stephen Rothwell
2013-01-16  3:49 ` Tony Prisk
2013-01-16  4:32   ` Stephen Warren
2013-01-16  4:52     ` Tony Prisk
2013-01-16 16:27       ` Olof Johansson
2013-01-16 17:08         ` Stephen Warren
2013-01-16 17:35           ` Olof Johansson
2013-01-16  3:10 Stephen Rothwell
2013-01-16  3:12 ` Stephen Rothwell

Linux-ARM-Kernel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/0 linux-arm-kernel/git/0.git
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/1 linux-arm-kernel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ https://lore.kernel.org/linux-arm-kernel \
		linux-arm-kernel@lists.infradead.org
	public-inbox-index linux-arm-kernel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-arm-kernel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git