linux-kernel - Re: linux-next: manual merge of the omap 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] [day] [month] [year] [list]

Message-ID: <20100708101422.GD1920@atomide.com>
Date:	Thu, 8 Jul 2010 13:14:23 +0300
From:	Tony Lindgren <tony@...mide.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-omap@...r.kernel.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Russell King <rmk@....linux.org.uk>,
	Mike Rapoport <mike@...pulab.co.il>
Subject: Re: linux-next: manual merge of the omap tree with the arm tree

* Stephen Rothwell <sfr@...b.auug.org.au> [100708 04:31]:
> Hi all,
> 
> Today's linux-next merge of the omap tree got conflicts in
> arch/arm/mach-omap2/board-3430sdp.c,
> arch/arm/mach-omap2/board-3630sdp.c,
> arch/arm/mach-omap2/board-am3517evm.c,
> arch/arm/mach-omap2/board-cm-t35.c,
> arch/arm/mach-omap2/board-devkit8000.c,
> arch/arm/mach-omap2/board-igep0020.c,
> arch/arm/mach-omap2/board-ldp.c,
> arch/arm/mach-omap2/board-omap3beagle.c,
> arch/arm/mach-omap2/board-omap3evm.c,
> arch/arm/mach-omap2/board-omap3pandora.c,
> arch/arm/mach-omap2/board-omap3touchbook.c,
> arch/arm/mach-omap2/board-overo.c,
> arch/arm/mach-omap2/board-zoom2.c and
> arch/arm/mach-omap2/board-zoom3.c
> between commit 1e6d923b4e5729b73518d241edf87a3ab2d5688c ("ARM: OMAP:
> Convert to use ->reserve method to reserve boot time memory") from the
> arm tree and commit c752ab9d5a5b6899f14fe1c6643c0fe0b499a4ba ("omap3:
> introduce omap3_map_io") from the omap tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, I'll merge with Russell's lmb branch when I
have confirmation that it will stay static.
 
> P.S. Tony, that omap tree commit has a fairly unuseful changelog and no
> SOB from its purported author ...

Oops, I'll check that.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/