From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [U-Boot, 1/4] tegra: Remove merge markers in some Kconfig files
Date: Sun, 6 Dec 2015 17:08:08 -0500 [thread overview]
Message-ID: <20151206220808.GA9551@bill-the-cat> (raw)
In-Reply-To: <1449244720-19253-1-git-send-email-sjg@chromium.org>
On Fri, Dec 04, 2015 at 08:58:37AM -0700, Simon Glass wrote:
> These were added by mistake in commit fde7e189. They cause a warning when
> configuring the boards. Remove them.
>
> Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reported-by: Stephen Warren <swarren@nvidia.com>
> Tested-by: Stephen Warren <swarren@nvidia.com>
> Reported-by: Kevin Hilman <khilman@linaro.org>
> Acked-by: Thomas Chou <thomas@wytron.com.tw>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/3dbcf8ea/attachment.sig>
prev parent reply other threads:[~2015-12-06 22:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-04 15:58 [U-Boot] [PATCH 1/4] tegra: Remove merge markers in some Kconfig files Simon Glass
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 ` Tom Rini [this message]
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=20151206220808.GA9551@bill-the-cat \
--to=trini@konsulko.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox