Re: linux-next: manual merge of the mfd tree with Linus' tree

2019-02-08 Thread Jarkko Nikula
On 2/8/19 4:37 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the mfd tree got a conflict in: drivers/mfd/Kconfig between commit: 9baddb61dfec ("mfd: Fix unmet dependency warning for MFD_TPS68470") from Linus' tree and commit: 09fdc9857712 ("mfd: Kconfig: Fix I2C_D

Re: linux-next: manual merge of the mfd tree with Linus' tree

2018-08-28 Thread Stephen Rothwell
Hi Geert, On Tue, 28 Aug 2018 15:34:38 +0200 Geert Uytterhoeven wrote: > > On Tue, Aug 21, 2018 at 10:31 AM Stephen Rothwell > wrote: > > On Tue, 21 Aug 2018 10:08:54 +0200 Geert Uytterhoeven > > wrote: > > > To obey sorting rules, the CIRRUS LOGIC entry should be before the CLANG > > > en

Re: linux-next: manual merge of the mfd tree with Linus' tree

2018-08-28 Thread Geert Uytterhoeven
Hi Stephen, On Tue, Aug 21, 2018 at 10:31 AM Stephen Rothwell wrote: > On Tue, 21 Aug 2018 10:08:54 +0200 Geert Uytterhoeven > wrote: > > To obey sorting rules, the CIRRUS LOGIC entry should be before the CLANG > > entry. > > Upon closer look, it should be inserted before the CISCO entries, too

Re: linux-next: manual merge of the mfd tree with Linus' tree

2018-08-21 Thread Stephen Rothwell
Hi Geert, On Tue, 21 Aug 2018 10:08:54 +0200 Geert Uytterhoeven wrote: > > To obey sorting rules, the CIRRUS LOGIC entry should be before the CLANG > entry. > Upon closer look, it should be inserted before the CISCO entries, too (in > the mfd tree). Thanks for noticing. Unfortunately it is bad

Re: linux-next: manual merge of the mfd tree with Linus' tree

2018-08-21 Thread Geert Uytterhoeven
On Fri, Aug 17, 2018 at 2:40 AM Stephen Rothwell wrote: > Today's linux-next merge of the mfd tree got a conflict in: > > MAINTAINERS > > between commit: > > 16b7db4c8150 ("MAINTAINERS: Add .clang-format entry") > > from Linus' tree and commit: > > 97c2b5cba204 ("mfd: madera: Add register de

Re: linux-next: manual merge of the mfd tree with Linus' tree

2018-03-08 Thread Lee Jones
On Thu, 08 Mar 2018, Stephen Rothwell wrote: > Hi Lee, > > Today's linux-next merge of the mfd tree got a conflict in: > > drivers/mfd/syscon.c > > between commit: > > 3bafc09e7797 ("mfd: syscon: Add hardware spinlock support") > > from Linus' tree and commit: > > 34c90dcce6b1 ("mfd: s

Re: linux-next: manual merge of the mfd tree with Linus' tree

2012-09-18 Thread Dong Aisheng
Hi Stephen, On 18 September 2012 11:19, Stephen Rothwell wrote: > Hi Samuel, > > Today's linux-next merge of the mfd tree got a conflict in > drivers/regulator/anatop-regulator.c between commit 3e2a928472da > ("regulator: anatop: Fix wrong mask used in anatop_get_voltage_sel") from > Linus' tree

Re: linux-next: manual merge of the mfd tree with Linus' tree

2012-07-24 Thread Laxman Dewangan
On Wednesday 25 July 2012 06:48 AM, Stephen Rothwell wrote: * PGP Signed by an unknown key Hi Samuel, Today's linux-next merge of the mfd tree got a conflict in arch/arm/configs/tegra_defconfig between commit dbebe1589d3a ("ARM: tegra: defconfig updates") from Linus' tree and commit 05f3ad2b8ae