* linux-next: manual merge of the omap tree with the arm-soc tree
@ 2023-01-09 22:50 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2023-01-09 22:50 UTC (permalink / raw)
To: Tony Lindgren, Olof Johansson, Arnd Bergmann
Cc: ARM, Juerg Haefliger, Juerg Haefliger, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1957 bytes --]
Hi all,
Today's linux-next merge of the omap tree got a conflict in:
arch/arm/mach-omap1/Kconfig
between commit:
67d3928c3df5 ("ARM: omap1: remove unused board files")
from the arm-soc tree and commit:
609c1fabc7c5 ("ARM: omap1: Kconfig: Fix indentation")
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/mach-omap1/Kconfig
index 8df9a4de0e79,f833526aa7cd..000000000000
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@@ -118,8 -165,33 +118,8 @@@ config MACH_OMAP_OS
depends on ARCH_OMAP16XX
help
TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
- if you have such a board.
+ if you have such a board.
-config OMAP_OSK_MISTRAL
- bool "Mistral QVGA board Support"
- depends on MACH_OMAP_OSK
- depends on UNUSED_BOARD_FILES
- help
- The OSK supports an optional add-on board with a Quarter-VGA
- touchscreen, PDA-ish buttons, a resume button, bicolor LED,
- and camera connector. Say Y here if you have this board.
-
-config MACH_OMAP_PERSEUS2
- bool "TI Perseus2"
- depends on ARCH_OMAP730
- depends on UNUSED_BOARD_FILES
- help
- Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
- a board.
-
-config MACH_OMAP_FSAMPLE
- bool "TI F-Sample"
- depends on ARCH_OMAP730
- depends on UNUSED_BOARD_FILES
- help
- Support for TI OMAP 850 F-Sample board. Say Y here if you have such
- a board.
-
config MACH_OMAP_PALMTE
bool "Palm Tungsten E"
depends on ARCH_OMAP15XX
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the omap tree with the arm-soc tree
@ 2023-01-09 22:50 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2023-01-09 22:50 UTC (permalink / raw)
To: Tony Lindgren, Olof Johansson, Arnd Bergmann
Cc: ARM, Juerg Haefliger, Juerg Haefliger, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 1957 bytes --]
Hi all,
Today's linux-next merge of the omap tree got a conflict in:
arch/arm/mach-omap1/Kconfig
between commit:
67d3928c3df5 ("ARM: omap1: remove unused board files")
from the arm-soc tree and commit:
609c1fabc7c5 ("ARM: omap1: Kconfig: Fix indentation")
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/mach-omap1/Kconfig
index 8df9a4de0e79,f833526aa7cd..000000000000
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@@ -118,8 -165,33 +118,8 @@@ config MACH_OMAP_OS
depends on ARCH_OMAP16XX
help
TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
- if you have such a board.
+ if you have such a board.
-config OMAP_OSK_MISTRAL
- bool "Mistral QVGA board Support"
- depends on MACH_OMAP_OSK
- depends on UNUSED_BOARD_FILES
- help
- The OSK supports an optional add-on board with a Quarter-VGA
- touchscreen, PDA-ish buttons, a resume button, bicolor LED,
- and camera connector. Say Y here if you have this board.
-
-config MACH_OMAP_PERSEUS2
- bool "TI Perseus2"
- depends on ARCH_OMAP730
- depends on UNUSED_BOARD_FILES
- help
- Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
- a board.
-
-config MACH_OMAP_FSAMPLE
- bool "TI F-Sample"
- depends on ARCH_OMAP730
- depends on UNUSED_BOARD_FILES
- help
- Support for TI OMAP 850 F-Sample board. Say Y here if you have such
- a board.
-
config MACH_OMAP_PALMTE
bool "Palm Tungsten E"
depends on ARCH_OMAP15XX
[-- 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] 8+ messages in thread
* Re: linux-next: manual merge of the omap tree with the arm-soc tree
2023-01-09 22:50 ` Stephen Rothwell
@ 2023-01-19 10:11 ` Tony Lindgren
-1 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2023-01-19 10:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, ARM, Juerg Haefliger,
Juerg Haefliger, Linux Kernel Mailing List,
Linux Next Mailing List
* Stephen Rothwell <sfr@canb.auug.org.au> [230109 22:57]:
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in:
>
> arch/arm/mach-omap1/Kconfig
>
> between commit:
>
> 67d3928c3df5 ("ARM: omap1: remove unused board files")
>
> from the arm-soc tree and commit:
>
> 609c1fabc7c5 ("ARM: omap1: Kconfig: Fix indentation")
>
> from the omap tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, I just dropped "ARM: omap1: remove unused board files" to
simplify things.
Juerg, care to update and resend in a few weeks after v6.3-rc1
after the omap1 clean-up patches are merged?
Regards,
Tony
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the omap tree with the arm-soc tree
@ 2023-01-19 10:11 ` Tony Lindgren
0 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2023-01-19 10:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Olof Johansson, Arnd Bergmann, ARM, Juerg Haefliger,
Juerg Haefliger, Linux Kernel Mailing List,
Linux Next Mailing List
* Stephen Rothwell <sfr@canb.auug.org.au> [230109 22:57]:
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in:
>
> arch/arm/mach-omap1/Kconfig
>
> between commit:
>
> 67d3928c3df5 ("ARM: omap1: remove unused board files")
>
> from the arm-soc tree and commit:
>
> 609c1fabc7c5 ("ARM: omap1: Kconfig: Fix indentation")
>
> from the omap tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, I just dropped "ARM: omap1: remove unused board files" to
simplify things.
Juerg, care to update and resend in a few weeks after v6.3-rc1
after the omap1 clean-up patches are merged?
Regards,
Tony
_______________________________________________
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] 8+ messages in thread
* [PATCH v2] ARM: omap1: Kconfig: Fix indentation
2023-01-19 10:11 ` Tony Lindgren
@ 2023-03-15 9:11 ` Juerg Haefliger
-1 siblings, 0 replies; 8+ messages in thread
From: Juerg Haefliger @ 2023-03-15 9:11 UTC (permalink / raw)
To: tony
Cc: arnd, juerg.haefliger, juergh, linux-arm-kernel, linux-kernel,
linux-next, olof, sfr
The convention for indentation seems to be a single tab. Help text is
further indented by an additional two whitespaces. Fix the lines that
violate these rules.
Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
v2: Updated for latest upstream.
---
arch/arm/mach-omap1/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 8df9a4de0e79..cbf703f0d850 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -118,7 +118,7 @@ config MACH_OMAP_OSK
depends on ARCH_OMAP16XX
help
TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
- if you have such a board.
+ if you have such a board.
config MACH_OMAP_PALMTE
bool "Palm Tungsten E"
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2] ARM: omap1: Kconfig: Fix indentation
@ 2023-03-15 9:11 ` Juerg Haefliger
0 siblings, 0 replies; 8+ messages in thread
From: Juerg Haefliger @ 2023-03-15 9:11 UTC (permalink / raw)
To: tony
Cc: arnd, juerg.haefliger, juergh, linux-arm-kernel, linux-kernel,
linux-next, olof, sfr
The convention for indentation seems to be a single tab. Help text is
further indented by an additional two whitespaces. Fix the lines that
violate these rules.
Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
v2: Updated for latest upstream.
---
arch/arm/mach-omap1/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 8df9a4de0e79..cbf703f0d850 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -118,7 +118,7 @@ config MACH_OMAP_OSK
depends on ARCH_OMAP16XX
help
TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
- if you have such a board.
+ if you have such a board.
config MACH_OMAP_PALMTE
bool "Palm Tungsten E"
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] ARM: omap1: Kconfig: Fix indentation
2023-03-15 9:11 ` Juerg Haefliger
@ 2023-03-27 6:55 ` Tony Lindgren
-1 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2023-03-27 6:55 UTC (permalink / raw)
To: Juerg Haefliger
Cc: arnd, juergh, linux-arm-kernel, linux-kernel, linux-next, olof,
sfr
* Juerg Haefliger <juerg.haefliger@canonical.com> [230315 11:12]:
> The convention for indentation seems to be a single tab. Help text is
> further indented by an additional two whitespaces. Fix the lines that
> violate these rules.
>
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
>
> ---
> v2: Updated for latest upstream.
Thans for updating it, applying into omap-for-v6.4/omap1.
Regards,
Tony
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] ARM: omap1: Kconfig: Fix indentation
@ 2023-03-27 6:55 ` Tony Lindgren
0 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2023-03-27 6:55 UTC (permalink / raw)
To: Juerg Haefliger
Cc: arnd, juergh, linux-arm-kernel, linux-kernel, linux-next, olof,
sfr
* Juerg Haefliger <juerg.haefliger@canonical.com> [230315 11:12]:
> The convention for indentation seems to be a single tab. Help text is
> further indented by an additional two whitespaces. Fix the lines that
> violate these rules.
>
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
>
> ---
> v2: Updated for latest upstream.
Thans for updating it, applying into omap-for-v6.4/omap1.
Regards,
Tony
_______________________________________________
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] 8+ messages in thread
end of thread, other threads:[~2023-03-27 6:56 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-09 22:50 linux-next: manual merge of the omap tree with the arm-soc tree Stephen Rothwell
2023-01-09 22:50 ` Stephen Rothwell
2023-01-19 10:11 ` Tony Lindgren
2023-01-19 10:11 ` Tony Lindgren
2023-03-15 9:11 ` [PATCH v2] ARM: omap1: Kconfig: Fix indentation Juerg Haefliger
2023-03-15 9:11 ` Juerg Haefliger
2023-03-27 6:55 ` Tony Lindgren
2023-03-27 6:55 ` Tony Lindgren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.