All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/4] tegra: Remove merge markers in some Kconfig files
Date: Fri,  4 Dec 2015 08:58:37 -0700	[thread overview]
Message-ID: <1449244720-19253-1-git-send-email-sjg@chromium.org> (raw)

These were added by mistake in commit fde7e189. They cause a warning when
configuring the boards. Remove them.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Stephen Warren <swarren@nvidia.com>
---

 configs/beaver_defconfig     | 3 ---
 configs/cardhu_defconfig     | 3 ---
 configs/jetson-tk1_defconfig | 3 ---
 configs/trimslice_defconfig  | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 2930344..8add08d 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 5760018..c9f565a 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 9500d2c..efc4aee 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index ee40218..e34faa3 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SFLASH=y
 CONFIG_USB=y
-- 
2.6.0.rc2.230.g3dd15c0

             reply	other threads:[~2015-12-04 15:58 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-04 15:58 Simon Glass [this message]
2015-12-04 15:58 ` [U-Boot] [PATCH 2/4] dm: serial: ns16550: Add pre-reloc flag to the driver Simon Glass
2015-12-05  5:53   ` Thomas Chou
2015-12-06 22:08   ` [U-Boot] [U-Boot, " Tom Rini
2015-12-04 15:58 ` [U-Boot] [PATCH 3/4] dm: tegra: Provide serial platform data for SPL Simon Glass
2015-12-05  5:53   ` Thomas Chou
2015-12-06 22:08   ` [U-Boot] [U-Boot, " Tom Rini
2015-12-04 15:58 ` [U-Boot] [PATCH 4/4] dm: omap: Fix serial UART on beaglebone black Simon Glass
2015-12-05  5:54   ` Thomas Chou
2015-12-06 14:17   ` Tom Rini
2015-12-06 16:41     ` Simon Glass
2015-12-04 17:16 ` [U-Boot] [PATCH 1/4] tegra: Remove merge markers in some Kconfig files Stephen Warren
2015-12-04 17:25   ` Simon Glass
2015-12-04 20:08     ` Stephen Warren
2015-12-05  5:52 ` Thomas Chou
2015-12-06 22:08 ` [U-Boot] [U-Boot, " Tom Rini

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=1449244720-19253-1-git-send-email-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /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.