Hi all,
Today's linux-next merge of the mfd tree got a conflict in:
include/linux/mfd/cros_ec_commands.h
between commit:
9c92ab619141 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule
282")
from Linus' tree and commit:
2769bd79a915 ("mfd: cros_ec: Update license term")
Hi all,
Today's linux-next merge of the mfd tree got a conflict in:
MAINTAINERS
between commit:
10b5d3d10759 ("MAINTAINERS: add maintainer for maxbotix ultrasonic driver")
from Linus' tree and commit:
796fad0101d3 ("MAINTAINERS: Add an entry for MAX77650 PMIC driver")
from the mfd tree
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
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_DESIGNWARE_PLATFORM dependencies")
from the mfd
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
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
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
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
Hi all,
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 definitions for Cirrus Logic Madera
codecs")
from the mfd tree.
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
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: syscon: Set regmap name to DT node name")
from the mfd tree.
I fixed it
Hi Lee,
Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/viperboard.c between commit b6684228726c ("mfd: viperboard:
Fix platform-device id collision") from Linus' tree and commit
5e65ea8c48e6 ("mfd: Use mfd_add_hotplug_devices() helper") from the mfd
tree.
I fixed it up (I
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/twl-core.c between commit 78a3c5ab1749 ("mfd: twl-core: Fix
chip ID for the twl6030-pwm module") from Linus' tree and commit
afc45898f62c ("mfd: twl-core: Support for proper PWM drivers") from the
mfd tree.
I fixed
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
drivers/video/backlight/88pm860x_bl.c between commit e1c9ac420ef1
("Revert "backlight: fix memory leak on obscure error path"") from Linus'
tree and commit a6ccdcd98c39 ("mfd: 88pm860x: Use REG resource for
backlight") from the
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
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 and commit baa64151aecc ("regulator: anatop-regulator:
Convert to use syscon
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
Documentation/devicetree/bindings/regulator/tps6586x.txt between commit
7f852e0584f6 ("regulator: tps6586x: correct vin pin for sm0/sm1/sm2")
from Linus' tree and commit 566a725dff0d ("mfd: dt: tps6586x: Add power
off control")
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
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 05f3ad2b8ae5
("ARM: tegra: defconfig: Enable tps6586x gpio") from the mfd tree.
Just context changes. I
19 matches
Mail list logo
