Fixes: cc5d0db390b0 ("regmap: Add 1-Wire bus support")
Commit de0d6dbdbdb2 ("w1: Add subsystem kernel public interface")
Fix place off w1.h header file
Cosmetic: Fix company name (local to international)
Signed-off-by: Alex A. Mihaylov <[email protected]>
---
drivers/base/regmap/regmap-w1.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/base/regmap/regmap-w1.c b/drivers/base/regmap/regmap-w1.c
index 5f04e7bf063e..e6c64b0be5b2 100644
--- a/drivers/base/regmap/regmap-w1.c
+++ b/drivers/base/regmap/regmap-w1.c
@@ -1,7 +1,7 @@
/*
* Register map access API - W1 (1-Wire) support
*
- * Copyright (C) 2017 OAO Radioavionica
+ * Copyright (c) 2017 Radioavionica Corporation
* Author: Alex A. Mihaylov <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
@@ -11,7 +11,7 @@
#include <linux/regmap.h>
#include <linux/module.h>
-#include "../../w1/w1.h"
+#include <linux/w1.h>
#include "internal.h"
--
2.13.0
Hi,
On Fri, Jul 07, 2017 at 06:38:22PM +0300, Alex A. Mihaylov wrote:
> Fixes: cc5d0db390b0 ("regmap: Add 1-Wire bus support")
> Commit de0d6dbdbdb2 ("w1: Add subsystem kernel public interface")
> Fix place off w1.h header file
>
> Cosmetic: Fix company name (local to international)
>
> Signed-off-by: Alex A. Mihaylov <[email protected]>
This should go into 4.13, but you actually did not include the
maintainer of regmap (which I just added, but you may have to
resend the patch, so that it lands in his inbox). Anyways the
change is:
Reviewed-by: Sebastian Reichel <[email protected]>
-- Sebastian
> ---
> drivers/base/regmap/regmap-w1.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/base/regmap/regmap-w1.c b/drivers/base/regmap/regmap-w1.c
> index 5f04e7bf063e..e6c64b0be5b2 100644
> --- a/drivers/base/regmap/regmap-w1.c
> +++ b/drivers/base/regmap/regmap-w1.c
> @@ -1,7 +1,7 @@
> /*
> * Register map access API - W1 (1-Wire) support
> *
> - * Copyright (C) 2017 OAO Radioavionica
> + * Copyright (c) 2017 Radioavionica Corporation
> * Author: Alex A. Mihaylov <[email protected]>
> *
> * This program is free software; you can redistribute it and/or modify
> @@ -11,7 +11,7 @@
>
> #include <linux/regmap.h>
> #include <linux/module.h>
> -#include "../../w1/w1.h"
> +#include <linux/w1.h>
>
> #include "internal.h"
>
> --
> 2.13.0
>
On Sat, Jul 08, 2017 at 04:58:08PM +0200, Sebastian Reichel wrote:
> On Fri, Jul 07, 2017 at 06:38:22PM +0300, Alex A. Mihaylov wrote:
> > Fixes: cc5d0db390b0 ("regmap: Add 1-Wire bus support")
> > Commit de0d6dbdbdb2 ("w1: Add subsystem kernel public interface")
> > Fix place off w1.h header file
> > Cosmetic: Fix company name (local to international)
> > Signed-off-by: Alex A. Mihaylov <[email protected]>
> This should go into 4.13, but you actually did not include the
> maintainer of regmap (which I just added, but you may have to
> resend the patch, so that it lands in his inbox). Anyways the
> change is:
No, he sent it to me originally and I redirected him to whoever has
moved the header file - the regmap code is in Linus' tree already, if
the header file is going to be moved this needs to include the regmap
support and this patch. I did at the time provide a signed tag for the
regmap 1wire support for precisely this purpose :(
Patches like this *really* shouldn't be appearing during the merge
window, they should be being handled well before that with everything
ready in -next when the merge window opens.
Hi,
On Mon, Jul 10, 2017 at 11:31:41AM +0100, Mark Brown wrote:
> On Sat, Jul 08, 2017 at 04:58:08PM +0200, Sebastian Reichel wrote:
> > On Fri, Jul 07, 2017 at 06:38:22PM +0300, Alex A. Mihaylov wrote:
> > > Fixes: cc5d0db390b0 ("regmap: Add 1-Wire bus support")
> > > Commit de0d6dbdbdb2 ("w1: Add subsystem kernel public interface")
> > > Fix place off w1.h header file
>
> > > Cosmetic: Fix company name (local to international)
>
> > > Signed-off-by: Alex A. Mihaylov <[email protected]>
>
> > This should go into 4.13, but you actually did not include the
> > maintainer of regmap (which I just added, but you may have to
> > resend the patch, so that it lands in his inbox). Anyways the
> > change is:
>
> No, he sent it to me originally and I redirected him to whoever has
> moved the header file - the regmap code is in Linus' tree already, if
> the header file is going to be moved this needs to include the regmap
> support and this patch. I did at the time provide a signed tag for the
> regmap 1wire support for precisely this purpose :(
>
> Patches like this *really* shouldn't be appearing during the merge
> window, they should be being handled well before that with everything
> ready in -next when the merge window opens.
Both patches were in linux-next and both patches have been pulled
by Linus. This is broken *now*.
-- Sebastian
On Mon, Jul 10, 2017 at 01:51:38PM +0200, Sebastian Reichel wrote:
> > Patches like this *really* shouldn't be appearing during the merge
> > window, they should be being handled well before that with everything
> > ready in -next when the merge window opens.
> Both patches were in linux-next and both patches have been pulled
> by Linus. This is broken *now*.
Why are none of the build bots finding problems if this is currently
broken and why did this not get fixed in -next when it was introduced?
Like I say I provided a tag for this and didn't get any request to
pull/apply the update in the other direction so it is extremely
disappointing to see that the header move went ahead after that without
the regmap support being included and someone else is having to come
along and clean up the mess.
Hi,
On Mon, Jul 10, 2017 at 01:19:35PM +0100, Mark Brown wrote:
> On Mon, Jul 10, 2017 at 01:51:38PM +0200, Sebastian Reichel wrote:
> > > Patches like this *really* shouldn't be appearing during the merge
> > > window, they should be being handled well before that with everything
> > > ready in -next when the merge window opens.
>
> > Both patches were in linux-next and both patches have been pulled
> > by Linus. This is broken *now*.
>
> Why are none of the build bots finding problems if this is currently
> broken and why did this not get fixed in -next when it was introduced?
I guess it is because at the moment nothing select REGMAP_W1 in
mainline. I did not (yet) queue the power-supply driver, which
was the initial reason for adding regmap w1 support.
> Like I say I provided a tag for this and didn't get any request to
> pull/apply the update in the other direction so it is extremely
> disappointing to see that the header move went ahead after that without
> the regmap support being included and someone else is having to come
> along and clean up the mess.
FWIW I am just the messenger, who actually pointed out the issue
_before_ it happened in the threads of both patchsets. I expected
this to be properly solved by you and Greg. Since this did not
work out regmap seems now the logical subsystem for the fix.
-- Sebastian
On Mon, Jul 10, 2017 at 05:49:35PM +0300, Evgeniy Polyakov wrote:
> Hi everyone
>
> 08.07.2017, 17:58, "Sebastian Reichel" <[email protected]>:
> > This should go into 4.13, but you actually did not include the
> > maintainer of regmap (which I just added, but you may have to
> > resend the patch, so that it lands in his inbox). Anyways the
> > change is:
> >
> > Reviewed-by: Sebastian Reichel <[email protected]>
>
> Greg, please pull it into current mainline tree,
> it fixes build issue because of merge conflict between w1 regmap and public interface patches.
>
> Thank you.
>
> Acked-by: Evgeniy Polyakov <[email protected]>
Sorry about this, I'll work on it after 4.13-rc1 is out.
greg k-h
On Mon, Jul 10, 2017 at 03:17:17PM +0200, Sebastian Reichel wrote:
> On Mon, Jul 10, 2017 at 01:19:35PM +0100, Mark Brown wrote:
> > Like I say I provided a tag for this and didn't get any request to
> > pull/apply the update in the other direction so it is extremely
> > disappointing to see that the header move went ahead after that without
> > the regmap support being included and someone else is having to come
> > along and clean up the mess.
> FWIW I am just the messenger, who actually pointed out the issue
> _before_ it happened in the threads of both patchsets. I expected
> this to be properly solved by you and Greg. Since this did not
> work out regmap seems now the logical subsystem for the fix.
Well, I can't really apply it till after -rc1 since I'd have to pick a
random commit in Linus' tree to do it and that doesn't make him happy
usually. Since it's not actually breaking the build or anything I'll
hold off till -rc1 and apply it then.