Messages in this thread Patch in this message | | | From | "Vaittinen, Matti" <> | Subject | Re: Applied "regulator: bd71828: Basic support for ROHM bd71828 PMIC regulators" to the regulator tree | Date | Wed, 18 Dec 2019 14:01:27 +0000 |
| |
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
| |