Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: build failure after merge of the mmc tree
@ 2021-04-16  3:48 Stephen Rothwell
  2021-04-16  3:49 ` Stephen Rothwell
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2021-04-16  3:48 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Jiapeng Chong, Linux Kernel Mailing List, Linux Next Mailing List


[-- Attachment #1: Type: text/plain, Size: 1690 bytes --]

Hi all,

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

In file included from drivers/memstick/host/r592.h:13,
                 from drivers/memstick/host/r592.c:21:
drivers/memstick/host/r592.c: In function 'r592_flush_fifo_write':
include/linux/kfifo.h:588:1: warning: ignoring return value of '__kfifo_uint_must_check_helper' declared with attribute 'warn_unused_result' [-Wunused-result]
  588 | __kfifo_uint_must_check_helper( \
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  589 | ({ \
      | ~~~~
  590 |  typeof((fifo) + 1) __tmp = (fifo); \
      |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  591 |  typeof(__tmp->ptr) __buf = (buf); \
      |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  592 |  unsigned long __n = (n); \
      |  ~~~~~~~~~~~~~~~~~~~~~~~~~~
  593 |  const size_t __recsize = sizeof(*__tmp->rectype); \
      |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  594 |  struct __kfifo *__kfifo = &__tmp->kfifo; \
      |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  595 |  (__recsize) ?\
      |  ~~~~~~~~~~~~~~
  596 |  __kfifo_out_r(__kfifo, __buf, __n, __recsize) : \
      |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  597 |  __kfifo_out(__kfifo, __buf, __n); \
      |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  598 | }) \
      | ~~~~
  599 | )
      | ~
drivers/memstick/host/r592.c:367:2: note: in expansion of macro 'kfifo_out'
  367 |  kfifo_out(&dev->pio_fifo, buffer, 4);
      |  ^~~~~~~~~

Caused by commit

  4b00ed3c5072 ("memstick: r592: remove unused variable")

Please check the fixes for "simple, robot reported" warnings :-(
-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2021-04-16  3:48 linux-next: build failure after merge of the mmc tree Stephen Rothwell
@ 2021-04-16  3:49 ` Stephen Rothwell
  2021-04-26  1:31   ` Stephen Rothwell
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2021-04-16  3:49 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Jiapeng Chong, Linux Kernel Mailing List, Linux Next Mailing List


[-- Attachment #1: Type: text/plain, Size: 1837 bytes --]

Hi all,

This is actually just a warning.

On Fri, 16 Apr 2021 13:48:27 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> In file included from drivers/memstick/host/r592.h:13,
>                  from drivers/memstick/host/r592.c:21:
> drivers/memstick/host/r592.c: In function 'r592_flush_fifo_write':
> include/linux/kfifo.h:588:1: warning: ignoring return value of '__kfifo_uint_must_check_helper' declared with attribute 'warn_unused_result' [-Wunused-result]
>   588 | __kfifo_uint_must_check_helper( \
>       | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   589 | ({ \
>       | ~~~~
>   590 |  typeof((fifo) + 1) __tmp = (fifo); \
>       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   591 |  typeof(__tmp->ptr) __buf = (buf); \
>       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   592 |  unsigned long __n = (n); \
>       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~
>   593 |  const size_t __recsize = sizeof(*__tmp->rectype); \
>       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   594 |  struct __kfifo *__kfifo = &__tmp->kfifo; \
>       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   595 |  (__recsize) ?\
>       |  ~~~~~~~~~~~~~~
>   596 |  __kfifo_out_r(__kfifo, __buf, __n, __recsize) : \
>       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   597 |  __kfifo_out(__kfifo, __buf, __n); \
>       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   598 | }) \
>       | ~~~~
>   599 | )
>       | ~
> drivers/memstick/host/r592.c:367:2: note: in expansion of macro 'kfifo_out'
>   367 |  kfifo_out(&dev->pio_fifo, buffer, 4);
>       |  ^~~~~~~~~
> 
> Caused by commit
> 
>   4b00ed3c5072 ("memstick: r592: remove unused variable")

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2021-04-16  3:49 ` Stephen Rothwell
@ 2021-04-26  1:31   ` Stephen Rothwell
  2021-04-26  9:46     ` Ulf Hansson
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2021-04-26  1:31 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Jiapeng Chong, Linux Kernel Mailing List, Linux Next Mailing List


[-- Attachment #1: Type: text/plain, Size: 2033 bytes --]

Hi all,

On Fri, 16 Apr 2021 13:49:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> This is actually just a warning.
> 
> On Fri, 16 Apr 2021 13:48:27 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > In file included from drivers/memstick/host/r592.h:13,
> >                  from drivers/memstick/host/r592.c:21:
> > drivers/memstick/host/r592.c: In function 'r592_flush_fifo_write':
> > include/linux/kfifo.h:588:1: warning: ignoring return value of '__kfifo_uint_must_check_helper' declared with attribute 'warn_unused_result' [-Wunused-result]
> >   588 | __kfifo_uint_must_check_helper( \
> >       | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >   589 | ({ \
> >       | ~~~~
> >   590 |  typeof((fifo) + 1) __tmp = (fifo); \
> >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >   591 |  typeof(__tmp->ptr) __buf = (buf); \
> >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >   592 |  unsigned long __n = (n); \
> >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~
> >   593 |  const size_t __recsize = sizeof(*__tmp->rectype); \
> >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >   594 |  struct __kfifo *__kfifo = &__tmp->kfifo; \
> >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >   595 |  (__recsize) ?\
> >       |  ~~~~~~~~~~~~~~
> >   596 |  __kfifo_out_r(__kfifo, __buf, __n, __recsize) : \
> >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >   597 |  __kfifo_out(__kfifo, __buf, __n); \
> >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >   598 | }) \
> >       | ~~~~
> >   599 | )
> >       | ~
> > drivers/memstick/host/r592.c:367:2: note: in expansion of macro 'kfifo_out'
> >   367 |  kfifo_out(&dev->pio_fifo, buffer, 4);
> >       |  ^~~~~~~~~
> > 
> > Caused by commit
> > 
> >   4b00ed3c5072 ("memstick: r592: remove unused variable")  

I am still getting this warning ...

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2021-04-26  1:31   ` Stephen Rothwell
@ 2021-04-26  9:46     ` Ulf Hansson
  0 siblings, 0 replies; 51+ messages in thread
From: Ulf Hansson @ 2021-04-26  9:46 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Jiapeng Chong, Linux Kernel Mailing List, Linux Next Mailing List

On Mon, 26 Apr 2021 at 03:32, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Fri, 16 Apr 2021 13:49:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > This is actually just a warning.
> >
> > On Fri, 16 Apr 2021 13:48:27 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> > > failed like this:
> > >
> > > In file included from drivers/memstick/host/r592.h:13,
> > >                  from drivers/memstick/host/r592.c:21:
> > > drivers/memstick/host/r592.c: In function 'r592_flush_fifo_write':
> > > include/linux/kfifo.h:588:1: warning: ignoring return value of '__kfifo_uint_must_check_helper' declared with attribute 'warn_unused_result' [-Wunused-result]
> > >   588 | __kfifo_uint_must_check_helper( \
> > >       | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > >   589 | ({ \
> > >       | ~~~~
> > >   590 |  typeof((fifo) + 1) __tmp = (fifo); \
> > >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > >   591 |  typeof(__tmp->ptr) __buf = (buf); \
> > >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > >   592 |  unsigned long __n = (n); \
> > >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~
> > >   593 |  const size_t __recsize = sizeof(*__tmp->rectype); \
> > >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > >   594 |  struct __kfifo *__kfifo = &__tmp->kfifo; \
> > >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > >   595 |  (__recsize) ?\
> > >       |  ~~~~~~~~~~~~~~
> > >   596 |  __kfifo_out_r(__kfifo, __buf, __n, __recsize) : \
> > >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > >   597 |  __kfifo_out(__kfifo, __buf, __n); \
> > >       |  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > >   598 | }) \
> > >       | ~~~~
> > >   599 | )
> > >       | ~
> > > drivers/memstick/host/r592.c:367:2: note: in expansion of macro 'kfifo_out'
> > >   367 |  kfifo_out(&dev->pio_fifo, buffer, 4);
> > >       |  ^~~~~~~~~
> > >
> > > Caused by commit
> > >
> > >   4b00ed3c5072 ("memstick: r592: remove unused variable")
>
> I am still getting this warning ...

Apologize for the delay, it should be fixed now.

Kind regards
Uffe

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2020-10-06  5:29 Stephen Rothwell
  0 siblings, 0 replies; 51+ messages in thread
From: Stephen Rothwell @ 2020-10-06  5:29 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Raul E Rangel, Linux Kernel Mailing List, Linux Next Mailing List


[-- Attachment #1: Type: text/plain, Size: 745 bytes --]

Hi all,

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

drivers/mmc/host/sdhci-acpi.c: In function 'amd_select_drive_strength':
drivers/mmc/host/sdhci-acpi.c:562:39: error: 'SDHCI_PRESET_DRV_SHIFT' undeclared (first use in this function); did you mean 'SDHCI_PRESET_DRV_MASK'?
  562 |   (preset & SDHCI_PRESET_DRV_MASK) >> SDHCI_PRESET_DRV_SHIFT;
      |                                       ^~~~~~~~~~~~~~~~~~~~~~
      |                                       SDHCI_PRESET_DRV_MASK

Caused by commit

  e9b80bb74fdd ("mmc: sdhci-acpi: AMDI0040: Allow changing HS200/HS400 driver strength")

I have used the mmc tree from next-20201002 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2020-09-25  4:40 Stephen Rothwell
  0 siblings, 0 replies; 51+ messages in thread
From: Stephen Rothwell @ 2020-09-25  4:40 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Amey Narkhede, Linux Next Mailing List, Linux Kernel Mailing List


[-- Attachment #1: Type: text/plain, Size: 778 bytes --]

Hi all,

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

drivers/mmc/host/davinci_mmc.c: In function 'mmc_davinci_set_ios':
drivers/mmc/host/davinci_mmc.c:696:19: error: 'mmc' redeclared as different kind of symbol
  696 |  struct mmc_host *mmc = mmc_from_priv(host);
      |                   ^~~
drivers/mmc/host/davinci_mmc.c:691:50: note: previous definition of 'mmc' was here
  691 | static void mmc_davinci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
      |                                 ~~~~~~~~~~~~~~~~~^~~

Caused by commit

  359c6349a771 ("mmc: davinci: Drop pointer to mmc_host from mmc_davinci_host")

I have used the mmc tree from next-20200924 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2020-06-02  3:44 Stephen Rothwell
  2020-06-02 12:05 ` Ulf Hansson
@ 2020-06-02 12:15 ` Kalle Valo
  1 sibling, 0 replies; 51+ messages in thread
From: Kalle Valo @ 2020-06-02 12:15 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Ulf Hansson, David Miller, Networking, Linux Next Mailing List,
	Linux Kernel Mailing List, Pali Rohár, Wright Feng,
	Chi-hsien Lin

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> After merging the mmc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c: In function
> 'brcmf_sdiod_probe':
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c:915:7:
> error: 'SDIO_DEVICE_ID_CYPRESS_4373' undeclared (first use in this
> function); did you mean 'SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373'?
>   915 |  case SDIO_DEVICE_ID_CYPRESS_4373:
>       |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>       |       SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c:915:7: note: each undeclared identifier is reported only once for each function it appears in
>
> Caused by commit
>
>   1eb911258805 ("mmc: sdio: Fix Cypress SDIO IDs macros in common include file")
>
> interacting with commit
>
>   2a7621ded321 ("brcmfmac: set F2 blocksize for 4373")
>
> from the net-next tree.
>
> I have applied the following merge fix patch.

Looks good to me, thanks. Ulf, I guess you will notify Linus about the
conflict in your pull request?

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2020-06-02  3:44 Stephen Rothwell
@ 2020-06-02 12:05 ` Ulf Hansson
  2020-06-02 12:15 ` Kalle Valo
  1 sibling, 0 replies; 51+ messages in thread
From: Ulf Hansson @ 2020-06-02 12:05 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux Next Mailing List,
	Linux Kernel Mailing List, Pali Rohár, Wright Feng,
	Chi-hsien Lin, Kalle Valo, Linus

+ Linus

On Tue, 2 Jun 2020 at 05:44, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the mmc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c: In function 'brcmf_sdiod_probe':
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c:915:7: error: 'SDIO_DEVICE_ID_CYPRESS_4373' undeclared (first use in this function); did you mean 'SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373'?
>   915 |  case SDIO_DEVICE_ID_CYPRESS_4373:
>       |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>       |       SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c:915:7: note: each undeclared identifier is reported only once for each function it appears in
>
> Caused by commit
>
>   1eb911258805 ("mmc: sdio: Fix Cypress SDIO IDs macros in common include file")
>
> interacting with commit
>
>   2a7621ded321 ("brcmfmac: set F2 blocksize for 4373")
>
> from the net-next tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 2 Jun 2020 13:41:04 +1000
> Subject: [PATCH] mmc: sdio: merge fix for "brcmfmac: set F2 blocksize for
>  4373"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks Stephen for fixing and reporting about this!

Looks like the fix is rather trivial, so I assume Linus can
cherry-pick your patch, while merging my pull request for mmc for
v5.8. In any case, I will monitor the process and send a fix on top,
if needed.

Kind regards
Uffe

> ---
>  drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
> index e718bd466830..46346cb3bc84 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
> @@ -912,7 +912,7 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
>                 goto out;
>         }
>         switch (sdiodev->func2->device) {
> -       case SDIO_DEVICE_ID_CYPRESS_4373:
> +       case SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373:
>                 f2_blksz = SDIO_4373_FUNC2_BLOCKSIZE;
>                 break;
>         case SDIO_DEVICE_ID_BROADCOM_4359:
> --
> 2.26.2
>
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2020-06-02  3:44 Stephen Rothwell
  2020-06-02 12:05 ` Ulf Hansson
  2020-06-02 12:15 ` Kalle Valo
  0 siblings, 2 replies; 51+ messages in thread
From: Stephen Rothwell @ 2020-06-02  3:44 UTC (permalink / raw)
  To: Ulf Hansson, David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Pali Rohár, Wright Feng, Chi-hsien Lin, Kalle Valo


[-- Attachment #1: Type: text/plain, Size: 1970 bytes --]

Hi all,

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

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c: In function 'brcmf_sdiod_probe':
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c:915:7: error: 'SDIO_DEVICE_ID_CYPRESS_4373' undeclared (first use in this function); did you mean 'SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373'?
  915 |  case SDIO_DEVICE_ID_CYPRESS_4373:
      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~
      |       SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c:915:7: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  1eb911258805 ("mmc: sdio: Fix Cypress SDIO IDs macros in common include file")

interacting with commit

  2a7621ded321 ("brcmfmac: set F2 blocksize for 4373")

from the net-next tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Jun 2020 13:41:04 +1000
Subject: [PATCH] mmc: sdio: merge fix for "brcmfmac: set F2 blocksize for
 4373"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index e718bd466830..46346cb3bc84 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -912,7 +912,7 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
 		goto out;
 	}
 	switch (sdiodev->func2->device) {
-	case SDIO_DEVICE_ID_CYPRESS_4373:
+	case SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373:
 		f2_blksz = SDIO_4373_FUNC2_BLOCKSIZE;
 		break;
 	case SDIO_DEVICE_ID_BROADCOM_4359:
-- 
2.26.2

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2020-05-18  4:27 Stephen Rothwell
@ 2020-05-18  6:10 ` Martin Blumenstingl
  0 siblings, 0 replies; 51+ messages in thread
From: Martin Blumenstingl @ 2020-05-18  6:10 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Ulf Hansson, Linux Next Mailing List, Linux Kernel Mailing List,
	Jerome Brunet

Hi Stephen,

On Mon, May 18, 2020 at 6:27 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> WARNING: modpost: missing MODULE_LICENSE() in drivers/mmc/host/meson-mx-sdhc-clkc.o
> see include/linux/module.h for more information
> ERROR: modpost: "meson_mx_sdhc_register_clkc" [drivers/mmc/host/meson-mx-sdhc.ko] undefined!
>
> Caused by commit
>
>   53ded1b676d1 ("mmc: host: meson-mx-sdhc: new driver for the Amlogic Meson SDHC host")
>
> I have used the mmc tree from next-20200515 for today.
brown paperbag time, sorry for this
I just sent a fix, see: [0]


Best regards,
Martin


[0] https://patchwork.kernel.org/patch/11554771/

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2020-05-18  4:27 Stephen Rothwell
  2020-05-18  6:10 ` Martin Blumenstingl
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2020-05-18  4:27 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Martin Blumenstingl, Jerome Brunet


[-- Attachment #1: Type: text/plain, Size: 539 bytes --]

Hi all,

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

WARNING: modpost: missing MODULE_LICENSE() in drivers/mmc/host/meson-mx-sdhc-clkc.o
see include/linux/module.h for more information
ERROR: modpost: "meson_mx_sdhc_register_clkc" [drivers/mmc/host/meson-mx-sdhc.ko] undefined!

Caused by commit

  53ded1b676d1 ("mmc: host: meson-mx-sdhc: new driver for the Amlogic Meson SDHC host")

I have used the mmc tree from next-20200515 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2018-02-15  0:49 Stephen Rothwell
@ 2018-02-15  5:29 ` Kishon Vijay Abraham I
  0 siblings, 0 replies; 51+ messages in thread
From: Kishon Vijay Abraham I @ 2018-02-15  5:29 UTC (permalink / raw)
  To: Stephen Rothwell, Ulf Hansson
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

Hi,

On Thursday 15 February 2018 06:19 AM, Stephen Rothwell wrote:
> Hi Ulf,
> 
> After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/mmc/host/sdhci-omap.c: In function 'sdhci_omap_set_timing':
> drivers/mmc/host/sdhci-omap.c:466:8: error: implicit declaration of function 'pinctrl_select_state'; did you mean 'inc_node_state'? [-Werror=implicit-function-declaration]
>   ret = pinctrl_select_state(omap_host->pinctrl, pinctrl_state);
>         ^~~~~~~~~~~~~~~~~~~~
>         inc_node_state
> drivers/mmc/host/sdhci-omap.c: In function 'sdhci_omap_iodelay_pinctrl_state':
> drivers/mmc/host/sdhci-omap.c:740:18: error: implicit declaration of function 'pinctrl_lookup_state'; did you mean 'inc_node_state'? [-Werror=implicit-function-declaration]
>   pinctrl_state = pinctrl_lookup_state(omap_host->pinctrl, mode);
>                   ^~~~~~~~~~~~~~~~~~~~
>                   inc_node_state
> drivers/mmc/host/sdhci-omap.c:740:16: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>   pinctrl_state = pinctrl_lookup_state(omap_host->pinctrl, mode);
>                 ^
> drivers/mmc/host/sdhci-omap.c: In function 'sdhci_omap_config_iodelay_pinctrl_state':
> drivers/mmc/host/sdhci-omap.c:769:23: error: implicit declaration of function 'devm_pinctrl_get'; did you mean 'devm_clk_get'? [-Werror=implicit-function-declaration]
>   omap_host->pinctrl = devm_pinctrl_get(omap_host->dev);
>                        ^~~~~~~~~~~~~~~~
>                        devm_clk_get
> drivers/mmc/host/sdhci-omap.c:769:21: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>   omap_host->pinctrl = devm_pinctrl_get(omap_host->dev);
>                      ^
> drivers/mmc/host/sdhci-omap.c:775:8: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
>   state = pinctrl_lookup_state(omap_host->pinctrl, "default");
>         ^
> 
> Caused by commit
> 
>   713190bb14aa ("mmc: sdhci_omap: Add support to set IODELAY values")
> 
> Forgot to include linux/pinctrl/consumer.h?

yeah, looks like it though I didn't observe this error with omap2plus_defconfig.

Ulf, can you drop "mmc: sdhci_omap: Add support to set IODELAY values" patch
from your next. I'll resend the patch after fixing it.

Thanks
Kishon

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2018-02-15  0:49 Stephen Rothwell
  2018-02-15  5:29 ` Kishon Vijay Abraham I
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2018-02-15  0:49 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Kishon Vijay Abraham I

Hi Ulf,

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

drivers/mmc/host/sdhci-omap.c: In function 'sdhci_omap_set_timing':
drivers/mmc/host/sdhci-omap.c:466:8: error: implicit declaration of function 'pinctrl_select_state'; did you mean 'inc_node_state'? [-Werror=implicit-function-declaration]
  ret = pinctrl_select_state(omap_host->pinctrl, pinctrl_state);
        ^~~~~~~~~~~~~~~~~~~~
        inc_node_state
drivers/mmc/host/sdhci-omap.c: In function 'sdhci_omap_iodelay_pinctrl_state':
drivers/mmc/host/sdhci-omap.c:740:18: error: implicit declaration of function 'pinctrl_lookup_state'; did you mean 'inc_node_state'? [-Werror=implicit-function-declaration]
  pinctrl_state = pinctrl_lookup_state(omap_host->pinctrl, mode);
                  ^~~~~~~~~~~~~~~~~~~~
                  inc_node_state
drivers/mmc/host/sdhci-omap.c:740:16: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
  pinctrl_state = pinctrl_lookup_state(omap_host->pinctrl, mode);
                ^
drivers/mmc/host/sdhci-omap.c: In function 'sdhci_omap_config_iodelay_pinctrl_state':
drivers/mmc/host/sdhci-omap.c:769:23: error: implicit declaration of function 'devm_pinctrl_get'; did you mean 'devm_clk_get'? [-Werror=implicit-function-declaration]
  omap_host->pinctrl = devm_pinctrl_get(omap_host->dev);
                       ^~~~~~~~~~~~~~~~
                       devm_clk_get
drivers/mmc/host/sdhci-omap.c:769:21: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
  omap_host->pinctrl = devm_pinctrl_get(omap_host->dev);
                     ^
drivers/mmc/host/sdhci-omap.c:775:8: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
  state = pinctrl_lookup_state(omap_host->pinctrl, "default");
        ^

Caused by commit

  713190bb14aa ("mmc: sdhci_omap: Add support to set IODELAY values")

Forgot to include linux/pinctrl/consumer.h?

I have used the mmc tree from next-20180214 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-06-04 19:21     ` Chris Ball
@ 2014-06-05  2:57       ` Chris Ball
  0 siblings, 0 replies; 51+ messages in thread
From: Chris Ball @ 2014-06-05  2:57 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Russell King

Hi Stephen,

On Wed, Jun 04 2014, Chris Ball wrote:
> On Tue, Jun 03 2014, Stephen Rothwell wrote:
>>> This is back again.  I have no idea why I didn't get this failure on
>>> Friday. Please, guys, go through your tree and fix this problem once
>>> and for all.  Grep is your friend.
>>> 
>>> I have used the mmc tree from next-20140522 again for today.
>>
>> Just wondering if you are even receiving my email?
>
> Sorry about this, I'm working on it now.

This one's fixed in mmc-next now.

Thanks,

- Chris.
-- 
Chris Ball   <http://printf.net/>

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-06-03 22:52   ` Stephen Rothwell
@ 2014-06-04 19:21     ` Chris Ball
  2014-06-05  2:57       ` Chris Ball
  0 siblings, 1 reply; 51+ messages in thread
From: Chris Ball @ 2014-06-04 19:21 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Russell King

Hi Stephen,

On Tue, Jun 03 2014, Stephen Rothwell wrote:
>> This is back again.  I have no idea why I didn't get this failure on
>> Friday. Please, guys, go through your tree and fix this problem once
>> and for all.  Grep is your friend.
>> 
>> I have used the mmc tree from next-20140522 again for today.
>
> Just wondering if you are even receiving my email?

Sorry about this, I'm working on it now.

- Chris.
-- 
Chris Ball   <http://printf.net/>

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-06-02  5:11 ` Stephen Rothwell
@ 2014-06-03 22:52   ` Stephen Rothwell
  2014-06-04 19:21     ` Chris Ball
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2014-06-03 22:52 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-next, linux-kernel, Russell King


[-- Attachment #1: Type: text/plain, Size: 1136 bytes --]

Hi Chris,

On Mon, 2 Jun 2014 15:11:41 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 26 May 2014 14:07:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the mmc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > drivers/mmc/host/sdhci-s3c.c: In function 'sdhci_s3c_notify_change':
> > drivers/mmc/host/sdhci-s3c.c:402:25: error: 'struct sdhci_host' has no member named 'card_tasklet'
> > 
> > Caused by commit 3560db8e247a ("mmc: sdhci: push card_tasklet into
> > threaded irq handler").  This is the second left over one I found.
> > Please check for any more (grep is your friend).
> > 
> > I have used the mmc tree from next-20140522 again for today.
> 
> This is back again.  I have no idea why I didn't get this failure on
> Friday. Please, guys, go through your tree and fix this problem once
> and for all.  Grep is your friend.
> 
> I have used the mmc tree from next-20140522 again for today.

Just wondering if you are even receiving my email?

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

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

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
       [not found]   ` <20140602214039.10062.15077@quantum>
@ 2014-06-02 21:43     ` Chris Ball
  0 siblings, 0 replies; 51+ messages in thread
From: Chris Ball @ 2014-06-02 21:43 UTC (permalink / raw)
  To: Mike Turquette
  Cc: Ulf Hansson, linux-next, linux-kernel, David Lanzendörfer,
	Stephen Rothwell, Hans de Goede

Hi,

On Mon, Jun 02 2014, Mike Turquette wrote:
>> Hi Mike, Chris,
>> 
>> So, the proper thing would be to let Mike to carry the above patch
>> though his clk tree instead.
>> 
>> Could we arrange that?
>
> I'm happy to take it with Chris' Acked-by.

Thanks, please do:

Acked-by: Chris Ball <chris@printf.net>

(Ulf is now MMC co-maintainer so his ack works too.)

- Chris.
-- 
Chris Ball   <http://printf.net/>

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-05-30  3:23 Stephen Rothwell
@ 2014-06-02  9:31 ` Ulf Hansson
       [not found]   ` <20140602214039.10062.15077@quantum>
  0 siblings, 1 reply; 51+ messages in thread
From: Ulf Hansson @ 2014-06-02  9:31 UTC (permalink / raw)
  To: Chris Ball, Mike Turquette
  Cc: linux-next, linux-kernel, David Lanzendörfer,
	Stephen Rothwell, Hans de Goede

On 30 May 2014 05:23, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Chris,
>
> After merging the mmc tree, today's linux-next build (arm multi_v7_defconfig)
> failed like this:
>
> drivers/mmc/host/sunxi-mmc.c:25:29: fatal error: linux/clk/sunxi.h: No such file or directory
>
> Caused by commit 19b7f796c375 ("mmc: sunxi: Add driver for SD/MMC hosts
> found on Allwinner sunxi SoCs").  Something has changed to turn on
> CONFIG_ARCH_SUNXI in the arm multi_v7_defconfig build since yesterday.
>
> linux/clk/sunxi.h is created by a commit in the clk tree
> (git://git.linaro.org/people/mturquette/linux.git#clk-next) which I
> don't include in linux-next until much later than the mmc tree.
>
> I have reverted that commit for today.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

Hi Mike, Chris,

So, the proper thing would be to let Mike to carry the above patch
though his clk tree instead.

Could we arrange that?

Kind regards
Ulf Hansson

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-05-26  4:07 Stephen Rothwell
@ 2014-06-02  5:11 ` Stephen Rothwell
  2014-06-03 22:52   ` Stephen Rothwell
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2014-06-02  5:11 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-next, linux-kernel, Russell King


[-- Attachment #1: Type: text/plain, Size: 957 bytes --]

Hi Chris,

On Mon, 26 May 2014 14:07:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the mmc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/mmc/host/sdhci-s3c.c: In function 'sdhci_s3c_notify_change':
> drivers/mmc/host/sdhci-s3c.c:402:25: error: 'struct sdhci_host' has no member named 'card_tasklet'
> 
> Caused by commit 3560db8e247a ("mmc: sdhci: push card_tasklet into
> threaded irq handler").  This is the second left over one I found.
> Please check for any more (grep is your friend).
> 
> I have used the mmc tree from next-20140522 again for today.

This is back again.  I have no idea why I didn't get this failure on
Friday. Please, guys, go through your tree and fix this problem once
and for all.  Grep is your friend.

I have used the mmc tree from next-20140522 again for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2014-05-30  3:23 Stephen Rothwell
  2014-06-02  9:31 ` Ulf Hansson
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2014-05-30  3:23 UTC (permalink / raw)
  To: Chris Ball
  Cc: linux-next, linux-kernel, David Lanzendörfer, Hans de Goede,
	Ulf Hansson, Mike Turquette


[-- Attachment #1: Type: text/plain, Size: 731 bytes --]

Hi Chris,

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

drivers/mmc/host/sunxi-mmc.c:25:29: fatal error: linux/clk/sunxi.h: No such file or directory

Caused by commit 19b7f796c375 ("mmc: sunxi: Add driver for SD/MMC hosts
found on Allwinner sunxi SoCs").  Something has changed to turn on
CONFIG_ARCH_SUNXI in the arm multi_v7_defconfig build since yesterday.

linux/clk/sunxi.h is created by a commit in the clk tree
(git://git.linaro.org/people/mturquette/linux.git#clk-next) which I
don't include in linux-next until much later than the mmc tree.

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

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

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2014-05-26  4:07 Stephen Rothwell
  2014-06-02  5:11 ` Stephen Rothwell
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2014-05-26  4:07 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-next, linux-kernel, Russell King


[-- Attachment #1: Type: text/plain, Size: 607 bytes --]

Hi Chris,

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

drivers/mmc/host/sdhci-s3c.c: In function 'sdhci_s3c_notify_change':
drivers/mmc/host/sdhci-s3c.c:402:25: error: 'struct sdhci_host' has no member named 'card_tasklet'

Caused by commit 3560db8e247a ("mmc: sdhci: push card_tasklet into
threaded irq handler").  This is the second left over one I found.
Please check for any more (grep is your friend).

I have used the mmc tree from next-20140522 again for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-05-23  5:32 Stephen Rothwell
@ 2014-05-23  8:45 ` Sebastian Hesselbarth
  0 siblings, 0 replies; 51+ messages in thread
From: Sebastian Hesselbarth @ 2014-05-23  8:45 UTC (permalink / raw)
  To: Stephen Rothwell, Chris Ball
  Cc: linux-next, linux-kernel, Russell King, Ulf Hansson,
	Markus Pargmann, Stephen Warren

On 05/23/2014 07:32 AM, Stephen Rothwell wrote:
> After merging the mmc tree, today's linux-next build (arm multi_v7_defconfig)
> failed like this:
>
> drivers/mmc/host/sdhci-dove.c: In function 'sdhci_dove_carddetect_irq':
> drivers/mmc/host/sdhci-dove.c:42:24: error: 'struct sdhci_host' has no member named 'card_tasklet'
>
> Caused by commit 3560db8e247a ("mmc: sdhci: push card_tasklet into
> threaded irq handler").
>
> I have used the mmc tree from next-20140522 for today.

Stephen,

I received that build failure yesterday for mmc-next. Patch sent to
Chris and Ulf. Should be fixed as soon as it hits mmc-next.

Sebastian

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2014-05-23  5:32 Stephen Rothwell
  2014-05-23  8:45 ` Sebastian Hesselbarth
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2014-05-23  5:32 UTC (permalink / raw)
  To: Chris Ball
  Cc: linux-next, linux-kernel, Russell King, Ulf Hansson,
	Markus Pargmann, Stephen Warren


[-- Attachment #1: Type: text/plain, Size: 511 bytes --]

Hi Chris,

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

drivers/mmc/host/sdhci-dove.c: In function 'sdhci_dove_carddetect_irq':
drivers/mmc/host/sdhci-dove.c:42:24: error: 'struct sdhci_host' has no member named 'card_tasklet'

Caused by commit 3560db8e247a ("mmc: sdhci: push card_tasklet into
threaded irq handler").

I have used the mmc tree from next-20140522 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-04-22  8:40 ` Ulf Hansson
@ 2014-04-22 11:10   ` Chris Ball
  0 siblings, 0 replies; 51+ messages in thread
From: Chris Ball @ 2014-04-22 11:10 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: linux-next, linux-kernel, Seungwon Jeon, Jaehoon Chung,
	Stephen Rothwell, John W. Linville, Fariya Fatima

Hi,

On Tue, Apr 22 2014, Ulf Hansson wrote:
> Until we work out the dependency issue caused by the above commit,
> could you please drop the following patches from your mmc-next
> branch!?
>
> df1a292 mmc: add support for HS400 mode of eMMC5.0
> f27a5d7 mmc: rework selection of bus speed mode
> e64f275 mmc: step power class after final selection of bus mode
> 6371adf mmc: identify available device type to select
> 3957848 mmc: drop the speed mode of card's state

Done, thanks.

- Chris.
-- 
Chris Ball   <http://printf.net/>

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-04-22  3:06 Stephen Rothwell
  2014-04-22  4:57 ` Seungwon Jeon
@ 2014-04-22  8:40 ` Ulf Hansson
  2014-04-22 11:10   ` Chris Ball
  1 sibling, 1 reply; 51+ messages in thread
From: Ulf Hansson @ 2014-04-22  8:40 UTC (permalink / raw)
  To: Chris Ball
  Cc: linux-next, linux-kernel, Seungwon Jeon, Jaehoon Chung,
	Stephen Rothwell, John W. Linville, Fariya Fatima

On 22 April 2014 05:06, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Chris,
>
> After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/net/wireless/rsi/rsi_91x_sdio.c: In function 'rsi_reset_card':
> drivers/net/wireless/rsi/rsi_91x_sdio.c:288:20: error: 'MMC_STATE_HIGHSPEED' undeclared (first use in this function)
>     card->state &= ~MMC_STATE_HIGHSPEED;
>                     ^
> drivers/net/wireless/rsi/rsi_91x_sdio.c:288:20: note: each undeclared identifier is reported only once for each function it appears in
> drivers/net/wireless/rsi/rsi_91x_sdio.c:299:4: error: implicit declaration of function 'mmc_card_set_highspeed' [-Werror=implicit-function-declaration]
>     mmc_card_set_highspeed(card);
>     ^
> drivers/net/wireless/rsi/rsi_91x_sdio.c:306:2: error: implicit declaration of function 'mmc_card_highspeed' [-Werror=implicit-function-declaration]
>   if (mmc_card_highspeed(card))
>   ^
>
> Caused by commit 395784826a81 ("mmc: drop the speed mode of card's state").
>
> I have used the version of the mmc tree from next-20140417 for today.

Hi Chris,

Until we work out the dependency issue caused by the above commit,
could you please drop the following patches from your mmc-next
branch!?

df1a292 mmc: add support for HS400 mode of eMMC5.0
f27a5d7 mmc: rework selection of bus speed mode
e64f275 mmc: step power class after final selection of bus mode
6371adf mmc: identify available device type to select
3957848 mmc: drop the speed mode of card's state

Kind regards
Ulf Hansson

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply	[flat|nested] 51+ messages in thread

* RE: linux-next: build failure after merge of the mmc tree
  2014-04-22  3:06 Stephen Rothwell
@ 2014-04-22  4:57 ` Seungwon Jeon
  2014-04-22  8:40 ` Ulf Hansson
  1 sibling, 0 replies; 51+ messages in thread
From: Seungwon Jeon @ 2014-04-22  4:57 UTC (permalink / raw)
  To: 'Stephen Rothwell', 'Chris Ball'
  Cc: linux-next, linux-kernel, 'Jaehoon Chung', 'Ulf Hansson'

On Tue, April 22, 2014, Stephen Rothwell wrote:
> Hi Chris,
> 
> After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/net/wireless/rsi/rsi_91x_sdio.c: In function 'rsi_reset_card':
> drivers/net/wireless/rsi/rsi_91x_sdio.c:288:20: error: 'MMC_STATE_HIGHSPEED' undeclared (first use in
> this function)
>     card->state &= ~MMC_STATE_HIGHSPEED;
>                     ^
> drivers/net/wireless/rsi/rsi_91x_sdio.c:288:20: note: each undeclared identifier is reported only once
> for each function it appears in
> drivers/net/wireless/rsi/rsi_91x_sdio.c:299:4: error: implicit declaration of function
> 'mmc_card_set_highspeed' [-Werror=implicit-function-declaration]
>     mmc_card_set_highspeed(card);
>     ^
> drivers/net/wireless/rsi/rsi_91x_sdio.c:306:2: error: implicit declaration of function
> 'mmc_card_highspeed' [-Werror=implicit-function-declaration]
>   if (mmc_card_highspeed(card))
>   ^
> 
> Caused by commit 395784826a81 ("mmc: drop the speed mode of card's state").
> 
> I have used the version of the mmc tree from next-20140417 for today.

I didn't detect usage out of mmc-sub for that.
Let me fix and send a patch.

Thanks,
Seungwon Jeon

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2014-04-22  3:06 Stephen Rothwell
  2014-04-22  4:57 ` Seungwon Jeon
  2014-04-22  8:40 ` Ulf Hansson
  0 siblings, 2 replies; 51+ messages in thread
From: Stephen Rothwell @ 2014-04-22  3:06 UTC (permalink / raw)
  To: Chris Ball
  Cc: linux-next, linux-kernel, Seungwon Jeon, Jaehoon Chung, Ulf Hansson


[-- Attachment #1: Type: text/plain, Size: 1107 bytes --]

Hi Chris,

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

drivers/net/wireless/rsi/rsi_91x_sdio.c: In function 'rsi_reset_card':
drivers/net/wireless/rsi/rsi_91x_sdio.c:288:20: error: 'MMC_STATE_HIGHSPEED' undeclared (first use in this function)
    card->state &= ~MMC_STATE_HIGHSPEED;
                    ^
drivers/net/wireless/rsi/rsi_91x_sdio.c:288:20: note: each undeclared identifier is reported only once for each function it appears in
drivers/net/wireless/rsi/rsi_91x_sdio.c:299:4: error: implicit declaration of function 'mmc_card_set_highspeed' [-Werror=implicit-function-declaration]
    mmc_card_set_highspeed(card);
    ^
drivers/net/wireless/rsi/rsi_91x_sdio.c:306:2: error: implicit declaration of function 'mmc_card_highspeed' [-Werror=implicit-function-declaration]
  if (mmc_card_highspeed(card))
  ^

Caused by commit 395784826a81 ("mmc: drop the speed mode of card's state").

I have used the version of the mmc tree from next-20140417 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2013-12-17  3:16     ` Shawn Guo
  2013-12-17  8:06       ` Dong Aisheng
@ 2014-01-13 17:49       ` Chris Ball
  1 sibling, 0 replies; 51+ messages in thread
From: Chris Ball @ 2014-01-13 17:49 UTC (permalink / raw)
  To: Shawn Guo
  Cc: Dong Aisheng, Stephen Rothwell, linux-next, linux-kernel, Dong Aisheng

Hi,

On Tue, Dec 17 2013, Shawn Guo wrote:
> Please drop fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support") from
> your tree.  It should go via my tree (with a rebase).  Sorry, I did not
> notice it early.

Sorry for missing this thread, everyone -- I've dropped this patch
from mmc-next now.

- Chris.
-- 
Chris Ball   <chris@printf.net>   <http://printf.net/>

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-01-06  6:44           ` Shawn Guo
  2014-01-06  7:29             ` Stephen Rothwell
@ 2014-01-07  3:27             ` Stephen Rothwell
  1 sibling, 0 replies; 51+ messages in thread
From: Stephen Rothwell @ 2014-01-07  3:27 UTC (permalink / raw)
  To: Shawn Guo
  Cc: Dong Aisheng, Chris Ball, linux-next, linux-kernel, Dong Aisheng


[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]

Hi Shawn,

On Mon, 6 Jan 2014 14:44:08 +0800 Shawn Guo <shawn.guo@linaro.org> wrote:
>
> Okay, I missed your point.  The resolution needs the additional changes
> as below.

Thanks, I applied the following as a merge fix patch today and will carry
it as necessary.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 7 Jan 2014 14:20:53 +1100
Subject: [PATCH] mmc: merge fixup for imx6qdl-sabresd.dtsi

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 0eab66ea2009..0eb5704f2850 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -356,6 +356,10 @@
 		pinctrl_usdhc3: usdhc3grp {
 			fsl,pins = <MX6QDL_USDHC3_PINGRP_D8>;
 		};
+
+		pinctrl_usdhc4: usdhc4grp {
+			fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>;
+		};
 	};
 };
 
@@ -438,7 +438,7 @@
 
 &usdhc4 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usdhc4_1>;
+	pinctrl-0 = <&pinctrl_usdhc4>;
 	bus-width = <8>;
 	non-removable;
 	no-1-8-v;

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-01-06  6:44           ` Shawn Guo
@ 2014-01-06  7:29             ` Stephen Rothwell
  2014-01-07  3:27             ` Stephen Rothwell
  1 sibling, 0 replies; 51+ messages in thread
From: Stephen Rothwell @ 2014-01-06  7:29 UTC (permalink / raw)
  To: Shawn Guo
  Cc: Dong Aisheng, Chris Ball, linux-next, linux-kernel, Dong Aisheng


[-- Attachment #1: Type: text/plain, Size: 881 bytes --]

Hi Shawn,

On Mon, 6 Jan 2014 14:44:08 +0800 Shawn Guo <shawn.guo@linaro.org> wrote:
>
> Okay, I missed your point.  The resolution needs the additional changes
> as below.
> 
> Shawn
> 
> diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> index 91e5dd4..8b05648 100644
> --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
> @@ -356,6 +356,10 @@
>                 pinctrl_usdhc3: usdhc3grp {
>                         fsl,pins = <MX6QDL_USDHC3_PINGRP_D8>;
>                 };
> +
> +               pinctrl_usdhc4: usdhc4grp {
> +                       fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>;
> +               };
>         };
>  };

Thanks, I will add this as a merge resolution patch tomorrow.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-01-06  6:46             ` Shawn Guo
@ 2014-01-06  6:46               ` Dong Aisheng
  0 siblings, 0 replies; 51+ messages in thread
From: Dong Aisheng @ 2014-01-06  6:46 UTC (permalink / raw)
  To: Shawn Guo
  Cc: Stephen Rothwell, Chris Ball, linux-next, linux-kernel, Dong Aisheng

On Mon, Jan 6, 2014 at 2:46 PM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On Mon, Jan 06, 2014 at 02:30:00PM +0800, Dong Aisheng wrote:
>> Hi Shawn,
>>
>> How do you suggest to fix this issue?
>> Can we cook a patch for it directly based on linux-next tree?
>
> No, we can not.  No patch should be targeting linux-next tree.  I just
> gave a resolution to Stephen.  Before Chris shows up and drops the patch
> from his tree, we will need to use that temp resolution.
>

Got it, thanks.

Regards
Dong Aisheng

> Shawn
>

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-01-06  6:30           ` Dong Aisheng
@ 2014-01-06  6:46             ` Shawn Guo
  2014-01-06  6:46               ` Dong Aisheng
  0 siblings, 1 reply; 51+ messages in thread
From: Shawn Guo @ 2014-01-06  6:46 UTC (permalink / raw)
  To: Dong Aisheng
  Cc: Stephen Rothwell, Chris Ball, linux-next, linux-kernel, Dong Aisheng

On Mon, Jan 06, 2014 at 02:30:00PM +0800, Dong Aisheng wrote:
> Hi Shawn,
> 
> How do you suggest to fix this issue?
> Can we cook a patch for it directly based on linux-next tree?

No, we can not.  No patch should be targeting linux-next tree.  I just
gave a resolution to Stephen.  Before Chris shows up and drops the patch
from his tree, we will need to use that temp resolution.

Shawn

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-01-06  6:22         ` Stephen Rothwell
  2014-01-06  6:30           ` Dong Aisheng
  2014-01-06  6:30           ` Shawn Guo
@ 2014-01-06  6:44           ` Shawn Guo
  2014-01-06  7:29             ` Stephen Rothwell
  2014-01-07  3:27             ` Stephen Rothwell
  2 siblings, 2 replies; 51+ messages in thread
From: Shawn Guo @ 2014-01-06  6:44 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Dong Aisheng, Chris Ball, linux-next, linux-kernel, Dong Aisheng

On Mon, Jan 06, 2014 at 05:22:43PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 17 Dec 2013 16:06:19 +0800 Dong Aisheng <dongas86@gmail.com> wrote:
> >
> > I tested that Chris tree does not have problem.
> > It's caused by IMX tree updates.
> > 
> > Chris,
> > Is the way Shawn suggested OK for you?
> 
> Can we have some resolution of this please?  This failed to build again
> today so I have used the version of the mmc tree from next-20131212
> again.  I tried the obvious fix (s/pinctrl_usdhc4_1/pinctrl_usdhc4/) but
> that didn't work.

Okay, I missed your point.  The resolution needs the additional changes
as below.

Shawn

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 91e5dd4..8b05648 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -356,6 +356,10 @@
                pinctrl_usdhc3: usdhc3grp {
                        fsl,pins = <MX6QDL_USDHC3_PINGRP_D8>;
                };
+
+               pinctrl_usdhc4: usdhc4grp {
+                       fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>;
+               };
        };
 };

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-01-06  6:22         ` Stephen Rothwell
  2014-01-06  6:30           ` Dong Aisheng
@ 2014-01-06  6:30           ` Shawn Guo
  2014-01-06  6:44           ` Shawn Guo
  2 siblings, 0 replies; 51+ messages in thread
From: Shawn Guo @ 2014-01-06  6:30 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Dong Aisheng, Chris Ball, linux-next, linux-kernel, Dong Aisheng

Hi Stephen,

On Mon, Jan 06, 2014 at 05:22:43PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 17 Dec 2013 16:06:19 +0800 Dong Aisheng <dongas86@gmail.com> wrote:
> >
> > I tested that Chris tree does not have problem.
> > It's caused by IMX tree updates.
> > 
> > Chris,
> > Is the way Shawn suggested OK for you?
> 
> Can we have some resolution of this please?  This failed to build again
> today so I have used the version of the mmc tree from next-20131212
> again.  I tried the obvious fix (s/pinctrl_usdhc4_1/pinctrl_usdhc4/) but
> that didn't work.

I'm afraid that using a working mmc tree next branch might be the only
option until Chris comes online to drop the patch from his tree.

Shawn

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2014-01-06  6:22         ` Stephen Rothwell
@ 2014-01-06  6:30           ` Dong Aisheng
  2014-01-06  6:46             ` Shawn Guo
  2014-01-06  6:30           ` Shawn Guo
  2014-01-06  6:44           ` Shawn Guo
  2 siblings, 1 reply; 51+ messages in thread
From: Dong Aisheng @ 2014-01-06  6:30 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Shawn Guo, Chris Ball, linux-next, linux-kernel, Dong Aisheng

Hi Shawn,

How do you suggest to fix this issue?
Can we cook a patch for it directly based on linux-next tree?

Regards
Dong Aisheng

On Mon, Jan 6, 2014 at 2:22 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Tue, 17 Dec 2013 16:06:19 +0800 Dong Aisheng <dongas86@gmail.com> wrote:
>>
>> I tested that Chris tree does not have problem.
>> It's caused by IMX tree updates.
>>
>> Chris,
>> Is the way Shawn suggested OK for you?
>
> Can we have some resolution of this please?  This failed to build again
> today so I have used the version of the mmc tree from next-20131212
> again.  I tried the obvious fix (s/pinctrl_usdhc4_1/pinctrl_usdhc4/) but
> that didn't work.
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2013-12-17  8:06       ` Dong Aisheng
@ 2014-01-06  6:22         ` Stephen Rothwell
  2014-01-06  6:30           ` Dong Aisheng
                             ` (2 more replies)
  0 siblings, 3 replies; 51+ messages in thread
From: Stephen Rothwell @ 2014-01-06  6:22 UTC (permalink / raw)
  To: Dong Aisheng
  Cc: Shawn Guo, Chris Ball, linux-next, linux-kernel, Dong Aisheng


[-- Attachment #1: Type: text/plain, Size: 545 bytes --]

Hi all,

On Tue, 17 Dec 2013 16:06:19 +0800 Dong Aisheng <dongas86@gmail.com> wrote:
>
> I tested that Chris tree does not have problem.
> It's caused by IMX tree updates.
> 
> Chris,
> Is the way Shawn suggested OK for you?

Can we have some resolution of this please?  This failed to build again
today so I have used the version of the mmc tree from next-20131212
again.  I tried the obvious fix (s/pinctrl_usdhc4_1/pinctrl_usdhc4/) but
that didn't work.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2013-12-17  2:28 ` Stephen Rothwell
  2013-12-17  3:07   ` Dong Aisheng
@ 2013-12-23  1:40   ` Stephen Rothwell
  1 sibling, 0 replies; 51+ messages in thread
From: Stephen Rothwell @ 2013-12-23  1:40 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-next, linux-kernel, Dong Aisheng, Shawn Guo


[-- Attachment #1: Type: text/plain, Size: 1050 bytes --]

On Tue, 17 Dec 2013 13:28:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Chris,
> 
> ping?

ping again - I am still getting this error.

> On Fri, 13 Dec 2013 12:57:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the mmc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > ERROR (phandle_references): Reference to non-existent node or label "pinctrl_usdhc4_1"
> > 
> > ERROR: Input tree has errors, aborting (use -f to force output)
> > make[2]: *** [arch/arm/boot/dts/imx6dl-sabresd.dtb] Error 2
> > ERROR (phandle_references): Reference to non-existent node or label "pinctrl_usdhc4_1"
> > 
> > ERROR: Input tree has errors, aborting (use -f to force output)
> > make[2]: *** [arch/arm/boot/dts/imx6q-sabresd.dtb] Error 2
> > 
> > Caused by commit fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support").
> > 
> > I have used the mmc tree from next-20131212 for today.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2013-12-17  3:16     ` Shawn Guo
@ 2013-12-17  8:06       ` Dong Aisheng
  2014-01-06  6:22         ` Stephen Rothwell
  2014-01-13 17:49       ` Chris Ball
  1 sibling, 1 reply; 51+ messages in thread
From: Dong Aisheng @ 2013-12-17  8:06 UTC (permalink / raw)
  To: Shawn Guo
  Cc: Stephen Rothwell, Chris Ball, linux-next, linux-kernel, Dong Aisheng

I tested that Chris tree does not have problem.
It's caused by IMX tree updates.

Chris,
Is the way Shawn suggested OK for you?

Regards
Dong Aisheng

On Tue, Dec 17, 2013 at 11:16 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> Hi Chris,
>
> Please drop fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support") from
> your tree.  It should go via my tree (with a rebase).  Sorry, I did not
> notice it early.
>
> Shawn
>
> On Tue, Dec 17, 2013 at 11:07:19AM +0800, Dong Aisheng wrote:
>> Hi Stephen,
>>
>> Sorry, i just see this mail.
>> It seems the imx pinctrl dt binding has changes since Chris pick my patch.
>> I will fix it ASAP.
>>
>> Regards
>> Dong Aisheng
>>
>> On Tue, Dec 17, 2013 at 10:28 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> > Hi Chris,
>> >
>> > ping?
>> >
>> > On Fri, 13 Dec 2013 12:57:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >>
>> >> After merging the mmc tree, today's linux-next build (arm
>> >> multi_v7_defconfig) failed like this:
>> >>
>> >> ERROR (phandle_references): Reference to non-existent node or label "pinctrl_usdhc4_1"
>> >>
>> >> ERROR: Input tree has errors, aborting (use -f to force output)
>> >> make[2]: *** [arch/arm/boot/dts/imx6dl-sabresd.dtb] Error 2
>> >> ERROR (phandle_references): Reference to non-existent node or label "pinctrl_usdhc4_1"
>> >>
>> >> ERROR: Input tree has errors, aborting (use -f to force output)
>> >> make[2]: *** [arch/arm/boot/dts/imx6q-sabresd.dtb] Error 2
>> >>
>> >> Caused by commit fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support").
>> >>
>> >> I have used the mmc tree from next-20131212 for today.
>> >
>> > --
>> > Cheers,
>> > Stephen Rothwell                    sfr@canb.auug.org.au
>

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2013-12-17  3:07   ` Dong Aisheng
@ 2013-12-17  3:16     ` Shawn Guo
  2013-12-17  8:06       ` Dong Aisheng
  2014-01-13 17:49       ` Chris Ball
  0 siblings, 2 replies; 51+ messages in thread
From: Shawn Guo @ 2013-12-17  3:16 UTC (permalink / raw)
  To: Dong Aisheng
  Cc: Stephen Rothwell, Chris Ball, linux-next, linux-kernel, Dong Aisheng

Hi Chris,

Please drop fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support") from
your tree.  It should go via my tree (with a rebase).  Sorry, I did not
notice it early.

Shawn

On Tue, Dec 17, 2013 at 11:07:19AM +0800, Dong Aisheng wrote:
> Hi Stephen,
> 
> Sorry, i just see this mail.
> It seems the imx pinctrl dt binding has changes since Chris pick my patch.
> I will fix it ASAP.
> 
> Regards
> Dong Aisheng
> 
> On Tue, Dec 17, 2013 at 10:28 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Chris,
> >
> > ping?
> >
> > On Fri, 13 Dec 2013 12:57:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >> After merging the mmc tree, today's linux-next build (arm
> >> multi_v7_defconfig) failed like this:
> >>
> >> ERROR (phandle_references): Reference to non-existent node or label "pinctrl_usdhc4_1"
> >>
> >> ERROR: Input tree has errors, aborting (use -f to force output)
> >> make[2]: *** [arch/arm/boot/dts/imx6dl-sabresd.dtb] Error 2
> >> ERROR (phandle_references): Reference to non-existent node or label "pinctrl_usdhc4_1"
> >>
> >> ERROR: Input tree has errors, aborting (use -f to force output)
> >> make[2]: *** [arch/arm/boot/dts/imx6q-sabresd.dtb] Error 2
> >>
> >> Caused by commit fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support").
> >>
> >> I have used the mmc tree from next-20131212 for today.
> >
> > --
> > Cheers,
> > Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2013-12-17  2:28 ` Stephen Rothwell
@ 2013-12-17  3:07   ` Dong Aisheng
  2013-12-17  3:16     ` Shawn Guo
  2013-12-23  1:40   ` Stephen Rothwell
  1 sibling, 1 reply; 51+ messages in thread
From: Dong Aisheng @ 2013-12-17  3:07 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Chris Ball, linux-next, linux-kernel, Dong Aisheng, Shawn Guo

Hi Stephen,

Sorry, i just see this mail.
It seems the imx pinctrl dt binding has changes since Chris pick my patch.
I will fix it ASAP.

Regards
Dong Aisheng

On Tue, Dec 17, 2013 at 10:28 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Chris,
>
> ping?
>
> On Fri, 13 Dec 2013 12:57:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the mmc tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> ERROR (phandle_references): Reference to non-existent node or label "pinctrl_usdhc4_1"
>>
>> ERROR: Input tree has errors, aborting (use -f to force output)
>> make[2]: *** [arch/arm/boot/dts/imx6dl-sabresd.dtb] Error 2
>> ERROR (phandle_references): Reference to non-existent node or label "pinctrl_usdhc4_1"
>>
>> ERROR: Input tree has errors, aborting (use -f to force output)
>> make[2]: *** [arch/arm/boot/dts/imx6q-sabresd.dtb] Error 2
>>
>> Caused by commit fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support").
>>
>> I have used the mmc tree from next-20131212 for today.
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2013-12-13  1:57 Stephen Rothwell
@ 2013-12-17  2:28 ` Stephen Rothwell
  2013-12-17  3:07   ` Dong Aisheng
  2013-12-23  1:40   ` Stephen Rothwell
  0 siblings, 2 replies; 51+ messages in thread
From: Stephen Rothwell @ 2013-12-17  2:28 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-next, linux-kernel, Dong Aisheng


[-- Attachment #1: Type: text/plain, Size: 877 bytes --]

Hi Chris,

ping?

On Fri, 13 Dec 2013 12:57:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the mmc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> ERROR (phandle_references): Reference to non-existent node or label "pinctrl_usdhc4_1"
> 
> ERROR: Input tree has errors, aborting (use -f to force output)
> make[2]: *** [arch/arm/boot/dts/imx6dl-sabresd.dtb] Error 2
> ERROR (phandle_references): Reference to non-existent node or label "pinctrl_usdhc4_1"
> 
> ERROR: Input tree has errors, aborting (use -f to force output)
> make[2]: *** [arch/arm/boot/dts/imx6q-sabresd.dtb] Error 2
> 
> Caused by commit fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support").
> 
> I have used the mmc tree from next-20131212 for today.

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2013-12-13  1:57 Stephen Rothwell
  2013-12-17  2:28 ` Stephen Rothwell
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2013-12-13  1:57 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-next, linux-kernel, Dong Aisheng


[-- Attachment #1: Type: text/plain, Size: 735 bytes --]

Hi Chris,

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

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

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

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

Caused by commit fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support").

I have used the mmc tree from next-20131212 for today.

-- 
Cheers,
Stephen Rothwell <sfr@canb.auug.org.au>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2011-11-09  1:06 Stephen Rothwell
@ 2011-11-09  1:35 ` Chris Ball
  0 siblings, 0 replies; 51+ messages in thread
From: Chris Ball @ 2011-11-09  1:35 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Qiang Liu

Hi Stephen,

On Tue, Nov 08 2011, Stephen Rothwell wrote:
> Hi Chris,
>
> After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/mmc/core/sd.c: In function 'mmc_read_switch':
> drivers/mmc/core/sd.c:310:19: error: 'SD_MODE_HIGH_SPEED' undeclared
> (first use in this function)
>
> Caused by commit f1649241a293 ("mmc: sd: Macro name cleanup for high
> speed dtr").  SD_MODE_HIGH_SPEED is not defined anywhere ...
>
> I have used the version of the mmc tree from next-20111108 for today.

Oops, I'm sorry about this.  It's fixed now.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2011-11-09  1:06 Stephen Rothwell
  2011-11-09  1:35 ` Chris Ball
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2011-11-09  1:06 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-next, linux-kernel, Qiang Liu


[-- Attachment #1: Type: text/plain, Size: 580 bytes --]

Hi Chris,

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

drivers/mmc/core/sd.c: In function 'mmc_read_switch':
drivers/mmc/core/sd.c:310:19: error: 'SD_MODE_HIGH_SPEED' undeclared (first use in this function)

Caused by commit f1649241a293 ("mmc: sd: Macro name cleanup for high
speed dtr").  SD_MODE_HIGH_SPEED is not defined anywhere ...

I have used the version of the mmc tree from next-20111108 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2011-09-22  6:13 Stephen Rothwell
@ 2011-09-22 11:56 ` Chris Ball
  0 siblings, 0 replies; 51+ messages in thread
From: Chris Ball @ 2011-09-22 11:56 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jaehoon Chung, Adrian Hunter

Hi,

On Thu, Sep 22 2011, Stephen Rothwell wrote:
> After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/mmc/core/core.c: In function 'mmc_do_hw_reset':
> drivers/mmc/core/core.c:1848:11: error: 'struct mmc_ios' has no member
> named 'ddr'

Thanks, sorry about that.  I had caught it locally, but pushing my fix
failed.  It's fixed now.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2011-09-22  6:13 Stephen Rothwell
  2011-09-22 11:56 ` Chris Ball
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2011-09-22  6:13 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-next, linux-kernel, Jaehoon Chung, Adrian Hunter


[-- Attachment #1: Type: text/plain, Size: 637 bytes --]

Hi Chris,

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

drivers/mmc/core/core.c: In function 'mmc_do_hw_reset':
drivers/mmc/core/core.c:1848:11: error: 'struct mmc_ios' has no member named 'ddr'

Caused by commit a0721d241b06 ("mmc: core: add eMMC hardware reset
support"). ddr was removed by commit 7fd781e8f9b7 ("mmc: remove unused
"ddr" parameter in struct mmc_ios") before v3.1-rc2.

Please build test ...

I have used the mmc tree from next-20110921 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2011-07-16  9:30 Stephen Rothwell
@ 2011-07-18 22:29 ` Per Forlin
  0 siblings, 0 replies; 51+ messages in thread
From: Per Forlin @ 2011-07-18 22:29 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Chris Ball, linux-next, linux-kernel, Nicolas Pitre

Hi,

On 16 July 2011 11:30, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Chris,
>
> After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/mmc/core/core.c:2141:1: error: redefinition of '__inittest'
> drivers/mmc/core/core.c:125:1: note: previous definition of '__inittest' was here
> drivers/mmc/core/core.c:2141:1: error: redefinition of 'init_module'
> drivers/mmc/core/core.c:125:1: note: previous definition of 'init_module' was here
>
> Seems to be caused by commit 65cae3d20446 ("mmc: core: add random fault
> injection").
This patch makes core.c contain two init_module, obviously an error if
building allmodconfig. I need to rework this patch and resend it.
I checked mmc-next just now and it has been removed already (thanks Chris).

Regards,
Per

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2011-07-16  9:30 Stephen Rothwell
  2011-07-18 22:29 ` Per Forlin
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2011-07-16  9:30 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-next, linux-kernel, Per Forlin


[-- Attachment #1: Type: text/plain, Size: 670 bytes --]

Hi Chris,

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

drivers/mmc/core/core.c:2141:1: error: redefinition of '__inittest'
drivers/mmc/core/core.c:125:1: note: previous definition of '__inittest' was here
drivers/mmc/core/core.c:2141:1: error: redefinition of 'init_module'
drivers/mmc/core/core.c:125:1: note: previous definition of 'init_module' was here

Seems to be caused by commit 65cae3d20446 ("mmc: core: add random fault
injection").

I have used the mmc tree from next-20110707 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2011-03-28  2:10 Stephen Rothwell
  0 siblings, 0 replies; 51+ messages in thread
From: Stephen Rothwell @ 2011-03-28  2:10 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-next, linux-kernel, Guennadi Liakhovetski


[-- Attachment #1: Type: text/plain, Size: 689 bytes --]

Hi Chris,

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

drivers/mmc/host/tmio_mmc_pio.c: In function 'sd_ctrl_read16_rep':
drivers/mmc/host/tmio_mmc_pio.c:56: error: implicit declaration of function 'readsw'
drivers/mmc/host/tmio_mmc_pio.c: In function 'sd_ctrl_write16_rep':
drivers/mmc/host/tmio_mmc_pio.c:73: error: implicit declaration of function 'writesw'

Presumably caused by commit b6147490e6aa ("mmc: tmio: split core
functionality, DMA and MFD glue").

I have used the mmc tree from next-20110325 for tdoay.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 51+ messages in thread

* Re: linux-next: build failure after merge of the mmc tree
  2010-10-25  1:12 Stephen Rothwell
@ 2010-10-25  2:21 ` Chris Ball
  0 siblings, 0 replies; 51+ messages in thread
From: Chris Ball @ 2010-10-25  2:21 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Olof Johansson, Andrew Morton

Hi Stephen,

On Mon, Oct 25, 2010 at 12:12:38PM +1100, Stephen Rothwell wrote:
> Hi Chris,
> 
> After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/mmc/card/block.c:57: error: 'CONFIG_MMC_BLOCK_MINORS' undeclared here (not in a function)
> 
> Caused by commit d8714fbfc66e16fc64a4525c02eebc34bac8385c ("mmc: make
> number of mmcblk minors configurable").  Forget to include a Kconfig
> update?
> 
> I have used the mmc tree from next-20101022 for today.

Sorry, yes.  I've tested and pushed a fixed version. 

Thanks very much,

-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 51+ messages in thread

* linux-next: build failure after merge of the mmc tree
@ 2010-10-25  1:12 Stephen Rothwell
  2010-10-25  2:21 ` Chris Ball
  0 siblings, 1 reply; 51+ messages in thread
From: Stephen Rothwell @ 2010-10-25  1:12 UTC (permalink / raw)
  To: Chris Ball; +Cc: linux-next, linux-kernel, Olof Johansson, Andrew Morton


[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

Hi Chris,

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

drivers/mmc/card/block.c:57: error: 'CONFIG_MMC_BLOCK_MINORS' undeclared here (not in a function)

Caused by commit d8714fbfc66e16fc64a4525c02eebc34bac8385c ("mmc: make
number of mmcblk minors configurable").  Forget to include a Kconfig
update?

I have used the mmc tree from next-20101022 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 51+ messages in thread

end of thread, back to index

Thread overview: 51+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-16  3:48 linux-next: build failure after merge of the mmc tree Stephen Rothwell
2021-04-16  3:49 ` Stephen Rothwell
2021-04-26  1:31   ` Stephen Rothwell
2021-04-26  9:46     ` Ulf Hansson
  -- strict thread matches above, loose matches on Subject: below --
2020-10-06  5:29 Stephen Rothwell
2020-09-25  4:40 Stephen Rothwell
2020-06-02  3:44 Stephen Rothwell
2020-06-02 12:05 ` Ulf Hansson
2020-06-02 12:15 ` Kalle Valo
2020-05-18  4:27 Stephen Rothwell
2020-05-18  6:10 ` Martin Blumenstingl
2018-02-15  0:49 Stephen Rothwell
2018-02-15  5:29 ` Kishon Vijay Abraham I
2014-05-30  3:23 Stephen Rothwell
2014-06-02  9:31 ` Ulf Hansson
     [not found]   ` <20140602214039.10062.15077@quantum>
2014-06-02 21:43     ` Chris Ball
2014-05-26  4:07 Stephen Rothwell
2014-06-02  5:11 ` Stephen Rothwell
2014-06-03 22:52   ` Stephen Rothwell
2014-06-04 19:21     ` Chris Ball
2014-06-05  2:57       ` Chris Ball
2014-05-23  5:32 Stephen Rothwell
2014-05-23  8:45 ` Sebastian Hesselbarth
2014-04-22  3:06 Stephen Rothwell
2014-04-22  4:57 ` Seungwon Jeon
2014-04-22  8:40 ` Ulf Hansson
2014-04-22 11:10   ` Chris Ball
2013-12-13  1:57 Stephen Rothwell
2013-12-17  2:28 ` Stephen Rothwell
2013-12-17  3:07   ` Dong Aisheng
2013-12-17  3:16     ` Shawn Guo
2013-12-17  8:06       ` Dong Aisheng
2014-01-06  6:22         ` Stephen Rothwell
2014-01-06  6:30           ` Dong Aisheng
2014-01-06  6:46             ` Shawn Guo
2014-01-06  6:46               ` Dong Aisheng
2014-01-06  6:30           ` Shawn Guo
2014-01-06  6:44           ` Shawn Guo
2014-01-06  7:29             ` Stephen Rothwell
2014-01-07  3:27             ` Stephen Rothwell
2014-01-13 17:49       ` Chris Ball
2013-12-23  1:40   ` Stephen Rothwell
2011-11-09  1:06 Stephen Rothwell
2011-11-09  1:35 ` Chris Ball
2011-09-22  6:13 Stephen Rothwell
2011-09-22 11:56 ` Chris Ball
2011-07-16  9:30 Stephen Rothwell
2011-07-18 22:29 ` Per Forlin
2011-03-28  2:10 Stephen Rothwell
2010-10-25  1:12 Stephen Rothwell
2010-10-25  2:21 ` Chris Ball

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git