linux-kernel - Re: [PATCH] mfd: mc13xxx-spi: fix merge conflict

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:	Mon, 2 Jul 2012 16:53:43 +0200
From:	Samuel Ortiz <sameo@...ux.intel.com>
To:	Axel Lin <axel.lin@...il.com>
Cc:	linux-kernel@...r.kernel.org, Marc Reilly <marc@...esign.com.au>,
	Philippe Rétornaz <philippe.retornaz@...l.ch>
Subject: Re: [PATCH] mfd: mc13xxx-spi: fix merge conflict

Hi Axel,

On Mon, Jul 02, 2012 at 04:03:00PM +0800, Axel Lin wrote:
> This patch fixes conflict between commit 8ae3559
> "mfd: mc13xxx workaround SPI hardware bug on i.Mx"
> and commit 10c7a5d "mfd: Use devm_* APIs for mc13xxx".
> 
> commit 8ae3559 changes regmap_init_spi to regmap_init.
> So now we need to use devm_regmap_init rather than devm_regmap_init_spi.
Good catch, thanks a lot.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
--
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/