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]

Date:	Thu, 24 Feb 2011 10:52:38 +0200
From:	Tomi Valkeinen <tomi.valkeinen@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"Nayak, Rajendra" <rnayak@...com>,
	Tony Lindgren <tony@...mide.com>,
	"Guruswamy, Senthilvadivu" <svadivu@...com>
Subject: Re: linux-next: manual merge of the omap_dss2 tree with the  tree

Hi,

On Wed, 2011-02-23 at 21:23 -0600, Stephen Rothwell wrote:
> Hi Tomi,
> 
> Today's linux-next merge of the omap_dss2 tree got a conflict in
> arch/arm/mach-omap2/board-3430sdp.c between commit
> 73a92aa4f1d6786eaa5b4e637eee648db0dfd7a7 ("omap3sdp: clean regulator
> supply mapping in board file") from the omap tree and commit
> b3e0ccec47b179b0d3a7bfdb9df7112e508b009c ("OMAP2,3 DSS2 Change driver
> name to omap_display") from the omap_dss2 tree.
> 
> I fixed it up (see below) and can carry this fix as necessary (though I
> have no idea if it is correct).
> 
> [The merge today did, however, lose most of the other conflicts, thanks]

It seems there was a small conflict resolution error when Tony merged my
patches (an extra regulator supply was left in the code). I fixed that
and rebased my tree on Tony's for-linus branch.

So I hope that now we're finally free of non-trivial conflicts =).

Thanks again.

 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/