[PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

[PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

[Sebastian Reichel]

This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32,
which breaks the omap3 device tree build due to a wrong reference.

I accidently queued this change via the power supply subsystem while
telling Marek at the same time, that it should go through Tony's tree.
Following that I did miss Stephen's messages about the build failure in
linux-next and since he switched to merging an older snapshot nobody
else noticed the problem in my tree. I didn't notice myself, since I
did not build any device tree files assuming none have changed by me.

Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
 arch/arm/boot/dts/twl4030.dtsi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index 482b7aa37808..36ae9160b558 100644
--- a/arch/arm/boot/dts/twl4030.dtsi
+++ b/arch/arm/boot/dts/twl4030.dtsi
@@ -22,8 +22,6 @@
 	charger: bci {
 		compatible = "ti,twl4030-bci";
 		interrupts = <9>, <2>;
-		io-channels = <&twl4030_madc 11>;
-		io-channel-name = "vac";
 		bci3v1-supply = <&vusb3v1>;
 	};
 
-- 
2.6.2

[PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

[Felipe Balbi]

Hi,

Sebastian Reichel <sre@kernel.org> writes:
> This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32,
> which breaks the omap3 device tree build due to a wrong reference.
>
> I accidently queued this change via the power supply subsystem while
> telling Marek at the same time, that it should go through Tony's tree.
> Following that I did miss Stephen's messages about the build failure in
> linux-next and since he switched to merging an older snapshot nobody
> else noticed the problem in my tree. I didn't notice myself, since I
> did not build any device tree files assuming none have changed by me.
>
> Signed-off-by: Sebastian Reichel <sre@kernel.org>

Reported-by: Felipe Balbi <balbi@ti.com>
Tested-by: Felipe Balbi <balbi@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>

> ---
>  arch/arm/boot/dts/twl4030.dtsi | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
> index 482b7aa37808..36ae9160b558 100644
> --- a/arch/arm/boot/dts/twl4030.dtsi
> +++ b/arch/arm/boot/dts/twl4030.dtsi
> @@ -22,8 +22,6 @@
>  	charger: bci {
>  		compatible = "ti,twl4030-bci";
>  		interrupts = <9>, <2>;
> -		io-channels = <&twl4030_madc 11>;
> -		io-channel-name = "vac";
>  		bci3v1-supply = <&vusb3v1>;
>  	};
>  
> -- 
> 2.6.2
>

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151106/a62fabc5/attachment.sig>

[PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

[Kevin Hilman]

On Fri, Nov 6, 2015 at 8:13 AM, Sebastian Reichel <sre@kernel.org> wrote:
> This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32,
> which breaks the omap3 device tree build due to a wrong reference.
>
> I accidently queued this change via the power supply subsystem while
> telling Marek at the same time, that it should go through Tony's tree.
> Following that I did miss Stephen's messages about the build failure in
> linux-next and since he switched to merging an older snapshot nobody
> else noticed the problem in my tree. I didn't notice myself, since I
> did not build any device tree files assuming none have changed by me.
>
> Signed-off-by: Sebastian Reichel <sre@kernel.org>

We also found this in kernelci.org build testing, and verified that
this fixes the build.

Tested-by: Kevin Hilman <khilman@linaro.org>

Thanks Felipe for reporting, and thanks Sebastian for the quick fix.

Kevin

[PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

[Tony Lindgren]

* Kevin Hilman <khilman@kernel.org> [151106 10:37]:
> On Fri, Nov 6, 2015 at 8:13 AM, Sebastian Reichel <sre@kernel.org> wrote:
> > This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32,
> > which breaks the omap3 device tree build due to a wrong reference.
> >
> > I accidently queued this change via the power supply subsystem while
> > telling Marek at the same time, that it should go through Tony's tree.
> > Following that I did miss Stephen's messages about the build failure in
> > linux-next and since he switched to merging an older snapshot nobody
> > else noticed the problem in my tree. I didn't notice myself, since I
> > did not build any device tree files assuming none have changed by me.
> >
> > Signed-off-by: Sebastian Reichel <sre@kernel.org>
> 
> We also found this in kernelci.org build testing, and verified that
> this fixes the build.
> 
> Tested-by: Kevin Hilman <khilman@linaro.org>
> 
> Thanks Felipe for reporting, and thanks Sebastian for the quick fix.

Acked-by: Tony Lindgren <tony@atomide.com>

Thanks,

Tony

[PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

[Belisko Marek]

On Fri, Nov 6, 2015 at 5:13 PM, Sebastian Reichel <sre@kernel.org> wrote:
> This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32,
> which breaks the omap3 device tree build due to a wrong reference.
>
> I accidently queued this change via the power supply subsystem while
> telling Marek at the same time, that it should go through Tony's tree.
> Following that I did miss Stephen's messages about the build failure in
> linux-next and since he switched to merging an older snapshot nobody
> else noticed the problem in my tree. I didn't notice myself, since I
> did not build any device tree files assuming none have changed by me.
Sorry for the mess. But wouldn't be better to use correct fix instead of revert?
>
> Signed-off-by: Sebastian Reichel <sre@kernel.org>
> ---
>  arch/arm/boot/dts/twl4030.dtsi | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
> index 482b7aa37808..36ae9160b558 100644
> --- a/arch/arm/boot/dts/twl4030.dtsi
> +++ b/arch/arm/boot/dts/twl4030.dtsi
> @@ -22,8 +22,6 @@
>         charger: bci {
>                 compatible = "ti,twl4030-bci";
>                 interrupts = <9>, <2>;
> -               io-channels = <&twl4030_madc 11>;
> -               io-channel-name = "vac";
>                 bci3v1-supply = <&vusb3v1>;
>         };
>
> --
> 2.6.2
>

BR,

marek

-- 
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer

Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
twitter: #opennandra
web: http://open-nandra.com

[PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

[Stephen Rothwell]

Hi Kevin,

On Fri, 6 Nov 2015 10:36:34 -0800 Kevin Hilman <khilman@kernel.org> wrote:
>
> On Fri, Nov 6, 2015 at 8:13 AM, Sebastian Reichel <sre@kernel.org> wrote:
> > This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32,
> > which breaks the omap3 device tree build due to a wrong reference.
> >
> > I accidently queued this change via the power supply subsystem while
> > telling Marek at the same time, that it should go through Tony's tree.
> > Following that I did miss Stephen's messages about the build failure in
> > linux-next and since he switched to merging an older snapshot nobody
> > else noticed the problem in my tree. I didn't notice myself, since I
> > did not build any device tree files assuming none have changed by me.
> >
> > Signed-off-by: Sebastian Reichel <sre@kernel.org>  
> 
> We also found this in kernelci.org build testing, and verified that
> this fixes the build.
> 
> Tested-by: Kevin Hilman <khilman@linaro.org>
> 
> Thanks Felipe for reporting, and thanks Sebastian for the quick fix.

I think "quick fix" is a bit rich.  I reported this to Sebastian on
Sept 29, Oct 2 , Oct 8, Oct 16, and Oct 21.  The only response I got
was from Marek Belisko on Oct 8 and 21.  I have been using the battery
tree (git://git.infradead.org/battery-2.6.git#master) from Sept 25, so
none of the commits after that have been in any linux-next release.

Yes, I am a little annoyed.  Do people have trouble receiving my emails?
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

[PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

[Kevin Hilman]

Hi Stephen,

On Fri, Nov 6, 2015 at 2:19 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> On Fri, 6 Nov 2015 10:36:34 -0800 Kevin Hilman <khilman@kernel.org> wrote:
>>
>> On Fri, Nov 6, 2015 at 8:13 AM, Sebastian Reichel <sre@kernel.org> wrote:
>> > This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32,
>> > which breaks the omap3 device tree build due to a wrong reference.
>> >
>> > I accidently queued this change via the power supply subsystem while
>> > telling Marek at the same time, that it should go through Tony's tree.
>> > Following that I did miss Stephen's messages about the build failure in
>> > linux-next and since he switched to merging an older snapshot nobody
>> > else noticed the problem in my tree. I didn't notice myself, since I
>> > did not build any device tree files assuming none have changed by me.
>> >
>> > Signed-off-by: Sebastian Reichel <sre@kernel.org>
>>
>> We also found this in kernelci.org build testing, and verified that
>> this fixes the build.
>>
>> Tested-by: Kevin Hilman <khilman@linaro.org>
>>
>> Thanks Felipe for reporting, and thanks Sebastian for the quick fix.
>
> I think "quick fix" is a bit rich.

You're right, sorry.  I didn't have the full context.  I wasn't fully
aware of the history in -next of this problem.  I just found it when
it ended up in mainline.  I don't think the problem was not getting
your emails, looks like the problem was a major disconnect between
what was sent to Linus and what was in -next. :(

Hopefully this snafu will help prevent that in the future,

Kevin

[PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

[Sebastian Reichel]

Hi,

On Sat, Nov 07, 2015 at 09:19:25AM +1100, Stephen Rothwell wrote:
> On Fri, 6 Nov 2015 10:36:34 -0800 Kevin Hilman <khilman@kernel.org> wrote:
> > On Fri, Nov 6, 2015 at 8:13 AM, Sebastian Reichel <sre@kernel.org> wrote:
> > > This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32,
> > > which breaks the omap3 device tree build due to a wrong reference.
> > >
> > > I accidently queued this change via the power supply subsystem while
> > > telling Marek at the same time, that it should go through Tony's tree.
> > > Following that I did miss Stephen's messages about the build failure in
> > > linux-next and since he switched to merging an older snapshot nobody
> > > else noticed the problem in my tree. I didn't notice myself, since I
> > > did not build any device tree files assuming none have changed by me.
> > >
> > > Signed-off-by: Sebastian Reichel <sre@kernel.org>  
> > 
> > We also found this in kernelci.org build testing, and verified that
> > this fixes the build.
> > 
> > Tested-by: Kevin Hilman <khilman@linaro.org>
> > 
> > Thanks Felipe for reporting, and thanks Sebastian for the quick fix.
> 
> I think "quick fix" is a bit rich.  I reported this to Sebastian on
> Sept 29, Oct 2 , Oct 8, Oct 16, and Oct 21.

Yes, I did see them after searching for them. My filter rules put
your mails together with the LKML mails (which I usually skip over
quite fast), so I did not notice the first one. Since the follow up
mails were in the same thread as the one(s) previously marked as
dont-care, I didn't notice them either.

> The only response I got was from Marek Belisko on Oct 8 and 21. I
> have been using the battery tree (git://git.infradead.org/battery-2.6.git#master)
> from Sept 25, so none of the commits after that have been in any linux-next
> release.
>
> Yes, I am a little annoyed.

Sorry :(

> Do people have trouble receiving my emails?

I did create two extra rules for your mails directly after preparing
the revert, so I hope it won't happen again.

On Sat, Fri, 6 Nov 2015 14:36:25 -0800, Kevin Hilman wrote:
> I don't think the problem was not getting your emails, looks like the
> problem was a major disconnect between what was sent to Linus and what
> was in -next. :(

Is there an easy way to check this, so that I can create a cronjob
checkin it? Having an additional automatic "your tree differs from
linux-next" would be helpful, since that would make me search for
the problem/a mail from Stephen.

-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151107/82e62c58/attachment.sig>

[PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

[Stephen Rothwell]

Hi Sebastian,

On Sat, 7 Nov 2015 03:44:57 +0100 Sebastian Reichel <sre@kernel.org> wrote:
>
> Is there an easy way to check this, so that I can create a cronjob
> checkin it? Having an additional automatic "your tree differs from
> linux-next" would be helpful, since that would make me search for
> the problem/a mail from Stephen.

Well,

wget -q -O- http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/plain/Next/SHA1s | sed -n 's/^battery\t\t*//p'

will get you the SHA1 of the top of your branch that I merged into the
latest release.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

[PATCH] Revert "ARM: dts: twl4030: Add iio properties for bci subnode"

[Tony Lindgren]

* Sebastian Reichel <sre@kernel.org> [151106 08:14]:
> This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32,
> which breaks the omap3 device tree build due to a wrong reference.
> 
> I accidently queued this change via the power supply subsystem while
> telling Marek at the same time, that it should go through Tony's tree.
> Following that I did miss Stephen's messages about the build failure in
> linux-next and since he switched to merging an older snapshot nobody
> else noticed the problem in my tree. I didn't notice myself, since I
> did not build any device tree files assuming none have changed by me.

Good to hear you figured out how it happened :)

Acked-by: Tony Lindgren <tony@atomide.com>


> Signed-off-by: Sebastian Reichel <sre@kernel.org>
> ---
>  arch/arm/boot/dts/twl4030.dtsi | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
> index 482b7aa37808..36ae9160b558 100644
> --- a/arch/arm/boot/dts/twl4030.dtsi
> +++ b/arch/arm/boot/dts/twl4030.dtsi
> @@ -22,8 +22,6 @@
>  	charger: bci {
>  		compatible = "ti,twl4030-bci";
>  		interrupts = <9>, <2>;
> -		io-channels = <&twl4030_madc 11>;
> -		io-channel-name = "vac";
>  		bci3v1-supply = <&vusb3v1>;
>  	};
>  
> -- 
> 2.6.2
>