All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tony Lindgren <tony@atomide.com>, Olof Johansson <olof@lixom.net>,
	Arnd Bergmann <arnd@arndb.de>
Cc: ARM <linux-arm-kernel@lists.infradead.org>,
	Juerg Haefliger <juerg.haefliger@canonical.com>,
	Juerg Haefliger <juergh@canonical.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the omap tree with the arm-soc tree
Date: Tue, 10 Jan 2023 09:50:41 +1100	[thread overview]
Message-ID: <20230110095041.0d6311d2@canb.auug.org.au> (raw)

[-- 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 --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tony Lindgren <tony@atomide.com>, Olof Johansson <olof@lixom.net>,
	Arnd Bergmann <arnd@arndb.de>
Cc: ARM <linux-arm-kernel@lists.infradead.org>,
	Juerg Haefliger <juerg.haefliger@canonical.com>,
	Juerg Haefliger <juergh@canonical.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the omap tree with the arm-soc tree
Date: Tue, 10 Jan 2023 09:50:41 +1100	[thread overview]
Message-ID: <20230110095041.0d6311d2@canb.auug.org.au> (raw)


[-- 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

             reply	other threads:[~2023-01-09 22:50 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-09 22:50 Stephen Rothwell [this message]
2023-01-09 22:50 ` linux-next: manual merge of the omap tree with the arm-soc tree 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
  -- strict thread matches above, loose matches on Subject: below --
2015-01-20  0:09 linux-next: manual merge of the omap tree with the arm-soc tree Stephen Rothwell
2015-01-20  0:09 ` Stephen Rothwell
2015-01-20  0:09 ` Stephen Rothwell
2015-01-20 17:10 ` Tony Lindgren
2015-01-20 17:10   ` Tony Lindgren
2015-01-20 17:10   ` Tony Lindgren
2015-01-20 18:24   ` Olof Johansson
2015-01-20 18:24     ` Olof Johansson
2015-01-20 18:24     ` Olof Johansson
2015-01-20 18:40     ` Tony Lindgren
2015-01-20 18:40       ` Tony Lindgren
2015-01-20 18:40       ` Tony Lindgren

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=20230110095041.0d6311d2@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=juerg.haefliger@canonical.com \
    --cc=juergh@canonical.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=tony@atomide.com \
    /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 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.