linux-kernel - Re: linux-next: manual merge of the omap

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: <20110224212339.GM20560@atomide.com>
Date:	Thu, 24 Feb 2011 13:23:39 -0800
From:	Tony Lindgren <tony@...mide.com>
To:	Tomi Valkeinen <tomi.valkeinen@...com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"linux-omap@...r.kernel.org" <linux-omap@...r.kernel.org>,
	"Guruswamy, Senthilvadivu" <svadivu@...com>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the omap
 tree

Hi,

* Tomi Valkeinen <tomi.valkeinen@...com> [110221 00:46]:
> 
> Tony, do you have such a semi-stable branch I could use as a base? Or
> any other ideas?

I guess you already figured this out.. The omap-for-linus branch should
have immutable commits. So you can merge with the earliest commit that
does the job for you from there.

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/