From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Warren Date: Wed, 25 Mar 2015 12:08:14 -0600 Subject: [U-Boot] [PATCH] tegra: pinmux: fix FUNCMUX_NDFLASH_KBC_8_BIT In-Reply-To: <1427305612.30675.15.camel@localhost.localdomain> References: <1427200154-9975-1-git-send-email-marcel@ziswiler.com> <551180DE.6030402@wwwdotorg.org> <1427305612.30675.15.camel@localhost.localdomain> Message-ID: <5512F98E.6080601@wwwdotorg.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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.