linux-kernel - Re: Applied "regulator: bd71828: Basic support for ROHM bd71828 PMIC regulators" to the regulator 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: <b72cd22df0bbbb159cda08e556037f1ccf490b3d.camel@fi.rohmeurope.com>
Date:   Wed, 18 Dec 2019 14:01:27 +0000
From:   "Vaittinen, Matti" <Matti.Vaittinen@...rohmeurope.com>
To:     "broonie@...nel.org" <broonie@...nel.org>
CC:     "corbet@....net" <corbet@....net>,
        "phil.edworthy@...esas.com" <phil.edworthy@...esas.com>,
        "dmurphy@...com" <dmurphy@...com>,
        "linux-leds@...r.kernel.org" <linux-leds@...r.kernel.org>,
        "linux-rtc@...r.kernel.org" <linux-rtc@...r.kernel.org>,
        "linux-gpio@...r.kernel.org" <linux-gpio@...r.kernel.org>,
        "mchehab+samsung@...nel.org" <mchehab+samsung@...nel.org>,
        "alexandre.belloni@...tlin.com" <alexandre.belloni@...tlin.com>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "mazziesaccount@...il.com" <mazziesaccount@...il.com>,
        "lgirdwood@...il.com" <lgirdwood@...il.com>,
        "jacek.anaszewski@...il.com" <jacek.anaszewski@...il.com>,
        "devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
        "a.zummo@...ertech.it" <a.zummo@...ertech.it>,
        "arnd@...db.de" <arnd@...db.de>,
        "linux-doc@...r.kernel.org" <linux-doc@...r.kernel.org>,
        "linus.walleij@...aro.org" <linus.walleij@...aro.org>,
        "mark.rutland@....com" <mark.rutland@....com>,
        "robh+dt@...nel.org" <robh+dt@...nel.org>,
        "mturquette@...libre.com" <mturquette@...libre.com>,
        "noralf@...nnes.org" <noralf@...nnes.org>,
        "bgolaszewski@...libre.com" <bgolaszewski@...libre.com>,
        "gregkh@...uxfoundation.org" <gregkh@...uxfoundation.org>,
        "linux-clk@...r.kernel.org" <linux-clk@...r.kernel.org>,
        "sboyd@...nel.org" <sboyd@...nel.org>,
        "lee.jones@...aro.org" <lee.jones@...aro.org>,
        "wsa+renesas@...g-engineering.com" <wsa+renesas@...g-engineering.com>,
        "pavel@....cz" <pavel@....cz>
Subject: Re: Applied "regulator: bd71828: Basic support for ROHM bd71828
 PMIC regulators" to the regulator tree


On Wed, 2019-12-18 at 13:17 +0000, Mark Brown wrote:
> On Wed, Dec 18, 2019 at 08:06:04AM +0000, Vaittinen, Matti wrote:
> 
> > I think you missed the [PATCH v6 08/15] regulator: bd718x7: Split
> > driver to common and bd718x7 specific parts
> 
> I didn't miss it, it was queued but it doesn't apply.
Right. The rohm-generic.h is changed by
[PATCH v6 04/15] mfd: rohm PMICs - use platform_device_id to match MFD
sub-devices

diff --git a/include/linux/mfd/rohm-generic.h b/include/linux/mfd/rohm-
generic.h
index bff15ac26f2c..922f88008232 100644
--- a/include/linux/mfd/rohm-generic.h
+++ b/include/linux/mfd/rohm-generic.h
@@ -4,7 +4,7 @@
 #ifndef __LINUX_MFD_ROHM_H__
 #define __LINUX_MFD_ROHM_H__
 
-enum {
+enum rohm_chip_type {


I think this is the root of the conflict here as [PATCH v6 04/15] is
not in regulator tree. How should I handle this so that it won't
conflict in your and Lee's trees?

Br,
	Matti