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

Message-ID: <20091116183425.GN3684@atomide.com>
Date:	Mon, 16 Nov 2009 10:34:26 -0800
From:	Tony Lindgren <tony@...mide.com>
To:	Tomi Valkeinen <tomi.valkeinen@...ia.com>
Cc:	"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>,
	ext Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the omap
 tree

* Tomi Valkeinen <tomi.valkeinen@...ia.com> [091116 02:06]:
> On Mon, 2009-11-16 at 06:04 +0100, ext Stephen Rothwell wrote:
> > Hi Tomi,
> > 
> > Today's linux-next merge of the omap_dss2 tree got a conflict in
> > arch/arm/configs/omap_3430sdp_defconfig between the omap tree and the
> > omap_dss2 tree.
> > 
> > I just used the version from the omap tree as I can't figure out anything
> > better, sorry.
> 
> Tony, 
> 
> These patches in omap tree seem to cause the conflicts. Are they stable,
> ie. can I cherry pick them to my for-next tree, and put my patches on
> top of them?

Well all the board-*.c patches are still getting shuffled around
this week a bit.. But we can resolve it with the following two changes.
 
> b30dcf5f37023d591caee80c233bf33706bc5a21
> omap3: 3430sdp: Enable Linux Regulator framework

This we should keep as it is, but the commit ID may still change.
 
> fc89f86e06c11b8828ce1d6c669f724877546c03
> ARM: OMAP3: Fix 3430SDP defconfig

I've cut out the CONFIG_FB related sections of this patch in
omap for-next branch, see below.

Tomi, please update your patch by leaving out the now unnecessary
TWL4030 and regulator sections. See also the updated version of
your patch attached.

And please also use the static commit id I gave earlier, the other
patches can still change a bit.

Regards,

Tony

View attachment "sdp3430-defconfig-nofb.patch" of type "text/x-diff" (1274 bytes)

View attachment "tomi-3430sdp-v2.patch" of type "text/x-diff" (7278 bytes)