From: Stephen Warren <swarren@wwwdotorg.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] tegra: pinmux: fix FUNCMUX_NDFLASH_KBC_8_BIT
Date: Wed, 25 Mar 2015 12:08:14 -0600 [thread overview]
Message-ID: <5512F98E.6080601@wwwdotorg.org> (raw)
In-Reply-To: <1427305612.30675.15.camel@localhost.localdomain>
On 03/25/2015 11:46 AM, Marcel Ziswiler wrote:
> On Tue, 2015-03-24 at 09:21 -0600, Stephen Warren wrote:
>>> diff --git a/arch/arm/mach-tegra/tegra20/funcmux.c b/arch/arm/mach-tegra/tegra20/funcmux.c
>>
>> Note that this will conflict with:
>>
>> 09f455dca749 ARM: tegra: collect SoC sources into mach-tegra
>>
>> ... which moved that file.
>
> I had another look but believe above mentioned commit actually did the
> following:
>
> arch/arm/cpu/tegra20-common/* -> arch/arm/mach-tegra/tegra20/*
>
> And my commit was already rebased to latest master and therefore already
> took that into account or am I missing something here?
Yes, I think I got it backwards; I was confused by the Tegra210 file
having been added in the old location after the move, or something.
next prev parent reply other threads:[~2015-03-25 18:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-24 12:29 [U-Boot] [PATCH] tegra: pinmux: fix FUNCMUX_NDFLASH_KBC_8_BIT Marcel Ziswiler
2015-03-24 15:21 ` Stephen Warren
2015-03-25 7:42 ` Marcel Ziswiler
2015-03-25 17:46 ` Marcel Ziswiler
2015-03-25 18:08 ` Stephen Warren [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-22 0:20 Lucas Stach
2013-01-22 16:24 ` Stephen Warren
2013-01-22 22:27 ` Lucas Stach
2013-01-23 1:55 ` Allen Martin
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=5512F98E.6080601@wwwdotorg.org \
--to=swarren@wwwdotorg.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox