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

Message-ID: <20160309053523.GN13692@x1>
Date:	Wed, 9 Mar 2016 12:35:23 +0700
From:	Lee Jones <lee.jones@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Linus Walleij <linus.walleij@...aro.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Laxman Dewangan <ldewangan@...dia.com>,
	"Andrew F. Davis" <afd@...com>
Subject: Re: linux-next: manual merge of the gpio tree with the mfd tree

On Wed, 09 Mar 2016, Stephen Rothwell wrote:

> Hi Linus,
> 
> Today's linux-next merge of the gpio tree got a conflict in:
> 
>   drivers/gpio/gpio-tps65912.c
> 
> between commits:
> 
>   65b6555971d0 ("mfd: tps65912: Remove old driver in preparation for new driver")
>   ca801a22f465 ("gpio: tps65912: Add GPIO driver for the TPS65912 PMIC")
> 
> from the mfd tree and commit:
> 
>   0964ac703edf ("gpio: tps65912: Use devm_gpiochip_add_data() for gpio registration")
> 
> from the gpio tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

I sent out a pull-request for this already.

Please pull 'ib-mfd-regulator-gpio-4.6' from my tree.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog