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] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 4 Feb 2010 20:04:44 -0800
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>
Subject: Re: linux-next: manual merge of the omap tree with the arm tree

* Stephen Rothwell <sfr@...b.auug.org.au> [100204 16:13]:
> Hi Tony,
> 
> On Thu, 4 Feb 2010 15:30:19 -0800 Tony Lindgren <tony@...mide.com> wrote:
> >
> > Thanks, I'll sort it out in omap for-next tree so they merge
> > cleanly.

Tried figuring out a clean mergeable solution, but it looks like
I need to manually merge or rebase the omap patches with patch
"ARM: 5910/1: ARM: Add tmp register for addruart and loadsp".

If we move the related debug-macro.S changes from omap tree to
Russell's tree, then I can't build my following multi-omap
patches..

Russell, can you please let me know if you have some static
commit ID containing the patch above that I could use that as
base for my patches?

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/