linux-kernel - Re: linux-next: manual merge of the regmap tree with Linus' 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] [day] [month] [year] [list]

Message-ID: <20130509100149.GD7478@sirena.org.uk>
Date:	Thu, 9 May 2013 11:01:49 +0100
From:	Mark Brown <broonie@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Srinivas Kandagatla <srinivas.kandagatla@...com>,
	Dimitris Papastamos <dp@...nsource.wolfsonmicro.com>
Subject: Re: linux-next: manual merge of the regmap tree with Linus' tree

On Thu, May 09, 2013 at 11:56:59AM +1000, Stephen Rothwell wrote:

> Today's linux-next merge of the regmap tree got a conflict in
> drivers/base/regmap/regmap-debugfs.c between commit 480738de0e07
> ("regmap: debugfs: Simplify calculation of `c->max_reg'") from Linus'
> tree and commit 5e3f5901ac6c ("regmap: debugfs: Fix start_reg
> calculation") from the regmap tree.

> I am not sure that the latter patch is ever required on top of the
> former, so for now I just used the former version (except for the last
> hunk) (see below) and can carry the fix as necessary (no action is
> required).

> Please let me know if this is the incorrect resolution.

Looks sensible.  I'll resolve everything on top of -rc1 once that's
released but I think that's the solution.

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)