Re: [PATCH 1/3] regmap: Add 1-Wire bus support

[Sebastian Reichel]

Hi,

On Thu, Jun 08, 2017 at 01:57:04PM +0100, Mark Brown wrote:
> On Thu, Jun 08, 2017 at 02:53:50PM +0200, Sebastian Reichel wrote:
> > On Fri, Jun 02, 2017 at 10:06:27AM +0300, Alex A. Mihaylov wrote:
> > > Add basic support regmap (register map access) API for 1-Wire bus
> 
> > > +#include <linux/module.h>
> > > +#include "../../w1/w1.h"
> 
> > This conflicts with the following patch:
> 
> > https://www.spinics.net/lists/kernel/msg2524566.html
> 
> Not in -next yet?

I think Greg did not yet apply it. It already has been
Acked by w1 maintainer, though. This was just a heads
up for upcoming trouble :)

> > I guess Greg could pull your immutable branch and above
> > patch can be augumented to also update regmap-w1.
> 
> Yes, or I can pull in a tag and apply an integration fix if needed.

Sure.

-- Sebastian

Attachment: signature.asc
Description: PGP signature