linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20111103130924.5811caec6db378f467006fc3@canb.auug.org.au>
Date:	Thu, 3 Nov 2011 13:09:24 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	Linus <torvalds@...ux-foundation.org>,
	Stephen Boyd <sboyd@...eaurora.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Brown <davidb@...eaurora.org>,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree

Hi Arnd,

On Tue, 13 Sep 2011 11:55:33 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> On Sun, 11 Sep 2011 19:18:53 -0700 Stephen Boyd <sboyd@...eaurora.org> wrote:
> >
> > The device tree machine description also needs to have the .fixup and
> > .reserve callbacks added to it so that the device tree machines boot
> > properly. Perhaps the soc tree needs to pull in Russell's tree at some
> > point to resolve this subtle logical conflict or when the trees are
> > merged together someone will need to do an evil merge and add the
> > callbacks in the merge commit.
> 
> Ah, right.  I have added this merge fixup for today and can carry it as
> necessary.

I am still applying this patch to the arm-soc merge.  I assume that it is
needed in Linus' tree now.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 13 Sep 2011 11:51:48 +1000
Subject: [PATCH] arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 arch/arm/mach-msm/board-msm8x60.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index 328df27..4ad2afb 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -153,6 +153,8 @@ MACHINE_END
 #ifdef CONFIG_OF
 /* TODO: General device tree support for all MSM. */
 DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
+	.fixup = msm8x60_fixup,
+	.reserve = msm8x60_reserve,
 	.map_io = msm8x60_map_io,
 	.init_irq = msm8x60_init_irq,
 	.init_machine = msm8x60_dt_init,
-- 
1.7.5.4


-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped