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
| ||
|
Date: Thu, 04 Feb 2010 11:42:55 +0200 From: Tomi Valkeinen <tomi.valkeinen@...ia.com> To: ext Tony Lindgren <tony@...mide.com> Cc: Grazvydas Ignotas <notasas@...il.com>, 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>, "Hunter Adrian (Nokia-D/Helsinki)" <adrian.hunter@...ia.com>, "linux-omap@...r.kernel.org" <linux-omap@...r.kernel.org> Subject: Re: linux-next: manual merge of the omap_dss2 tree with the omap tree On Wed, 2010-02-03 at 18:12 +0100, ext Tony Lindgren wrote: > * Grazvydas Ignotas <notasas@...il.com> [100203 04:27]: > > hi, > > > > On Wed, Feb 3, 2010 at 6:29 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote: > > > Hi Tomi, > > > > > > Today's linux-next merge of the omap_dss2 tree got a conflict in > > > arch/arm/mach-omap2/board-omap3pandora.c between commit > > > f8b6f704105164eac7c043a48f79c4234e03e4b2 ("omap: Rename hsmmc symbols to > > > reflect independence from twl4030") from the omap tree and commit > > > aacb4387a1e6f3b57977375532c6d8e47fcd5652 ("OMAP: pandora: add DSS2 > > > support and related regulators") from the omap_dss2 tree. > > > > I've rebased my patch against linux-omap/for-next (attached). To fix > > the conflict, Tomi can rebase his queue on linux-omap/for-next, or > > Tony can simply take this to his queue - this has no "hard" > > dependencies on other queued DSS2 changes, has only board file changes > > and builds fine in linux-omap/for-next. I would prefer the second > > option, as I plan sending more boardfile changes to linux-omap. > > Thanks Stephen and Grazvydas. > > This sounds good to me, I've added this patch into omap for-next. > > Tomi can you please drop the earlier version from your branch? Sounds good to me. I dropped the patch from my tree. Tomi -- 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/
Powered by blists - more mailing lists