linux-next: build failure after merge of the arm-soc tree

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

Hi all,

After merging the arm-soc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/boot/dts/exynos5250-snow.dts:13:46: fatal error: dt-bindings/clock/maxim,max77686.h: No such file or directory
 #include <dt-bindings/clock/maxim,max77686.h>
                                              ^

Caused by commit c04c92ed5614 ("ARM: dts: Add rtc_src clk for s3c-rtc
on exynos5250-snow").

Presumably there is some dependency on some tree that someone has
forgotten to merge :-(

I reverted that commit for today.

Which then got to:

/scratch/sfr/next/arch/arm/boot/dts/exynos5420-peach-pit.dts:15:46: fatal error: dt-bindings/clock/maxim,max77802.h: No such file or directory
 #include <dt-bindings/clock/maxim,max77802.h>
                                              ^
compilation terminated.
/scratch/sfr/next/arch/arm/boot/dts/exynos5800-peach-pi.dts:15:46: fatal error: dt-bindings/clock/maxim,max77802.h: No such file or directory
 #include <dt-bindings/clock/maxim,max77802.h>
                                              ^
compilation terminated.
Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:417.21-22 syntax error
FATAL ERROR: Unable to parse input tree

Caused by 8bd43b6e6df7 ("ARM: dts: Add rtc_src clk for s3c-rtc on
exynos Peach boards").

I give up ... please test your trees better ...

I have used the arm-soc tree form next-20141001 for today (which still
needs 5 reverts to get it to build :-().
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- 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/20141002/a84b5526/attachment.sig>

linux-next: build failure after merge of the arm-soc tree

[Kukjin Kim]

+ Mike

Stephen Rothwell wrote:
> 
> Hi all,
> 
Hi,

> After merging the arm-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/boot/dts/exynos5250-snow.dts:13:46: fatal error: dt-bindings/clock/maxim,max77686.h: No such
> file or directory
>  #include <dt-bindings/clock/maxim,max77686.h>
>                                               ^
> 
> Caused by commit c04c92ed5614 ("ARM: dts: Add rtc_src clk for s3c-rtc
> on exynos5250-snow").
> 
> Presumably there is some dependency on some tree that someone has
> forgotten to merge :-(
> 
Hmm...I thought it should be fine once Mike's clk tree is landing into the
-next tree. Firstly sorry about that and how should I do in this case?

> I reverted that commit for today.
> 
> Which then got to:
> 
> /scratch/sfr/next/arch/arm/boot/dts/exynos5420-peach-pit.dts:15:46: fatal error: dt-
> bindings/clock/maxim,max77802.h: No such file or directory
>  #include <dt-bindings/clock/maxim,max77802.h>
>                                               ^
> compilation terminated.
> /scratch/sfr/next/arch/arm/boot/dts/exynos5800-peach-pi.dts:15:46: fatal error: dt-
> bindings/clock/maxim,max77802.h: No such file or directory
>  #include <dt-bindings/clock/maxim,max77802.h>
>                                               ^
> compilation terminated.
> Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:417.21-22 syntax error
> FATAL ERROR: Unable to parse input tree
> 
> Caused by 8bd43b6e6df7 ("ARM: dts: Add rtc_src clk for s3c-rtc on
> exynos Peach boards").
> 
> I give up ... please test your trees better ...
> 
So sorry, actually it's my fault, I missed the information to arm-soc when I
sent a pull-request, just I thought arm-soc were aware of that before happening
the error when samsung tree merged...

- Kukjin

> I have used the arm-soc tree form next-20141001 for today (which still
> needs 5 reverts to get it to build :-().

linux-next: build failure after merge of the arm-soc tree

[Arnd Bergmann]

On Thursday 02 October 2014 11:37:42 Stephen Rothwell wrote:
> After merging the arm-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/boot/dts/exynos5250-snow.dts:13:46: fatal error: dt-bindings/clock/maxim,max77686.h: No such file or directory
>  #include <dt-bindings/clock/maxim,max77686.h>
>                                               ^
> 
> Caused by commit c04c92ed5614 ("ARM: dts: Add rtc_src clk for s3c-rtc
> on exynos5250-snow").
> 
> Presumably there is some dependency on some tree that someone has
> forgotten to merge 
> 
> I reverted that commit for today.
> 
> Which then got to:
> 
> /scratch/sfr/next/arch/arm/boot/dts/exynos5420-peach-pit.dts:15:46: fatal error: dt-bindings/clock/maxim,max77802.h: No such file or directory
>  #include <dt-bindings/clock/maxim,max77802.h>
>                                               ^
> compilation terminated.
> /scratch/sfr/next/arch/arm/boot/dts/exynos5800-peach-pi.dts:15:46: fatal error: dt-bindings/clock/maxim,max77802.h: No such file or directory
>  #include <dt-bindings/clock/maxim,max77802.h>
>                                               ^
> compilation terminated.
> Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:417.21-22 syntax error
> FATAL ERROR: Unable to parse input tree
> 
> Caused by 8bd43b6e6df7 ("ARM: dts: Add rtc_src clk for s3c-rtc on
> exynos Peach boards").
> 
> I give up ... please test your trees better ...

I'm deeply sorry about that. I actually saw the problem here but was too
tired to fix it up again by redoing all the merges in our next/late
branch.

I've changed the for-next branch now to drop all of next/late, I think
we're better off not sending any of it for 3.18, especially as I found
some other problems as well.

> I have used the arm-soc tree form next-20141001 for today (which still
> needs 5 reverts to get it to build :-().

D'oh. I actually fixed these already last friday in the next/dt branch
but for some reason forgot to include it in for-next.
I've made sure that everything is included now.

	Arnd

linux-next: build failure after merge of the arm-soc tree

[Javier Martinez Canillas]

Hello Arnd, Stephen,

On 10/02/2014 04:32 PM, Arnd Bergmann wrote:
> On Thursday 02 October 2014 11:37:42 Stephen Rothwell wrote:
>> After merging the arm-soc tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>> 
>> arch/arm/boot/dts/exynos5250-snow.dts:13:46: fatal error: dt-bindings/clock/maxim,max77686.h: No such file or directory
>>  #include <dt-bindings/clock/maxim,max77686.h>
>>                                               ^
>> 
>> Caused by commit c04c92ed5614 ("ARM: dts: Add rtc_src clk for s3c-rtc
>> on exynos5250-snow").
>> 
>> Presumably there is some dependency on some tree that someone has
>> forgotten to merge 
>> 
>> I reverted that commit for today.
>> 
>> Which then got to:
>> 
>> /scratch/sfr/next/arch/arm/boot/dts/exynos5420-peach-pit.dts:15:46: fatal error: dt-bindings/clock/maxim,max77802.h: No such file or directory
>>  #include <dt-bindings/clock/maxim,max77802.h>
>>                                               ^
>> compilation terminated.
>> /scratch/sfr/next/arch/arm/boot/dts/exynos5800-peach-pi.dts:15:46: fatal error: dt-bindings/clock/maxim,max77802.h: No such file or directory
>>  #include <dt-bindings/clock/maxim,max77802.h>
>>                                               ^
>> compilation terminated.
>> Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:417.21-22 syntax error
>> FATAL ERROR: Unable to parse input tree
>> 
>> Caused by 8bd43b6e6df7 ("ARM: dts: Add rtc_src clk for s3c-rtc on
>> exynos Peach boards").
>> 
>> I give up ... please test your trees better ...
> 
> I'm deeply sorry about that. I actually saw the problem here but was too
> tired to fix it up again by redoing all the merges in our next/late
> branch.
> 

I'm so sorry about the breakage, when I posted this patch I mentioned that
it was meant for the 3.18-rc cycle once 3.18-rc1 was released [0]. Because
it fixes a regression caused by a patch queued in the clock tree for 3.18.
I should had been more explicit about the dependencies to avoid confusions.

> I've changed the for-next branch now to drop all of next/late, I think
> we're better off not sending any of it for 3.18, especially as I found
> some other problems as well.
> 

Do you think that it may be possible to send this for the 3.18-rc cycle
or should it have to wait for 3.19? Without this the real time clock does
not work on the Peach Chromebooks and your next/late branch contains other
fixes as well (e.g: the Exynos USB dr_mode DT patches).

>> I have used the arm-soc tree form next-20141001 for today (which still
>> needs 5 reverts to get it to build :-().
> 
> D'oh. I actually fixed these already last friday in the next/dt branch
> but for some reason forgot to include it in for-next.
> I've made sure that everything is included now.
> 
> 	Arnd
>

Thanks a lot and best regards,
Javier

[0]: https://www.mail-archive.com/linux-samsung-soc at vger.kernel.org/msg36702.html

linux-next: build failure after merge of the arm-soc tree

[Russell King - ARM Linux]

On Fri, Oct 03, 2014 at 08:50:09AM +0200, Javier Martinez Canillas wrote:
> Hello Arnd, Stephen,
> 
> I'm so sorry about the breakage, when I posted this patch I mentioned that
> it was meant for the 3.18-rc cycle once 3.18-rc1 was released [0]. Because
> it fixes a regression caused by a patch queued in the clock tree for 3.18.
> I should had been more explicit about the dependencies to avoid confusions.

If a patch is known to cause a regression, it shouldn't be going in during
the merge window _or_ the fix patch should also go in during the merge
window via the same route to resolve the regression before it's noticable.

Given the number of changes which go in during the merge window, waiting
for -rc to fix a known bug *before* the merge window is not on - it breaks
the ability to bisect during the period where bisect really is needed.

-- 
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.

linux-next: build failure after merge of the arm-soc tree

[Javier Martinez Canillas]

Hello Russell,

On 10/03/2014 09:56 AM, Russell King - ARM Linux wrote:
> On Fri, Oct 03, 2014 at 08:50:09AM +0200, Javier Martinez Canillas wrote:
>> Hello Arnd, Stephen,
>> 
>> I'm so sorry about the breakage, when I posted this patch I mentioned that
>> it was meant for the 3.18-rc cycle once 3.18-rc1 was released [0]. Because
>> it fixes a regression caused by a patch queued in the clock tree for 3.18.
>> I should had been more explicit about the dependencies to avoid confusions.
> 
> If a patch is known to cause a regression, it shouldn't be going in during
> the merge window _or_ the fix patch should also go in during the merge
> window via the same route to resolve the regression before it's noticable.
> 
> Given the number of changes which go in during the merge window, waiting
> for -rc to fix a known bug *before* the merge window is not on - it breaks
> the ability to bisect during the period where bisect really is needed.
> 

I'm not the author of the patch that caused the regression, I just was bitten
by it and proposed a fix. So please don't kill the messenger :-)

Sorry, I didn't know about this rule, otherwise I would had asked Mike to pick
the fix instead. Or at least ask Kukjin to provide an immutable branch so Mike
could merge it on his clock tree.

Best regards,
Javier

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 634 bytes --]

Hi all,

After merging the arm-soc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/input/touchscreen/ads7846.c: In function 'ads7846_get_props':
drivers/input/touchscreen/ads7846.c:1126:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
 1126 |         pdata->model = (u32)device_get_match_data(dev);
      |                        ^
cc1: all warnings being treated as errors

Caused by commit

  8f7913c04f6a ("Input: ads7846 - Fix usage of match data")

I have used the arm-soc tree from next-20230609 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: build failure after merge of the arm-soc tree

[Linus Walleij]

On Tue, Jun 13, 2023 at 2:43 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> After merging the arm-soc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/input/touchscreen/ads7846.c: In function 'ads7846_get_props':
> drivers/input/touchscreen/ads7846.c:1126:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
>  1126 |         pdata->model = (u32)device_get_match_data(dev);
>       |                        ^
> cc1: all warnings being treated as errors

There is already a patch, I'm sure it's on its way in:
https://lore.kernel.org/linux-input/20230609202722.3634721-1-arnd@kernel.org/

Arnd can you apply this patch to the SoC tree where the cause
(by me) is? It's on top of the OMAP GPIO cleanups.

Yours,
Linus Walleij

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1982 bytes --]

Hi all,

After merging the arm-soc tree, today's linux-next build (various)
failed like this:

arch/arm/mach-sa1100/h3600.c:125:3: error: ‘struct irda_platform_data’ has no member named ‘shutdown’
arch/arm/mach-sa1100/h3600.c:124:3: error: ‘struct irda_platform_data’ has no member named ‘startup’
arch/arm/mach-sa1100/h3600.c:123:3: error: ‘struct irda_platform_data’ has no member named ‘set_speed’
arch/arm/mach-sa1100/h3600.c:122:3: error: ‘struct irda_platform_data’ has no member named ‘set_power’
arch/arm/mach-sa1100/h3600.c:121:34: error: storage size of ‘h3600_irda_data’ isn’t known
arch/arm/mach-sa1100/h3600.c:121:15: error: variable ‘h3600_irda_data’ has initializer but incomplete type
arch/arm/mach-sa1100/collie.c:148:3: error: ‘struct irda_platform_data’ has no member named ‘set_power’
arch/arm/mach-sa1100/collie.c:147:3: error: ‘struct irda_platform_data’ has no member named ‘shutdown’
arch/arm/mach-sa1100/collie.c:146:3: error: ‘struct irda_platform_data’ has no member named ‘startup’
arch/arm/mach-sa1100/collie.c:145:34: error: storage size of ‘collie_ir_data’ isn’t known
arch/arm/mach-sa1100/collie.c:145:15: error: variable ‘collie_ir_data’ has initializer but incomplete type

Caused by commit

  56d3391e6c85 ("ARM: sa1100: remove irda references")

These came from the kernelci builds.

$ git grep -w irda_platform_data
arch/arm/mach-sa1100/assabet.c:static struct irda_platform_data assabet_irda_data = {
arch/arm/mach-sa1100/collie.c:static struct irda_platform_data collie_ir_data = {
arch/arm/mach-sa1100/generic.c:void sa11x0_register_irda(struct irda_platform_data *irda)
arch/arm/mach-sa1100/generic.h:struct irda_platform_data;
arch/arm/mach-sa1100/generic.h:void sa11x0_register_irda(struct irda_platform_data *irda);
arch/arm/mach-sa1100/h3600.c:static struct irda_platform_data h3600_irda_data = {

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: build failure after merge of the arm-soc tree

[Arnd Bergmann]

On Mon, Jan 16, 2023, at 06:27, Stephen Rothwell wrote:
> Hi all,
>
> After merging the arm-soc tree, today's linux-next build (various)
> failed like this:
>
> arch/arm/mach-sa1100/h3600.c:125:3: error: ‘struct irda_platform_data’ 
> has no member named ‘shutdown’
> arch/arm/mach-sa1100/h3600.c:124:3: error: ‘struct irda_platform_data’ 
> has no member named ‘startup’
> arch/arm/mach-sa1100/h3600.c:123:3: error: ‘struct irda_platform_data’ 
> has no member named ‘set_speed’
> arch/arm/mach-sa1100/h3600.c:122:3: error: ‘struct irda_platform_data’ 
> has no member named ‘set_power’
> arch/arm/mach-sa1100/h3600.c:121:34: error: storage size of 
> ‘h3600_irda_data’ isn’t known
> arch/arm/mach-sa1100/h3600.c:121:15: error: variable ‘h3600_irda_data’ 
> has initializer but incomplete type
> arch/arm/mach-sa1100/collie.c:148:3: error: ‘struct irda_platform_data’ 
> has no member named ‘set_power’
> arch/arm/mach-sa1100/collie.c:147:3: error: ‘struct irda_platform_data’ 
> has no member named ‘shutdown’
> arch/arm/mach-sa1100/collie.c:146:3: error: ‘struct irda_platform_data’ 
> has no member named ‘startup’
> arch/arm/mach-sa1100/collie.c:145:34: error: storage size of 
> ‘collie_ir_data’ isn’t known
> arch/arm/mach-sa1100/collie.c:145:15: error: variable ‘collie_ir_data’ 
> has initializer but incomplete type
>
> Caused by commit
>
>   56d3391e6c85 ("ARM: sa1100: remove irda references")
>
> These came from the kernelci builds.

Fixed now, thanks for the report!

I had completed a few thousand randconfig builds on this without
seeing the issue, but could reproduce it easily with the
defconfigs.  I had some settings in my randconfig builder to
tip it towards the more common armv6/v7 builds, will adjust it
to do the opposite now for testing that better, and hopefully
remember to undo it all later.

      Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1484 bytes --]

Hi all,

After merging the arm-soc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/soc/mediatek/mtk-mmsys.c:64:10: error: 'const struct mtk_mmsys_driver_data' has no member named 'sw0_rst_offset'
   64 |         .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B,
      |          ^~~~~~~~~~~~~~
In file included from drivers/soc/mediatek/mtk-mmsys.c:18:
drivers/soc/mediatek/mt8186-mmsys.h:55:57: warning: excess elements in struct initializer
   55 | #define MT8186_MMSYS_SW0_RST_B                          0x160
      |                                                         ^~~~~
drivers/soc/mediatek/mtk-mmsys.c:64:27: note: in expansion of macro 'MT8186_MMSYS_SW0_RST_B'
   64 |         .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B,
      |                           ^~~~~~~~~~~~~~~~~~~~~~
drivers/soc/mediatek/mt8186-mmsys.h:55:57: note: (near initialization for 'mt8186_mmsys_driver_data')
   55 | #define MT8186_MMSYS_SW0_RST_B                          0x160
      |                                                         ^~~~~
drivers/soc/mediatek/mtk-mmsys.c:64:27: note: in expansion of macro 'MT8186_MMSYS_SW0_RST_B'
   64 |         .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B,
      |                           ^~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  831785f0e5b9 ("soc: mediatek: mmsys: add mmsys reset control for MT8186")

I have used the arm-soc tree from next-20220301 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: build failure after merge of the arm-soc tree

[Arnd Bergmann]

On Tue, Mar 1, 2022 at 11:50 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the arm-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/soc/mediatek/mtk-mmsys.c:64:10: error: 'const struct mtk_mmsys_driver_data' has no member named 'sw0_rst_offset'
>    64 |         .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B,
>       |          ^~~~~~~~~~~~~~
> In file included from drivers/soc/mediatek/mtk-mmsys.c:18:
> drivers/soc/mediatek/mt8186-mmsys.h:55:57: warning: excess elements in struct initializer
>    55 | #define MT8186_MMSYS_SW0_RST_B                          0x160
>       |                                                         ^~~~~
> drivers/soc/mediatek/mtk-mmsys.c:64:27: note: in expansion of macro 'MT8186_MMSYS_SW0_RST_B'
>    64 |         .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B,
>       |                           ^~~~~~~~~~~~~~~~~~~~~~
> drivers/soc/mediatek/mt8186-mmsys.h:55:57: note: (near initialization for 'mt8186_mmsys_driver_data')
>    55 | #define MT8186_MMSYS_SW0_RST_B                          0x160
>       |                                                         ^~~~~
> drivers/soc/mediatek/mtk-mmsys.c:64:27: note: in expansion of macro 'MT8186_MMSYS_SW0_RST_B'
>    64 |         .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B,
>       |                           ^~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
>   831785f0e5b9 ("soc: mediatek: mmsys: add mmsys reset control for MT8186")
>
> I have used the arm-soc tree from next-20220301 for today.

I'm going on vacation right now, did a quick revert of that commit to fix the
build. Rex-BC Chen, Matthias: please send a proper fix that I can apply next
week when I get back, to replace my revert.

         Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: build failure after merge of the arm-soc tree

[Matthias Brugger]

Hi Arnd,

On 02/03/2022 08:45, Arnd Bergmann wrote:
> On Tue, Mar 1, 2022 at 11:50 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi all,
>>
>> After merging the arm-soc tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> drivers/soc/mediatek/mtk-mmsys.c:64:10: error: 'const struct mtk_mmsys_driver_data' has no member named 'sw0_rst_offset'
>>     64 |         .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B,
>>        |          ^~~~~~~~~~~~~~
>> In file included from drivers/soc/mediatek/mtk-mmsys.c:18:
>> drivers/soc/mediatek/mt8186-mmsys.h:55:57: warning: excess elements in struct initializer
>>     55 | #define MT8186_MMSYS_SW0_RST_B                          0x160
>>        |                                                         ^~~~~
>> drivers/soc/mediatek/mtk-mmsys.c:64:27: note: in expansion of macro 'MT8186_MMSYS_SW0_RST_B'
>>     64 |         .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B,
>>        |                           ^~~~~~~~~~~~~~~~~~~~~~
>> drivers/soc/mediatek/mt8186-mmsys.h:55:57: note: (near initialization for 'mt8186_mmsys_driver_data')
>>     55 | #define MT8186_MMSYS_SW0_RST_B                          0x160
>>        |                                                         ^~~~~
>> drivers/soc/mediatek/mtk-mmsys.c:64:27: note: in expansion of macro 'MT8186_MMSYS_SW0_RST_B'
>>     64 |         .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B,
>>        |                           ^~~~~~~~~~~~~~~~~~~~~~
>>
>> Caused by commit
>>
>>    831785f0e5b9 ("soc: mediatek: mmsys: add mmsys reset control for MT8186")
>>
>> I have used the arm-soc tree from next-20220301 for today.
> 
> I'm going on vacation right now, did a quick revert of that commit to fix the
> build. Rex-BC Chen, Matthias: please send a proper fix that I can apply next
> week when I get back, to replace my revert.
> 

I send a new pull request with the missing commit included. Please let me know 
if you prefer the commit on top of the old pull request. This would break 
git-bisecting, but the window of commits is rather small.

I fixed my for-next branch yesterday already.

Sorry for the inconvenience.

Matthias

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: build failure after merge of the arm-soc tree

[Arnd Bergmann]

On Wed, Mar 2, 2022 at 10:52 AM Matthias Brugger <matthias.bgg@gmail.com> wrote:
>
> I send a new pull request with the missing commit included. Please let me know
> if you prefer the commit on top of the old pull request. This would break
> git-bisecting, but the window of commits is rather small.
>
> I fixed my for-next branch yesterday already.

I would prefer a commit on top of the old pull request, so I don't have to
rebase the later merges. I'll be able to apply that on Monday.

       Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1098 bytes --]

Hi all,

After merging the arm-soc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

Error: arch/arm/boot/dts/sama7g5.dtsi:167.3-7 syntax error
FATAL ERROR: Unable to parse input tree

Caused by commit

  9be4be3ed1ec ("Merge branch 'arm/dt' into for-next")

I added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 12 Oct 2021 10:37:29 +1100
Subject: [PATCH] merge fix for missing semicolon

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/boot/dts/sama7g5.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sama7g5.dtsi b/arch/arm/boot/dts/sama7g5.dtsi
index efcaa6ad7533..f98977f3980d 100644
--- a/arch/arm/boot/dts/sama7g5.dtsi
+++ b/arch/arm/boot/dts/sama7g5.dtsi
@@ -162,7 +162,7 @@ ps_wdt: watchdog@e001d180 {
 		chipid@e0020000 {
 			compatible = "microchip,sama7g5-chipid";
 			reg = <0xe0020000 0x8>;
-		}
+		};
 
 		adc: adc@e1000000 {
 			compatible = "microchip,sama7g5-adc";
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: build failure after merge of the arm-soc tree

[Nicolas Ferre]

On 12/10/2021 at 02:03, Stephen Rothwell wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> Hi all,
> 
> After merging the arm-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> Error: arch/arm/boot/dts/sama7g5.dtsi:167.3-7 syntax error
> FATAL ERROR: Unable to parse input tree
> 
> Caused by commit
> 
>    9be4be3ed1ec ("Merge branch 'arm/dt' into for-next")
> 
> I added the following patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 12 Oct 2021 10:37:29 +1100
> Subject: [PATCH] merge fix for missing semicolon
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

This patch is valid.

When solving this merge conflict in at91-next here:
https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git/commit/?id=dbbb39806c65b0ab3f330fc7a855bc13b20ad2ce

I had following patch to have the nodes in alphabetical order:

--- a/arch/arm/boot/dts/sama7g5.dtsi 

+++ b/arch/arm/boot/dts/sama7g5.dtsi 

@@@ -159,11 -137,22 +159,27 @@@ 

                         clocks = <&clk32k 0>;
                 };

+               adc: adc@e1000000 { 

+                       compatible = "microchip,sama7g5-adc"; 

+                       reg = <0xe1000000 0x200>; 

+                       interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; 

+                       clocks = <&pmc PMC_TYPE_GCK 26>; 

+                       assigned-clocks = <&pmc PMC_TYPE_GCK 26>; 

+                       assigned-clock-rates = <100000000>; 

+                       clock-names = "adc_clk"; 

+                       dmas = <&dma0 AT91_XDMAC_DT_PERID(0)>; 

+                       dma-names = "rx"; 

+                       atmel,min-sample-rate-hz = <200000>; 

+                       atmel,max-sample-rate-hz = <20000000>; 

+                       atmel,startup-time-ms = <4>; 

+                       status = "disabled"; 

+               }; 

+ 

  +              chipid@e0020000 { 

  +                      compatible = "microchip,sama7g5-chipid"; 

  +                      reg = <0xe0020000 0x8>; 

  +              }; 

  + 

                 sdmmc0: mmc@e1204000 {
                         compatible = "microchip,sama7g5-sdhci", 
"microchip,sam9x60-sdhci";
                         reg = <0xe1204000 0x4000>;


Sorry for not having mentioned this conflict in the pull-request.

Best regards,
   Nicolas

> ---
>   arch/arm/boot/dts/sama7g5.dtsi | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/sama7g5.dtsi b/arch/arm/boot/dts/sama7g5.dtsi
> index efcaa6ad7533..f98977f3980d 100644
> --- a/arch/arm/boot/dts/sama7g5.dtsi
> +++ b/arch/arm/boot/dts/sama7g5.dtsi
> @@ -162,7 +162,7 @@ ps_wdt: watchdog@e001d180 {
>                  chipid@e0020000 {
>                          compatible = "microchip,sama7g5-chipid";
>                          reg = <0xe0020000 0x8>;
> -               }
> +               };
> 
>                  adc: adc@e1000000 {
>                          compatible = "microchip,sama7g5-adc";
> --
> 2.33.0
> 
> --
> Cheers,
> Stephen Rothwell
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 


-- 
Nicolas Ferre

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: build failure after merge of the arm-soc tree

[Arnd Bergmann]

On Tue, Oct 12, 2021 at 9:35 AM Nicolas Ferre
<nicolas.ferre@microchip.com> wrote:
> On 12/10/2021 at 02:03, Stephen Rothwell wrote:
> >
> > After merging the arm-soc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > Error: arch/arm/boot/dts/sama7g5.dtsi:167.3-7 syntax error
> > FATAL ERROR: Unable to parse input tree
> >
> > Caused by commit
> >
> >    9be4be3ed1ec ("Merge branch 'arm/dt' into for-next")

Thank you for the report!

I had verified the arm/dt branch by itself, but didn't recheck it after I
merged it into the for-next branch. At least that one is easy to fix
up as I don't send the combined branch to Linus, and the arm/dt
branch does not have the problem.

> I had following patch to have the nodes in alphabetical order:
>
...
>
> Sorry for not having mentioned this conflict in the pull-request.

No worries,

I had assumed you had them sorted by unit-address, so I had them
 in the wrong order as well. Fixing up both issues in for-next
now by redoing the merge.

       Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: build failure after merge of the arm-soc tree

[Nicolas Ferre]

On 12/10/2021 at 09:56, Arnd Bergmann wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> On Tue, Oct 12, 2021 at 9:35 AM Nicolas Ferre
> <nicolas.ferre@microchip.com> wrote:
>> On 12/10/2021 at 02:03, Stephen Rothwell wrote:
>>>
>>> After merging the arm-soc tree, today's linux-next build (arm
>>> multi_v7_defconfig) failed like this:
>>>
>>> Error: arch/arm/boot/dts/sama7g5.dtsi:167.3-7 syntax error
>>> FATAL ERROR: Unable to parse input tree
>>>
>>> Caused by commit
>>>
>>>     9be4be3ed1ec ("Merge branch 'arm/dt' into for-next")
> 
> Thank you for the report!
> 
> I had verified the arm/dt branch by itself, but didn't recheck it after I
> merged it into the for-next branch. At least that one is easy to fix
> up as I don't send the combined branch to Linus, and the arm/dt
> branch does not have the problem.
> 
>> I had following patch to have the nodes in alphabetical order:
>>
> ...
>>
>> Sorry for not having mentioned this conflict in the pull-request.
> 
> No worries,
> 
> I had assumed you had them sorted by unit-address, so I had them
>   in the wrong order as well. Fixing up both issues in for-next
> now by redoing the merge.

OMG, you're right, it's by unit-address: I'm removing my at91-next for 
now to not cause more confusion and merge conflicts.

Not a big deal if you already re-did the merge.

Best regards,
   Nicolas


-- 
Nicolas Ferre

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1754 bytes --]

Hi all,

After merging the arm-soc tree, today's linux-next build (powerpc
allnoconfig) failed like this:

drivers/of/address.c: In function 'of_iomap':
drivers/of/address.c:907:10: error: implicit declaration of function 'ioremap_np'; did you mean 'ioremap_wt'? [-Werror=implicit-function-declaration]
  907 |   return ioremap_np(res.start, resource_size(&res));
      |          ^~~~~~~~~~
      |          ioremap_wt
drivers/of/address.c:907:10: warning: returning 'int' from a function with return type 'void *' makes pointer from integer without a cast [-Wint-conversion]
  907 |   return ioremap_np(res.start, resource_size(&res));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/of/address.c: In function 'of_io_request_and_map':
drivers/of/address.c:942:7: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
  942 |   mem = ioremap_np(res.start, resource_size(&res));
      |       ^
lib/devres.c: In function '__devm_ioremap':
lib/devres.c:47:10: error: implicit declaration of function 'ioremap_np'; did you mean 'ioremap_wt'? [-Werror=implicit-function-declaration]
   47 |   addr = ioremap_np(offset, size);
      |          ^~~~~~~~~~
      |          ioremap_wt
lib/devres.c:47:8: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
   47 |   addr = ioremap_np(offset, size);
      |        ^

Caused by commits

  7c566bb5e4d5 ("asm-generic/io.h:  Add a non-posted variant of ioremap()")
  89897f739d7b ("of/address: Add infrastructure to declare MMIO as non-posted")
(and maybe some others)

I have reverted 86332e9e3477..7d2d16ccf15d for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: build failure after merge of the arm-soc tree

[Hector Martin]

Hi Stephen,

On 09/04/2021 19.13, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the arm-soc tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
> 
[...]
> Caused by commits
> 
>    7c566bb5e4d5 ("asm-generic/io.h:  Add a non-posted variant of ioremap()")
>    89897f739d7b ("of/address: Add infrastructure to declare MMIO as non-posted")
> (and maybe some others)
> 
> I have reverted 86332e9e3477..7d2d16ccf15d for today.

This is fixed in ea9629283839 in the soc tree, which went in a few hours 
ago. Sorry for the noise.

-- 
Hector Martin (marcan@marcan.st)
Public Key: https://mrcn.st/pub

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 782 bytes --]

Hi all,

After merging the arm-soc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/soc/sunxi/sunxi_mbus.c: In function 'sunxi_mbus_notifier':
drivers/soc/sunxi/sunxi_mbus.c:93:8: error: implicit declaration of function 'dma_direct_set_offset' [-Werror=implicit-function-declaration]
   93 |  ret = dma_direct_set_offset(dev, PHYS_OFFSET, 0, SZ_4G);
      |        ^~~~~~~~~~~~~~~~~~~~~

Caused by commit

  b4bdc4fbf8d0 ("soc: sunxi: Deal with the MBUS DMA offsets in a central place")

probably interacting with commit

  16fee29b0735 ("dma-mapping: remove the dma_direct_set_offset export")

which is also in the arm-soc tree ...

I have used the arm-soc tree from next-20201123 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: build failure after merge of the arm-soc tree

[Christoph Hellwig]

On Tue, Nov 24, 2020 at 09:31:15AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the arm-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/soc/sunxi/sunxi_mbus.c: In function 'sunxi_mbus_notifier':
> drivers/soc/sunxi/sunxi_mbus.c:93:8: error: implicit declaration of function 'dma_direct_set_offset' [-Werror=implicit-function-declaration]
>    93 |  ret = dma_direct_set_offset(dev, PHYS_OFFSET, 0, SZ_4G);
>       |        ^~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   b4bdc4fbf8d0 ("soc: sunxi: Deal with the MBUS DMA offsets in a central place")
> 
> probably interacting with commit
> 
>   16fee29b0735 ("dma-mapping: remove the dma_direct_set_offset export")
> 
> which is also in the arm-soc tree ...

drivers/soc/sunxi/sunxi_mbus.c now needs an include of <linux/dma-map-ops.h>.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: build failure after merge of the arm-soc tree

[Maxime Ripard]

[-- Attachment #1.1: Type: text/plain, Size: 1026 bytes --]

On Tue, Nov 24, 2020 at 10:18:04AM +0100, Christoph Hellwig wrote:
> On Tue, Nov 24, 2020 at 09:31:15AM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the arm-soc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > drivers/soc/sunxi/sunxi_mbus.c: In function 'sunxi_mbus_notifier':
> > drivers/soc/sunxi/sunxi_mbus.c:93:8: error: implicit declaration of function 'dma_direct_set_offset' [-Werror=implicit-function-declaration]
> >    93 |  ret = dma_direct_set_offset(dev, PHYS_OFFSET, 0, SZ_4G);
> >       |        ^~~~~~~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   b4bdc4fbf8d0 ("soc: sunxi: Deal with the MBUS DMA offsets in a central place")
> > 
> > probably interacting with commit
> > 
> >   16fee29b0735 ("dma-mapping: remove the dma_direct_set_offset export")
> > 
> > which is also in the arm-soc tree ...
> 
> drivers/soc/sunxi/sunxi_mbus.c now needs an include of <linux/dma-map-ops.h>.

I just sent a patch doing so

Maxime

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1162 bytes --]

Hi all,

After merging the arm-soc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/Kconfig:720: syntax error
arch/arm/Kconfig:719: invalid statement
arch/arm/Kconfig:720: can't open file "arch/arm/mach-ks8695/Kconfig"

Caused by commit

  eb4f78f8b8cb ("ARM: remove ks8695 platform")

I applied the following patch for today

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Aug 2019 08:46:39 +1000
Subject: [PATCH] arm-soc: fix up bad rebase?

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/Kconfig | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1597c542dc4f..769a853c8c6e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -716,12 +716,6 @@ source "arch/arm/mach-ixp4xx/Kconfig"
 
 source "arch/arm/mach-keystone/Kconfig"
 
-<<<<<<< HEAD
-source "arch/arm/mach-ks8695/Kconfig"
-=======
-source "arch/arm/mach-lpc32xx/Kconfig"
->>>>>>> ARM: remove ks8695 platform
-
 source "arch/arm/mach-mediatek/Kconfig"
 
 source "arch/arm/mach-meson/Kconfig"
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: build failure after merge of the arm-soc tree

[Arnd Bergmann]

On Wed, Aug 14, 2019 at 12:50 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the arm-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> arch/arm/Kconfig:720: syntax error
> arch/arm/Kconfig:719: invalid statement
> arch/arm/Kconfig:720: can't open file "arch/arm/mach-ks8695/Kconfig"
>
> Caused by commit
>
>   eb4f78f8b8cb ("ARM: remove ks8695 platform")
>
> I applied the following patch for today
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 14 Aug 2019 08:46:39 +1000
> Subject: [PATCH] arm-soc: fix up bad rebase?
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>


Thanks for the report. I folded your fix into the original patch now.

       Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

Hi all,

After merging the arm-soc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

sound/arm/pxa2xx-pcm-lib.c: In function '__pxa2xx_pcm_open':
sound/arm/pxa2xx-pcm-lib.c:129:6: error: 'pxad_filter_fn' undeclared (first use in this function); did you mean 'dma_filter_fn'?
      pxad_filter_fn,
      ^~~~~~~~~~~~~~
      dma_filter_fn

Caused by commit

  0d0b16b8e008 ("dmaengine: pxa: make the filter function internal")

I have used the arm-soc tree from next-20180713 for today.

-- 
Cheers,
Stephen Rothwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180716/b55d2790/attachment.sig>

linux-next: build failure after merge of the arm-soc tree

[Olof Johansson]

On Sun, Jul 15, 2018 at 4:13 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the arm-soc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> sound/arm/pxa2xx-pcm-lib.c: In function '__pxa2xx_pcm_open':
> sound/arm/pxa2xx-pcm-lib.c:129:6: error: 'pxad_filter_fn' undeclared (first use in this function); did you mean 'dma_filter_fn'?
>       pxad_filter_fn,
>       ^~~~~~~~~~~~~~
>       dma_filter_fn
>
> Caused by commit
>
>   0d0b16b8e008 ("dmaengine: pxa: make the filter function internal")
>
> I have used the arm-soc tree from next-20180713 for today.

It's a known issue due to dependencies with a driver tree. :(

Robert, this is unfortunate. What's the dependent patches? We can pick
them up in our tree as duplicates if needed.


-Olof

linux-next: build failure after merge of the arm-soc tree

[Olof Johansson]

On Sun, Jul 15, 2018 at 4:50 PM, Olof Johansson <olof@lixom.net> wrote:
> On Sun, Jul 15, 2018 at 4:13 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> After merging the arm-soc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> sound/arm/pxa2xx-pcm-lib.c: In function '__pxa2xx_pcm_open':
>> sound/arm/pxa2xx-pcm-lib.c:129:6: error: 'pxad_filter_fn' undeclared (first use in this function); did you mean 'dma_filter_fn'?
>>       pxad_filter_fn,
>>       ^~~~~~~~~~~~~~
>>       dma_filter_fn
>>
>> Caused by commit
>>
>>   0d0b16b8e008 ("dmaengine: pxa: make the filter function internal")
>>
>> I have used the arm-soc tree from next-20180713 for today.
>
> It's a known issue due to dependencies with a driver tree. :(
>
> Robert, this is unfortunate. What's the dependent patches? We can pick
> them up in our tree as duplicates if needed.

Ok, it was easy to drop PXA this time around, so I've done that.
Stephen; arm-soc/for-next should be building again (for tomorrow).


Thanks,

-Olof

linux-next: build failure after merge of the arm-soc tree

[Robert Jarzmik]

Olof Johansson <olof@lixom.net> writes:

> It's a known issue due to dependencies with a driver tree. :(
>
> Robert, this is unfortunate. What's the dependent patches? We can pick
> them up in our tree as duplicates if needed.
I'd rather postpone one of the patches, as I explained in the pull request.
As Stephen noticed, this will be :
0d0b16b8e008 ("dmaengine: pxa: make the filter function internal")

I'll queue this one for the 4.20 cycle. By the way, all of this cames from the
fact that I didn't take this very patch in my imutable branch for this change
...

I'll also resend a pull request, without this patch if that's good for you,
which will solve the breakage.

Cheers.

-- 
Robert

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

Hi all,

After merging the arm-soc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "of_flash_probe_versatile" [drivers/mtd/maps/physmap_of.ko] undefined!

Caused by commit

  b0afd44bc192 ("mtd: physmap_of: add a hook for Versatile write protection")

I used the arm-soc tree from next-20160422 for today.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the arm-soc tree

[Arnd Bergmann]

On Tuesday 26 April 2016 09:43:31 Stephen Rothwell wrote:
> Hi all,
> 
> After merging the arm-soc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "of_flash_probe_versatile" [drivers/mtd/maps/physmap_of.ko] undefined!
> 
> Caused by commit
> 
>   b0afd44bc192 ("mtd: physmap_of: add a hook for Versatile write protection")
> 
> I used the arm-soc tree from next-20160422 for today.
> 

Ah, sorry about that. I think I fixed it up just as you pulled it in.
If you don't mind, could you try pulling the tree once more on top
of what you have?

	Arnd

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

Hi Arnd,

On Tue, 26 Apr 2016 01:54:20 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
>
> Ah, sorry about that. I think I fixed it up just as you pulled it in.
> If you don't mind, could you try pulling the tree once more on top
> of what you have?

Sorry, but I need to keep going if I am to finish each day.  I will
fetch it for tomorrow, though.  If I finish early enough, I will see if
I can fetch and merge it at the end ...

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the arm-soc tree

[Arnd Bergmann]

On Tuesday 26 April 2016 10:51:50 Stephen Rothwell wrote:
> Hi Arnd,
> 
> On Tue, 26 Apr 2016 01:54:20 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
> >
> > Ah, sorry about that. I think I fixed it up just as you pulled it in.
> > If you don't mind, could you try pulling the tree once more on top
> > of what you have?
> 
> Sorry, but I need to keep going if I am to finish each day.  I will
> fetch it for tomorrow, though.  If I finish early enough, I will see if
> I can fetch and merge it at the end ...
> 

Ok, fair enough. I've now merged the latest arm-soc/for-next branch with
today's linux-next to give it some extra time on the test infrastructure.

	Arnd

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

Hi all,

After merging the arm-soc tree, today's linux-next build (arm defconfig)
failed like this:

*** Default configuration is based on 'versatile_defconfig'
#
# configuration written to .config
#
make[1]: Leaving directory '/home/sfr/next/arm_defconfig'
.config:2033:warning: symbol value '' invalid for DEBUG_UART_PHYS
.config:2034:warning: symbol value '' invalid for DEBUG_UART_VIRT
*
* Restart config...
*
	.
	.
	.
Kernel low-level debugging functions (read help!) (DEBUG_LL) [Y/n/?] y
  Kernel low-level debugging port
    1. Kernel low-level debugging messages via ARM Versatile UART (DEBUG_VERSATILE)
    2. Kernel low-level debugging via EmbeddedICE DCC channel (DEBUG_ICEDCC)
    3. Kernel low-level debug output via semihosting I/O (DEBUG_SEMIHOSTING)
    4. Kernel low-level debugging via 8250 UART (DEBUG_LL_UART_8250)
  > 5. Kernel low-level debugging via ARM Ltd PL01x Primecell UART (DEBUG_LL_UART_PL01X)
  choice[1-5]: 5
Physical base address of debug UART (DEBUG_UART_PHYS) [] (NEW) aborted!

Console input/output is redirected. Run 'make oldconfig' to update configuration.

Presumably caused by the changes to arch/arm/Kconfig.debug in today's
arm-soc tree.

I left it broken for today.

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

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

Hi all,

After merging the arm-soc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/boot/dts/berlin2q.dtsi:62.24-25 syntax error
FATAL ERROR: Unable to parse input tree

I can't see what caused this error, so I have just used the arm-soc tree
from next-20151013 for today.

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

linux-next: build failure after merge of the arm-soc tree

[Jisheng Zhang]

Dear all,

On Thu, 15 Oct 2015 10:19:20 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> After merging the arm-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/boot/dts/berlin2q.dtsi:62.24-25 syntax error
> FATAL ERROR: Unable to parse input tree

I just checked, this is caused by missing the following two commits

f72d787d9287 ("clk: berlin: move MAX_CLKS out of drivers/clk/berlin")

44b2e5f96d5e ("clk: berlin: add cpuclk")

Thanks,
Jisheng

> 
> I can't see what caused this error, so I have just used the arm-soc tree
> from next-20151013 for today.
> 

linux-next: build failure after merge of the arm-soc tree

[Arnd Bergmann]

On Thursday 15 October 2015 10:40:45 Jisheng Zhang wrote:
> On Thu, 15 Oct 2015 10:19:20 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi all,
> > 
> > After merging the arm-soc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > arch/arm/boot/dts/berlin2q.dtsi:62.24-25 syntax error
> > FATAL ERROR: Unable to parse input tree
> 
> I just checked, this is caused by missing the following two commits
> 
> f72d787d9287 ("clk: berlin: move MAX_CLKS out of drivers/clk/berlin")
> 
> 44b2e5f96d5e ("clk: berlin: add cpuclk")

I've reverted 23998645f6e73 ("ARM: berlin: dts: add the cpufreq-dt
bindings on the BG2Q") on my for-next branch for the time being, to
get a working tree again and am waiting for a proper fixup patch
from Sebastian now to rectify the next/dt branch.

	Arnd

linux-next: build failure after merge of the arm-soc tree

[Arnd Bergmann]

On Thursday 15 October 2015 10:19:20 Stephen Rothwell wrote:
> 
> After merging the arm-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/boot/dts/berlin2q.dtsi:62.24-25 syntax error
> FATAL ERROR: Unable to parse input tree
> 
> I can't see what caused this error, so I have just used the arm-soc tree
> from next-20151013 for today.
> 
> 

Thanks a lot, I've merged a broken branch that was based on the
wrong start point.

	Arnd

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

Hi all,

After merging the arm-soc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/mach-shmobile/Makefile:59: *** missing 'endif'.  Stop.

Caused by commit

  ff20775d189c ("Merge tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup")

I have used the arm-soc tree from next-20150806 for today.

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

linux-next: build failure after merge of the arm-soc tree

[Michael Ellerman]

Hi all,

After merging the arm-soc tree, today's linux-next build (arm_multi_v7_defconfig)
failed like this:

  scripts/Makefile.build:258: recipe for target 'arch/arm/mach-socfpga/platsmp.o' failed
  arch/arm/mach-socfpga/platsmp.c:66:23: error: 'socfpga_secondary_startup' undeclared (first use in this function)
     writel(virt_to_phys(socfpga_secondary_startup),
                       ^

Caused by the interaction of commits 45be0cdb5323 "ARM: socfpga: add
CPU_METHOD_OF_DECLARE for Arria 10" and 02b4e2756e01 "ARM: v7 setup function
should invalidate L1 cache".

I applied the following fix for today.

diff --git a/arch/arm/mach-socfpga/platsmp.c b/arch/arm/mach-socfpga/platsmp.c
index 4d2ad3d31f7b..c6f1df89f9af 100644
--- a/arch/arm/mach-socfpga/platsmp.c
+++ b/arch/arm/mach-socfpga/platsmp.c
@@ -63,7 +63,7 @@ static int socfpga_a10_boot_secondary(unsigned int cpu, struct task_struct *idle
 		       SOCFPGA_A10_RSTMGR_MODMPURST);
 		memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);
 
-		writel(virt_to_phys(socfpga_secondary_startup),
+		writel(virt_to_phys(secondary_startup),
 		       sys_manager_base_addr + (socfpga_cpu1start_addr & 0x00000fff));
 
 		flush_cache_all();

cheers

linux-next: build failure after merge of the arm-soc tree

[Kevin Hilman]

Michael Ellerman <mpe@ellerman.id.au> writes:

> Hi all,
>
> After merging the arm-soc tree, today's linux-next build (arm_multi_v7_defconfig)
> failed like this:
>
>   scripts/Makefile.build:258: recipe for target 'arch/arm/mach-socfpga/platsmp.o' failed
>   arch/arm/mach-socfpga/platsmp.c:66:23: error: 'socfpga_secondary_startup' undeclared (first use in this function)
>      writel(virt_to_phys(socfpga_secondary_startup),
>                        ^
>
> Caused by the interaction of commits 45be0cdb5323 "ARM: socfpga: add
> CPU_METHOD_OF_DECLARE for Arria 10" and 02b4e2756e01 "ARM: v7 setup function
> should invalidate L1 cache".

I found this as well, unfortunately after it was already pulled for -next.

> I applied the following fix for today.

Yes, that's the right fix, and arm-soc now has the equivalent fix as
well.

Thanks,

Kevin

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

Hi all,

After merging the arm-soc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

In file included from arch/arm/boot/dts/mt8135.dtsi:18:0,
                 from arch/arm/boot/dts/mt8135-evbp1.dts:16:
arch/arm/boot/dts/mt8135-pinfunc.h:18:40: fatal error: dt-bindings/pinctrl/mt65xx.h: No such file or directory
 #include <dt-bindings/pinctrl/mt65xx.h>
                                        ^

Caused by commit e6f219b8ec5e ("ARM: dts: mt8135: Add pinctrl/GPIO/EINT
node for mt8135").

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150407/66fa8ace/attachment.sig>

linux-next: build failure after merge of the arm-soc tree

[Matthias Brugger]

2015-04-07 3:12 GMT+02:00 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi all,
>
> After merging the arm-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from arch/arm/boot/dts/mt8135.dtsi:18:0,
>                  from arch/arm/boot/dts/mt8135-evbp1.dts:16:
> arch/arm/boot/dts/mt8135-pinfunc.h:18:40: fatal error: dt-bindings/pinctrl/mt65xx.h: No such file or directory
>  #include <dt-bindings/pinctrl/mt65xx.h>
>                                         ^
>
> Caused by commit e6f219b8ec5e ("ARM: dts: mt8135: Add pinctrl/GPIO/EINT
> node for mt8135").

This will be fixed as soon as Linus pinctrl for-next branch got merged [1].

Cheers,
Matthias

[1] https://git.kernel.org/cgit/linux/kernel/git/linusw/linux-pinctrl.git/commit/?h=for-next&id=a6df410d420aa4ff316797d352f69e7ebae5ff98

>
> I have reverted that commit for today.
> --
> Cheers,
> Stephen Rothwell                    sfr at canb.auug.org.au



-- 
motzblog.wordpress.com

linux-next: build failure after merge of the arm-soc tree

[Linus Walleij]

On Tue, Apr 7, 2015 at 10:43 AM, Matthias Brugger
<matthias.bgg@gmail.com> wrote:
> 2015-04-07 3:12 GMT+02:00 Stephen Rothwell <sfr@canb.auug.org.au>:
>> Hi all,
>>
>> After merging the arm-soc tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> In file included from arch/arm/boot/dts/mt8135.dtsi:18:0,
>>                  from arch/arm/boot/dts/mt8135-evbp1.dts:16:
>> arch/arm/boot/dts/mt8135-pinfunc.h:18:40: fatal error: dt-bindings/pinctrl/mt65xx.h: No such file or directory
>>  #include <dt-bindings/pinctrl/mt65xx.h>
>>                                         ^
>>
>> Caused by commit e6f219b8ec5e ("ARM: dts: mt8135: Add pinctrl/GPIO/EINT
>> node for mt8135").
>
> This will be fixed as soon as Linus pinctrl for-next branch got merged [1].

Hm that's unfortunate, we do not rely on merge orders.

Either the ARM SoC tree needs to pull in the pinctrl commit
or I need to carry this patch in the pinctrl tree.

Is this sufficiently stand-alone to be merged into my tree
or do you need to go by the former approach?

Yours,
Linus Walleij

linux-next: build failure after merge of the arm-soc tree

[Matthias Brugger]

2015-04-07 11:28 GMT+02:00 Linus Walleij <linus.walleij@linaro.org>:
> On Tue, Apr 7, 2015 at 10:43 AM, Matthias Brugger
> <matthias.bgg@gmail.com> wrote:
>> 2015-04-07 3:12 GMT+02:00 Stephen Rothwell <sfr@canb.auug.org.au>:
>>> Hi all,
>>>
>>> After merging the arm-soc tree, today's linux-next build (arm
>>> multi_v7_defconfig) failed like this:
>>>
>>> In file included from arch/arm/boot/dts/mt8135.dtsi:18:0,
>>>                  from arch/arm/boot/dts/mt8135-evbp1.dts:16:
>>> arch/arm/boot/dts/mt8135-pinfunc.h:18:40: fatal error: dt-bindings/pinctrl/mt65xx.h: No such file or directory
>>>  #include <dt-bindings/pinctrl/mt65xx.h>
>>>                                         ^
>>>
>>> Caused by commit e6f219b8ec5e ("ARM: dts: mt8135: Add pinctrl/GPIO/EINT
>>> node for mt8135").
>>
>> This will be fixed as soon as Linus pinctrl for-next branch got merged [1].
>
> Hm that's unfortunate, we do not rely on merge orders.
>
> Either the ARM SoC tree needs to pull in the pinctrl commit
> or I need to carry this patch in the pinctrl tree.
>
> Is this sufficiently stand-alone to be merged into my tree
> or do you need to go by the former approach?

It's a standalone patch, so for me it is fine if you merge the patch
into your tree.

Thanks,
Matthias

-- 
motzblog.wordpress.com

linux-next: build failure after merge of the arm-soc tree

[Arnd Bergmann]

On Tuesday 07 April 2015 11:28:22 Linus Walleij wrote:
> On Tue, Apr 7, 2015 at 10:43 AM, Matthias Brugger
> <matthias.bgg@gmail.com> wrote:
> > 2015-04-07 3:12 GMT+02:00 Stephen Rothwell <sfr@canb.auug.org.au>:
> >> Hi all,
> >>
> >> After merging the arm-soc tree, today's linux-next build (arm
> >> multi_v7_defconfig) failed like this:
> >>
> >> In file included from arch/arm/boot/dts/mt8135.dtsi:18:0,
> >>                  from arch/arm/boot/dts/mt8135-evbp1.dts:16:
> >> arch/arm/boot/dts/mt8135-pinfunc.h:18:40: fatal error: dt-bindings/pinctrl/mt65xx.h: No such file or directory
> >>  #include <dt-bindings/pinctrl/mt65xx.h>
> >>                                         ^
> >>
> >> Caused by commit e6f219b8ec5e ("ARM: dts: mt8135: Add pinctrl/GPIO/EINT
> >> node for mt8135").
> >
> > This will be fixed as soon as Linus pinctrl for-next branch got merged [1].
> 
> Hm that's unfortunate, we do not rely on merge orders.
> 
> Either the ARM SoC tree needs to pull in the pinctrl commit
> or I need to carry this patch in the pinctrl tree.
> 
> Is this sufficiently stand-alone to be merged into my tree
> or do you need to go by the former approach?

Let's just delay this patch to another merge window. You can add the
driver now, and we should just revert the DT node addition in arm-soc,
and then we'll add it in 4.2, or come up with a better solution.

It's possible that we can come up with a way to avoid defining macros
for the pinctrl tables here.

	Arnd

linux-next: build failure after merge of the arm-soc tree

[Linus Walleij]

On Tue, Apr 7, 2015 at 2:28 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Tuesday 07 April 2015 11:28:22 Linus Walleij wrote:
>> On Tue, Apr 7, 2015 at 10:43 AM, Matthias Brugger
>> <matthias.bgg@gmail.com> wrote:
>> > 2015-04-07 3:12 GMT+02:00 Stephen Rothwell <sfr@canb.auug.org.au>:
>> >> Hi all,
>> >>
>> >> After merging the arm-soc tree, today's linux-next build (arm
>> >> multi_v7_defconfig) failed like this:
>> >>
>> >> In file included from arch/arm/boot/dts/mt8135.dtsi:18:0,
>> >>                  from arch/arm/boot/dts/mt8135-evbp1.dts:16:
>> >> arch/arm/boot/dts/mt8135-pinfunc.h:18:40: fatal error: dt-bindings/pinctrl/mt65xx.h: No such file or directory
>> >>  #include <dt-bindings/pinctrl/mt65xx.h>
>> >>                                         ^
>> >>
>> >> Caused by commit e6f219b8ec5e ("ARM: dts: mt8135: Add pinctrl/GPIO/EINT
>> >> node for mt8135").
>> >
>> > This will be fixed as soon as Linus pinctrl for-next branch got merged [1].
>>
>> Hm that's unfortunate, we do not rely on merge orders.
>>
>> Either the ARM SoC tree needs to pull in the pinctrl commit
>> or I need to carry this patch in the pinctrl tree.
>>
>> Is this sufficiently stand-alone to be merged into my tree
>> or do you need to go by the former approach?
>
> Let's just delay this patch to another merge window. You can add the
> driver now, and we should just revert the DT node addition in arm-soc,
> and then we'll add it in 4.2, or come up with a better solution.

OK. I'm not applying it then.

Yours,
Linus Walleij

linux-next: build failure after merge of the arm-soc tree

[Matthias Brugger]

2015-04-08 16:49 GMT+02:00 Linus Walleij <linus.walleij@linaro.org>:
> On Tue, Apr 7, 2015 at 2:28 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>> On Tuesday 07 April 2015 11:28:22 Linus Walleij wrote:
>>> On Tue, Apr 7, 2015 at 10:43 AM, Matthias Brugger
>>> <matthias.bgg@gmail.com> wrote:
>>> > 2015-04-07 3:12 GMT+02:00 Stephen Rothwell <sfr@canb.auug.org.au>:
>>> >> Hi all,
>>> >>
>>> >> After merging the arm-soc tree, today's linux-next build (arm
>>> >> multi_v7_defconfig) failed like this:
>>> >>
>>> >> In file included from arch/arm/boot/dts/mt8135.dtsi:18:0,
>>> >>                  from arch/arm/boot/dts/mt8135-evbp1.dts:16:
>>> >> arch/arm/boot/dts/mt8135-pinfunc.h:18:40: fatal error: dt-bindings/pinctrl/mt65xx.h: No such file or directory
>>> >>  #include <dt-bindings/pinctrl/mt65xx.h>
>>> >>                                         ^
>>> >>
>>> >> Caused by commit e6f219b8ec5e ("ARM: dts: mt8135: Add pinctrl/GPIO/EINT
>>> >> node for mt8135").
>>> >
>>> > This will be fixed as soon as Linus pinctrl for-next branch got merged [1].
>>>
>>> Hm that's unfortunate, we do not rely on merge orders.
>>>
>>> Either the ARM SoC tree needs to pull in the pinctrl commit
>>> or I need to carry this patch in the pinctrl tree.
>>>
>>> Is this sufficiently stand-alone to be merged into my tree
>>> or do you need to go by the former approach?
>>
>> Let's just delay this patch to another merge window. You can add the
>> driver now, and we should just revert the DT node addition in arm-soc,
>> and then we'll add it in 4.2, or come up with a better solution.
>
> OK. I'm not applying it then.

@arnd: I will send the patch in the next merge window then. Do you
want me to do anything else for this merge window (e.g. resend the
pull request without the patch)?

Cheers,
Matthias

-- 
motzblog.wordpress.com

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

Hi all,

On Wed, 8 Apr 2015 16:59:49 +0200 Matthias Brugger <matthias.bgg@gmail.com> wrote:
>
> 2015-04-08 16:49 GMT+02:00 Linus Walleij <linus.walleij@linaro.org>:
> > On Tue, Apr 7, 2015 at 2:28 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> >> On Tuesday 07 April 2015 11:28:22 Linus Walleij wrote:
> >>> On Tue, Apr 7, 2015 at 10:43 AM, Matthias Brugger
> >>> <matthias.bgg@gmail.com> wrote:
> >>> > 2015-04-07 3:12 GMT+02:00 Stephen Rothwell <sfr@canb.auug.org.au>:
> >>> >> Hi all,
> >>> >>
> >>> >> After merging the arm-soc tree, today's linux-next build (arm
> >>> >> multi_v7_defconfig) failed like this:
> >>> >>
> >>> >> In file included from arch/arm/boot/dts/mt8135.dtsi:18:0,
> >>> >>                  from arch/arm/boot/dts/mt8135-evbp1.dts:16:
> >>> >> arch/arm/boot/dts/mt8135-pinfunc.h:18:40: fatal error: dt-bindings/pinctrl/mt65xx.h: No such file or directory
> >>> >>  #include <dt-bindings/pinctrl/mt65xx.h>
> >>> >>                                         ^
> >>> >>
> >>> >> Caused by commit e6f219b8ec5e ("ARM: dts: mt8135: Add pinctrl/GPIO/EINT
> >>> >> node for mt8135").
> >>> >
> >>> > This will be fixed as soon as Linus pinctrl for-next branch got merged [1].
> >>>
> >>> Hm that's unfortunate, we do not rely on merge orders.
> >>>
> >>> Either the ARM SoC tree needs to pull in the pinctrl commit
> >>> or I need to carry this patch in the pinctrl tree.
> >>>
> >>> Is this sufficiently stand-alone to be merged into my tree
> >>> or do you need to go by the former approach?
> >>
> >> Let's just delay this patch to another merge window. You can add the
> >> driver now, and we should just revert the DT node addition in arm-soc,
> >> and then we'll add it in 4.2, or come up with a better solution.
> >
> > OK. I'm not applying it then.
> 
> @arnd: I will send the patch in the next merge window then. Do you
> want me to do anything else for this merge window (e.g. resend the
> pull request without the patch)?

I am still applying my reversion patch to the arm-soc tree merge ...

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150414/322e31b4/attachment.sig>

linux-next: build failure after merge of the arm-soc tree

[Arnd Bergmann]

On Tuesday 14 April 2015 09:47:35 Stephen Rothwell wrote:
> Hi all,
> 
> On Wed, 8 Apr 2015 16:59:49 +0200 Matthias Brugger <matthias.bgg@gmail.com> wrote:
> >
> > 2015-04-08 16:49 GMT+02:00 Linus Walleij <linus.walleij@linaro.org>:
> > > On Tue, Apr 7, 2015 at 2:28 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> > >> On Tuesday 07 April 2015 11:28:22 Linus Walleij wrote:
> > >>> On Tue, Apr 7, 2015 at 10:43 AM, Matthias Brugger
> > >>> <matthias.bgg@gmail.com> wrote:
> > >>> > 2015-04-07 3:12 GMT+02:00 Stephen Rothwell <sfr@canb.auug.org.au>:
> > >>> >> Hi all,
> > >>> >>
> > >>> >> After merging the arm-soc tree, today's linux-next build (arm
> > >>> >> multi_v7_defconfig) failed like this:
> > >>> >>
> > >>> >> In file included from arch/arm/boot/dts/mt8135.dtsi:18:0,
> > >>> >>                  from arch/arm/boot/dts/mt8135-evbp1.dts:16:
> > >>> >> arch/arm/boot/dts/mt8135-pinfunc.h:18:40: fatal error: dt-bindings/pinctrl/mt65xx.h: No such file or directory
> > >>> >>  #include <dt-bindings/pinctrl/mt65xx.h>
> > >>> >>                                         ^
> > >>> >>
> > >>> >> Caused by commit e6f219b8ec5e ("ARM: dts: mt8135: Add pinctrl/GPIO/EINT
> > >>> >> node for mt8135").
> > >>> >
> > >>> > This will be fixed as soon as Linus pinctrl for-next branch got merged [1].
> > >>>
> > >>> Hm that's unfortunate, we do not rely on merge orders.
> > >>>
> > >>> Either the ARM SoC tree needs to pull in the pinctrl commit
> > >>> or I need to carry this patch in the pinctrl tree.
> > >>>
> > >>> Is this sufficiently stand-alone to be merged into my tree
> > >>> or do you need to go by the former approach?
> > >>
> > >> Let's just delay this patch to another merge window. You can add the
> > >> driver now, and we should just revert the DT node addition in arm-soc,
> > >> and then we'll add it in 4.2, or come up with a better solution.
> > >
> > > OK. I'm not applying it then.
> > 
> > @arnd: I will send the patch in the next merge window then. Do you
> > want me to do anything else for this merge window (e.g. resend the
> > pull request without the patch)?
> 
> I am still applying my reversion patch to the arm-soc tree merge ...

Sorry about that. I've applied the same revert now to our branch, but
there are some other fixes that I need to apply too before I upload
it. If you don't mind pulling arm-soc again manually at the end
of your merges for today, that might be helpful, otherwise it should
be fixed tomorrow.

	Arnd

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

Hi all,

After merging the arm-soc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

Error: arch/arm/boot/dts/hisi-x5hd2.dtsi:374.22-23 syntax error
FATAL ERROR: Unable to parse input tree

There are a series of new commits to this file today and I have no idea
which one caused the problem.

I reverted:

610bd8722ef4	"ARM: dts: hix5hd2: add wdg node"
6868feb6dd97	"ARM: dts: hix5hd2: add gpio node"
420a2d55f046	"ARM: dts: hix5hd2: add sata node"
f16c7fb2f3ff	"ARM: dts: hix5hd2: add usb node"
b196e1ca400d	"ARM: dts: hix5hd2: add mmc node"
de8b6054780e	"ARM: dts: hix5hd2: add gmac node"

which fixed the build problem.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- 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/20140926/3b473feb/attachment.sig>

linux-next: build failure after merge of the arm-soc tree

[Wei Xu]

On 2014/9/26 9:55, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the arm-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> Error: arch/arm/boot/dts/hisi-x5hd2.dtsi:374.22-23 syntax error
> FATAL ERROR: Unable to parse input tree
> 
> There are a series of new commits to this file today and I have no idea
> which one caused the problem.

Hi Stephen,

Sorry for that.
It is caused by this commit: 610bd8722ef4 "ARM: dts: hix5hd2: add wdg node".
And Olof has already helped to reverted this commit.

Best Regards,
Wei

> I reverted:
> 
> 610bd8722ef4	"ARM: dts: hix5hd2: add wdg node"
> 6868feb6dd97	"ARM: dts: hix5hd2: add gpio node"
> 420a2d55f046	"ARM: dts: hix5hd2: add sata node"
> f16c7fb2f3ff	"ARM: dts: hix5hd2: add usb node"
> b196e1ca400d	"ARM: dts: hix5hd2: add mmc node"
> de8b6054780e	"ARM: dts: hix5hd2: add gmac node"
> 
> which fixed the build problem.
> 

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

Hi all,

On Fri, 26 Sep 2014 11:55:39 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the arm-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> Error: arch/arm/boot/dts/hisi-x5hd2.dtsi:374.22-23 syntax error
> FATAL ERROR: Unable to parse input tree

OK, now I get:

Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:417.21-22 syntax error
FATAL ERROR: Unable to parse input tree

Are you guys really testing this stuff? :-(

> There are a series of new commits to this file today and I have no idea
> which one caused the problem.
> 
> I reverted:
> 
> 610bd8722ef4	"ARM: dts: hix5hd2: add wdg node"

Reverted in the arm-soc tree.

> 6868feb6dd97	"ARM: dts: hix5hd2: add gpio node"

Error is now:

Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:183.21-22 syntax error

> 420a2d55f046	"ARM: dts: hix5hd2: add sata node"

Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:183.21-22 syntax error


> f16c7fb2f3ff	"ARM: dts: hix5hd2: add usb node"

Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:183.21-22 syntax error

> b196e1ca400d	"ARM: dts: hix5hd2: add mmc node"

Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:174.21-22 syntax error

> de8b6054780e	"ARM: dts: hix5hd2: add gmac node"

no more errors.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- 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/20140930/9d4adcd5/attachment.sig>

linux-next: build failure after merge of the arm-soc tree

[Wei Xu]

On 2014/9/30 8:12, Stephen Rothwell wrote:
> Hi all,
> 
> On Fri, 26 Sep 2014 11:55:39 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the arm-soc tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> Error: arch/arm/boot/dts/hisi-x5hd2.dtsi:374.22-23 syntax error
>> FATAL ERROR: Unable to parse input tree 
> OK, now I get:
> 
> Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:417.21-22 syntax error
> FATAL ERROR: Unable to parse input tree
> Are you guys really testing this stuff? :-(

Hi Stephen, Olof, Arnd,

Sorry for my fault and bring so much trouble to all of you.
I sent this pull request before the clock patch set being accepted.
And I did forget to compile the dtb. 
But I will make sure it will *not* happen next time.
Arnd has already helped to revert the series of this patch set in arm-soc.git:next/dt.

Hi Arnd, Olof,

Could you please help to revert this series of patch set in arm-soc.git:for-next?
Thanks!

Best Regards,
Wei
 
>> There are a series of new commits to this file today and I have no idea
>> which one caused the problem.
>>
>> I reverted:
>>
>> 610bd8722ef4	"ARM: dts: hix5hd2: add wdg node"
> 
> Reverted in the arm-soc tree.
> 
>> 6868feb6dd97	"ARM: dts: hix5hd2: add gpio node"
> 
> Error is now:
> 
> Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:183.21-22 syntax error
> 
>> 420a2d55f046	"ARM: dts: hix5hd2: add sata node"
> 
> Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:183.21-22 syntax error
> 
> 
>> f16c7fb2f3ff	"ARM: dts: hix5hd2: add usb node"
> 
> Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:183.21-22 syntax error
> 
>> b196e1ca400d	"ARM: dts: hix5hd2: add mmc node"
> 
> Error: /scratch/sfr/next/arch/arm/boot/dts/hisi-x5hd2.dtsi:174.21-22 syntax error
> 
>> de8b6054780e	"ARM: dts: hix5hd2: add gmac node"
> 
> no more errors.
> 

linux-next: build failure after merge of the arm-soc tree

[Mark Brown]

Hi all,

After merging the arm-soc tree, today's linux-next build (20140309)
failed for arm64 defconfig like this:

/home/broonie/next/next/drivers/irqchip/irq-gic.c: In function 'gic_raise_softirq':
/home/broonie/next/next/drivers/irqchip/irq-gic.c:666:2: error: implicit declaration of function 'dmb' [-Werror=implicit-function-declaration]
  dmb(ishst);
  ^
/home/broonie/next/next/drivers/irqchip/irq-gic.c:666:6: error: 'ishst' undeclared (first use in this function)
  dmb(ishst);
      ^
/home/broonie/next/next/drivers/irqchip/irq-gic.c:666:6: note: each undeclared identifier is reported only once for each function it appears
in
cc1: some warnings being treated as errors
make[3]: *** [drivers/irqchip/irq-gic.o] Error 1

This is due to 8adbf57fc4294 (irqchip: gic: use dmb ishst instead of dsb
when raising a softirq) and has been going on for several builds now but
Stephen hasn't been including this build in his per-merge testing.  I've
abandoned arm64 testing since a simple revert causes problems for arm.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140309/ab01db95/attachment.sig>

linux-next: build failure after merge of the arm-soc tree

[Will Deacon]

On Sun, Mar 09, 2014 at 11:55:14AM +0000, Mark Brown wrote:
> Hi all,

Hi Mark,

> After merging the arm-soc tree, today's linux-next build (20140309)
> failed for arm64 defconfig like this:
> 
> /home/broonie/next/next/drivers/irqchip/irq-gic.c: In function 'gic_raise_softirq':
> /home/broonie/next/next/drivers/irqchip/irq-gic.c:666:2: error: implicit declaration of function 'dmb' [-Werror=implicit-function-declaration]
>   dmb(ishst);
>   ^

Damnit, that's because we ended up going with dmb instead of dsb after it
(surprisingly) turned out to be sufficient. The simple patch below fixes the
problem -- Catalin, can we get this into -next please?

I have an extra patch which actually makes use of the options, but we should
get things building again first.

Cheers,

Will

--->8

>From bacbd4af61a671ad21f58197ed16116ff41b54cd Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Mon, 10 Mar 2014 10:36:52 +0000
Subject: [PATCH] arm64: barriers: add dmb barrier

Commit 8adbf57fc429 ("irqchip: gic: use dmb ishst instead of dsb when
raising a softirq") added an explicit dmb(...) call to the GIC driver.

This patch adds a simple dmb() macro to arm64, which expands to a DMB SY
instruction.

Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 arch/arm64/include/asm/barrier.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
index 409ca370cfe2..66eb7648043b 100644
--- a/arch/arm64/include/asm/barrier.h
+++ b/arch/arm64/include/asm/barrier.h
@@ -25,6 +25,7 @@
 #define wfi()		asm volatile("wfi" : : : "memory")
 
 #define isb()		asm volatile("isb" : : : "memory")
+#define dmb(opt)	asm volatile("dmb sy" : : : "memory")
 #define dsb(opt)	asm volatile("dsb sy" : : : "memory")
 
 #define mb()		dsb()
-- 
1.8.2.2

linux-next: build failure after merge of the arm-soc tree

[Catalin Marinas]

On Mon, Mar 10, 2014 at 10:45:58AM +0000, Will Deacon wrote:
> On Sun, Mar 09, 2014 at 11:55:14AM +0000, Mark Brown wrote:
> > Hi all,
> 
> Hi Mark,
> 
> > After merging the arm-soc tree, today's linux-next build (20140309)
> > failed for arm64 defconfig like this:
> > 
> > /home/broonie/next/next/drivers/irqchip/irq-gic.c: In function 'gic_raise_softirq':
> > /home/broonie/next/next/drivers/irqchip/irq-gic.c:666:2: error: implicit declaration of function 'dmb' [-Werror=implicit-function-declaration]
> >   dmb(ishst);
> >   ^
> 
> Damnit, that's because we ended up going with dmb instead of dsb after it
> (surprisingly) turned out to be sufficient. The simple patch below fixes the
> problem -- Catalin, can we get this into -next please?

Done.

-- 
Catalin

linux-next: build failure after merge of the arm-soc tree

[Mark Brown]

Hi all,

After merging the arm-soc tree, today's linux-next build (20140309)
failed for multi_v7_defconfig like this:

ERROR (phandle_references): Reference to non-existent node or label "sysmgr"

ERROR (phandle_references): Reference to non-existent node or label "sysmgr"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/socfpga_arria5_socdk.dtb] Error 2
make[2]: *** Waiting for unfinished jobs....
ERROR (phandle_references): Reference to non-existent node or label "sysmgr"

ERROR (phandle_references): Reference to non-existent node or label "sysmgr"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/socfpga_cyclone5_sockit.dtb] Error 2
ERROR (phandle_references): Reference to non-existent node or label "sysmgr"

ERROR (phandle_references): Reference to non-existent node or label "sysmgr"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/socfpga_cyclone5_socdk.dtb] Error 2
make[1]: *** [dtbs] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [sub-make] Error 2
Build failed

I have tried using the tree from Friday instead but see following mail.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140309/96ecf1a1/attachment.sig>

linux-next: build failure after merge of the arm-soc tree

[Olof Johansson]

On Sun, Mar 9, 2014 at 4:41 AM, Mark Brown <broonie@kernel.org> wrote:
> Hi all,
>
> After merging the arm-soc tree, today's linux-next build (20140309)
> failed for multi_v7_defconfig like this:
>
> ERROR (phandle_references): Reference to non-existent node or label "sysmgr"
>
> ERROR (phandle_references): Reference to non-existent node or label "sysmgr"
>
> ERROR: Input tree has errors, aborting (use -f to force output)
> make[2]: *** [arch/arm/boot/dts/socfpga_arria5_socdk.dtb] Error 2

Known issue, I unmerged the offending branch but didn't push out the
backed out for-next branch last night (I was unaware that you were
doing linux-next now, and sfr doesn't do them until Sunday night our
time, so I didn't think it was urgent).



-Olof

linux-next: build failure after merge of the arm-soc tree

[Mark Brown]

On Sun, Mar 09, 2014 at 10:08:58AM -0700, Olof Johansson wrote:
> On Sun, Mar 9, 2014 at 4:41 AM, Mark Brown <broonie@kernel.org> wrote:

> > ERROR: Input tree has errors, aborting (use -f to force output)
> > make[2]: *** [arch/arm/boot/dts/socfpga_arria5_socdk.dtb] Error 2

> Known issue, I unmerged the offending branch but didn't push out the
> backed out for-next branch last night (I was unaware that you were
> doing linux-next now, and sfr doesn't do them until Sunday night our
> time, so I didn't think it was urgent).

No worries, I wouldn't have done it on a Sunday either but this time
round I've got Stephen's scripts so I've been pipe cleaning those so
hopefully everything will actually run properly on Monday.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140309/d8130a81/attachment.sig>

linux-next: build failure after merge of the arm-soc tree

[Stephen Rothwell]

Hi all,

After merging the arm-soc tree, today's linux-next build (powerpc ppc64_defconfig)
failed like this:

powerpc64-linux-ld: cannot find drivers/pci/host/built-in.o: No such file or directory

Caused by commit 9ecbe03ae85b ("pci: infrastructure to add drivers in
drivers/pci/host").

I have used the arm-soc tree from next-20130418 for today.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130419/02269d24/attachment-0001.sig>

linux-next: build failure after merge of the arm-soc tree

[Olof Johansson]

On Thu, Apr 18, 2013 at 11:46 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the arm-soc tree, today's linux-next build (powerpc ppc64_defconfig)
> failed like this:
>
> powerpc64-linux-ld: cannot find drivers/pci/host/built-in.o: No such file or directory
>
> Caused by commit 9ecbe03ae85b ("pci: infrastructure to add drivers in
> drivers/pci/host").
>
> I have used the arm-soc tree from next-20130418 for today.

Sorry about that, I'll drop the branch that brought in the of_pci
consolidation from our repo.


-Olof

linux-next: build failure after merge of the arm-soc tree

[Thomas Petazzoni]

Dear Olof Johansson,

On Fri, 19 Apr 2013 07:01:28 -0700, Olof Johansson wrote:

> > After merging the arm-soc tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > powerpc64-linux-ld: cannot find drivers/pci/host/built-in.o: No
> > such file or directory
> >
> > Caused by commit 9ecbe03ae85b ("pci: infrastructure to add drivers
> > in drivers/pci/host").
> >
> > I have used the arm-soc tree from next-20130418 for today.
> 
> Sorry about that, I'll drop the branch that brought in the of_pci
> consolidation from our repo.

The build failure reported here is totally independent of the of_pci
consolidation work. It's caused by the commit pointed in this e-mail,
and it is independent from Andrew Murray's work on of_pci consolidation.

Best regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com