Hi all,
After merging the wireless-drivers-next tree, today's linux-next build
(powerpc allyesconfig) failed like this:
drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
b47s->window = ioremap_cache(res->start, resource_size(res));
^
drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
b47s->window = ioremap_cache(res->start, resource_size(res));
^
Caused by commit
57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell
On 19 July 2016 at 09:09, Kalle Valo <[email protected]> wrote:
> Rafał Miłecki <[email protected]> writes:
>
>> On 19 July 2016 at 08:30, Kalle Valo <[email protected]> wrote:
>>> Stephen Rothwell <[email protected]> writes:
>>>
>>>> After merging the wireless-drivers-next tree, today's linux-next build
>>>> (powerpc allyesconfig) failed like this:
>>>>
>>>> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
>>>> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>>>> b47s->window = ioremap_cache(res->start, resource_size(res));
>>>> ^
>>>> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>>>> b47s->window = ioremap_cache(res->start, resource_size(res));
>>>> ^
>>>>
>>>> Caused by commit
>>>>
>>>> 57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>>>>
>>>> I have reverted that commit for today.
>>>
>>> Thanks, kbuild bot also notified about this.
>>>
>>> Rafał, as the merge window is getting really close I would like to
>>> revert this for now and we can reapply it once we the problem is fully
>>> solved. And we can use my pending branch for build testing the patch
>>> with kbuild bot. What do you think?
>>
>> The simplest fix sounds pretty much as simple as the revert.
>
> The problem is that I don't have much time, I need to send the pull
> request to Dave within next few days. The fix might create other
> problems so I'm not enthusiastic about iterating with this patch at the
> moment. I think it can wait for 4.9.
I sent a patch seconds ago, you may just take a look at it. If you
still prefer to revert my commit, go ahead.
--
Rafał
Brian Norris <[email protected]> writes:
> Just to head this off, since I noticed it...
>
> On Tue, Jul 19, 2016 at 05:08:59PM +0300, Kalle Valo wrote:
>> Rafał Miłecki <[email protected]> writes:
>> > I sent a patch seconds ago, you may just take a look at it. If you
>> > still prefer to revert my commit, go ahead.
>>
>> Ok, let's try your fix. We still have few days. I applied the patch[1]
>> to the pending branch this morning and if I don't see any errors I apply
>> it later tonight and hopefully it will be in tomorrow's linux-next
>> build. Thanks for the quick fix, very much appreciated.
>>
>> [1] "mtd: add arch dependency for MTD_BCM47XXSFLASH symbol"
>> https://patchwork.kernel.org/patch/9236053/
>
> I applied a trivial change to this same Kconfig entry:
>
> Subject: mtd: update description of MTD_BCM47XXSFLASH symbol
> http://git.infradead.org/l2-mtd.git/commitdiff/0a526341fee054c1e2b9f0e4b2b424ae81707d4c
>
> It's a trivial conflict, so should we just let Linus work it out? I can
> note it my MTD pull request, if wireless lands first.
Sounds good to me. Do note that Linus doesn't pull wireless-drivers-next
directly, it goes through net-next. But I'll let Dave also know about
this when I send him the pull request.
--
Kalle Valo
Just to head this off, since I noticed it...
On Tue, Jul 19, 2016 at 05:08:59PM +0300, Kalle Valo wrote:
> Rafał Miłecki <[email protected]> writes:
> > I sent a patch seconds ago, you may just take a look at it. If you
> > still prefer to revert my commit, go ahead.
>
> Ok, let's try your fix. We still have few days. I applied the patch[1]
> to the pending branch this morning and if I don't see any errors I apply
> it later tonight and hopefully it will be in tomorrow's linux-next
> build. Thanks for the quick fix, very much appreciated.
>
> [1] "mtd: add arch dependency for MTD_BCM47XXSFLASH symbol"
> https://patchwork.kernel.org/patch/9236053/
I applied a trivial change to this same Kconfig entry:
Subject: mtd: update description of MTD_BCM47XXSFLASH symbol
http://git.infradead.org/l2-mtd.git/commitdiff/0a526341fee054c1e2b9f0e4b2b424ae81707d4c
It's a trivial conflict, so should we just let Linus work it out? I can
note it my MTD pull request, if wireless lands first.
Brian
Rafał Miłecki <[email protected]> writes:
> On 19 July 2016 at 08:30, Kalle Valo <[email protected]> wrote:
>> Stephen Rothwell <[email protected]> writes:
>>
>>> After merging the wireless-drivers-next tree, today's linux-next build
>>> (powerpc allyesconfig) failed like this:
>>>
>>> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
>>> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>>> b47s->window = ioremap_cache(res->start, resource_size(res));
>>> ^
>>> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>>> b47s->window = ioremap_cache(res->start, resource_size(res));
>>> ^
>>>
>>> Caused by commit
>>>
>>> 57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>>>
>>> I have reverted that commit for today.
>>
>> Thanks, kbuild bot also notified about this.
>>
>> Rafał, as the merge window is getting really close I would like to
>> revert this for now and we can reapply it once we the problem is fully
>> solved. And we can use my pending branch for build testing the patch
>> with kbuild bot. What do you think?
>
> The simplest fix sounds pretty much as simple as the revert.
The problem is that I don't have much time, I need to send the pull
request to Dave within next few days. The fix might create other
problems so I'm not enthusiastic about iterating with this patch at the
moment. I think it can wait for 4.9.
--
Kalle Valo
On 19 July 2016 at 08:30, Kalle Valo <[email protected]> wrote:
> Stephen Rothwell <[email protected]> writes:
>
>> After merging the wireless-drivers-next tree, today's linux-next build
>> (powerpc allyesconfig) failed like this:
>>
>> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
>> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>> b47s->window = ioremap_cache(res->start, resource_size(res));
>> ^
>> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>> b47s->window = ioremap_cache(res->start, resource_size(res));
>> ^
>>
>> Caused by commit
>>
>> 57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>>
>> I have reverted that commit for today.
>
> Thanks, kbuild bot also notified about this.
>
> Rafał, as the merge window is getting really close I would like to
> revert this for now and we can reapply it once we the problem is fully
> solved. And we can use my pending branch for build testing the patch
> with kbuild bot. What do you think?
The simplest fix sounds pretty much as simple as the revert. In the
seconds thread I was considering two fixes: switching to memremap and
adding depends on.
What about trying a simple "depends on"?
--
Rafał
Stephen Rothwell <[email protected]> writes:
> After merging the wireless-drivers-next tree, today's linux-next build
> (powerpc allyesconfig) failed like this:
>
> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
> b47s->window = ioremap_cache(res->start, resource_size(res));
> ^
> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
> b47s->window = ioremap_cache(res->start, resource_size(res));
> ^
>
> Caused by commit
>
> 57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>
> I have reverted that commit for today.
Thanks, kbuild bot also notified about this.
Rafał, as the merge window is getting really close I would like to
revert this for now and we can reapply it once we the problem is fully
solved. And we can use my pending branch for build testing the patch
with kbuild bot. What do you think?
--
Kalle Valo
Hi Brian,
On Tue, 19 Jul 2016 11:39:13 -0700 Brian Norris <[email protected]> wrote:
>
> I applied a trivial change to this same Kconfig entry:
>
> Subject: mtd: update description of MTD_BCM47XXSFLASH symbol
> http://git.infradead.org/l2-mtd.git/commitdiff/0a526341fee054c1e2b9f0e4b2b424ae81707d4c
>
> It's a trivial conflict, so should we just let Linus work it out? I can
> note it my MTD pull request, if wireless lands first.
Linus and I should be able to cope. I will send my usual notification today.
--
Cheers,
Stephen Rothwell
Rafał Miłecki <[email protected]> writes:
> On 19 July 2016 at 09:09, Kalle Valo <[email protected]> wrote:
>> Rafał Miłecki <[email protected]> writes:
>>
>>> On 19 July 2016 at 08:30, Kalle Valo <[email protected]> wrote:
>>>> Stephen Rothwell <[email protected]> writes:
>>>>
>>>>> After merging the wireless-drivers-next tree, today's linux-next build
>>>>> (powerpc allyesconfig) failed like this:
>>>>>
>>>>> drivers/mtd/devices/bcm47xxsflash.c: In function 'bcm47xxsflash_bcma_probe':
>>>>> drivers/mtd/devices/bcm47xxsflash.c:299:17: error: implicit declaration of function 'ioremap_cache' [-Werror=implicit-function-declaration]
>>>>> b47s->window = ioremap_cache(res->start, resource_size(res));
>>>>> ^
>>>>> drivers/mtd/devices/bcm47xxsflash.c:299:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>>>>> b47s->window = ioremap_cache(res->start, resource_size(res));
>>>>> ^
>>>>>
>>>>> Caused by commit
>>>>>
>>>>> 57d8f7dd2132 ("bcma: allow enabling serial flash support on non-MIPS SoCs")
>>>>>
>>>>> I have reverted that commit for today.
>>>>
>>>> Thanks, kbuild bot also notified about this.
>>>>
>>>> Rafał, as the merge window is getting really close I would like to
>>>> revert this for now and we can reapply it once we the problem is fully
>>>> solved. And we can use my pending branch for build testing the patch
>>>> with kbuild bot. What do you think?
>>>
>>> The simplest fix sounds pretty much as simple as the revert.
>>
>> The problem is that I don't have much time, I need to send the pull
>> request to Dave within next few days. The fix might create other
>> problems so I'm not enthusiastic about iterating with this patch at the
>> moment. I think it can wait for 4.9.
>
> I sent a patch seconds ago, you may just take a look at it. If you
> still prefer to revert my commit, go ahead.
Ok, let's try your fix. We still have few days. I applied the patch[1]
to the pending branch this morning and if I don't see any errors I apply
it later tonight and hopefully it will be in tomorrow's linux-next
build. Thanks for the quick fix, very much appreciated.
[1] "mtd: add arch dependency for MTD_BCM47XXSFLASH symbol"
https://patchwork.kernel.org/patch/9236053/
--
Kalle Valo
Hi Igor,
On Wed, 7 Jun 2017 19:43:18 -0700 Igor Mitsyanko <[email protected]> wrote:
>
> thanks. As I understand, you've applied this patch during a merge and no
> further actions are required, correct?
Dave Miller will need to apply that patch (or something similar) when
he merges the wireless-drivers-next tree into the net-next tree. I
will keep applying the patch each day until then.
--
Cheers,
Stephen Rothwell
Stephen Rothwell <[email protected]> writes:
> Hi Igor,
>
> On Wed, 7 Jun 2017 19:43:18 -0700 Igor Mitsyanko <[email protected]> wrote:
>>
>> thanks. As I understand, you've applied this patch during a merge and no
>> further actions are required, correct?
>
> Dave Miller will need to apply that patch (or something similar) when
> he merges the wireless-drivers-next tree into the net-next tree. I
> will keep applying the patch each day until then.
Thanks, I'll remind Dave about this when i submit the pull request (very
soon now).
--
Kalle Valo