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

[Alexandru Ardelean]

On Mon, 29 Mar 2021 at 09:15, Greg KH  wrote:
>
> On Mon, Mar 29, 2021 at 04:55:25PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the staging tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/iio/adc/ti-ads131e08.c: In function 'ads131e08_read_reg':
> > drivers/iio/adc/ti-ads131e08.c:180:5: error: 'struct spi_transfer' has no 
> > member named 'delay_usecs'
> >   180 |.delay_usecs = st->sdecode_delay_us,
> >   | ^~~
> > drivers/iio/adc/ti-ads131e08.c: In function 'ads131e08_write_reg':
> > drivers/iio/adc/ti-ads131e08.c:206:5: error: 'struct spi_transfer' has no 
> > member named 'delay_usecs'
> >   206 |.delay_usecs = st->sdecode_delay_us,
> >   | ^~~
> >
> > Caused by commit
> >
> >   d935eddd2799 ("iio: adc: Add driver for Texas Instruments ADS131E0x ADC 
> > family")
> >
> > interacting with commit
> >
> >   3ab1cce55337 ("spi: core: remove 'delay_usecs' field from spi_transfer")
> >
> > from the spi tree.
> >
> > I have applied the following merge fix patch.
> >
> > From: Stephen Rothwell 
> > Date: Mon, 29 Mar 2021 16:51:22 +1100
> > Subject: [PATCH] iio: adc: merge fix for "spi: core: remove 'delay_usecs'
> >  field from spi_transfer"
> >

Reviewed-by: Alexandru Ardelean 

> > Signed-off-by: Stephen Rothwell 
> > ---
> >  drivers/iio/adc/ti-ads131e08.c | 10 --
> >  1 file changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/iio/adc/ti-ads131e08.c b/drivers/iio/adc/ti-ads131e08.c
> > index 0060d5f0abb0..764dab087b41 100644
> > --- a/drivers/iio/adc/ti-ads131e08.c
> > +++ b/drivers/iio/adc/ti-ads131e08.c
> > @@ -177,7 +177,10 @@ static int ads131e08_read_reg(struct ads131e08_state 
> > *st, u8 reg)
> >   {
> >   .tx_buf = >tx_buf,
> >   .len = 2,
> > - .delay_usecs = st->sdecode_delay_us,
> > + .delay = {
> > + .value = st->sdecode_delay_us,
> > + .unit = SPI_DELAY_UNIT_USECS,
> > + },
> >   }, {
> >   .rx_buf = >rx_buf,
> >   .len = 1,
> > @@ -203,7 +206,10 @@ static int ads131e08_write_reg(struct ads131e08_state 
> > *st, u8 reg, u8 value)
> >   {
> >   .tx_buf = >tx_buf,
> >   .len = 3,
> > - .delay_usecs = st->sdecode_delay_us,
> > + .delay = {
> > + .value = st->sdecode_delay_us,
> > + .unit = SPI_DELAY_UNIT_USECS,
> > + },
> >   }
> >   };
> >
> > --
> > 2.30.0
> >
>
> Thanks for the fix, looks correct to me.
>
> greg k-h

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

[Greg KH]

On Mon, Mar 29, 2021 at 04:55:25PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/iio/adc/ti-ads131e08.c: In function 'ads131e08_read_reg':
> drivers/iio/adc/ti-ads131e08.c:180:5: error: 'struct spi_transfer' has no 
> member named 'delay_usecs'
>   180 |.delay_usecs = st->sdecode_delay_us,
>   | ^~~
> drivers/iio/adc/ti-ads131e08.c: In function 'ads131e08_write_reg':
> drivers/iio/adc/ti-ads131e08.c:206:5: error: 'struct spi_transfer' has no 
> member named 'delay_usecs'
>   206 |.delay_usecs = st->sdecode_delay_us,
>   | ^~~
> 
> Caused by commit
> 
>   d935eddd2799 ("iio: adc: Add driver for Texas Instruments ADS131E0x ADC 
> family")
> 
> interacting with commit
> 
>   3ab1cce55337 ("spi: core: remove 'delay_usecs' field from spi_transfer")
> 
> from the spi tree.
> 
> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell 
> Date: Mon, 29 Mar 2021 16:51:22 +1100
> Subject: [PATCH] iio: adc: merge fix for "spi: core: remove 'delay_usecs'
>  field from spi_transfer"
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/iio/adc/ti-ads131e08.c | 10 --
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/adc/ti-ads131e08.c b/drivers/iio/adc/ti-ads131e08.c
> index 0060d5f0abb0..764dab087b41 100644
> --- a/drivers/iio/adc/ti-ads131e08.c
> +++ b/drivers/iio/adc/ti-ads131e08.c
> @@ -177,7 +177,10 @@ static int ads131e08_read_reg(struct ads131e08_state 
> *st, u8 reg)
>   {
>   .tx_buf = >tx_buf,
>   .len = 2,
> - .delay_usecs = st->sdecode_delay_us,
> + .delay = {
> + .value = st->sdecode_delay_us,
> + .unit = SPI_DELAY_UNIT_USECS,
> + },
>   }, {
>   .rx_buf = >rx_buf,
>   .len = 1,
> @@ -203,7 +206,10 @@ static int ads131e08_write_reg(struct ads131e08_state 
> *st, u8 reg, u8 value)
>   {
>   .tx_buf = >tx_buf,
>   .len = 3,
> - .delay_usecs = st->sdecode_delay_us,
> + .delay = {
> + .value = st->sdecode_delay_us,
> + .unit = SPI_DELAY_UNIT_USECS,
> + },
>   }
>   };
>  
> -- 
> 2.30.0
> 

Thanks for the fix, looks correct to me.

greg k-h

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi all,

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

drivers/iio/adc/ti-ads131e08.c: In function 'ads131e08_read_reg':
drivers/iio/adc/ti-ads131e08.c:180:5: error: 'struct spi_transfer' has no 
member named 'delay_usecs'
  180 |.delay_usecs = st->sdecode_delay_us,
  | ^~~
drivers/iio/adc/ti-ads131e08.c: In function 'ads131e08_write_reg':
drivers/iio/adc/ti-ads131e08.c:206:5: error: 'struct spi_transfer' has no 
member named 'delay_usecs'
  206 |.delay_usecs = st->sdecode_delay_us,
  | ^~~

Caused by commit

  d935eddd2799 ("iio: adc: Add driver for Texas Instruments ADS131E0x ADC 
family")

interacting with commit

  3ab1cce55337 ("spi: core: remove 'delay_usecs' field from spi_transfer")

from the spi tree.

I have applied the following merge fix patch.

From: Stephen Rothwell 
Date: Mon, 29 Mar 2021 16:51:22 +1100
Subject: [PATCH] iio: adc: merge fix for "spi: core: remove 'delay_usecs'
 field from spi_transfer"

Signed-off-by: Stephen Rothwell 
---
 drivers/iio/adc/ti-ads131e08.c | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/adc/ti-ads131e08.c b/drivers/iio/adc/ti-ads131e08.c
index 0060d5f0abb0..764dab087b41 100644
--- a/drivers/iio/adc/ti-ads131e08.c
+++ b/drivers/iio/adc/ti-ads131e08.c
@@ -177,7 +177,10 @@ static int ads131e08_read_reg(struct ads131e08_state *st, 
u8 reg)
{
.tx_buf = >tx_buf,
.len = 2,
-   .delay_usecs = st->sdecode_delay_us,
+   .delay = {
+   .value = st->sdecode_delay_us,
+   .unit = SPI_DELAY_UNIT_USECS,
+   },
}, {
.rx_buf = >rx_buf,
.len = 1,
@@ -203,7 +206,10 @@ static int ads131e08_write_reg(struct ads131e08_state *st, 
u8 reg, u8 value)
{
.tx_buf = >tx_buf,
.len = 3,
-   .delay_usecs = st->sdecode_delay_us,
+   .delay = {
+   .value = st->sdecode_delay_us,
+   .unit = SPI_DELAY_UNIT_USECS,
+   },
}
};
 
-- 
2.30.0

-- 
Cheers,
Stephen Rothwell


pgpi7uy9bxc2a.pgp
Description: OpenPGP digital signature

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

[Stephen Rothwell]

Hi all,

On Mon, 7 Dec 2020 16:46:01 +1100 Stephen Rothwell  
wrote:
>
> Hi all,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/iio/trigger/iio-trig-sysfs.c: In function 'iio_sysfs_trigger_probe':
> drivers/iio/trigger/iio-trig-sysfs.c:164:21: error: 'struct irq_work' has no 
> member named 'flags'
>   164 |  atomic_set(>work.flags, IRQ_WORK_HARD_IRQ);
>   | ^
> 
> Caused by commit
> 
>   0449fc4eead7 ("iio: sysfs-trigger: Mark irq_work to expire in hardirq 
> context")
> 
> interacting with commit
> 
>   7a9f50a05843 ("irq_work: Cleanup")
> 
> from the tip tree.
> 
> I applied the following merge fix patch:
> 
> From: Stephen Rothwell 
> Date: Mon, 7 Dec 2020 16:42:18 +1100
> Subject: [PATCH] fixup for "irq_work: Cleanup"
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/iio/trigger/iio-trig-sysfs.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/trigger/iio-trig-sysfs.c 
> b/drivers/iio/trigger/iio-trig-sysfs.c
> index 10a3fd29362b..0f6b512a5c37 100644
> --- a/drivers/iio/trigger/iio-trig-sysfs.c
> +++ b/drivers/iio/trigger/iio-trig-sysfs.c
> @@ -160,8 +160,7 @@ static int iio_sysfs_trigger_probe(int id)
>   t->trig->dev.parent = _sysfs_trig_dev;
>   iio_trigger_set_drvdata(t->trig, t);
>  
> - init_irq_work(>work, iio_sysfs_trigger_work);
> - atomic_set(>work.flags, IRQ_WORK_HARD_IRQ);
> + t->work = IRQ_WORK_INIT_HARD(iio_sysfs_trigger_work);
>  
>   ret = iio_trigger_register(t->trig);
>   if (ret)

Just a reminder that I am still applying this merge fix.
-- 
Cheers,
Stephen Rothwell


pgpA0k6vDG04a.pgp
Description: OpenPGP digital signature

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

[Stephen Rothwell]

Hi Greg,

On Mon, 7 Dec 2020 10:26:06 +0100 Greg KH  wrote:
>
> > diff --git a/drivers/iio/trigger/iio-trig-sysfs.c 
> > b/drivers/iio/trigger/iio-trig-sysfs.c
> > index 10a3fd29362b..0f6b512a5c37 100644
> > --- a/drivers/iio/trigger/iio-trig-sysfs.c
> > +++ b/drivers/iio/trigger/iio-trig-sysfs.c
> > @@ -160,8 +160,7 @@ static int iio_sysfs_trigger_probe(int id)
> > t->trig->dev.parent = _sysfs_trig_dev;
> > iio_trigger_set_drvdata(t->trig, t);
> >  
> > -   init_irq_work(>work, iio_sysfs_trigger_work);
> > -   atomic_set(>work.flags, IRQ_WORK_HARD_IRQ);
> > +   t->work = IRQ_WORK_INIT_HARD(iio_sysfs_trigger_work);
> >  
> > ret = iio_trigger_register(t->trig);
> > if (ret)
> > -- 
> > 2.29.2  
> 
> Is this patch "safe" to take now, if the tip tree isn't part of my tree?

Unfortunately not, as IRQ_WORK_INIT_HARD() is introduced by the tip tree
commit.

-- 
Cheers,
Stephen Rothwell


pgpxzGHdoZGH2.pgp
Description: OpenPGP digital signature

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

[Greg KH]

On Mon, Dec 07, 2020 at 04:46:01PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/iio/trigger/iio-trig-sysfs.c: In function 'iio_sysfs_trigger_probe':
> drivers/iio/trigger/iio-trig-sysfs.c:164:21: error: 'struct irq_work' has no 
> member named 'flags'
>   164 |  atomic_set(>work.flags, IRQ_WORK_HARD_IRQ);
>   | ^
> 
> Caused by commit
> 
>   0449fc4eead7 ("iio: sysfs-trigger: Mark irq_work to expire in hardirq 
> context")
> 
> interacting with commit
> 
>   7a9f50a05843 ("irq_work: Cleanup")
> 
> from the tip tree.
> 
> I applied the following merge fix patch:
> 
> From: Stephen Rothwell 
> Date: Mon, 7 Dec 2020 16:42:18 +1100
> Subject: [PATCH] fixup for "irq_work: Cleanup"
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/iio/trigger/iio-trig-sysfs.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/trigger/iio-trig-sysfs.c 
> b/drivers/iio/trigger/iio-trig-sysfs.c
> index 10a3fd29362b..0f6b512a5c37 100644
> --- a/drivers/iio/trigger/iio-trig-sysfs.c
> +++ b/drivers/iio/trigger/iio-trig-sysfs.c
> @@ -160,8 +160,7 @@ static int iio_sysfs_trigger_probe(int id)
>   t->trig->dev.parent = _sysfs_trig_dev;
>   iio_trigger_set_drvdata(t->trig, t);
>  
> - init_irq_work(>work, iio_sysfs_trigger_work);
> - atomic_set(>work.flags, IRQ_WORK_HARD_IRQ);
> + t->work = IRQ_WORK_INIT_HARD(iio_sysfs_trigger_work);
>  
>   ret = iio_trigger_register(t->trig);
>   if (ret)
> -- 
> 2.29.2

Is this patch "safe" to take now, if the tip tree isn't part of my tree?

thanks,

greg k-h

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi all,

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

drivers/iio/trigger/iio-trig-sysfs.c: In function 'iio_sysfs_trigger_probe':
drivers/iio/trigger/iio-trig-sysfs.c:164:21: error: 'struct irq_work' has no 
member named 'flags'
  164 |  atomic_set(>work.flags, IRQ_WORK_HARD_IRQ);
  | ^

Caused by commit

  0449fc4eead7 ("iio: sysfs-trigger: Mark irq_work to expire in hardirq 
context")

interacting with commit

  7a9f50a05843 ("irq_work: Cleanup")

from the tip tree.

I applied the following merge fix patch:

From: Stephen Rothwell 
Date: Mon, 7 Dec 2020 16:42:18 +1100
Subject: [PATCH] fixup for "irq_work: Cleanup"

Signed-off-by: Stephen Rothwell 
---
 drivers/iio/trigger/iio-trig-sysfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/iio/trigger/iio-trig-sysfs.c 
b/drivers/iio/trigger/iio-trig-sysfs.c
index 10a3fd29362b..0f6b512a5c37 100644
--- a/drivers/iio/trigger/iio-trig-sysfs.c
+++ b/drivers/iio/trigger/iio-trig-sysfs.c
@@ -160,8 +160,7 @@ static int iio_sysfs_trigger_probe(int id)
t->trig->dev.parent = _sysfs_trig_dev;
iio_trigger_set_drvdata(t->trig, t);
 
-   init_irq_work(>work, iio_sysfs_trigger_work);
-   atomic_set(>work.flags, IRQ_WORK_HARD_IRQ);
+   t->work = IRQ_WORK_INIT_HARD(iio_sysfs_trigger_work);
 
ret = iio_trigger_register(t->trig);
if (ret)
-- 
2.29.2

-- 
Cheers,
Stephen Rothwell


pgpzmi42TNT1w.pgp
Description: OpenPGP digital signature

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

[Greg KH]

On Tue, Oct 08, 2019 at 01:49:07PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the staging tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> In file included from include/linux/byteorder/big_endian.h:5,
>  from arch/powerpc/include/uapi/asm/byteorder.h:14,
>  from include/asm-generic/bitops/le.h:6,
>  from arch/powerpc/include/asm/bitops.h:243,
>  from include/linux/bitops.h:26,
>  from include/linux/kernel.h:12,
>  from include/asm-generic/bug.h:19,
>  from arch/powerpc/include/asm/bug.h:120,
>  from include/linux/bug.h:5,
>  from include/linux/gpio/consumer.h:5,
>  from drivers/staging/wfx/bh.c:8:
> drivers/staging/wfx/bh.c: In function 'rx_helper':
> drivers/staging/wfx/bh.c:86:19: warning: passing argument 1 of '__swab16s' 
> makes pointer from integer without a cast [-Wint-conversion]
>86 |   le16_to_cpus(hif->len);
> include/uapi/linux/byteorder/big_endian.h:97:38: note: in definition of macro 
> '__le16_to_cpus'
>97 | #define __le16_to_cpus(x) __swab16s((x))
>   |  ^
> drivers/staging/wfx/bh.c:86:3: note: in expansion of macro 'le16_to_cpus'
>86 |   le16_to_cpus(hif->len);
>   |   ^~~~
> In file included from include/linux/swab.h:5,
>  from include/uapi/linux/byteorder/big_endian.h:13,
>  from include/linux/byteorder/big_endian.h:5,
>  from arch/powerpc/include/uapi/asm/byteorder.h:14,
>  from include/asm-generic/bitops/le.h:6,
>  from arch/powerpc/include/asm/bitops.h:243,
>  from include/linux/bitops.h:26,
>  from include/linux/kernel.h:12,
>  from include/asm-generic/bug.h:19,
>  from arch/powerpc/include/asm/bug.h:120,
>  from include/linux/bug.h:5,
>  from include/linux/gpio/consumer.h:5,
>  from drivers/staging/wfx/bh.c:8:
> include/uapi/linux/swab.h:230:37: note: expected '__u16 *' {aka 'short 
> unsigned int *'} but argument is of type 'uint16_t' {aka 'short unsigned int'}
>   230 | static inline void __swab16s(__u16 *p)
>   |  ~~~^
> In file included from include/linux/byteorder/big_endian.h:5,
>  from arch/powerpc/include/uapi/asm/byteorder.h:14,
>  from include/asm-generic/bitops/le.h:6,
>  from arch/powerpc/include/asm/bitops.h:243,
>  from include/linux/bitops.h:26,
>  from include/linux/kernel.h:12,
>  from include/asm-generic/bug.h:19,
>  from arch/powerpc/include/asm/bug.h:120,
>  from include/linux/bug.h:5,
>  from include/linux/gpio/consumer.h:5,
>  from drivers/staging/wfx/bh.c:8:
> drivers/staging/wfx/bh.c:91:19: warning: passing argument 1 of '__swab16s' 
> makes pointer from integer without a cast [-Wint-conversion]
>91 |   le16_to_cpus(hif->len);
> include/uapi/linux/byteorder/big_endian.h:97:38: note: in definition of macro 
> '__le16_to_cpus'
>97 | #define __le16_to_cpus(x) __swab16s((x))
>   |  ^
> drivers/staging/wfx/bh.c:91:3: note: in expansion of macro 'le16_to_cpus'
>91 |   le16_to_cpus(hif->len);
>   |   ^~~~
> In file included from include/linux/swab.h:5,
>  from include/uapi/linux/byteorder/big_endian.h:13,
>  from include/linux/byteorder/big_endian.h:5,
>  from arch/powerpc/include/uapi/asm/byteorder.h:14,
>  from include/asm-generic/bitops/le.h:6,
>  from arch/powerpc/include/asm/bitops.h:243,
>  from include/linux/bitops.h:26,
>  from include/linux/kernel.h:12,
>  from include/asm-generic/bug.h:19,
>  from arch/powerpc/include/asm/bug.h:120,
>  from include/linux/bug.h:5,
>  from include/linux/gpio/consumer.h:5,
>  from drivers/staging/wfx/bh.c:8:
> include/uapi/linux/swab.h:230:37: note: expected '__u16 *' {aka 'short 
> unsigned int *'} but argument is of type 'uint16_t' {aka 'short unsigned int'}
>   230 | static inline void __swab16s(__u16 *p)
>   |  ~~~^
> In file included from include/linux/byteorder/big_endian.h:5,
>  from arch/powerpc/include/uapi/asm/byteorder.h:14,
>  from include/asm-generic/bitops/le.h:6,
>  from arch/powerpc/include/asm/bitops.h:243,
>  from include/linux/bitops.h:26,
>  from include/linux/kernel.h:12,
>  from include/asm-generic/bug.h:19,
>  from arch/powerpc/include/asm/bug.h:120,
> 

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi all,

After merging the staging tree, today's linux-next build (powerpc
allyesconfig) failed like this:

In file included from include/linux/byteorder/big_endian.h:5,
 from arch/powerpc/include/uapi/asm/byteorder.h:14,
 from include/asm-generic/bitops/le.h:6,
 from arch/powerpc/include/asm/bitops.h:243,
 from include/linux/bitops.h:26,
 from include/linux/kernel.h:12,
 from include/asm-generic/bug.h:19,
 from arch/powerpc/include/asm/bug.h:120,
 from include/linux/bug.h:5,
 from include/linux/gpio/consumer.h:5,
 from drivers/staging/wfx/bh.c:8:
drivers/staging/wfx/bh.c: In function 'rx_helper':
drivers/staging/wfx/bh.c:86:19: warning: passing argument 1 of '__swab16s' 
makes pointer from integer without a cast [-Wint-conversion]
   86 |   le16_to_cpus(hif->len);
include/uapi/linux/byteorder/big_endian.h:97:38: note: in definition of macro 
'__le16_to_cpus'
   97 | #define __le16_to_cpus(x) __swab16s((x))
  |  ^
drivers/staging/wfx/bh.c:86:3: note: in expansion of macro 'le16_to_cpus'
   86 |   le16_to_cpus(hif->len);
  |   ^~~~
In file included from include/linux/swab.h:5,
 from include/uapi/linux/byteorder/big_endian.h:13,
 from include/linux/byteorder/big_endian.h:5,
 from arch/powerpc/include/uapi/asm/byteorder.h:14,
 from include/asm-generic/bitops/le.h:6,
 from arch/powerpc/include/asm/bitops.h:243,
 from include/linux/bitops.h:26,
 from include/linux/kernel.h:12,
 from include/asm-generic/bug.h:19,
 from arch/powerpc/include/asm/bug.h:120,
 from include/linux/bug.h:5,
 from include/linux/gpio/consumer.h:5,
 from drivers/staging/wfx/bh.c:8:
include/uapi/linux/swab.h:230:37: note: expected '__u16 *' {aka 'short unsigned 
int *'} but argument is of type 'uint16_t' {aka 'short unsigned int'}
  230 | static inline void __swab16s(__u16 *p)
  |  ~~~^
In file included from include/linux/byteorder/big_endian.h:5,
 from arch/powerpc/include/uapi/asm/byteorder.h:14,
 from include/asm-generic/bitops/le.h:6,
 from arch/powerpc/include/asm/bitops.h:243,
 from include/linux/bitops.h:26,
 from include/linux/kernel.h:12,
 from include/asm-generic/bug.h:19,
 from arch/powerpc/include/asm/bug.h:120,
 from include/linux/bug.h:5,
 from include/linux/gpio/consumer.h:5,
 from drivers/staging/wfx/bh.c:8:
drivers/staging/wfx/bh.c:91:19: warning: passing argument 1 of '__swab16s' 
makes pointer from integer without a cast [-Wint-conversion]
   91 |   le16_to_cpus(hif->len);
include/uapi/linux/byteorder/big_endian.h:97:38: note: in definition of macro 
'__le16_to_cpus'
   97 | #define __le16_to_cpus(x) __swab16s((x))
  |  ^
drivers/staging/wfx/bh.c:91:3: note: in expansion of macro 'le16_to_cpus'
   91 |   le16_to_cpus(hif->len);
  |   ^~~~
In file included from include/linux/swab.h:5,
 from include/uapi/linux/byteorder/big_endian.h:13,
 from include/linux/byteorder/big_endian.h:5,
 from arch/powerpc/include/uapi/asm/byteorder.h:14,
 from include/asm-generic/bitops/le.h:6,
 from arch/powerpc/include/asm/bitops.h:243,
 from include/linux/bitops.h:26,
 from include/linux/kernel.h:12,
 from include/asm-generic/bug.h:19,
 from arch/powerpc/include/asm/bug.h:120,
 from include/linux/bug.h:5,
 from include/linux/gpio/consumer.h:5,
 from drivers/staging/wfx/bh.c:8:
include/uapi/linux/swab.h:230:37: note: expected '__u16 *' {aka 'short unsigned 
int *'} but argument is of type 'uint16_t' {aka 'short unsigned int'}
  230 | static inline void __swab16s(__u16 *p)
  |  ~~~^
In file included from include/linux/byteorder/big_endian.h:5,
 from arch/powerpc/include/uapi/asm/byteorder.h:14,
 from include/asm-generic/bitops/le.h:6,
 from arch/powerpc/include/asm/bitops.h:243,
 from include/linux/bitops.h:26,
 from include/linux/kernel.h:12,
 from include/asm-generic/bug.h:19,
 from arch/powerpc/include/asm/bug.h:120,
 from include/linux/bug.h:5,
 from include/net/mac80211.h:16,
 from drivers/staging/wfx/key.c:8:
drivers/staging/wfx/hif_tx_mib.h: In function 'hif_set_mfp':
drivers/staging/wfx/hif_tx_mib.h:139:15: error: 

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

[Greg KH]

On Mon, Jun 24, 2019 at 05:38:55PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the staging tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> lib/Kconfig:132:error: recursive dependency detected!
> lib/Kconfig:132:symbol CRC32 is selected by XZ_DEC
> lib/xz/Kconfig:2:   symbol XZ_DEC is selected by FW_LOADER_COMPRESS
> drivers/base/firmware_loader/Kconfig:158:   symbol FW_LOADER_COMPRESS 
> depends on FW_LOADER
> drivers/base/firmware_loader/Kconfig:4: symbol FW_LOADER is selected by KS7010
> drivers/staging/ks7010/Kconfig:2:   symbol KS7010 depends on CRYPTO_HASH
> crypto/Kconfig:65:  symbol CRYPTO_HASH is selected by CRYPTO_CRC32_ARM_CE
> arch/arm/crypto/Kconfig:123:symbol CRYPTO_CRC32_ARM_CE depends on CRC32
> For a resolution refer to Documentation/kbuild/kconfig-language.rst
> subsection "Kconfig recursive dependency limitations"
> 
> This is just while doing the "make multi_v7_defconfig".
> 
> Caused by commit
> 
>   3e5bc68fa596 ("staging: ks7010: Fix build error")
> 
> I have reverted that commit for today.

Odd.  I'll go revert this now too.

thanks,

greg k-h

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi all,

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

lib/Kconfig:132:error: recursive dependency detected!
lib/Kconfig:132:symbol CRC32 is selected by XZ_DEC
lib/xz/Kconfig:2:   symbol XZ_DEC is selected by FW_LOADER_COMPRESS
drivers/base/firmware_loader/Kconfig:158:   symbol FW_LOADER_COMPRESS 
depends on FW_LOADER
drivers/base/firmware_loader/Kconfig:4: symbol FW_LOADER is selected by KS7010
drivers/staging/ks7010/Kconfig:2:   symbol KS7010 depends on CRYPTO_HASH
crypto/Kconfig:65:  symbol CRYPTO_HASH is selected by CRYPTO_CRC32_ARM_CE
arch/arm/crypto/Kconfig:123:symbol CRYPTO_CRC32_ARM_CE depends on CRC32
For a resolution refer to Documentation/kbuild/kconfig-language.rst
subsection "Kconfig recursive dependency limitations"

This is just while doing the "make multi_v7_defconfig".

Caused by commit

  3e5bc68fa596 ("staging: ks7010: Fix build error")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell


pgp4boyRayNa4.pgp
Description: OpenPGP digital signature

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

[Chao Yu]

On 2018/8/2 15:14, Greg KH wrote:
> On Thu, Aug 02, 2018 at 03:01:59PM +0800, Chao Yu wrote:
>> Hi Greg,
>>
>> On 2018/8/2 14:15, Greg KH wrote:
>>> On Wed, Aug 01, 2018 at 05:09:13PM +0800, Chao Yu wrote:
 Hi Stephen,

 On 2018/7/30 14:31, Gao Xiang wrote:
> Hi Stephen,
>
> On 2018/7/30 14:16, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> After merging the staging tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/staging/erofs/super.c: In function 'erofs_read_super':
>> drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared 
>> (first use in this function); did you mean 'IS_RDONLY'?
>>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
>>  ^
>>  IS_RDONLY
>> drivers/staging/erofs/super.c:343:17: note: each undeclared identifier 
>> is reported only once for each function it appears in
>> drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared 
>> (first use in this function); did you mean 'S_NOATIME'?
>>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
>>  ^~
>>  S_NOATIME
>> drivers/staging/erofs/super.c: In function 'erofs_mount':
>> drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
>> 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
>>, erofs_fill_super);
>>   ^~~~
>> In file included from include/linux/buffer_head.h:12:0,
>>  from drivers/staging/erofs/super.c:14:
>> include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned 
>> int}' but argument is of type 'int (*)(struct super_block *, void *, 
>> int)'
>>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>>^~
>> drivers/staging/erofs/super.c:500:9: error: too few arguments to 
>> function 'mount_bdev'
>>   return mount_bdev(fs_type, flags, dev_name,
>>  ^~
>> In file included from include/linux/buffer_head.h:12:0,
>>  from drivers/staging/erofs/super.c:14:
>> include/linux/fs.h:2151:23: note: declared here
>>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>>^~
>> drivers/staging/erofs/super.c: At top level:
>> drivers/staging/erofs/super.c:518:20: error: initialization from 
>> incompatible pointer type [-Werror=incompatible-pointer-types]
>>   .mount  = erofs_mount,
>> ^~~
>> drivers/staging/erofs/super.c:518:20: note: (near initialization for 
>> 'erofs_fs_type.mount')
>> drivers/staging/erofs/super.c: In function 'erofs_remount':
>> drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared 
>> (first use in this function); did you mean 'IS_RDONLY'?
>>   *flags |= MS_RDONLY;
>> ^
>> IS_RDONLY
>> drivers/staging/erofs/super.c: At top level:
>> drivers/staging/erofs/super.c:640:16: error: initialization from 
>> incompatible pointer type [-Werror=incompatible-pointer-types]
>>   .remount_fs = erofs_remount,
>> ^
>>
>> Caused by various commits creating erofs in the staging tree interacting
>> with various commits redoing the mount infrastructure in the vfs tree.
>>
>> I have disabed CONFIG_EROFS_FS for now:

 Xiang has submitted several patches as below to fix compiling error on 
 -next
 tree, could you consider to merge those temporary fixes into -next after 
 merging
 staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
 compiling and test?

 staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, 
 S_NOATIME)
 https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html

 staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
 https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html

 staging: erofs: update .mount and .remount_sb
 https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html
>>>
>>> Why have these not been submitted to me for inclusion in my tree?
>> Oh, let me explain, that is because the compiling error only occurs in -next
>> tree, since -next collects and merges developing patches including common vfs
>> stuff from multi-trees, but those patches didn't cover erofs, such as:
>>
>> ('vfs: Suppress MS_* flag defs within the kernel unless explicitly enabled")
>> https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/commit/?h=for-next=109b45090d7d3ce2797bb1ef7f70eead5bfe0ff3
>>
>> ("vfs: Require specification of size of mount data for internal mounts")
>> 

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

[Chao Yu]

On 2018/8/2 15:14, Greg KH wrote:
> On Thu, Aug 02, 2018 at 03:01:59PM +0800, Chao Yu wrote:
>> Hi Greg,
>>
>> On 2018/8/2 14:15, Greg KH wrote:
>>> On Wed, Aug 01, 2018 at 05:09:13PM +0800, Chao Yu wrote:
 Hi Stephen,

 On 2018/7/30 14:31, Gao Xiang wrote:
> Hi Stephen,
>
> On 2018/7/30 14:16, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> After merging the staging tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/staging/erofs/super.c: In function 'erofs_read_super':
>> drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared 
>> (first use in this function); did you mean 'IS_RDONLY'?
>>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
>>  ^
>>  IS_RDONLY
>> drivers/staging/erofs/super.c:343:17: note: each undeclared identifier 
>> is reported only once for each function it appears in
>> drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared 
>> (first use in this function); did you mean 'S_NOATIME'?
>>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
>>  ^~
>>  S_NOATIME
>> drivers/staging/erofs/super.c: In function 'erofs_mount':
>> drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
>> 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
>>, erofs_fill_super);
>>   ^~~~
>> In file included from include/linux/buffer_head.h:12:0,
>>  from drivers/staging/erofs/super.c:14:
>> include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned 
>> int}' but argument is of type 'int (*)(struct super_block *, void *, 
>> int)'
>>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>>^~
>> drivers/staging/erofs/super.c:500:9: error: too few arguments to 
>> function 'mount_bdev'
>>   return mount_bdev(fs_type, flags, dev_name,
>>  ^~
>> In file included from include/linux/buffer_head.h:12:0,
>>  from drivers/staging/erofs/super.c:14:
>> include/linux/fs.h:2151:23: note: declared here
>>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>>^~
>> drivers/staging/erofs/super.c: At top level:
>> drivers/staging/erofs/super.c:518:20: error: initialization from 
>> incompatible pointer type [-Werror=incompatible-pointer-types]
>>   .mount  = erofs_mount,
>> ^~~
>> drivers/staging/erofs/super.c:518:20: note: (near initialization for 
>> 'erofs_fs_type.mount')
>> drivers/staging/erofs/super.c: In function 'erofs_remount':
>> drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared 
>> (first use in this function); did you mean 'IS_RDONLY'?
>>   *flags |= MS_RDONLY;
>> ^
>> IS_RDONLY
>> drivers/staging/erofs/super.c: At top level:
>> drivers/staging/erofs/super.c:640:16: error: initialization from 
>> incompatible pointer type [-Werror=incompatible-pointer-types]
>>   .remount_fs = erofs_remount,
>> ^
>>
>> Caused by various commits creating erofs in the staging tree interacting
>> with various commits redoing the mount infrastructure in the vfs tree.
>>
>> I have disabed CONFIG_EROFS_FS for now:

 Xiang has submitted several patches as below to fix compiling error on 
 -next
 tree, could you consider to merge those temporary fixes into -next after 
 merging
 staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
 compiling and test?

 staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, 
 S_NOATIME)
 https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html

 staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
 https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html

 staging: erofs: update .mount and .remount_sb
 https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html
>>>
>>> Why have these not been submitted to me for inclusion in my tree?
>> Oh, let me explain, that is because the compiling error only occurs in -next
>> tree, since -next collects and merges developing patches including common vfs
>> stuff from multi-trees, but those patches didn't cover erofs, such as:
>>
>> ('vfs: Suppress MS_* flag defs within the kernel unless explicitly enabled")
>> https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/commit/?h=for-next=109b45090d7d3ce2797bb1ef7f70eead5bfe0ff3
>>
>> ("vfs: Require specification of size of mount data for internal mounts")
>> 

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

[Greg KH]

On Thu, Aug 02, 2018 at 03:01:59PM +0800, Chao Yu wrote:
> Hi Greg,
> 
> On 2018/8/2 14:15, Greg KH wrote:
> > On Wed, Aug 01, 2018 at 05:09:13PM +0800, Chao Yu wrote:
> >> Hi Stephen,
> >>
> >> On 2018/7/30 14:31, Gao Xiang wrote:
> >>> Hi Stephen,
> >>>
> >>> On 2018/7/30 14:16, Stephen Rothwell wrote:
>  Hi Greg,
> 
>  After merging the staging tree, today's linux-next build (x86_64
>  allmodconfig) failed like this:
> 
>  drivers/staging/erofs/super.c: In function 'erofs_read_super':
>  drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared 
>  (first use in this function); did you mean 'IS_RDONLY'?
>    sb->s_flags |= MS_RDONLY | MS_NOATIME;
>   ^
>   IS_RDONLY
>  drivers/staging/erofs/super.c:343:17: note: each undeclared identifier 
>  is reported only once for each function it appears in
>  drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared 
>  (first use in this function); did you mean 'S_NOATIME'?
>    sb->s_flags |= MS_RDONLY | MS_NOATIME;
>   ^~
>   S_NOATIME
>  drivers/staging/erofs/super.c: In function 'erofs_mount':
>  drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
>  'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
> , erofs_fill_super);
>    ^~~~
>  In file included from include/linux/buffer_head.h:12:0,
>   from drivers/staging/erofs/super.c:14:
>  include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned 
>  int}' but argument is of type 'int (*)(struct super_block *, void *, 
>  int)'
>   extern struct dentry *mount_bdev(struct file_system_type *fs_type,
> ^~
>  drivers/staging/erofs/super.c:500:9: error: too few arguments to 
>  function 'mount_bdev'
>    return mount_bdev(fs_type, flags, dev_name,
>   ^~
>  In file included from include/linux/buffer_head.h:12:0,
>   from drivers/staging/erofs/super.c:14:
>  include/linux/fs.h:2151:23: note: declared here
>   extern struct dentry *mount_bdev(struct file_system_type *fs_type,
> ^~
>  drivers/staging/erofs/super.c: At top level:
>  drivers/staging/erofs/super.c:518:20: error: initialization from 
>  incompatible pointer type [-Werror=incompatible-pointer-types]
>    .mount  = erofs_mount,
>  ^~~
>  drivers/staging/erofs/super.c:518:20: note: (near initialization for 
>  'erofs_fs_type.mount')
>  drivers/staging/erofs/super.c: In function 'erofs_remount':
>  drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared 
>  (first use in this function); did you mean 'IS_RDONLY'?
>    *flags |= MS_RDONLY;
>  ^
>  IS_RDONLY
>  drivers/staging/erofs/super.c: At top level:
>  drivers/staging/erofs/super.c:640:16: error: initialization from 
>  incompatible pointer type [-Werror=incompatible-pointer-types]
>    .remount_fs = erofs_remount,
>  ^
> 
>  Caused by various commits creating erofs in the staging tree interacting
>  with various commits redoing the mount infrastructure in the vfs tree.
> 
>  I have disabed CONFIG_EROFS_FS for now:
> >>
> >> Xiang has submitted several patches as below to fix compiling error on 
> >> -next
> >> tree, could you consider to merge those temporary fixes into -next after 
> >> merging
> >> staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
> >> compiling and test?
> >>
> >> staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, 
> >> S_NOATIME)
> >> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html
> >>
> >> staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
> >> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html
> >>
> >> staging: erofs: update .mount and .remount_sb
> >> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html
> > 
> > Why have these not been submitted to me for inclusion in my tree?
> Oh, let me explain, that is because the compiling error only occurs in -next
> tree, since -next collects and merges developing patches including common vfs
> stuff from multi-trees, but those patches didn't cover erofs, such as:
> 
> ('vfs: Suppress MS_* flag defs within the kernel unless explicitly enabled")
> https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/commit/?h=for-next=109b45090d7d3ce2797bb1ef7f70eead5bfe0ff3
> 
> ("vfs: Require specification of size of mount data for internal mounts")
> https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/commit/?h=for-next=0a191e4505a4f255e6513b49426213da69bf0e80
> 
> As I 

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

[Greg KH]

On Thu, Aug 02, 2018 at 03:01:59PM +0800, Chao Yu wrote:
> Hi Greg,
> 
> On 2018/8/2 14:15, Greg KH wrote:
> > On Wed, Aug 01, 2018 at 05:09:13PM +0800, Chao Yu wrote:
> >> Hi Stephen,
> >>
> >> On 2018/7/30 14:31, Gao Xiang wrote:
> >>> Hi Stephen,
> >>>
> >>> On 2018/7/30 14:16, Stephen Rothwell wrote:
>  Hi Greg,
> 
>  After merging the staging tree, today's linux-next build (x86_64
>  allmodconfig) failed like this:
> 
>  drivers/staging/erofs/super.c: In function 'erofs_read_super':
>  drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared 
>  (first use in this function); did you mean 'IS_RDONLY'?
>    sb->s_flags |= MS_RDONLY | MS_NOATIME;
>   ^
>   IS_RDONLY
>  drivers/staging/erofs/super.c:343:17: note: each undeclared identifier 
>  is reported only once for each function it appears in
>  drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared 
>  (first use in this function); did you mean 'S_NOATIME'?
>    sb->s_flags |= MS_RDONLY | MS_NOATIME;
>   ^~
>   S_NOATIME
>  drivers/staging/erofs/super.c: In function 'erofs_mount':
>  drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
>  'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
> , erofs_fill_super);
>    ^~~~
>  In file included from include/linux/buffer_head.h:12:0,
>   from drivers/staging/erofs/super.c:14:
>  include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned 
>  int}' but argument is of type 'int (*)(struct super_block *, void *, 
>  int)'
>   extern struct dentry *mount_bdev(struct file_system_type *fs_type,
> ^~
>  drivers/staging/erofs/super.c:500:9: error: too few arguments to 
>  function 'mount_bdev'
>    return mount_bdev(fs_type, flags, dev_name,
>   ^~
>  In file included from include/linux/buffer_head.h:12:0,
>   from drivers/staging/erofs/super.c:14:
>  include/linux/fs.h:2151:23: note: declared here
>   extern struct dentry *mount_bdev(struct file_system_type *fs_type,
> ^~
>  drivers/staging/erofs/super.c: At top level:
>  drivers/staging/erofs/super.c:518:20: error: initialization from 
>  incompatible pointer type [-Werror=incompatible-pointer-types]
>    .mount  = erofs_mount,
>  ^~~
>  drivers/staging/erofs/super.c:518:20: note: (near initialization for 
>  'erofs_fs_type.mount')
>  drivers/staging/erofs/super.c: In function 'erofs_remount':
>  drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared 
>  (first use in this function); did you mean 'IS_RDONLY'?
>    *flags |= MS_RDONLY;
>  ^
>  IS_RDONLY
>  drivers/staging/erofs/super.c: At top level:
>  drivers/staging/erofs/super.c:640:16: error: initialization from 
>  incompatible pointer type [-Werror=incompatible-pointer-types]
>    .remount_fs = erofs_remount,
>  ^
> 
>  Caused by various commits creating erofs in the staging tree interacting
>  with various commits redoing the mount infrastructure in the vfs tree.
> 
>  I have disabed CONFIG_EROFS_FS for now:
> >>
> >> Xiang has submitted several patches as below to fix compiling error on 
> >> -next
> >> tree, could you consider to merge those temporary fixes into -next after 
> >> merging
> >> staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
> >> compiling and test?
> >>
> >> staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, 
> >> S_NOATIME)
> >> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html
> >>
> >> staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
> >> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html
> >>
> >> staging: erofs: update .mount and .remount_sb
> >> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html
> > 
> > Why have these not been submitted to me for inclusion in my tree?
> Oh, let me explain, that is because the compiling error only occurs in -next
> tree, since -next collects and merges developing patches including common vfs
> stuff from multi-trees, but those patches didn't cover erofs, such as:
> 
> ('vfs: Suppress MS_* flag defs within the kernel unless explicitly enabled")
> https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/commit/?h=for-next=109b45090d7d3ce2797bb1ef7f70eead5bfe0ff3
> 
> ("vfs: Require specification of size of mount data for internal mounts")
> https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/commit/?h=for-next=0a191e4505a4f255e6513b49426213da69bf0e80
> 
> As I 

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

[Chao Yu]

Hi Greg,

On 2018/8/2 14:15, Greg KH wrote:
> On Wed, Aug 01, 2018 at 05:09:13PM +0800, Chao Yu wrote:
>> Hi Stephen,
>>
>> On 2018/7/30 14:31, Gao Xiang wrote:
>>> Hi Stephen,
>>>
>>> On 2018/7/30 14:16, Stephen Rothwell wrote:
 Hi Greg,

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

 drivers/staging/erofs/super.c: In function 'erofs_read_super':
 drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared (first 
 use in this function); did you mean 'IS_RDONLY'?
   sb->s_flags |= MS_RDONLY | MS_NOATIME;
  ^
  IS_RDONLY
 drivers/staging/erofs/super.c:343:17: note: each undeclared identifier is 
 reported only once for each function it appears in
 drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared 
 (first use in this function); did you mean 'S_NOATIME'?
   sb->s_flags |= MS_RDONLY | MS_NOATIME;
  ^~
  S_NOATIME
 drivers/staging/erofs/super.c: In function 'erofs_mount':
 drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
, erofs_fill_super);
   ^~~~
 In file included from include/linux/buffer_head.h:12:0,
  from drivers/staging/erofs/super.c:14:
 include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned 
 int}' but argument is of type 'int (*)(struct super_block *, void *, int)'
  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
^~
 drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
 'mount_bdev'
   return mount_bdev(fs_type, flags, dev_name,
  ^~
 In file included from include/linux/buffer_head.h:12:0,
  from drivers/staging/erofs/super.c:14:
 include/linux/fs.h:2151:23: note: declared here
  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
^~
 drivers/staging/erofs/super.c: At top level:
 drivers/staging/erofs/super.c:518:20: error: initialization from 
 incompatible pointer type [-Werror=incompatible-pointer-types]
   .mount  = erofs_mount,
 ^~~
 drivers/staging/erofs/super.c:518:20: note: (near initialization for 
 'erofs_fs_type.mount')
 drivers/staging/erofs/super.c: In function 'erofs_remount':
 drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared (first 
 use in this function); did you mean 'IS_RDONLY'?
   *flags |= MS_RDONLY;
 ^
 IS_RDONLY
 drivers/staging/erofs/super.c: At top level:
 drivers/staging/erofs/super.c:640:16: error: initialization from 
 incompatible pointer type [-Werror=incompatible-pointer-types]
   .remount_fs = erofs_remount,
 ^

 Caused by various commits creating erofs in the staging tree interacting
 with various commits redoing the mount infrastructure in the vfs tree.

 I have disabed CONFIG_EROFS_FS for now:
>>
>> Xiang has submitted several patches as below to fix compiling error on -next
>> tree, could you consider to merge those temporary fixes into -next after 
>> merging
>> staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
>> compiling and test?
>>
>> staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, 
>> S_NOATIME)
>> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html
>>
>> staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
>> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html
>>
>> staging: erofs: update .mount and .remount_sb
>> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html
> 
> Why have these not been submitted to me for inclusion in my tree?
Oh, let me explain, that is because the compiling error only occurs in -next
tree, since -next collects and merges developing patches including common vfs
stuff from multi-trees, but those patches didn't cover erofs, such as:

('vfs: Suppress MS_* flag defs within the kernel unless explicitly enabled")
https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/commit/?h=for-next=109b45090d7d3ce2797bb1ef7f70eead5bfe0ff3

("vfs: Require specification of size of mount data for internal mounts")
https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/commit/?h=for-next=0a191e4505a4f255e6513b49426213da69bf0e80

As I checked, above vfs related patches has not been merged in staging tree, if
I submit those erofs patches to you and after including them in
staging-{test,nexts} tree, it can easily cause compiling error. So I just send
them to Stephen first for fixing integrity compiling error.

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

[Chao Yu]

Hi Greg,

On 2018/8/2 14:15, Greg KH wrote:
> On Wed, Aug 01, 2018 at 05:09:13PM +0800, Chao Yu wrote:
>> Hi Stephen,
>>
>> On 2018/7/30 14:31, Gao Xiang wrote:
>>> Hi Stephen,
>>>
>>> On 2018/7/30 14:16, Stephen Rothwell wrote:
 Hi Greg,

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

 drivers/staging/erofs/super.c: In function 'erofs_read_super':
 drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared (first 
 use in this function); did you mean 'IS_RDONLY'?
   sb->s_flags |= MS_RDONLY | MS_NOATIME;
  ^
  IS_RDONLY
 drivers/staging/erofs/super.c:343:17: note: each undeclared identifier is 
 reported only once for each function it appears in
 drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared 
 (first use in this function); did you mean 'S_NOATIME'?
   sb->s_flags |= MS_RDONLY | MS_NOATIME;
  ^~
  S_NOATIME
 drivers/staging/erofs/super.c: In function 'erofs_mount':
 drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
, erofs_fill_super);
   ^~~~
 In file included from include/linux/buffer_head.h:12:0,
  from drivers/staging/erofs/super.c:14:
 include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned 
 int}' but argument is of type 'int (*)(struct super_block *, void *, int)'
  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
^~
 drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
 'mount_bdev'
   return mount_bdev(fs_type, flags, dev_name,
  ^~
 In file included from include/linux/buffer_head.h:12:0,
  from drivers/staging/erofs/super.c:14:
 include/linux/fs.h:2151:23: note: declared here
  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
^~
 drivers/staging/erofs/super.c: At top level:
 drivers/staging/erofs/super.c:518:20: error: initialization from 
 incompatible pointer type [-Werror=incompatible-pointer-types]
   .mount  = erofs_mount,
 ^~~
 drivers/staging/erofs/super.c:518:20: note: (near initialization for 
 'erofs_fs_type.mount')
 drivers/staging/erofs/super.c: In function 'erofs_remount':
 drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared (first 
 use in this function); did you mean 'IS_RDONLY'?
   *flags |= MS_RDONLY;
 ^
 IS_RDONLY
 drivers/staging/erofs/super.c: At top level:
 drivers/staging/erofs/super.c:640:16: error: initialization from 
 incompatible pointer type [-Werror=incompatible-pointer-types]
   .remount_fs = erofs_remount,
 ^

 Caused by various commits creating erofs in the staging tree interacting
 with various commits redoing the mount infrastructure in the vfs tree.

 I have disabed CONFIG_EROFS_FS for now:
>>
>> Xiang has submitted several patches as below to fix compiling error on -next
>> tree, could you consider to merge those temporary fixes into -next after 
>> merging
>> staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
>> compiling and test?
>>
>> staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, 
>> S_NOATIME)
>> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html
>>
>> staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
>> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html
>>
>> staging: erofs: update .mount and .remount_sb
>> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html
> 
> Why have these not been submitted to me for inclusion in my tree?
Oh, let me explain, that is because the compiling error only occurs in -next
tree, since -next collects and merges developing patches including common vfs
stuff from multi-trees, but those patches didn't cover erofs, such as:

('vfs: Suppress MS_* flag defs within the kernel unless explicitly enabled")
https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/commit/?h=for-next=109b45090d7d3ce2797bb1ef7f70eead5bfe0ff3

("vfs: Require specification of size of mount data for internal mounts")
https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git/commit/?h=for-next=0a191e4505a4f255e6513b49426213da69bf0e80

As I checked, above vfs related patches has not been merged in staging tree, if
I submit those erofs patches to you and after including them in
staging-{test,nexts} tree, it can easily cause compiling error. So I just send
them to Stephen first for fixing integrity compiling error.

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

[Greg KH]

On Wed, Aug 01, 2018 at 05:09:13PM +0800, Chao Yu wrote:
> Hi Stephen,
> 
> On 2018/7/30 14:31, Gao Xiang wrote:
> > Hi Stephen,
> > 
> > On 2018/7/30 14:16, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> After merging the staging tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> drivers/staging/erofs/super.c: In function 'erofs_read_super':
> >> drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared (first 
> >> use in this function); did you mean 'IS_RDONLY'?
> >>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
> >>  ^
> >>  IS_RDONLY
> >> drivers/staging/erofs/super.c:343:17: note: each undeclared identifier is 
> >> reported only once for each function it appears in
> >> drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared 
> >> (first use in this function); did you mean 'S_NOATIME'?
> >>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
> >>  ^~
> >>  S_NOATIME
> >> drivers/staging/erofs/super.c: In function 'erofs_mount':
> >> drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
> >> 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
> >>, erofs_fill_super);
> >>   ^~~~
> >> In file included from include/linux/buffer_head.h:12:0,
> >>  from drivers/staging/erofs/super.c:14:
> >> include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned 
> >> int}' but argument is of type 'int (*)(struct super_block *, void *, int)'
> >>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
> >>^~
> >> drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
> >> 'mount_bdev'
> >>   return mount_bdev(fs_type, flags, dev_name,
> >>  ^~
> >> In file included from include/linux/buffer_head.h:12:0,
> >>  from drivers/staging/erofs/super.c:14:
> >> include/linux/fs.h:2151:23: note: declared here
> >>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
> >>^~
> >> drivers/staging/erofs/super.c: At top level:
> >> drivers/staging/erofs/super.c:518:20: error: initialization from 
> >> incompatible pointer type [-Werror=incompatible-pointer-types]
> >>   .mount  = erofs_mount,
> >> ^~~
> >> drivers/staging/erofs/super.c:518:20: note: (near initialization for 
> >> 'erofs_fs_type.mount')
> >> drivers/staging/erofs/super.c: In function 'erofs_remount':
> >> drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared (first 
> >> use in this function); did you mean 'IS_RDONLY'?
> >>   *flags |= MS_RDONLY;
> >> ^
> >> IS_RDONLY
> >> drivers/staging/erofs/super.c: At top level:
> >> drivers/staging/erofs/super.c:640:16: error: initialization from 
> >> incompatible pointer type [-Werror=incompatible-pointer-types]
> >>   .remount_fs = erofs_remount,
> >> ^
> >>
> >> Caused by various commits creating erofs in the staging tree interacting
> >> with various commits redoing the mount infrastructure in the vfs tree.
> >>
> >> I have disabed CONFIG_EROFS_FS for now:
> 
> Xiang has submitted several patches as below to fix compiling error on -next
> tree, could you consider to merge those temporary fixes into -next after 
> merging
> staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
> compiling and test?
> 
> staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, S_NOATIME)
> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html
> 
> staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html
> 
> staging: erofs: update .mount and .remount_sb
> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html

Why have these not been submitted to me for inclusion in my tree?

thanks,

greg k-h

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

[Greg KH]

On Wed, Aug 01, 2018 at 05:09:13PM +0800, Chao Yu wrote:
> Hi Stephen,
> 
> On 2018/7/30 14:31, Gao Xiang wrote:
> > Hi Stephen,
> > 
> > On 2018/7/30 14:16, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> After merging the staging tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> drivers/staging/erofs/super.c: In function 'erofs_read_super':
> >> drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared (first 
> >> use in this function); did you mean 'IS_RDONLY'?
> >>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
> >>  ^
> >>  IS_RDONLY
> >> drivers/staging/erofs/super.c:343:17: note: each undeclared identifier is 
> >> reported only once for each function it appears in
> >> drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared 
> >> (first use in this function); did you mean 'S_NOATIME'?
> >>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
> >>  ^~
> >>  S_NOATIME
> >> drivers/staging/erofs/super.c: In function 'erofs_mount':
> >> drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
> >> 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
> >>, erofs_fill_super);
> >>   ^~~~
> >> In file included from include/linux/buffer_head.h:12:0,
> >>  from drivers/staging/erofs/super.c:14:
> >> include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned 
> >> int}' but argument is of type 'int (*)(struct super_block *, void *, int)'
> >>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
> >>^~
> >> drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
> >> 'mount_bdev'
> >>   return mount_bdev(fs_type, flags, dev_name,
> >>  ^~
> >> In file included from include/linux/buffer_head.h:12:0,
> >>  from drivers/staging/erofs/super.c:14:
> >> include/linux/fs.h:2151:23: note: declared here
> >>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
> >>^~
> >> drivers/staging/erofs/super.c: At top level:
> >> drivers/staging/erofs/super.c:518:20: error: initialization from 
> >> incompatible pointer type [-Werror=incompatible-pointer-types]
> >>   .mount  = erofs_mount,
> >> ^~~
> >> drivers/staging/erofs/super.c:518:20: note: (near initialization for 
> >> 'erofs_fs_type.mount')
> >> drivers/staging/erofs/super.c: In function 'erofs_remount':
> >> drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared (first 
> >> use in this function); did you mean 'IS_RDONLY'?
> >>   *flags |= MS_RDONLY;
> >> ^
> >> IS_RDONLY
> >> drivers/staging/erofs/super.c: At top level:
> >> drivers/staging/erofs/super.c:640:16: error: initialization from 
> >> incompatible pointer type [-Werror=incompatible-pointer-types]
> >>   .remount_fs = erofs_remount,
> >> ^
> >>
> >> Caused by various commits creating erofs in the staging tree interacting
> >> with various commits redoing the mount infrastructure in the vfs tree.
> >>
> >> I have disabed CONFIG_EROFS_FS for now:
> 
> Xiang has submitted several patches as below to fix compiling error on -next
> tree, could you consider to merge those temporary fixes into -next after 
> merging
> staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
> compiling and test?
> 
> staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, S_NOATIME)
> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html
> 
> staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html
> 
> staging: erofs: update .mount and .remount_sb
> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html

Why have these not been submitted to me for inclusion in my tree?

thanks,

greg k-h

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

[Chao Yu]

Hi Stephen,

Sorry, yesterday I missed this email due to my email filter.

On 2018/8/1 23:07, Stephen Rothwell wrote:
> Hi Chao,
> 
> On Wed, 1 Aug 2018 17:09:13 +0800 Chao Yu  wrote:
>>
>> Xiang has submitted several patches as below to fix compiling error on -next
>> tree, could you consider to merge those temporary fixes into -next after 
>> merging
>> staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
>> compiling and test?
>>
>> staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, 
>> S_NOATIME)
>> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html
>>
>> staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
>> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html
>>
>> staging: erofs: update .mount and .remount_sb
>> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html
> 
> OK, I will apply those tomorrow (actually later today :-)) and and stop
> disabling CONFIG_EROFS_FS.

OK, thanks for doing that, I and Xiang will keep an eye on compile result.

> 
>> BTW, for this condition that erofs was not covered by some common vfs
>> stuff changes in other one's tree, who should take care of those
>> missing fixes during coming next merge window?
> 
> It might be easiest for Greg to add the disabling CONFIG_EROFS_FS patch
> to the staging tree itself for his first pull request during the merge
> window and then send a second pull request (after the vfs and maybe the
> Xarray stuff has been merged by Linus) with these patches followed by a
> revert of the disabling patch.

Thanks for the advice, I think that's a good way to solve the issue, let me send
a patch to disable erofs compiling temporarily to avoid conflict during merge
window. :)

Thanks,

> 

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

[Chao Yu]

Hi Stephen,

Sorry, yesterday I missed this email due to my email filter.

On 2018/8/1 23:07, Stephen Rothwell wrote:
> Hi Chao,
> 
> On Wed, 1 Aug 2018 17:09:13 +0800 Chao Yu  wrote:
>>
>> Xiang has submitted several patches as below to fix compiling error on -next
>> tree, could you consider to merge those temporary fixes into -next after 
>> merging
>> staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
>> compiling and test?
>>
>> staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, 
>> S_NOATIME)
>> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html
>>
>> staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
>> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html
>>
>> staging: erofs: update .mount and .remount_sb
>> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html
> 
> OK, I will apply those tomorrow (actually later today :-)) and and stop
> disabling CONFIG_EROFS_FS.

OK, thanks for doing that, I and Xiang will keep an eye on compile result.

> 
>> BTW, for this condition that erofs was not covered by some common vfs
>> stuff changes in other one's tree, who should take care of those
>> missing fixes during coming next merge window?
> 
> It might be easiest for Greg to add the disabling CONFIG_EROFS_FS patch
> to the staging tree itself for his first pull request during the merge
> window and then send a second pull request (after the vfs and maybe the
> Xarray stuff has been merged by Linus) with these patches followed by a
> revert of the disabling patch.

Thanks for the advice, I think that's a good way to solve the issue, let me send
a patch to disable erofs compiling temporarily to avoid conflict during merge
window. :)

Thanks,

> 

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

[Stephen Rothwell]

Hi Chao,

On Wed, 1 Aug 2018 17:09:13 +0800 Chao Yu  wrote:
>
> Xiang has submitted several patches as below to fix compiling error on -next
> tree, could you consider to merge those temporary fixes into -next after 
> merging
> staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
> compiling and test?
> 
> staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, S_NOATIME)
> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html
> 
> staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html
> 
> staging: erofs: update .mount and .remount_sb
> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html

OK, I will apply those tomorrow (actually later today :-)) and and stop
disabling CONFIG_EROFS_FS.

> BTW, for this condition that erofs was not covered by some common vfs
> stuff changes in other one's tree, who should take care of those
> missing fixes during coming next merge window?

It might be easiest for Greg to add the disabling CONFIG_EROFS_FS patch
to the staging tree itself for his first pull request during the merge
window and then send a second pull request (after the vfs and maybe the
Xarray stuff has been merged by Linus) with these patches followed by a
revert of the disabling patch.

-- 
Cheers,
Stephen Rothwell


pgpprpBnlhWt3.pgp
Description: OpenPGP digital signature

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

[Stephen Rothwell]

Hi Chao,

On Wed, 1 Aug 2018 17:09:13 +0800 Chao Yu  wrote:
>
> Xiang has submitted several patches as below to fix compiling error on -next
> tree, could you consider to merge those temporary fixes into -next after 
> merging
> staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
> compiling and test?
> 
> staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, S_NOATIME)
> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html
> 
> staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html
> 
> staging: erofs: update .mount and .remount_sb
> https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html

OK, I will apply those tomorrow (actually later today :-)) and and stop
disabling CONFIG_EROFS_FS.

> BTW, for this condition that erofs was not covered by some common vfs
> stuff changes in other one's tree, who should take care of those
> missing fixes during coming next merge window?

It might be easiest for Greg to add the disabling CONFIG_EROFS_FS patch
to the staging tree itself for his first pull request during the merge
window and then send a second pull request (after the vfs and maybe the
Xarray stuff has been merged by Linus) with these patches followed by a
revert of the disabling patch.

-- 
Cheers,
Stephen Rothwell


pgpprpBnlhWt3.pgp
Description: OpenPGP digital signature

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

[Chao Yu]

Hi Stephen,

On 2018/7/30 14:31, Gao Xiang wrote:
> Hi Stephen,
> 
> On 2018/7/30 14:16, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> After merging the staging tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/staging/erofs/super.c: In function 'erofs_read_super':
>> drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared (first 
>> use in this function); did you mean 'IS_RDONLY'?
>>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
>>  ^
>>  IS_RDONLY
>> drivers/staging/erofs/super.c:343:17: note: each undeclared identifier is 
>> reported only once for each function it appears in
>> drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared (first 
>> use in this function); did you mean 'S_NOATIME'?
>>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
>>  ^~
>>  S_NOATIME
>> drivers/staging/erofs/super.c: In function 'erofs_mount':
>> drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
>> 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
>>, erofs_fill_super);
>>   ^~~~
>> In file included from include/linux/buffer_head.h:12:0,
>>  from drivers/staging/erofs/super.c:14:
>> include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned int}' 
>> but argument is of type 'int (*)(struct super_block *, void *, int)'
>>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>>^~
>> drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
>> 'mount_bdev'
>>   return mount_bdev(fs_type, flags, dev_name,
>>  ^~
>> In file included from include/linux/buffer_head.h:12:0,
>>  from drivers/staging/erofs/super.c:14:
>> include/linux/fs.h:2151:23: note: declared here
>>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>>^~
>> drivers/staging/erofs/super.c: At top level:
>> drivers/staging/erofs/super.c:518:20: error: initialization from 
>> incompatible pointer type [-Werror=incompatible-pointer-types]
>>   .mount  = erofs_mount,
>> ^~~
>> drivers/staging/erofs/super.c:518:20: note: (near initialization for 
>> 'erofs_fs_type.mount')
>> drivers/staging/erofs/super.c: In function 'erofs_remount':
>> drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared (first 
>> use in this function); did you mean 'IS_RDONLY'?
>>   *flags |= MS_RDONLY;
>> ^
>> IS_RDONLY
>> drivers/staging/erofs/super.c: At top level:
>> drivers/staging/erofs/super.c:640:16: error: initialization from 
>> incompatible pointer type [-Werror=incompatible-pointer-types]
>>   .remount_fs = erofs_remount,
>> ^
>>
>> Caused by various commits creating erofs in the staging tree interacting
>> with various commits redoing the mount infrastructure in the vfs tree.
>>
>> I have disabed CONFIG_EROFS_FS for now:

Xiang has submitted several patches as below to fix compiling error on -next
tree, could you consider to merge those temporary fixes into -next after merging
staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
compiling and test?

staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, S_NOATIME)
https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html

staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html

staging: erofs: update .mount and .remount_sb
https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html

BTW, for this condition that erofs was not covered by some common vfs stuff
changes in other one's tree, who should take care of those missing fixes during
coming next merge window?

Thanks,

> 
> I will fix them as soon as possible, and test it with the latest linux-next 
> code.
> It seems caused by some vfs changes.
> 
> Thanks,
> Gao Xiang
> 
> .
> 

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

[Chao Yu]

Hi Stephen,

On 2018/7/30 14:31, Gao Xiang wrote:
> Hi Stephen,
> 
> On 2018/7/30 14:16, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> After merging the staging tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/staging/erofs/super.c: In function 'erofs_read_super':
>> drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared (first 
>> use in this function); did you mean 'IS_RDONLY'?
>>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
>>  ^
>>  IS_RDONLY
>> drivers/staging/erofs/super.c:343:17: note: each undeclared identifier is 
>> reported only once for each function it appears in
>> drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared (first 
>> use in this function); did you mean 'S_NOATIME'?
>>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
>>  ^~
>>  S_NOATIME
>> drivers/staging/erofs/super.c: In function 'erofs_mount':
>> drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
>> 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
>>, erofs_fill_super);
>>   ^~~~
>> In file included from include/linux/buffer_head.h:12:0,
>>  from drivers/staging/erofs/super.c:14:
>> include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned int}' 
>> but argument is of type 'int (*)(struct super_block *, void *, int)'
>>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>>^~
>> drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
>> 'mount_bdev'
>>   return mount_bdev(fs_type, flags, dev_name,
>>  ^~
>> In file included from include/linux/buffer_head.h:12:0,
>>  from drivers/staging/erofs/super.c:14:
>> include/linux/fs.h:2151:23: note: declared here
>>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>>^~
>> drivers/staging/erofs/super.c: At top level:
>> drivers/staging/erofs/super.c:518:20: error: initialization from 
>> incompatible pointer type [-Werror=incompatible-pointer-types]
>>   .mount  = erofs_mount,
>> ^~~
>> drivers/staging/erofs/super.c:518:20: note: (near initialization for 
>> 'erofs_fs_type.mount')
>> drivers/staging/erofs/super.c: In function 'erofs_remount':
>> drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared (first 
>> use in this function); did you mean 'IS_RDONLY'?
>>   *flags |= MS_RDONLY;
>> ^
>> IS_RDONLY
>> drivers/staging/erofs/super.c: At top level:
>> drivers/staging/erofs/super.c:640:16: error: initialization from 
>> incompatible pointer type [-Werror=incompatible-pointer-types]
>>   .remount_fs = erofs_remount,
>> ^
>>
>> Caused by various commits creating erofs in the staging tree interacting
>> with various commits redoing the mount infrastructure in the vfs tree.
>>
>> I have disabed CONFIG_EROFS_FS for now:

Xiang has submitted several patches as below to fix compiling error on -next
tree, could you consider to merge those temporary fixes into -next after merging
staging-next's updates, and reenable CONFIG_EROFS_FS for further integrity
compiling and test?

staging: erofs: fix superblock/inode flags (MS_RDONLY -> SB_RDONLY, S_NOATIME)
https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html

staging: erofs: remove RADIX_TREE_EXCEPTIONAL_{ENTRY, SHIFT}
https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000283.html

staging: erofs: update .mount and .remount_sb
https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000285.html

BTW, for this condition that erofs was not covered by some common vfs stuff
changes in other one's tree, who should take care of those missing fixes during
coming next merge window?

Thanks,

> 
> I will fix them as soon as possible, and test it with the latest linux-next 
> code.
> It seems caused by some vfs changes.
> 
> Thanks,
> Gao Xiang
> 
> .
> 

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

[Gao Xiang]

On 2018/7/30 19:18, David Howells wrote:
> Gao Xiang  wrote:
> 
>> struct erofs_mount_private priv = {
>>  .dev_name = dev_name,
>>  .options = data
>> };
>> return mount_bdev(fs_type, flags, dev_name, , erofs_fill_super);
>>
>>
>> However, I have no idea if it is safe to do so in the future, so I also
>> change it into a more stardard way.
> 
> Hopefully, in the near future, you won't do it like this at all, but rather
> create an fs_context and then your filesystem would be able to munge that
> directly before calling mount_bdev().
> 

OK, got you. Look forword to the new fs_context feature and thanks for your 
help :)

Thanks,
Gao Xiang

> David
> 

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

[Gao Xiang]

On 2018/7/30 19:18, David Howells wrote:
> Gao Xiang  wrote:
> 
>> struct erofs_mount_private priv = {
>>  .dev_name = dev_name,
>>  .options = data
>> };
>> return mount_bdev(fs_type, flags, dev_name, , erofs_fill_super);
>>
>>
>> However, I have no idea if it is safe to do so in the future, so I also
>> change it into a more stardard way.
> 
> Hopefully, in the near future, you won't do it like this at all, but rather
> create an fs_context and then your filesystem would be able to munge that
> directly before calling mount_bdev().
> 

OK, got you. Look forword to the new fs_context feature and thanks for your 
help :)

Thanks,
Gao Xiang

> David
> 

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

[David Howells]

Gao Xiang  wrote:

> struct erofs_mount_private priv = {
>   .dev_name = dev_name,
>   .options = data
> };
> return mount_bdev(fs_type, flags, dev_name, , erofs_fill_super);
> 
> 
> However, I have no idea if it is safe to do so in the future, so I also
> change it into a more stardard way.

Hopefully, in the near future, you won't do it like this at all, but rather
create an fs_context and then your filesystem would be able to munge that
directly before calling mount_bdev().

David

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

[David Howells]

Gao Xiang  wrote:

> struct erofs_mount_private priv = {
>   .dev_name = dev_name,
>   .options = data
> };
> return mount_bdev(fs_type, flags, dev_name, , erofs_fill_super);
> 
> 
> However, I have no idea if it is safe to do so in the future, so I also
> change it into a more stardard way.

Hopefully, in the near future, you won't do it like this at all, but rather
create an fs_context and then your filesystem would be able to munge that
directly before calling mount_bdev().

David

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

[Gao Xiang]

Hi David,

Thanks for your reply :)

On 2018/7/30 17:47, David Howells wrote:
> Gao Xiang  wrote:
> 
>>>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
> 
> This should be using SB_* rather than MS_* for interaction with sb->s_flags.

Yes, I saw the related discussion and your submission in the linux-fsdevel 
mailing list last year. :D
The code of erofs once had to support from 3.13 ~ the current kernel, therefore 
I didn't turn MS_RDONLY into SB_RDONLY.
But it seems that "vfs: Suppress MS_* flag defs within the kernel unless 
explicitly enabled" tends to remove them all.

I have submitted a patch to linux-erofs mailing list for preview.
https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html

> 
>>> drivers/staging/erofs/super.c: In function 'erofs_mount':
>>> drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
>>> 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
>>>, erofs_fill_super);
>>>   ^~~~
>>> In file included from include/linux/buffer_head.h:12:0,
>>>  from drivers/staging/erofs/super.c:14:
>>> include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned int}' 
>>> but argument is of type 'int (*)(struct super_block *, void *, int)'
>>>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>>>^~
>>> drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
>>> 'mount_bdev'
>>>   return mount_bdev(fs_type, flags, dev_name,
>>>  ^~
> 
> There's a patch in Al Viro's tree that passes a size_t argument indicating the
> size of the mount data from mount down into the filesystem and into the
> helpers as the data may be on a kernel stack or in kernel .rodata rather than
> in a full page of its own.
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
> 
> Currently this is commit 0a191e4505a4f255e6513b49426213da69bf0e80
> 
> vfs: Require specification of size of mount data for internal mounts

I just fixed according to the latest linux-next tree (the same patchset, also 
for preview)
https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000284.html

Once I tend to use void *data to pass more mount arguments on stack, eg.

struct erofs_mount_private {
const char *dev_name;
char *options;
};
...
struct erofs_mount_private priv = {
.dev_name = dev_name,
.options = data
};
return mount_bdev(fs_type, flags, dev_name, , erofs_fill_super);


However, I have no idea if it is safe to do so in the future, so I also change 
it into a more stardard way.


BTW, It seems that Greg's staging tree doesn't have Al Viro's submission...
And I have little experience to handle that, so I just ask Chao for help...


Thanks for your kindly reminder :)

Thanks,
Gao Xiang

> 
> David
> 

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

[Gao Xiang]

Hi David,

Thanks for your reply :)

On 2018/7/30 17:47, David Howells wrote:
> Gao Xiang  wrote:
> 
>>>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
> 
> This should be using SB_* rather than MS_* for interaction with sb->s_flags.

Yes, I saw the related discussion and your submission in the linux-fsdevel 
mailing list last year. :D
The code of erofs once had to support from 3.13 ~ the current kernel, therefore 
I didn't turn MS_RDONLY into SB_RDONLY.
But it seems that "vfs: Suppress MS_* flag defs within the kernel unless 
explicitly enabled" tends to remove them all.

I have submitted a patch to linux-erofs mailing list for preview.
https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000282.html

> 
>>> drivers/staging/erofs/super.c: In function 'erofs_mount':
>>> drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
>>> 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
>>>, erofs_fill_super);
>>>   ^~~~
>>> In file included from include/linux/buffer_head.h:12:0,
>>>  from drivers/staging/erofs/super.c:14:
>>> include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned int}' 
>>> but argument is of type 'int (*)(struct super_block *, void *, int)'
>>>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>>>^~
>>> drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
>>> 'mount_bdev'
>>>   return mount_bdev(fs_type, flags, dev_name,
>>>  ^~
> 
> There's a patch in Al Viro's tree that passes a size_t argument indicating the
> size of the mount data from mount down into the filesystem and into the
> helpers as the data may be on a kernel stack or in kernel .rodata rather than
> in a full page of its own.
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
> 
> Currently this is commit 0a191e4505a4f255e6513b49426213da69bf0e80
> 
> vfs: Require specification of size of mount data for internal mounts

I just fixed according to the latest linux-next tree (the same patchset, also 
for preview)
https://lists.ozlabs.org/pipermail/linux-erofs/2018-July/000284.html

Once I tend to use void *data to pass more mount arguments on stack, eg.

struct erofs_mount_private {
const char *dev_name;
char *options;
};
...
struct erofs_mount_private priv = {
.dev_name = dev_name,
.options = data
};
return mount_bdev(fs_type, flags, dev_name, , erofs_fill_super);


However, I have no idea if it is safe to do so in the future, so I also change 
it into a more stardard way.


BTW, It seems that Greg's staging tree doesn't have Al Viro's submission...
And I have little experience to handle that, so I just ask Chao for help...


Thanks for your kindly reminder :)

Thanks,
Gao Xiang

> 
> David
> 

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

[David Howells]

Gao Xiang  wrote:

> >   sb->s_flags |= MS_RDONLY | MS_NOATIME;

This should be using SB_* rather than MS_* for interaction with sb->s_flags.

> > drivers/staging/erofs/super.c: In function 'erofs_mount':
> > drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
> > 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
> >, erofs_fill_super);
> >   ^~~~
> > In file included from include/linux/buffer_head.h:12:0,
> >  from drivers/staging/erofs/super.c:14:
> > include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned int}' 
> > but argument is of type 'int (*)(struct super_block *, void *, int)'
> >  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
> >^~
> > drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
> > 'mount_bdev'
> >   return mount_bdev(fs_type, flags, dev_name,
> >  ^~

There's a patch in Al Viro's tree that passes a size_t argument indicating the
size of the mount data from mount down into the filesystem and into the
helpers as the data may be on a kernel stack or in kernel .rodata rather than
in a full page of its own.

https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git

Currently this is commit 0a191e4505a4f255e6513b49426213da69bf0e80

vfs: Require specification of size of mount data for internal mounts

David

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

[David Howells]

Gao Xiang  wrote:

> >   sb->s_flags |= MS_RDONLY | MS_NOATIME;

This should be using SB_* rather than MS_* for interaction with sb->s_flags.

> > drivers/staging/erofs/super.c: In function 'erofs_mount':
> > drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
> > 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
> >, erofs_fill_super);
> >   ^~~~
> > In file included from include/linux/buffer_head.h:12:0,
> >  from drivers/staging/erofs/super.c:14:
> > include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned int}' 
> > but argument is of type 'int (*)(struct super_block *, void *, int)'
> >  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
> >^~
> > drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
> > 'mount_bdev'
> >   return mount_bdev(fs_type, flags, dev_name,
> >  ^~

There's a patch in Al Viro's tree that passes a size_t argument indicating the
size of the mount data from mount down into the filesystem and into the
helpers as the data may be on a kernel stack or in kernel .rodata rather than
in a full page of its own.

https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git

Currently this is commit 0a191e4505a4f255e6513b49426213da69bf0e80

vfs: Require specification of size of mount data for internal mounts

David

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

[Gao Xiang]

Hi Stephen,

On 2018/7/30 14:16, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/erofs/super.c: In function 'erofs_read_super':
> drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared (first 
> use in this function); did you mean 'IS_RDONLY'?
>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
>  ^
>  IS_RDONLY
> drivers/staging/erofs/super.c:343:17: note: each undeclared identifier is 
> reported only once for each function it appears in
> drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared (first 
> use in this function); did you mean 'S_NOATIME'?
>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
>  ^~
>  S_NOATIME
> drivers/staging/erofs/super.c: In function 'erofs_mount':
> drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
> 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
>, erofs_fill_super);
>   ^~~~
> In file included from include/linux/buffer_head.h:12:0,
>  from drivers/staging/erofs/super.c:14:
> include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned int}' 
> but argument is of type 'int (*)(struct super_block *, void *, int)'
>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>^~
> drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
> 'mount_bdev'
>   return mount_bdev(fs_type, flags, dev_name,
>  ^~
> In file included from include/linux/buffer_head.h:12:0,
>  from drivers/staging/erofs/super.c:14:
> include/linux/fs.h:2151:23: note: declared here
>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>^~
> drivers/staging/erofs/super.c: At top level:
> drivers/staging/erofs/super.c:518:20: error: initialization from incompatible 
> pointer type [-Werror=incompatible-pointer-types]
>   .mount  = erofs_mount,
> ^~~
> drivers/staging/erofs/super.c:518:20: note: (near initialization for 
> 'erofs_fs_type.mount')
> drivers/staging/erofs/super.c: In function 'erofs_remount':
> drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared (first 
> use in this function); did you mean 'IS_RDONLY'?
>   *flags |= MS_RDONLY;
> ^
> IS_RDONLY
> drivers/staging/erofs/super.c: At top level:
> drivers/staging/erofs/super.c:640:16: error: initialization from incompatible 
> pointer type [-Werror=incompatible-pointer-types]
>   .remount_fs = erofs_remount,
> ^
> 
> Caused by various commits creating erofs in the staging tree interacting
> with various commits redoing the mount infrastructure in the vfs tree.
> 
> I have disabed CONFIG_EROFS_FS for now:

I will fix them as soon as possible, and test it with the latest linux-next 
code.
It seems caused by some vfs changes.

Thanks,
Gao Xiang

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

[Gao Xiang]

Hi Stephen,

On 2018/7/30 14:16, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/erofs/super.c: In function 'erofs_read_super':
> drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared (first 
> use in this function); did you mean 'IS_RDONLY'?
>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
>  ^
>  IS_RDONLY
> drivers/staging/erofs/super.c:343:17: note: each undeclared identifier is 
> reported only once for each function it appears in
> drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared (first 
> use in this function); did you mean 'S_NOATIME'?
>   sb->s_flags |= MS_RDONLY | MS_NOATIME;
>  ^~
>  S_NOATIME
> drivers/staging/erofs/super.c: In function 'erofs_mount':
> drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
> 'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
>, erofs_fill_super);
>   ^~~~
> In file included from include/linux/buffer_head.h:12:0,
>  from drivers/staging/erofs/super.c:14:
> include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned int}' 
> but argument is of type 'int (*)(struct super_block *, void *, int)'
>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>^~
> drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
> 'mount_bdev'
>   return mount_bdev(fs_type, flags, dev_name,
>  ^~
> In file included from include/linux/buffer_head.h:12:0,
>  from drivers/staging/erofs/super.c:14:
> include/linux/fs.h:2151:23: note: declared here
>  extern struct dentry *mount_bdev(struct file_system_type *fs_type,
>^~
> drivers/staging/erofs/super.c: At top level:
> drivers/staging/erofs/super.c:518:20: error: initialization from incompatible 
> pointer type [-Werror=incompatible-pointer-types]
>   .mount  = erofs_mount,
> ^~~
> drivers/staging/erofs/super.c:518:20: note: (near initialization for 
> 'erofs_fs_type.mount')
> drivers/staging/erofs/super.c: In function 'erofs_remount':
> drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared (first 
> use in this function); did you mean 'IS_RDONLY'?
>   *flags |= MS_RDONLY;
> ^
> IS_RDONLY
> drivers/staging/erofs/super.c: At top level:
> drivers/staging/erofs/super.c:640:16: error: initialization from incompatible 
> pointer type [-Werror=incompatible-pointer-types]
>   .remount_fs = erofs_remount,
> ^
> 
> Caused by various commits creating erofs in the staging tree interacting
> with various commits redoing the mount infrastructure in the vfs tree.
> 
> I have disabed CONFIG_EROFS_FS for now:

I will fix them as soon as possible, and test it with the latest linux-next 
code.
It seems caused by some vfs changes.

Thanks,
Gao Xiang

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/erofs/super.c: In function 'erofs_read_super':
drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared (first use 
in this function); did you mean 'IS_RDONLY'?
  sb->s_flags |= MS_RDONLY | MS_NOATIME;
 ^
 IS_RDONLY
drivers/staging/erofs/super.c:343:17: note: each undeclared identifier is 
reported only once for each function it appears in
drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared (first use 
in this function); did you mean 'S_NOATIME'?
  sb->s_flags |= MS_RDONLY | MS_NOATIME;
 ^~
 S_NOATIME
drivers/staging/erofs/super.c: In function 'erofs_mount':
drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
   , erofs_fill_super);
  ^~~~
In file included from include/linux/buffer_head.h:12:0,
 from drivers/staging/erofs/super.c:14:
include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned int}' but 
argument is of type 'int (*)(struct super_block *, void *, int)'
 extern struct dentry *mount_bdev(struct file_system_type *fs_type,
   ^~
drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
'mount_bdev'
  return mount_bdev(fs_type, flags, dev_name,
 ^~
In file included from include/linux/buffer_head.h:12:0,
 from drivers/staging/erofs/super.c:14:
include/linux/fs.h:2151:23: note: declared here
 extern struct dentry *mount_bdev(struct file_system_type *fs_type,
   ^~
drivers/staging/erofs/super.c: At top level:
drivers/staging/erofs/super.c:518:20: error: initialization from incompatible 
pointer type [-Werror=incompatible-pointer-types]
  .mount  = erofs_mount,
^~~
drivers/staging/erofs/super.c:518:20: note: (near initialization for 
'erofs_fs_type.mount')
drivers/staging/erofs/super.c: In function 'erofs_remount':
drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared (first use 
in this function); did you mean 'IS_RDONLY'?
  *flags |= MS_RDONLY;
^
IS_RDONLY
drivers/staging/erofs/super.c: At top level:
drivers/staging/erofs/super.c:640:16: error: initialization from incompatible 
pointer type [-Werror=incompatible-pointer-types]
  .remount_fs = erofs_remount,
^

Caused by various commits creating erofs in the staging tree interacting
with various commits redoing the mount infrastructure in the vfs tree.

I have disabed CONFIG_EROFS_FS for now:

From: Stephen Rothwell 
Date: Mon, 30 Jul 2018 16:10:57 +1000
Subject: [PATCH] disable erofs for now

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/erofs/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/erofs/Kconfig b/drivers/staging/erofs/Kconfig
index 663b755bf2fb..b37d994aa687 100644
--- a/drivers/staging/erofs/Kconfig
+++ b/drivers/staging/erofs/Kconfig
@@ -3,6 +3,7 @@
 config EROFS_FS
tristate "EROFS filesystem support"
depends on BLOCK
+   depends on BROKEN
help
  EROFS(Enhanced Read-Only File System) is a lightweight
  read-only file system with modern designs (eg. page-sized
-- 
2.18.0

-- 
Cheers,
Stephen Rothwell


pgppZ_eT1V1CU.pgp
Description: OpenPGP digital signature

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/erofs/super.c: In function 'erofs_read_super':
drivers/staging/erofs/super.c:343:17: error: 'MS_RDONLY' undeclared (first use 
in this function); did you mean 'IS_RDONLY'?
  sb->s_flags |= MS_RDONLY | MS_NOATIME;
 ^
 IS_RDONLY
drivers/staging/erofs/super.c:343:17: note: each undeclared identifier is 
reported only once for each function it appears in
drivers/staging/erofs/super.c:343:29: error: 'MS_NOATIME' undeclared (first use 
in this function); did you mean 'S_NOATIME'?
  sb->s_flags |= MS_RDONLY | MS_NOATIME;
 ^~
 S_NOATIME
drivers/staging/erofs/super.c: In function 'erofs_mount':
drivers/staging/erofs/super.c:501:10: warning: passing argument 5 of 
'mount_bdev' makes integer from pointer without a cast [-Wint-conversion]
   , erofs_fill_super);
  ^~~~
In file included from include/linux/buffer_head.h:12:0,
 from drivers/staging/erofs/super.c:14:
include/linux/fs.h:2151:23: note: expected 'size_t {aka long unsigned int}' but 
argument is of type 'int (*)(struct super_block *, void *, int)'
 extern struct dentry *mount_bdev(struct file_system_type *fs_type,
   ^~
drivers/staging/erofs/super.c:500:9: error: too few arguments to function 
'mount_bdev'
  return mount_bdev(fs_type, flags, dev_name,
 ^~
In file included from include/linux/buffer_head.h:12:0,
 from drivers/staging/erofs/super.c:14:
include/linux/fs.h:2151:23: note: declared here
 extern struct dentry *mount_bdev(struct file_system_type *fs_type,
   ^~
drivers/staging/erofs/super.c: At top level:
drivers/staging/erofs/super.c:518:20: error: initialization from incompatible 
pointer type [-Werror=incompatible-pointer-types]
  .mount  = erofs_mount,
^~~
drivers/staging/erofs/super.c:518:20: note: (near initialization for 
'erofs_fs_type.mount')
drivers/staging/erofs/super.c: In function 'erofs_remount':
drivers/staging/erofs/super.c:630:12: error: 'MS_RDONLY' undeclared (first use 
in this function); did you mean 'IS_RDONLY'?
  *flags |= MS_RDONLY;
^
IS_RDONLY
drivers/staging/erofs/super.c: At top level:
drivers/staging/erofs/super.c:640:16: error: initialization from incompatible 
pointer type [-Werror=incompatible-pointer-types]
  .remount_fs = erofs_remount,
^

Caused by various commits creating erofs in the staging tree interacting
with various commits redoing the mount infrastructure in the vfs tree.

I have disabed CONFIG_EROFS_FS for now:

From: Stephen Rothwell 
Date: Mon, 30 Jul 2018 16:10:57 +1000
Subject: [PATCH] disable erofs for now

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/erofs/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/erofs/Kconfig b/drivers/staging/erofs/Kconfig
index 663b755bf2fb..b37d994aa687 100644
--- a/drivers/staging/erofs/Kconfig
+++ b/drivers/staging/erofs/Kconfig
@@ -3,6 +3,7 @@
 config EROFS_FS
tristate "EROFS filesystem support"
depends on BLOCK
+   depends on BROKEN
help
  EROFS(Enhanced Read-Only File System) is a lightweight
  read-only file system with modern designs (eg. page-sized
-- 
2.18.0

-- 
Cheers,
Stephen Rothwell


pgppZ_eT1V1CU.pgp
Description: OpenPGP digital signature

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

[Greg KH]

On Tue, Jul 17, 2018 at 09:49:45AM +0300, Ivan Safonov wrote:
> On 07/17/2018 09:28 AM, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > After merging the staging tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/staging/rtl8188eu/core/rtw_security.c: In function 
> > 'rtw_tkip_decrypt':
> > drivers/staging/rtl8188eu/core/rtw_security.c:399:21: error: storage size 
> > of 'mycontext' isn't known
> >struct arc4context mycontext;
> >   ^
> > drivers/staging/rtl8188eu/core/rtw_security.c:437:4: error: implicit 
> > declaration of function 'phase1' [-Werror=implicit-function-declaration]
> >  phase1((u16 *)[0], prwskey, >ta[0], pnh);
> >  ^~
> > drivers/staging/rtl8188eu/core/rtw_security.c:438:4: error: implicit 
> > declaration of function 'phase2' [-Werror=implicit-function-declaration]
> >  phase2([0], prwskey, (unsigned short *)[0], pnl);
> >  ^~
> > drivers/staging/rtl8188eu/core/rtw_security.c:442:4: error: implicit 
> > declaration of function 'arcfour_init'; did you mean 'rcu_init'? 
> > [-Werror=implicit-function-declaration]
> >  arcfour_init(, rc4key, 16);
> >  ^~~~
> >  rcu_init
> > drivers/staging/rtl8188eu/core/rtw_security.c:443:4: error: implicit 
> > declaration of function 'arcfour_encrypt'; did you mean 'rtw_wep_encrypt'? 
> > [-Werror=implicit-function-declaration]
> >  arcfour_encrypt(, payload, payload, length);
> >  ^~~
> >  rtw_wep_encrypt
> > drivers/staging/rtl8188eu/core/rtw_security.c:445:23: error: implicit 
> > declaration of function 'getcrc32'; did you mean 'get_cred'? 
> > [-Werror=implicit-function-declaration]
> >  *((__le32 *)crc) = getcrc32(payload, length-4);
> > ^~~~
> > get_cred
> > drivers/staging/rtl8188eu/core/rtw_security.c:399:21: warning: unused 
> > variable 'mycontext' [-Wunused-variable]
> >struct arc4context mycontext;
> >   ^
> > 
> > Caused by commit
> > 
> >0d4876f4e977 ("staging:r8188eu: Use lib80211 to encrypt (TKIP) tx 
> > frames")
> > 
> > interacting with commit
> > 
> >69a1d98c831e ("Revert "staging:r8188eu: Use lib80211 to support TKIP"")
> > 
> > from the staging.current tree.
> > 
> > I just reverted the staging.current commit ...
> > 
> All commits using lib8022 in r8188eu cause the system to crash. I will
> revert 5 commits in the near future (2 for decryption and 3 for encryption)
> in one patch, it will be bit easier.
> 
> I apologize for such an unpleasant situation.

Not a problem, thanks for fixing this up.  If you need me to merge the
two branches together right now in order to make the patch apply easier,
please let me know and I will be glad to do so.

thanks,

greg k-h

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

[Greg KH]

On Tue, Jul 17, 2018 at 09:49:45AM +0300, Ivan Safonov wrote:
> On 07/17/2018 09:28 AM, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > After merging the staging tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/staging/rtl8188eu/core/rtw_security.c: In function 
> > 'rtw_tkip_decrypt':
> > drivers/staging/rtl8188eu/core/rtw_security.c:399:21: error: storage size 
> > of 'mycontext' isn't known
> >struct arc4context mycontext;
> >   ^
> > drivers/staging/rtl8188eu/core/rtw_security.c:437:4: error: implicit 
> > declaration of function 'phase1' [-Werror=implicit-function-declaration]
> >  phase1((u16 *)[0], prwskey, >ta[0], pnh);
> >  ^~
> > drivers/staging/rtl8188eu/core/rtw_security.c:438:4: error: implicit 
> > declaration of function 'phase2' [-Werror=implicit-function-declaration]
> >  phase2([0], prwskey, (unsigned short *)[0], pnl);
> >  ^~
> > drivers/staging/rtl8188eu/core/rtw_security.c:442:4: error: implicit 
> > declaration of function 'arcfour_init'; did you mean 'rcu_init'? 
> > [-Werror=implicit-function-declaration]
> >  arcfour_init(, rc4key, 16);
> >  ^~~~
> >  rcu_init
> > drivers/staging/rtl8188eu/core/rtw_security.c:443:4: error: implicit 
> > declaration of function 'arcfour_encrypt'; did you mean 'rtw_wep_encrypt'? 
> > [-Werror=implicit-function-declaration]
> >  arcfour_encrypt(, payload, payload, length);
> >  ^~~
> >  rtw_wep_encrypt
> > drivers/staging/rtl8188eu/core/rtw_security.c:445:23: error: implicit 
> > declaration of function 'getcrc32'; did you mean 'get_cred'? 
> > [-Werror=implicit-function-declaration]
> >  *((__le32 *)crc) = getcrc32(payload, length-4);
> > ^~~~
> > get_cred
> > drivers/staging/rtl8188eu/core/rtw_security.c:399:21: warning: unused 
> > variable 'mycontext' [-Wunused-variable]
> >struct arc4context mycontext;
> >   ^
> > 
> > Caused by commit
> > 
> >0d4876f4e977 ("staging:r8188eu: Use lib80211 to encrypt (TKIP) tx 
> > frames")
> > 
> > interacting with commit
> > 
> >69a1d98c831e ("Revert "staging:r8188eu: Use lib80211 to support TKIP"")
> > 
> > from the staging.current tree.
> > 
> > I just reverted the staging.current commit ...
> > 
> All commits using lib8022 in r8188eu cause the system to crash. I will
> revert 5 commits in the near future (2 for decryption and 3 for encryption)
> in one patch, it will be bit easier.
> 
> I apologize for such an unpleasant situation.

Not a problem, thanks for fixing this up.  If you need me to merge the
two branches together right now in order to make the patch apply easier,
please let me know and I will be glad to do so.

thanks,

greg k-h

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

[Ivan Safonov]

On 07/17/2018 09:28 AM, Stephen Rothwell wrote:

Hi Greg,

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

drivers/staging/rtl8188eu/core/rtw_security.c: In function 'rtw_tkip_decrypt':
drivers/staging/rtl8188eu/core/rtw_security.c:399:21: error: storage size of 
'mycontext' isn't known
   struct arc4context mycontext;
  ^
drivers/staging/rtl8188eu/core/rtw_security.c:437:4: error: implicit 
declaration of function 'phase1' [-Werror=implicit-function-declaration]
 phase1((u16 *)[0], prwskey, >ta[0], pnh);
 ^~
drivers/staging/rtl8188eu/core/rtw_security.c:438:4: error: implicit 
declaration of function 'phase2' [-Werror=implicit-function-declaration]
 phase2([0], prwskey, (unsigned short *)[0], pnl);
 ^~
drivers/staging/rtl8188eu/core/rtw_security.c:442:4: error: implicit 
declaration of function 'arcfour_init'; did you mean 'rcu_init'? 
[-Werror=implicit-function-declaration]
 arcfour_init(, rc4key, 16);
 ^~~~
 rcu_init
drivers/staging/rtl8188eu/core/rtw_security.c:443:4: error: implicit 
declaration of function 'arcfour_encrypt'; did you mean 'rtw_wep_encrypt'? 
[-Werror=implicit-function-declaration]
 arcfour_encrypt(, payload, payload, length);
 ^~~
 rtw_wep_encrypt
drivers/staging/rtl8188eu/core/rtw_security.c:445:23: error: implicit 
declaration of function 'getcrc32'; did you mean 'get_cred'? 
[-Werror=implicit-function-declaration]
 *((__le32 *)crc) = getcrc32(payload, length-4);
^~~~
get_cred
drivers/staging/rtl8188eu/core/rtw_security.c:399:21: warning: unused variable 
'mycontext' [-Wunused-variable]
   struct arc4context mycontext;
  ^

Caused by commit

   0d4876f4e977 ("staging:r8188eu: Use lib80211 to encrypt (TKIP) tx frames")

interacting with commit

   69a1d98c831e ("Revert "staging:r8188eu: Use lib80211 to support TKIP"")

from the staging.current tree.

I just reverted the staging.current commit ...

All commits using lib8022 in r8188eu cause the system to crash. I will 
revert 5 commits in the near future (2 for decryption and 3 for 
encryption) in one patch, it will be bit easier.


I apologize for such an unpleasant situation.

Ivan Safonov.

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

[Ivan Safonov]

On 07/17/2018 09:28 AM, Stephen Rothwell wrote:

Hi Greg,

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

drivers/staging/rtl8188eu/core/rtw_security.c: In function 'rtw_tkip_decrypt':
drivers/staging/rtl8188eu/core/rtw_security.c:399:21: error: storage size of 
'mycontext' isn't known
   struct arc4context mycontext;
  ^
drivers/staging/rtl8188eu/core/rtw_security.c:437:4: error: implicit 
declaration of function 'phase1' [-Werror=implicit-function-declaration]
 phase1((u16 *)[0], prwskey, >ta[0], pnh);
 ^~
drivers/staging/rtl8188eu/core/rtw_security.c:438:4: error: implicit 
declaration of function 'phase2' [-Werror=implicit-function-declaration]
 phase2([0], prwskey, (unsigned short *)[0], pnl);
 ^~
drivers/staging/rtl8188eu/core/rtw_security.c:442:4: error: implicit 
declaration of function 'arcfour_init'; did you mean 'rcu_init'? 
[-Werror=implicit-function-declaration]
 arcfour_init(, rc4key, 16);
 ^~~~
 rcu_init
drivers/staging/rtl8188eu/core/rtw_security.c:443:4: error: implicit 
declaration of function 'arcfour_encrypt'; did you mean 'rtw_wep_encrypt'? 
[-Werror=implicit-function-declaration]
 arcfour_encrypt(, payload, payload, length);
 ^~~
 rtw_wep_encrypt
drivers/staging/rtl8188eu/core/rtw_security.c:445:23: error: implicit 
declaration of function 'getcrc32'; did you mean 'get_cred'? 
[-Werror=implicit-function-declaration]
 *((__le32 *)crc) = getcrc32(payload, length-4);
^~~~
get_cred
drivers/staging/rtl8188eu/core/rtw_security.c:399:21: warning: unused variable 
'mycontext' [-Wunused-variable]
   struct arc4context mycontext;
  ^

Caused by commit

   0d4876f4e977 ("staging:r8188eu: Use lib80211 to encrypt (TKIP) tx frames")

interacting with commit

   69a1d98c831e ("Revert "staging:r8188eu: Use lib80211 to support TKIP"")

from the staging.current tree.

I just reverted the staging.current commit ...

All commits using lib8022 in r8188eu cause the system to crash. I will 
revert 5 commits in the near future (2 for decryption and 3 for 
encryption) in one patch, it will be bit easier.


I apologize for such an unpleasant situation.

Ivan Safonov.

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/rtl8188eu/core/rtw_security.c: In function 'rtw_tkip_decrypt':
drivers/staging/rtl8188eu/core/rtw_security.c:399:21: error: storage size of 
'mycontext' isn't known
  struct arc4context mycontext;
 ^
drivers/staging/rtl8188eu/core/rtw_security.c:437:4: error: implicit 
declaration of function 'phase1' [-Werror=implicit-function-declaration]
phase1((u16 *)[0], prwskey, >ta[0], pnh);
^~
drivers/staging/rtl8188eu/core/rtw_security.c:438:4: error: implicit 
declaration of function 'phase2' [-Werror=implicit-function-declaration]
phase2([0], prwskey, (unsigned short *)[0], pnl);
^~
drivers/staging/rtl8188eu/core/rtw_security.c:442:4: error: implicit 
declaration of function 'arcfour_init'; did you mean 'rcu_init'? 
[-Werror=implicit-function-declaration]
arcfour_init(, rc4key, 16);
^~~~
rcu_init
drivers/staging/rtl8188eu/core/rtw_security.c:443:4: error: implicit 
declaration of function 'arcfour_encrypt'; did you mean 'rtw_wep_encrypt'? 
[-Werror=implicit-function-declaration]
arcfour_encrypt(, payload, payload, length);
^~~
rtw_wep_encrypt
drivers/staging/rtl8188eu/core/rtw_security.c:445:23: error: implicit 
declaration of function 'getcrc32'; did you mean 'get_cred'? 
[-Werror=implicit-function-declaration]
*((__le32 *)crc) = getcrc32(payload, length-4);
   ^~~~
   get_cred
drivers/staging/rtl8188eu/core/rtw_security.c:399:21: warning: unused variable 
'mycontext' [-Wunused-variable]
  struct arc4context mycontext;
 ^

Caused by commit

  0d4876f4e977 ("staging:r8188eu: Use lib80211 to encrypt (TKIP) tx frames")

interacting with commit

  69a1d98c831e ("Revert "staging:r8188eu: Use lib80211 to support TKIP"")

from the staging.current tree.

I just reverted the staging.current commit ...

-- 
Cheers,
Stephen Rothwell


pgpSboS7U2qFE.pgp
Description: OpenPGP digital signature

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/rtl8188eu/core/rtw_security.c: In function 'rtw_tkip_decrypt':
drivers/staging/rtl8188eu/core/rtw_security.c:399:21: error: storage size of 
'mycontext' isn't known
  struct arc4context mycontext;
 ^
drivers/staging/rtl8188eu/core/rtw_security.c:437:4: error: implicit 
declaration of function 'phase1' [-Werror=implicit-function-declaration]
phase1((u16 *)[0], prwskey, >ta[0], pnh);
^~
drivers/staging/rtl8188eu/core/rtw_security.c:438:4: error: implicit 
declaration of function 'phase2' [-Werror=implicit-function-declaration]
phase2([0], prwskey, (unsigned short *)[0], pnl);
^~
drivers/staging/rtl8188eu/core/rtw_security.c:442:4: error: implicit 
declaration of function 'arcfour_init'; did you mean 'rcu_init'? 
[-Werror=implicit-function-declaration]
arcfour_init(, rc4key, 16);
^~~~
rcu_init
drivers/staging/rtl8188eu/core/rtw_security.c:443:4: error: implicit 
declaration of function 'arcfour_encrypt'; did you mean 'rtw_wep_encrypt'? 
[-Werror=implicit-function-declaration]
arcfour_encrypt(, payload, payload, length);
^~~
rtw_wep_encrypt
drivers/staging/rtl8188eu/core/rtw_security.c:445:23: error: implicit 
declaration of function 'getcrc32'; did you mean 'get_cred'? 
[-Werror=implicit-function-declaration]
*((__le32 *)crc) = getcrc32(payload, length-4);
   ^~~~
   get_cred
drivers/staging/rtl8188eu/core/rtw_security.c:399:21: warning: unused variable 
'mycontext' [-Wunused-variable]
  struct arc4context mycontext;
 ^

Caused by commit

  0d4876f4e977 ("staging:r8188eu: Use lib80211 to encrypt (TKIP) tx frames")

interacting with commit

  69a1d98c831e ("Revert "staging:r8188eu: Use lib80211 to support TKIP"")

from the staging.current tree.

I just reverted the staging.current commit ...

-- 
Cheers,
Stephen Rothwell


pgpSboS7U2qFE.pgp
Description: OpenPGP digital signature

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

[Jonathan Cameron]

On 26 September 2017 04:54:41 BST, Stephen Rothwell  
wrote:
>Hi Greg,
>
>After merging the staging tree, today's linux-next build (x86_64
>allmodconfig) failed like this:
>
>drivers/iio/counter/stm32-lptimer-cnt.c:181:2: error: unknown field
>'driver_module' specified in initializer
>  .driver_module = THIS_MODULE,
>  ^
>In file included from include/linux/linkage.h:6:0,
> from include/linux/kernel.h:6,
> from include/asm-generic/bug.h:15,
> from arch/x86/include/asm/bug.h:81,
> from include/linux/bug.h:4,
> from include/linux/bitfield.h:18,
> from drivers/iio/counter/stm32-lptimer-cnt.c:13:
>include/linux/export.h:35:21: error: initialization from incompatible
>pointer type [-Werror=incompatible-pointer-types]
> #define THIS_MODULE (&__this_module)
> ^
>drivers/iio/counter/stm32-lptimer-cnt.c:181:19: note: in expansion of
>macro 'THIS_MODULE'
>  .driver_module = THIS_MODULE,
>   ^
>include/linux/export.h:35:21: note: (near initialization for
>'stm32_lptim_cnt_iio_info.write_raw_get_fmt')
> #define THIS_MODULE (&__this_module)
> ^
>drivers/iio/counter/stm32-lptimer-cnt.c:181:19: note: in expansion of
>macro 'THIS_MODULE'
>  .driver_module = THIS_MODULE,
>   ^
>
>Caused by commit
>
>97623c0a80a6 ("iio: drop iio_info.driver_module and
>iio_trigger_ops.owner.")
>
>I have used the staging tree from next-20170922 for today.

Sorry, my mess up. Will send a patch dropping that line shortly..

Jonathan

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

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

[Jonathan Cameron]

On 26 September 2017 04:54:41 BST, Stephen Rothwell  
wrote:
>Hi Greg,
>
>After merging the staging tree, today's linux-next build (x86_64
>allmodconfig) failed like this:
>
>drivers/iio/counter/stm32-lptimer-cnt.c:181:2: error: unknown field
>'driver_module' specified in initializer
>  .driver_module = THIS_MODULE,
>  ^
>In file included from include/linux/linkage.h:6:0,
> from include/linux/kernel.h:6,
> from include/asm-generic/bug.h:15,
> from arch/x86/include/asm/bug.h:81,
> from include/linux/bug.h:4,
> from include/linux/bitfield.h:18,
> from drivers/iio/counter/stm32-lptimer-cnt.c:13:
>include/linux/export.h:35:21: error: initialization from incompatible
>pointer type [-Werror=incompatible-pointer-types]
> #define THIS_MODULE (&__this_module)
> ^
>drivers/iio/counter/stm32-lptimer-cnt.c:181:19: note: in expansion of
>macro 'THIS_MODULE'
>  .driver_module = THIS_MODULE,
>   ^
>include/linux/export.h:35:21: note: (near initialization for
>'stm32_lptim_cnt_iio_info.write_raw_get_fmt')
> #define THIS_MODULE (&__this_module)
> ^
>drivers/iio/counter/stm32-lptimer-cnt.c:181:19: note: in expansion of
>macro 'THIS_MODULE'
>  .driver_module = THIS_MODULE,
>   ^
>
>Caused by commit
>
>97623c0a80a6 ("iio: drop iio_info.driver_module and
>iio_trigger_ops.owner.")
>
>I have used the staging tree from next-20170922 for today.

Sorry, my mess up. Will send a patch dropping that line shortly..

Jonathan

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/iio/counter/stm32-lptimer-cnt.c:181:2: error: unknown field 
'driver_module' specified in initializer
  .driver_module = THIS_MODULE,
  ^
In file included from include/linux/linkage.h:6:0,
 from include/linux/kernel.h:6,
 from include/asm-generic/bug.h:15,
 from arch/x86/include/asm/bug.h:81,
 from include/linux/bug.h:4,
 from include/linux/bitfield.h:18,
 from drivers/iio/counter/stm32-lptimer-cnt.c:13:
include/linux/export.h:35:21: error: initialization from incompatible pointer 
type [-Werror=incompatible-pointer-types]
 #define THIS_MODULE (&__this_module)
 ^
drivers/iio/counter/stm32-lptimer-cnt.c:181:19: note: in expansion of macro 
'THIS_MODULE'
  .driver_module = THIS_MODULE,
   ^
include/linux/export.h:35:21: note: (near initialization for 
'stm32_lptim_cnt_iio_info.write_raw_get_fmt')
 #define THIS_MODULE (&__this_module)
 ^
drivers/iio/counter/stm32-lptimer-cnt.c:181:19: note: in expansion of macro 
'THIS_MODULE'
  .driver_module = THIS_MODULE,
   ^

Caused by commit

  97623c0a80a6 ("iio: drop iio_info.driver_module and iio_trigger_ops.owner.")

I have used the staging tree from next-20170922 for today.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/iio/counter/stm32-lptimer-cnt.c:181:2: error: unknown field 
'driver_module' specified in initializer
  .driver_module = THIS_MODULE,
  ^
In file included from include/linux/linkage.h:6:0,
 from include/linux/kernel.h:6,
 from include/asm-generic/bug.h:15,
 from arch/x86/include/asm/bug.h:81,
 from include/linux/bug.h:4,
 from include/linux/bitfield.h:18,
 from drivers/iio/counter/stm32-lptimer-cnt.c:13:
include/linux/export.h:35:21: error: initialization from incompatible pointer 
type [-Werror=incompatible-pointer-types]
 #define THIS_MODULE (&__this_module)
 ^
drivers/iio/counter/stm32-lptimer-cnt.c:181:19: note: in expansion of macro 
'THIS_MODULE'
  .driver_module = THIS_MODULE,
   ^
include/linux/export.h:35:21: note: (near initialization for 
'stm32_lptim_cnt_iio_info.write_raw_get_fmt')
 #define THIS_MODULE (&__this_module)
 ^
drivers/iio/counter/stm32-lptimer-cnt.c:181:19: note: in expansion of macro 
'THIS_MODULE'
  .driver_module = THIS_MODULE,
   ^

Caused by commit

  97623c0a80a6 ("iio: drop iio_info.driver_module and iio_trigger_ops.owner.")

I have used the staging tree from next-20170922 for today.

-- 
Cheers,
Stephen Rothwell

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

[Greg KH]

On Mon, May 01, 2017 at 02:42:18PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c: In function 
> 'rtw_cfg80211_indicate_connect':
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:552:6: error: passing 
> argument 2 of 'cfg80211_roamed' from incompatible pointer type 
> [-Werror=incompatible-pointer-types]
> , notify_channel
>   ^
> In file included from 
> drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
>  from drivers/staging/rtl8723bs/include/osdep_service.h:23,
>  from drivers/staging/rtl8723bs/include/drv_types.h:29,
>  from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
> include/net/cfg80211.h:5435:6: note: expected 'struct cfg80211_roam_info *' 
> but argument is of type 'struct ieee80211_channel *'
>  void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
>   ^
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:553:6: warning: passing 
> argument 3 of 'cfg80211_roamed' makes integer from pointer without a cast 
> [-Wint-conversion]
> , cur_network->network.MacAddress
>   ^
> In file included from 
> drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
>  from drivers/staging/rtl8723bs/include/osdep_service.h:23,
>  from drivers/staging/rtl8723bs/include/drv_types.h:29,
>  from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
> include/net/cfg80211.h:5435:6: note: expected 'gfp_t {aka unsigned int}' but 
> argument is of type 'unsigned char *'
>  void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
>   ^
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:551:3: error: too many 
> arguments to function 'cfg80211_roamed'
>cfg80211_roamed(padapter->pnetdev
>^
> In file included from 
> drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
>  from drivers/staging/rtl8723bs/include/osdep_service.h:23,
>  from drivers/staging/rtl8723bs/include/drv_types.h:29,
>  from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
> include/net/cfg80211.h:5435:6: note: declared here
>  void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
>   ^
> 
> Caused by commit
> 
>   554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
> 
> interacting with commit
> 
>   29ce6ecbb83c ("cfg80211: unify cfg80211_roamed() and cfg80211_roamed_bss()")
> 
> from the mac80211-next tree.
> 
> I applied the following merge fix patch.
> 
> From: Stephen Rothwell 
> Date: Mon, 1 May 2017 14:34:17 +1000
> Subject: [PATCH] staging: rtl8723bs: fix up for cfg80211_roamed() API change
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 20 
>  1 file changed, 12 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
> b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> index f092a72bffda..5e7a61f24f8d 100644
> --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> @@ -542,20 +542,24 @@ void rtw_cfg80211_indicate_connect(struct adapter 
> *padapter)
>   struct ieee80211_channel *notify_channel;
>   u32 freq;
>   u16 channel = cur_network->network.Configuration.DSConfig;
> + struct cfg80211_roam_info roam_info = {};
>  
>   freq = rtw_ieee80211_channel_to_frequency(channel, 
> NL80211_BAND_2GHZ);
>  
>   notify_channel = ieee80211_get_channel(wiphy, freq);
>  
>   DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", 
> FUNC_ADPT_ARG(padapter));
> - cfg80211_roamed(padapter->pnetdev
> - , notify_channel
> - , cur_network->network.MacAddress
> - , pmlmepriv->assoc_req+sizeof(struct 
> ieee80211_hdr_3addr)+2
> - , pmlmepriv->assoc_req_len-sizeof(struct 
> ieee80211_hdr_3addr)-2
> - , pmlmepriv->assoc_rsp+sizeof(struct 
> ieee80211_hdr_3addr)+6
> - , pmlmepriv->assoc_rsp_len-sizeof(struct 
> ieee80211_hdr_3addr)-6
> - , GFP_ATOMIC);
> + roam_info.channel = notify_channel;
> + roam_info.bssid = cur_network->network.MacAddress;
> + roam_info.req_ie =
> + pmlmepriv->assoc_req+sizeof(struct 
> ieee80211_hdr_3addr)+2;
> + roam_info.req_ie_len =
> + pmlmepriv->assoc_req_len-sizeof(struct 
> ieee80211_hdr_3addr)-2;
> + roam_info.resp_ie =
> + pmlmepriv->assoc_rsp+sizeof(struct 
> ieee80211_hdr_3addr)+6;
> + roam_info.resp_ie_len =
> 

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

[Greg KH]

On Mon, May 01, 2017 at 02:42:18PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c: In function 
> 'rtw_cfg80211_indicate_connect':
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:552:6: error: passing 
> argument 2 of 'cfg80211_roamed' from incompatible pointer type 
> [-Werror=incompatible-pointer-types]
> , notify_channel
>   ^
> In file included from 
> drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
>  from drivers/staging/rtl8723bs/include/osdep_service.h:23,
>  from drivers/staging/rtl8723bs/include/drv_types.h:29,
>  from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
> include/net/cfg80211.h:5435:6: note: expected 'struct cfg80211_roam_info *' 
> but argument is of type 'struct ieee80211_channel *'
>  void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
>   ^
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:553:6: warning: passing 
> argument 3 of 'cfg80211_roamed' makes integer from pointer without a cast 
> [-Wint-conversion]
> , cur_network->network.MacAddress
>   ^
> In file included from 
> drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
>  from drivers/staging/rtl8723bs/include/osdep_service.h:23,
>  from drivers/staging/rtl8723bs/include/drv_types.h:29,
>  from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
> include/net/cfg80211.h:5435:6: note: expected 'gfp_t {aka unsigned int}' but 
> argument is of type 'unsigned char *'
>  void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
>   ^
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:551:3: error: too many 
> arguments to function 'cfg80211_roamed'
>cfg80211_roamed(padapter->pnetdev
>^
> In file included from 
> drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
>  from drivers/staging/rtl8723bs/include/osdep_service.h:23,
>  from drivers/staging/rtl8723bs/include/drv_types.h:29,
>  from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
> include/net/cfg80211.h:5435:6: note: declared here
>  void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
>   ^
> 
> Caused by commit
> 
>   554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
> 
> interacting with commit
> 
>   29ce6ecbb83c ("cfg80211: unify cfg80211_roamed() and cfg80211_roamed_bss()")
> 
> from the mac80211-next tree.
> 
> I applied the following merge fix patch.
> 
> From: Stephen Rothwell 
> Date: Mon, 1 May 2017 14:34:17 +1000
> Subject: [PATCH] staging: rtl8723bs: fix up for cfg80211_roamed() API change
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 20 
>  1 file changed, 12 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
> b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> index f092a72bffda..5e7a61f24f8d 100644
> --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> @@ -542,20 +542,24 @@ void rtw_cfg80211_indicate_connect(struct adapter 
> *padapter)
>   struct ieee80211_channel *notify_channel;
>   u32 freq;
>   u16 channel = cur_network->network.Configuration.DSConfig;
> + struct cfg80211_roam_info roam_info = {};
>  
>   freq = rtw_ieee80211_channel_to_frequency(channel, 
> NL80211_BAND_2GHZ);
>  
>   notify_channel = ieee80211_get_channel(wiphy, freq);
>  
>   DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", 
> FUNC_ADPT_ARG(padapter));
> - cfg80211_roamed(padapter->pnetdev
> - , notify_channel
> - , cur_network->network.MacAddress
> - , pmlmepriv->assoc_req+sizeof(struct 
> ieee80211_hdr_3addr)+2
> - , pmlmepriv->assoc_req_len-sizeof(struct 
> ieee80211_hdr_3addr)-2
> - , pmlmepriv->assoc_rsp+sizeof(struct 
> ieee80211_hdr_3addr)+6
> - , pmlmepriv->assoc_rsp_len-sizeof(struct 
> ieee80211_hdr_3addr)-6
> - , GFP_ATOMIC);
> + roam_info.channel = notify_channel;
> + roam_info.bssid = cur_network->network.MacAddress;
> + roam_info.req_ie =
> + pmlmepriv->assoc_req+sizeof(struct 
> ieee80211_hdr_3addr)+2;
> + roam_info.req_ie_len =
> + pmlmepriv->assoc_req_len-sizeof(struct 
> ieee80211_hdr_3addr)-2;
> + roam_info.resp_ie =
> + pmlmepriv->assoc_rsp+sizeof(struct 
> ieee80211_hdr_3addr)+6;
> + roam_info.resp_ie_len =
> + 

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c: In function 
'rtw_cfg80211_indicate_connect':
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:552:6: error: passing 
argument 2 of 'cfg80211_roamed' from incompatible pointer type 
[-Werror=incompatible-pointer-types]
, notify_channel
  ^
In file included from 
drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
 from drivers/staging/rtl8723bs/include/osdep_service.h:23,
 from drivers/staging/rtl8723bs/include/drv_types.h:29,
 from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
include/net/cfg80211.h:5435:6: note: expected 'struct cfg80211_roam_info *' but 
argument is of type 'struct ieee80211_channel *'
 void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
  ^
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:553:6: warning: passing 
argument 3 of 'cfg80211_roamed' makes integer from pointer without a cast 
[-Wint-conversion]
, cur_network->network.MacAddress
  ^
In file included from 
drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
 from drivers/staging/rtl8723bs/include/osdep_service.h:23,
 from drivers/staging/rtl8723bs/include/drv_types.h:29,
 from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
include/net/cfg80211.h:5435:6: note: expected 'gfp_t {aka unsigned int}' but 
argument is of type 'unsigned char *'
 void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
  ^
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:551:3: error: too many 
arguments to function 'cfg80211_roamed'
   cfg80211_roamed(padapter->pnetdev
   ^
In file included from 
drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
 from drivers/staging/rtl8723bs/include/osdep_service.h:23,
 from drivers/staging/rtl8723bs/include/drv_types.h:29,
 from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
include/net/cfg80211.h:5435:6: note: declared here
 void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
  ^

Caused by commit

  554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

interacting with commit

  29ce6ecbb83c ("cfg80211: unify cfg80211_roamed() and cfg80211_roamed_bss()")

from the mac80211-next tree.

I applied the following merge fix patch.

From: Stephen Rothwell 
Date: Mon, 1 May 2017 14:34:17 +1000
Subject: [PATCH] staging: rtl8723bs: fix up for cfg80211_roamed() API change

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index f092a72bffda..5e7a61f24f8d 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -542,20 +542,24 @@ void rtw_cfg80211_indicate_connect(struct adapter 
*padapter)
struct ieee80211_channel *notify_channel;
u32 freq;
u16 channel = cur_network->network.Configuration.DSConfig;
+   struct cfg80211_roam_info roam_info = {};
 
freq = rtw_ieee80211_channel_to_frequency(channel, 
NL80211_BAND_2GHZ);
 
notify_channel = ieee80211_get_channel(wiphy, freq);
 
DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", 
FUNC_ADPT_ARG(padapter));
-   cfg80211_roamed(padapter->pnetdev
-   , notify_channel
-   , cur_network->network.MacAddress
-   , pmlmepriv->assoc_req+sizeof(struct 
ieee80211_hdr_3addr)+2
-   , pmlmepriv->assoc_req_len-sizeof(struct 
ieee80211_hdr_3addr)-2
-   , pmlmepriv->assoc_rsp+sizeof(struct 
ieee80211_hdr_3addr)+6
-   , pmlmepriv->assoc_rsp_len-sizeof(struct 
ieee80211_hdr_3addr)-6
-   , GFP_ATOMIC);
+   roam_info.channel = notify_channel;
+   roam_info.bssid = cur_network->network.MacAddress;
+   roam_info.req_ie =
+   pmlmepriv->assoc_req+sizeof(struct 
ieee80211_hdr_3addr)+2;
+   roam_info.req_ie_len =
+   pmlmepriv->assoc_req_len-sizeof(struct 
ieee80211_hdr_3addr)-2;
+   roam_info.resp_ie =
+   pmlmepriv->assoc_rsp+sizeof(struct 
ieee80211_hdr_3addr)+6;
+   roam_info.resp_ie_len =
+   pmlmepriv->assoc_rsp_len-sizeof(struct 
ieee80211_hdr_3addr)-6;
+   cfg80211_roamed(padapter->pnetdev, _info, GFP_ATOMIC);
}
else
{
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c: In function 
'rtw_cfg80211_indicate_connect':
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:552:6: error: passing 
argument 2 of 'cfg80211_roamed' from incompatible pointer type 
[-Werror=incompatible-pointer-types]
, notify_channel
  ^
In file included from 
drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
 from drivers/staging/rtl8723bs/include/osdep_service.h:23,
 from drivers/staging/rtl8723bs/include/drv_types.h:29,
 from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
include/net/cfg80211.h:5435:6: note: expected 'struct cfg80211_roam_info *' but 
argument is of type 'struct ieee80211_channel *'
 void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
  ^
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:553:6: warning: passing 
argument 3 of 'cfg80211_roamed' makes integer from pointer without a cast 
[-Wint-conversion]
, cur_network->network.MacAddress
  ^
In file included from 
drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
 from drivers/staging/rtl8723bs/include/osdep_service.h:23,
 from drivers/staging/rtl8723bs/include/drv_types.h:29,
 from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
include/net/cfg80211.h:5435:6: note: expected 'gfp_t {aka unsigned int}' but 
argument is of type 'unsigned char *'
 void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
  ^
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:551:3: error: too many 
arguments to function 'cfg80211_roamed'
   cfg80211_roamed(padapter->pnetdev
   ^
In file included from 
drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
 from drivers/staging/rtl8723bs/include/osdep_service.h:23,
 from drivers/staging/rtl8723bs/include/drv_types.h:29,
 from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
include/net/cfg80211.h:5435:6: note: declared here
 void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
  ^

Caused by commit

  554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

interacting with commit

  29ce6ecbb83c ("cfg80211: unify cfg80211_roamed() and cfg80211_roamed_bss()")

from the mac80211-next tree.

I applied the following merge fix patch.

From: Stephen Rothwell 
Date: Mon, 1 May 2017 14:34:17 +1000
Subject: [PATCH] staging: rtl8723bs: fix up for cfg80211_roamed() API change

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index f092a72bffda..5e7a61f24f8d 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -542,20 +542,24 @@ void rtw_cfg80211_indicate_connect(struct adapter 
*padapter)
struct ieee80211_channel *notify_channel;
u32 freq;
u16 channel = cur_network->network.Configuration.DSConfig;
+   struct cfg80211_roam_info roam_info = {};
 
freq = rtw_ieee80211_channel_to_frequency(channel, 
NL80211_BAND_2GHZ);
 
notify_channel = ieee80211_get_channel(wiphy, freq);
 
DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", 
FUNC_ADPT_ARG(padapter));
-   cfg80211_roamed(padapter->pnetdev
-   , notify_channel
-   , cur_network->network.MacAddress
-   , pmlmepriv->assoc_req+sizeof(struct 
ieee80211_hdr_3addr)+2
-   , pmlmepriv->assoc_req_len-sizeof(struct 
ieee80211_hdr_3addr)-2
-   , pmlmepriv->assoc_rsp+sizeof(struct 
ieee80211_hdr_3addr)+6
-   , pmlmepriv->assoc_rsp_len-sizeof(struct 
ieee80211_hdr_3addr)-6
-   , GFP_ATOMIC);
+   roam_info.channel = notify_channel;
+   roam_info.bssid = cur_network->network.MacAddress;
+   roam_info.req_ie =
+   pmlmepriv->assoc_req+sizeof(struct 
ieee80211_hdr_3addr)+2;
+   roam_info.req_ie_len =
+   pmlmepriv->assoc_req_len-sizeof(struct 
ieee80211_hdr_3addr)-2;
+   roam_info.resp_ie =
+   pmlmepriv->assoc_rsp+sizeof(struct 
ieee80211_hdr_3addr)+6;
+   roam_info.resp_ie_len =
+   pmlmepriv->assoc_rsp_len-sizeof(struct 
ieee80211_hdr_3addr)-6;
+   cfg80211_roamed(padapter->pnetdev, _info, GFP_ATOMIC);
}
else
{
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

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

[Greg KH]

On Thu, Apr 27, 2017 at 02:20:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c: In function 
> 'rtw_cfg80211_preinit_wiphy':
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3409:18: error: 
> 'WIPHY_FLAG_SUPPORTS_SCHED_SCAN' undeclared (first use in this function)
>   wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
>   ^
> 
> Caused by commit
> 
>   554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
> 
> interacting with commit
> 
>   ca986ad9bcd3 ("nl80211: allow multiple active scheduled scan requests")
> 
> from the mac80211-next tree.
> 
> I applied the below merge fix patch.
> 
> Also, I noticed that CONFIG_PNO_SUPPORT is checked for in several
> files, but there is no such Kconfig option ...
> 
> From: Stephen Rothwell 
> Date: Thu, 27 Apr 2017 14:12:12 +1000
> Subject: [PATCH] staging: merge fix for "nl80211: allow multiple active
>  scheduled scan requests"
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
> b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> index f17f4fbd3396..c1977b11b6ac 100644
> --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> @@ -3406,7 +3406,7 @@ static void rtw_cfg80211_preinit_wiphy(struct adapter 
> *padapter, struct wiphy *w
>   wiphy->flags |= WIPHY_FLAG_OFFCHAN_TX | WIPHY_FLAG_HAVE_AP_SME;
>  
>  #if defined(CONFIG_PM)
> - wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
> + wiphy->max_sched_scan_reqs = 1;
>  #ifdef CONFIG_PNO_SUPPORT
>   wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT;
>  #endif

Thanks for the patch, looks good to me.

greg k-h

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

[Greg KH]

On Thu, Apr 27, 2017 at 02:20:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c: In function 
> 'rtw_cfg80211_preinit_wiphy':
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3409:18: error: 
> 'WIPHY_FLAG_SUPPORTS_SCHED_SCAN' undeclared (first use in this function)
>   wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
>   ^
> 
> Caused by commit
> 
>   554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
> 
> interacting with commit
> 
>   ca986ad9bcd3 ("nl80211: allow multiple active scheduled scan requests")
> 
> from the mac80211-next tree.
> 
> I applied the below merge fix patch.
> 
> Also, I noticed that CONFIG_PNO_SUPPORT is checked for in several
> files, but there is no such Kconfig option ...
> 
> From: Stephen Rothwell 
> Date: Thu, 27 Apr 2017 14:12:12 +1000
> Subject: [PATCH] staging: merge fix for "nl80211: allow multiple active
>  scheduled scan requests"
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
> b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> index f17f4fbd3396..c1977b11b6ac 100644
> --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> @@ -3406,7 +3406,7 @@ static void rtw_cfg80211_preinit_wiphy(struct adapter 
> *padapter, struct wiphy *w
>   wiphy->flags |= WIPHY_FLAG_OFFCHAN_TX | WIPHY_FLAG_HAVE_AP_SME;
>  
>  #if defined(CONFIG_PM)
> - wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
> + wiphy->max_sched_scan_reqs = 1;
>  #ifdef CONFIG_PNO_SUPPORT
>   wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT;
>  #endif

Thanks for the patch, looks good to me.

greg k-h

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c: In function 
'rtw_cfg80211_preinit_wiphy':
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3409:18: error: 
'WIPHY_FLAG_SUPPORTS_SCHED_SCAN' undeclared (first use in this function)
  wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
  ^

Caused by commit

  554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

interacting with commit

  ca986ad9bcd3 ("nl80211: allow multiple active scheduled scan requests")

from the mac80211-next tree.

I applied the below merge fix patch.

Also, I noticed that CONFIG_PNO_SUPPORT is checked for in several
files, but there is no such Kconfig option ...

From: Stephen Rothwell 
Date: Thu, 27 Apr 2017 14:12:12 +1000
Subject: [PATCH] staging: merge fix for "nl80211: allow multiple active
 scheduled scan requests"

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index f17f4fbd3396..c1977b11b6ac 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -3406,7 +3406,7 @@ static void rtw_cfg80211_preinit_wiphy(struct adapter 
*padapter, struct wiphy *w
wiphy->flags |= WIPHY_FLAG_OFFCHAN_TX | WIPHY_FLAG_HAVE_AP_SME;
 
 #if defined(CONFIG_PM)
-   wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
+   wiphy->max_sched_scan_reqs = 1;
 #ifdef CONFIG_PNO_SUPPORT
wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT;
 #endif
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c: In function 
'rtw_cfg80211_preinit_wiphy':
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3409:18: error: 
'WIPHY_FLAG_SUPPORTS_SCHED_SCAN' undeclared (first use in this function)
  wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
  ^

Caused by commit

  554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

interacting with commit

  ca986ad9bcd3 ("nl80211: allow multiple active scheduled scan requests")

from the mac80211-next tree.

I applied the below merge fix patch.

Also, I noticed that CONFIG_PNO_SUPPORT is checked for in several
files, but there is no such Kconfig option ...

From: Stephen Rothwell 
Date: Thu, 27 Apr 2017 14:12:12 +1000
Subject: [PATCH] staging: merge fix for "nl80211: allow multiple active
 scheduled scan requests"

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index f17f4fbd3396..c1977b11b6ac 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -3406,7 +3406,7 @@ static void rtw_cfg80211_preinit_wiphy(struct adapter 
*padapter, struct wiphy *w
wiphy->flags |= WIPHY_FLAG_OFFCHAN_TX | WIPHY_FLAG_HAVE_AP_SME;
 
 #if defined(CONFIG_PM)
-   wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
+   wiphy->max_sched_scan_reqs = 1;
 #ifdef CONFIG_PNO_SUPPORT
wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT;
 #endif
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

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

[Greg KH]

On Tue, Apr 18, 2017 at 04:26:52PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Tue, 18 Apr 2017 07:54:40 +0200 Greg KH  wrote:
> >
> > On Tue, Apr 18, 2017 at 03:32:20PM +1000, Stephen Rothwell wrote:
> > > Hi Greg,
> > > 
> > > After merging the staging tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > make[7]: *** No rule to make target 
> > > 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.o',
> > >  needed by 'drivers/staging/media/atomisp/pci/atomisp2/atomisp.o'.  Stop.
> > > 
> > > Caused by commit
> > > 
> > >   7afe8f84f793 ("atomisp: remove UDS kernel code")
> > > 
> > > I have used the staging tree from next-20170413 for today.  
> > 
> > Ok, the 0-day bot reported something odd like this, with Alan's original
> > patches, but I couldn't reproduce it, and then when I applied them, the
> > 0-day bot worked just fine.  But now you are having the same issue.
> > 
> > I'm totally confused, Alan, any ideas?
> 
> Well, drivers/staging/media/atomisp/pci/atomisp2/Makefile lists
> css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.o in atomisp-objs.
> 
> The above commit deleted
> drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.c

{sigh} It was a long last week...  My tree had a "stale" .o file laying
around from the previous build, I can reproduce this now, sorry for the
noise.  I'll go fix it...

greg k-h

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

[Greg KH]

On Tue, Apr 18, 2017 at 04:26:52PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Tue, 18 Apr 2017 07:54:40 +0200 Greg KH  wrote:
> >
> > On Tue, Apr 18, 2017 at 03:32:20PM +1000, Stephen Rothwell wrote:
> > > Hi Greg,
> > > 
> > > After merging the staging tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > make[7]: *** No rule to make target 
> > > 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.o',
> > >  needed by 'drivers/staging/media/atomisp/pci/atomisp2/atomisp.o'.  Stop.
> > > 
> > > Caused by commit
> > > 
> > >   7afe8f84f793 ("atomisp: remove UDS kernel code")
> > > 
> > > I have used the staging tree from next-20170413 for today.  
> > 
> > Ok, the 0-day bot reported something odd like this, with Alan's original
> > patches, but I couldn't reproduce it, and then when I applied them, the
> > 0-day bot worked just fine.  But now you are having the same issue.
> > 
> > I'm totally confused, Alan, any ideas?
> 
> Well, drivers/staging/media/atomisp/pci/atomisp2/Makefile lists
> css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.o in atomisp-objs.
> 
> The above commit deleted
> drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.c

{sigh} It was a long last week...  My tree had a "stale" .o file laying
around from the previous build, I can reproduce this now, sorry for the
noise.  I'll go fix it...

greg k-h

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

[Johannes Berg]

On Tue, 2017-04-18 at 15:53 +1000, Stephen Rothwell wrote:

> Caused by commit
> 
>   554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

Oh, another new driver :)

> interacting with commit
> 
>   818a986e4eba ("cfg80211: move add/change interface monitor flags
> into params")
> 
> from the mac80211-next tree.
> 
> I have added the following merge fix patch:
> 
> From: Stephen Rothwell 
> Date: Tue, 18 Apr 2017 15:43:43 +1000
> Subject: [PATCH] staging: merge fix for add/change_virtual-intf API
> change

That looks good, evidently it doesn't care about the parameter then.

Thanks!

johannes

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

[Johannes Berg]

On Tue, 2017-04-18 at 15:53 +1000, Stephen Rothwell wrote:

> Caused by commit
> 
>   554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

Oh, another new driver :)

> interacting with commit
> 
>   818a986e4eba ("cfg80211: move add/change interface monitor flags
> into params")
> 
> from the mac80211-next tree.
> 
> I have added the following merge fix patch:
> 
> From: Stephen Rothwell 
> Date: Tue, 18 Apr 2017 15:43:43 +1000
> Subject: [PATCH] staging: merge fix for add/change_virtual-intf API
> change

That looks good, evidently it doesn't care about the parameter then.

Thanks!

johannes

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

[Stephen Rothwell]

Hi Greg,

On Tue, 18 Apr 2017 07:54:40 +0200 Greg KH  wrote:
>
> On Tue, Apr 18, 2017 at 03:32:20PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > After merging the staging tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > make[7]: *** No rule to make target 
> > 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.o',
> >  needed by 'drivers/staging/media/atomisp/pci/atomisp2/atomisp.o'.  Stop.
> > 
> > Caused by commit
> > 
> >   7afe8f84f793 ("atomisp: remove UDS kernel code")
> > 
> > I have used the staging tree from next-20170413 for today.  
> 
> Ok, the 0-day bot reported something odd like this, with Alan's original
> patches, but I couldn't reproduce it, and then when I applied them, the
> 0-day bot worked just fine.  But now you are having the same issue.
> 
> I'm totally confused, Alan, any ideas?

Well, drivers/staging/media/atomisp/pci/atomisp2/Makefile lists
css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.o in atomisp-objs.

The above commit deleted
drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.c

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi Greg,

On Tue, 18 Apr 2017 07:54:40 +0200 Greg KH  wrote:
>
> On Tue, Apr 18, 2017 at 03:32:20PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > After merging the staging tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > make[7]: *** No rule to make target 
> > 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.o',
> >  needed by 'drivers/staging/media/atomisp/pci/atomisp2/atomisp.o'.  Stop.
> > 
> > Caused by commit
> > 
> >   7afe8f84f793 ("atomisp: remove UDS kernel code")
> > 
> > I have used the staging tree from next-20170413 for today.  
> 
> Ok, the 0-day bot reported something odd like this, with Alan's original
> patches, but I couldn't reproduce it, and then when I applied them, the
> 0-day bot worked just fine.  But now you are having the same issue.
> 
> I'm totally confused, Alan, any ideas?

Well, drivers/staging/media/atomisp/pci/atomisp2/Makefile lists
css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.o in atomisp-objs.

The above commit deleted
drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.c

-- 
Cheers,
Stephen Rothwell

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

[Greg KH]

On Tue, Apr 18, 2017 at 03:32:20PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> make[7]: *** No rule to make target 
> 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.o',
>  needed by 'drivers/staging/media/atomisp/pci/atomisp2/atomisp.o'.  Stop.
> 
> Caused by commit
> 
>   7afe8f84f793 ("atomisp: remove UDS kernel code")
> 
> I have used the staging tree from next-20170413 for today.

Ok, the 0-day bot reported something odd like this, with Alan's original
patches, but I couldn't reproduce it, and then when I applied them, the
0-day bot worked just fine.  But now you are having the same issue.

I'm totally confused, Alan, any ideas?

thanks,

greg k-h

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

[Greg KH]

On Tue, Apr 18, 2017 at 03:32:20PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> make[7]: *** No rule to make target 
> 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.o',
>  needed by 'drivers/staging/media/atomisp/pci/atomisp2/atomisp.o'.  Stop.
> 
> Caused by commit
> 
>   7afe8f84f793 ("atomisp: remove UDS kernel code")
> 
> I have used the staging tree from next-20170413 for today.

Ok, the 0-day bot reported something odd like this, with Alan's original
patches, but I couldn't reproduce it, and then when I applied them, the
0-day bot worked just fine.  But now you are having the same issue.

I'm totally confused, Alan, any ideas?

thanks,

greg k-h

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi all,

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

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3426:25: error: 
initialization from incompatible pointer type 
[-Werror=incompatible-pointer-types]
  .change_virtual_intf = cfg80211_rtw_change_iface,
 ^
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3426:25: note: (near 
initialization for 'rtw_cfg80211_ops.change_virtual_intf')
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3445:22: error: 
initialization from incompatible pointer type 
[-Werror=incompatible-pointer-types]
  .add_virtual_intf = cfg80211_rtw_add_virtual_intf,
  ^
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3445:22: note: (near 
initialization for 'rtw_cfg80211_ops.add_virtual_intf')

Caused by commit

  554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

interacting with commit

  818a986e4eba ("cfg80211: move add/change interface monitor flags into params")

from the mac80211-next tree.

I have added the following merge fix patch:

From: Stephen Rothwell 
Date: Tue, 18 Apr 2017 15:43:43 +1000
Subject: [PATCH] staging: merge fix for add/change_virtual-intf API change

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 52aa65bfd890..f17f4fbd3396 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1310,7 +1310,7 @@ extern int netdev_open(struct net_device *pnetdev);
 
 static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
 struct net_device *ndev,
-enum nl80211_iftype type, u32 *flags,
+enum nl80211_iftype type,
 struct vif_params *params)
 {
enum nl80211_iftype old_type;
@@ -2711,7 +2711,7 @@ static struct wireless_dev *
struct wiphy *wiphy,
const char *name,
unsigned char name_assign_type,
-   enum nl80211_iftype type, u32 *flags, struct vif_params *params)
+   enum nl80211_iftype type, struct vif_params *params)
 {
int ret = 0;
struct net_device* ndev = NULL;
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi all,

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

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3426:25: error: 
initialization from incompatible pointer type 
[-Werror=incompatible-pointer-types]
  .change_virtual_intf = cfg80211_rtw_change_iface,
 ^
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3426:25: note: (near 
initialization for 'rtw_cfg80211_ops.change_virtual_intf')
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3445:22: error: 
initialization from incompatible pointer type 
[-Werror=incompatible-pointer-types]
  .add_virtual_intf = cfg80211_rtw_add_virtual_intf,
  ^
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:3445:22: note: (near 
initialization for 'rtw_cfg80211_ops.add_virtual_intf')

Caused by commit

  554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

interacting with commit

  818a986e4eba ("cfg80211: move add/change interface monitor flags into params")

from the mac80211-next tree.

I have added the following merge fix patch:

From: Stephen Rothwell 
Date: Tue, 18 Apr 2017 15:43:43 +1000
Subject: [PATCH] staging: merge fix for add/change_virtual-intf API change

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c 
b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 52aa65bfd890..f17f4fbd3396 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1310,7 +1310,7 @@ extern int netdev_open(struct net_device *pnetdev);
 
 static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
 struct net_device *ndev,
-enum nl80211_iftype type, u32 *flags,
+enum nl80211_iftype type,
 struct vif_params *params)
 {
enum nl80211_iftype old_type;
@@ -2711,7 +2711,7 @@ static struct wireless_dev *
struct wiphy *wiphy,
const char *name,
unsigned char name_assign_type,
-   enum nl80211_iftype type, u32 *flags, struct vif_params *params)
+   enum nl80211_iftype type, struct vif_params *params)
 {
int ret = 0;
struct net_device* ndev = NULL;
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

make[7]: *** No rule to make target 
'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.o',
 needed by 'drivers/staging/media/atomisp/pci/atomisp2/atomisp.o'.  Stop.

Caused by commit

  7afe8f84f793 ("atomisp: remove UDS kernel code")

I have used the staging tree from next-20170413 for today.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

make[7]: *** No rule to make target 
'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.o',
 needed by 'drivers/staging/media/atomisp/pci/atomisp2/atomisp.o'.  Stop.

Caused by commit

  7afe8f84f793 ("atomisp: remove UDS kernel code")

I have used the staging tree from next-20170413 for today.

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi Greg,

On Tue, 11 Apr 2017 07:38:32 +0200 Greg KH  wrote:
>
> I should have this fixed now, sorry for taking so long.

Thanks and no worries.
-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi Greg,

On Tue, 11 Apr 2017 07:38:32 +0200 Greg KH  wrote:
>
> I should have this fixed now, sorry for taking so long.

Thanks and no worries.
-- 
Cheers,
Stephen Rothwell

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

[Greg KH]

On Tue, Apr 11, 2017 at 07:15:42AM +0200, Greg KH wrote:
> On Tue, Apr 11, 2017 at 03:04:40PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > After merging the staging tree, today's linux-next build (powerpc
> > allyesconfig - I presume that an x86_64 allyesconfig will fail the
> > same way) failed like this:
> > 
> > drivers/staging/rtl8188eu/core/rtw_wlan_util.o: In function 
> > `.rtw_get_oper_ch':
> > (.text+0x9d0): multiple definition of `.rtw_get_oper_ch'
> > drivers/staging/rtl8723bs/core/rtw_wlan_util.o:(.text+0x9a0): first defined 
> > here
> > 
> > and many, many more ...
> > 
> > Presumably caused by commit
> > 
> >   554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
> > 
> > I guess this driver was copied from drivers/staging/rtl8188eu/ at some
> > point and modified (or they have the same ancestor) since they share a
> > large number of global symbols.
> > 
> > I have applied the following patch for today:
> > 
> > From: Stephen Rothwell 
> > Date: Tue, 11 Apr 2017 14:53:55 +1000
> > Subject: [PATCH] staging: disable the rtl8723bs sdio wifi driver for now
> > 
> > Signed-off-by: Stephen Rothwell 
> > ---
> >  drivers/staging/rtl8723bs/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/staging/rtl8723bs/Kconfig 
> > b/drivers/staging/rtl8723bs/Kconfig
> > index 71450eee3b28..04706d3148d6 100644
> > --- a/drivers/staging/rtl8723bs/Kconfig
> > +++ b/drivers/staging/rtl8723bs/Kconfig
> > @@ -1,6 +1,7 @@
> >  config RTL8723BS
> > tristate "Realtek RTL8723BS SDIO Wireless LAN NIC driver"
> > depends on WLAN && MMC && CFG80211
> > +   depends on BROKEN
> > select WIRELESS_EXT
> > select WEXT_PRIV
> > ---help---
> 
> Yes, thanks, we are going to force this to be built as a module which
> should resolve the issues...

I should have this fixed now, sorry for taking so long.

greg k-h

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

[Greg KH]

On Tue, Apr 11, 2017 at 07:15:42AM +0200, Greg KH wrote:
> On Tue, Apr 11, 2017 at 03:04:40PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > After merging the staging tree, today's linux-next build (powerpc
> > allyesconfig - I presume that an x86_64 allyesconfig will fail the
> > same way) failed like this:
> > 
> > drivers/staging/rtl8188eu/core/rtw_wlan_util.o: In function 
> > `.rtw_get_oper_ch':
> > (.text+0x9d0): multiple definition of `.rtw_get_oper_ch'
> > drivers/staging/rtl8723bs/core/rtw_wlan_util.o:(.text+0x9a0): first defined 
> > here
> > 
> > and many, many more ...
> > 
> > Presumably caused by commit
> > 
> >   554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
> > 
> > I guess this driver was copied from drivers/staging/rtl8188eu/ at some
> > point and modified (or they have the same ancestor) since they share a
> > large number of global symbols.
> > 
> > I have applied the following patch for today:
> > 
> > From: Stephen Rothwell 
> > Date: Tue, 11 Apr 2017 14:53:55 +1000
> > Subject: [PATCH] staging: disable the rtl8723bs sdio wifi driver for now
> > 
> > Signed-off-by: Stephen Rothwell 
> > ---
> >  drivers/staging/rtl8723bs/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/staging/rtl8723bs/Kconfig 
> > b/drivers/staging/rtl8723bs/Kconfig
> > index 71450eee3b28..04706d3148d6 100644
> > --- a/drivers/staging/rtl8723bs/Kconfig
> > +++ b/drivers/staging/rtl8723bs/Kconfig
> > @@ -1,6 +1,7 @@
> >  config RTL8723BS
> > tristate "Realtek RTL8723BS SDIO Wireless LAN NIC driver"
> > depends on WLAN && MMC && CFG80211
> > +   depends on BROKEN
> > select WIRELESS_EXT
> > select WEXT_PRIV
> > ---help---
> 
> Yes, thanks, we are going to force this to be built as a module which
> should resolve the issues...

I should have this fixed now, sorry for taking so long.

greg k-h

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

[Greg KH]

On Tue, Apr 11, 2017 at 03:04:40PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (powerpc
> allyesconfig - I presume that an x86_64 allyesconfig will fail the
> same way) failed like this:
> 
> drivers/staging/rtl8188eu/core/rtw_wlan_util.o: In function 
> `.rtw_get_oper_ch':
> (.text+0x9d0): multiple definition of `.rtw_get_oper_ch'
> drivers/staging/rtl8723bs/core/rtw_wlan_util.o:(.text+0x9a0): first defined 
> here
> 
> and many, many more ...
> 
> Presumably caused by commit
> 
>   554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
> 
> I guess this driver was copied from drivers/staging/rtl8188eu/ at some
> point and modified (or they have the same ancestor) since they share a
> large number of global symbols.
> 
> I have applied the following patch for today:
> 
> From: Stephen Rothwell 
> Date: Tue, 11 Apr 2017 14:53:55 +1000
> Subject: [PATCH] staging: disable the rtl8723bs sdio wifi driver for now
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/staging/rtl8723bs/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/staging/rtl8723bs/Kconfig 
> b/drivers/staging/rtl8723bs/Kconfig
> index 71450eee3b28..04706d3148d6 100644
> --- a/drivers/staging/rtl8723bs/Kconfig
> +++ b/drivers/staging/rtl8723bs/Kconfig
> @@ -1,6 +1,7 @@
>  config RTL8723BS
>   tristate "Realtek RTL8723BS SDIO Wireless LAN NIC driver"
>   depends on WLAN && MMC && CFG80211
> + depends on BROKEN
>   select WIRELESS_EXT
>   select WEXT_PRIV
>   ---help---

Yes, thanks, we are going to force this to be built as a module which
should resolve the issues...

thanks,

greg k-h

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

[Greg KH]

On Tue, Apr 11, 2017 at 03:04:40PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (powerpc
> allyesconfig - I presume that an x86_64 allyesconfig will fail the
> same way) failed like this:
> 
> drivers/staging/rtl8188eu/core/rtw_wlan_util.o: In function 
> `.rtw_get_oper_ch':
> (.text+0x9d0): multiple definition of `.rtw_get_oper_ch'
> drivers/staging/rtl8723bs/core/rtw_wlan_util.o:(.text+0x9a0): first defined 
> here
> 
> and many, many more ...
> 
> Presumably caused by commit
> 
>   554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
> 
> I guess this driver was copied from drivers/staging/rtl8188eu/ at some
> point and modified (or they have the same ancestor) since they share a
> large number of global symbols.
> 
> I have applied the following patch for today:
> 
> From: Stephen Rothwell 
> Date: Tue, 11 Apr 2017 14:53:55 +1000
> Subject: [PATCH] staging: disable the rtl8723bs sdio wifi driver for now
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/staging/rtl8723bs/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/staging/rtl8723bs/Kconfig 
> b/drivers/staging/rtl8723bs/Kconfig
> index 71450eee3b28..04706d3148d6 100644
> --- a/drivers/staging/rtl8723bs/Kconfig
> +++ b/drivers/staging/rtl8723bs/Kconfig
> @@ -1,6 +1,7 @@
>  config RTL8723BS
>   tristate "Realtek RTL8723BS SDIO Wireless LAN NIC driver"
>   depends on WLAN && MMC && CFG80211
> + depends on BROKEN
>   select WIRELESS_EXT
>   select WEXT_PRIV
>   ---help---

Yes, thanks, we are going to force this to be built as a module which
should resolve the issues...

thanks,

greg k-h

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

After merging the staging tree, today's linux-next build (powerpc
allyesconfig - I presume that an x86_64 allyesconfig will fail the
same way) failed like this:

drivers/staging/rtl8188eu/core/rtw_wlan_util.o: In function `.rtw_get_oper_ch':
(.text+0x9d0): multiple definition of `.rtw_get_oper_ch'
drivers/staging/rtl8723bs/core/rtw_wlan_util.o:(.text+0x9a0): first defined here

and many, many more ...

Presumably caused by commit

  554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

I guess this driver was copied from drivers/staging/rtl8188eu/ at some
point and modified (or they have the same ancestor) since they share a
large number of global symbols.

I have applied the following patch for today:

From: Stephen Rothwell 
Date: Tue, 11 Apr 2017 14:53:55 +1000
Subject: [PATCH] staging: disable the rtl8723bs sdio wifi driver for now

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/rtl8723bs/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/rtl8723bs/Kconfig 
b/drivers/staging/rtl8723bs/Kconfig
index 71450eee3b28..04706d3148d6 100644
--- a/drivers/staging/rtl8723bs/Kconfig
+++ b/drivers/staging/rtl8723bs/Kconfig
@@ -1,6 +1,7 @@
 config RTL8723BS
tristate "Realtek RTL8723BS SDIO Wireless LAN NIC driver"
depends on WLAN && MMC && CFG80211
+   depends on BROKEN
select WIRELESS_EXT
select WEXT_PRIV
---help---
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

After merging the staging tree, today's linux-next build (powerpc
allyesconfig - I presume that an x86_64 allyesconfig will fail the
same way) failed like this:

drivers/staging/rtl8188eu/core/rtw_wlan_util.o: In function `.rtw_get_oper_ch':
(.text+0x9d0): multiple definition of `.rtw_get_oper_ch'
drivers/staging/rtl8723bs/core/rtw_wlan_util.o:(.text+0x9a0): first defined here

and many, many more ...

Presumably caused by commit

  554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

I guess this driver was copied from drivers/staging/rtl8188eu/ at some
point and modified (or they have the same ancestor) since they share a
large number of global symbols.

I have applied the following patch for today:

From: Stephen Rothwell 
Date: Tue, 11 Apr 2017 14:53:55 +1000
Subject: [PATCH] staging: disable the rtl8723bs sdio wifi driver for now

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/rtl8723bs/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/rtl8723bs/Kconfig 
b/drivers/staging/rtl8723bs/Kconfig
index 71450eee3b28..04706d3148d6 100644
--- a/drivers/staging/rtl8723bs/Kconfig
+++ b/drivers/staging/rtl8723bs/Kconfig
@@ -1,6 +1,7 @@
 config RTL8723BS
tristate "Realtek RTL8723BS SDIO Wireless LAN NIC driver"
depends on WLAN && MMC && CFG80211
+   depends on BROKEN
select WIRELESS_EXT
select WEXT_PRIV
---help---
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/rtl8723bs/core/rtw_ieee80211.c: In function 'rtw_macaddr_cfg':
drivers/staging/rtl8723bs/core/rtw_ieee80211.c:1193:22: error: implicit 
declaration of function 'of_get_property' 
[-Werror=implicit-function-declaration]
  (addr = of_get_property(np, "local-mac-address", )) &&
  ^
drivers/staging/rtl8723bs/core/rtw_ieee80211.c:1193:20: warning: assignment 
makes pointer from integer without a cast [-Wint-conversion]
  (addr = of_get_property(np, "local-mac-address", )) &&
^

Caused by commit

  554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

I have used the staging tree from next-20170407 for today.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/rtl8723bs/core/rtw_ieee80211.c: In function 'rtw_macaddr_cfg':
drivers/staging/rtl8723bs/core/rtw_ieee80211.c:1193:22: error: implicit 
declaration of function 'of_get_property' 
[-Werror=implicit-function-declaration]
  (addr = of_get_property(np, "local-mac-address", )) &&
  ^
drivers/staging/rtl8723bs/core/rtw_ieee80211.c:1193:20: warning: assignment 
makes pointer from integer without a cast [-Wint-conversion]
  (addr = of_get_property(np, "local-mac-address", )) &&
^

Caused by commit

  554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")

I have used the staging tree from next-20170407 for today.

-- 
Cheers,
Stephen Rothwell

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

[Greg KH]

On Tue, Mar 07, 2017 at 08:49:47PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Tue, 7 Mar 2017 09:47:29 +0100 Greg KH  wrote:
> >
> > I really can't duplicate this here, but you and the kbuild bot are
> > hitting this now.  in drivers/staging/media/atomisp/Makefile we have:
> > LINUXINCLUDE+= -I drivers/staging/media/atomisp/include/
> > to point the include path at where atomisp_gmin_platform.h is at.
> > 
> > So I don't understand what is going on here.  Alan, any hints?
> 
> I use a separate object dir (O=...) so maybe you need
> 
> LINUXINCLUDE += -I$(srctree)/drivers/staging/media/atomisp/include/

Ah!  yeah, using LINUXINCLUDE sucks, I'll go make all of those include
files relative references to make just building a subdir work properly.

thanks for the pointer, this should get fixed in my tree soon...

greg k-h

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

[Greg KH]

On Tue, Mar 07, 2017 at 08:49:47PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Tue, 7 Mar 2017 09:47:29 +0100 Greg KH  wrote:
> >
> > I really can't duplicate this here, but you and the kbuild bot are
> > hitting this now.  in drivers/staging/media/atomisp/Makefile we have:
> > LINUXINCLUDE+= -I drivers/staging/media/atomisp/include/
> > to point the include path at where atomisp_gmin_platform.h is at.
> > 
> > So I don't understand what is going on here.  Alan, any hints?
> 
> I use a separate object dir (O=...) so maybe you need
> 
> LINUXINCLUDE += -I$(srctree)/drivers/staging/media/atomisp/include/

Ah!  yeah, using LINUXINCLUDE sucks, I'll go make all of those include
files relative references to make just building a subdir work properly.

thanks for the pointer, this should get fixed in my tree soon...

greg k-h

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

[Stephen Rothwell]

Hi Greg,

On Tue, 7 Mar 2017 09:47:29 +0100 Greg KH  wrote:
>
> I really can't duplicate this here, but you and the kbuild bot are
> hitting this now.  in drivers/staging/media/atomisp/Makefile we have:
>   LINUXINCLUDE+= -I drivers/staging/media/atomisp/include/
> to point the include path at where atomisp_gmin_platform.h is at.
> 
> So I don't understand what is going on here.  Alan, any hints?

I use a separate object dir (O=...) so maybe you need

LINUXINCLUDE += -I$(srctree)/drivers/staging/media/atomisp/include/

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi Greg,

On Tue, 7 Mar 2017 09:47:29 +0100 Greg KH  wrote:
>
> I really can't duplicate this here, but you and the kbuild bot are
> hitting this now.  in drivers/staging/media/atomisp/Makefile we have:
>   LINUXINCLUDE+= -I drivers/staging/media/atomisp/include/
> to point the include path at where atomisp_gmin_platform.h is at.
> 
> So I don't understand what is going on here.  Alan, any hints?

I use a separate object dir (O=...) so maybe you need

LINUXINCLUDE += -I$(srctree)/drivers/staging/media/atomisp/include/

-- 
Cheers,
Stephen Rothwell

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

[Greg KH]

On Tue, Mar 07, 2017 at 12:25:42PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/media/atomisp/i2c/mt9m114.c:38:41: fatal error: 
> linux/atomisp_gmin_platform.h: No such file or directory
> drivers/staging/media/atomisp/i2c/gc2235.c:32:41: fatal error: 
> linux/atomisp_gmin_platform.h: No such file or directory
> drivers/staging/media/atomisp/i2c/ov2722.c:32:41: fatal error: 
> linux/atomisp_gmin_platform.h: No such file or directory

I really can't duplicate this here, but you and the kbuild bot are
hitting this now.  in drivers/staging/media/atomisp/Makefile we have:
LINUXINCLUDE+= -I drivers/staging/media/atomisp/include/
to point the include path at where atomisp_gmin_platform.h is at.

So I don't understand what is going on here.  Alan, any hints?

thanks,

greg k-h

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

[Greg KH]

On Tue, Mar 07, 2017 at 12:25:42PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/media/atomisp/i2c/mt9m114.c:38:41: fatal error: 
> linux/atomisp_gmin_platform.h: No such file or directory
> drivers/staging/media/atomisp/i2c/gc2235.c:32:41: fatal error: 
> linux/atomisp_gmin_platform.h: No such file or directory
> drivers/staging/media/atomisp/i2c/ov2722.c:32:41: fatal error: 
> linux/atomisp_gmin_platform.h: No such file or directory

I really can't duplicate this here, but you and the kbuild bot are
hitting this now.  in drivers/staging/media/atomisp/Makefile we have:
LINUXINCLUDE+= -I drivers/staging/media/atomisp/include/
to point the include path at where atomisp_gmin_platform.h is at.

So I don't understand what is going on here.  Alan, any hints?

thanks,

greg k-h

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

[Greg KH]

On Tue, Mar 07, 2017 at 12:25:42PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/media/atomisp/i2c/mt9m114.c:38:41: fatal error: 
> linux/atomisp_gmin_platform.h: No such file or directory
> drivers/staging/media/atomisp/i2c/gc2235.c:32:41: fatal error: 
> linux/atomisp_gmin_platform.h: No such file or directory
> drivers/staging/media/atomisp/i2c/ov2722.c:32:41: fatal error: 
> linux/atomisp_gmin_platform.h: No such file or directory
> drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c:25:35: fatal 
> error: linux/vlv2_plat_clock.h: No such file or directory
> drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c:28:38:
>  fatal error: asm/intel_mid_pcihelpers.h: No such file or directory
> drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c:10:35:
>  fatal error: linux/vlv2_plat_clock.h: No such file or directory
> In file included from 
> drivers/staging/media/atomisp/pci/atomisp2/./atomisp_drvfs.c:26:0:
> drivers/staging/media/atomisp/pci/atomisp2/./atomisp_compat.h:27:27: fatal 
> error: linux/atomisp.h: No such file or directory
> 
> Caused by commit
> 
>   a49d25364dfb ("staging/atomisp: Add support for the Intel IPU v2")
> 
> or maybe some of the followups?
> 
> I have used the staging tree from next-20170306 for today.

I just got a report from the kbuild bot about this as well, it didn't
used to happen before, and I can't duplicate it myself.  Alan, any hints
as to what broke here?

thanks,

greg k-h

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

[Greg KH]

On Tue, Mar 07, 2017 at 12:25:42PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/media/atomisp/i2c/mt9m114.c:38:41: fatal error: 
> linux/atomisp_gmin_platform.h: No such file or directory
> drivers/staging/media/atomisp/i2c/gc2235.c:32:41: fatal error: 
> linux/atomisp_gmin_platform.h: No such file or directory
> drivers/staging/media/atomisp/i2c/ov2722.c:32:41: fatal error: 
> linux/atomisp_gmin_platform.h: No such file or directory
> drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c:25:35: fatal 
> error: linux/vlv2_plat_clock.h: No such file or directory
> drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c:28:38:
>  fatal error: asm/intel_mid_pcihelpers.h: No such file or directory
> drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c:10:35:
>  fatal error: linux/vlv2_plat_clock.h: No such file or directory
> In file included from 
> drivers/staging/media/atomisp/pci/atomisp2/./atomisp_drvfs.c:26:0:
> drivers/staging/media/atomisp/pci/atomisp2/./atomisp_compat.h:27:27: fatal 
> error: linux/atomisp.h: No such file or directory
> 
> Caused by commit
> 
>   a49d25364dfb ("staging/atomisp: Add support for the Intel IPU v2")
> 
> or maybe some of the followups?
> 
> I have used the staging tree from next-20170306 for today.

I just got a report from the kbuild bot about this as well, it didn't
used to happen before, and I can't duplicate it myself.  Alan, any hints
as to what broke here?

thanks,

greg k-h

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/media/atomisp/i2c/mt9m114.c:38:41: fatal error: 
linux/atomisp_gmin_platform.h: No such file or directory
drivers/staging/media/atomisp/i2c/gc2235.c:32:41: fatal error: 
linux/atomisp_gmin_platform.h: No such file or directory
drivers/staging/media/atomisp/i2c/ov2722.c:32:41: fatal error: 
linux/atomisp_gmin_platform.h: No such file or directory
drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c:25:35: fatal 
error: linux/vlv2_plat_clock.h: No such file or directory
drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c:28:38: 
fatal error: asm/intel_mid_pcihelpers.h: No such file or directory
drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c:10:35: 
fatal error: linux/vlv2_plat_clock.h: No such file or directory
In file included from 
drivers/staging/media/atomisp/pci/atomisp2/./atomisp_drvfs.c:26:0:
drivers/staging/media/atomisp/pci/atomisp2/./atomisp_compat.h:27:27: fatal 
error: linux/atomisp.h: No such file or directory

Caused by commit

  a49d25364dfb ("staging/atomisp: Add support for the Intel IPU v2")

or maybe some of the followups?

I have used the staging tree from next-20170306 for today.

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/media/atomisp/i2c/mt9m114.c:38:41: fatal error: 
linux/atomisp_gmin_platform.h: No such file or directory
drivers/staging/media/atomisp/i2c/gc2235.c:32:41: fatal error: 
linux/atomisp_gmin_platform.h: No such file or directory
drivers/staging/media/atomisp/i2c/ov2722.c:32:41: fatal error: 
linux/atomisp_gmin_platform.h: No such file or directory
drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c:25:35: fatal 
error: linux/vlv2_plat_clock.h: No such file or directory
drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c:28:38: 
fatal error: asm/intel_mid_pcihelpers.h: No such file or directory
drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c:10:35: 
fatal error: linux/vlv2_plat_clock.h: No such file or directory
In file included from 
drivers/staging/media/atomisp/pci/atomisp2/./atomisp_drvfs.c:26:0:
drivers/staging/media/atomisp/pci/atomisp2/./atomisp_compat.h:27:27: fatal 
error: linux/atomisp.h: No such file or directory

Caused by commit

  a49d25364dfb ("staging/atomisp: Add support for the Intel IPU v2")

or maybe some of the followups?

I have used the staging tree from next-20170306 for today.

-- 
Cheers,
Stephen Rothwell

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

[Greg KH]

On Fri, May 13, 2016 at 01:15:38PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1706:9: 
> error: too few arguments to function 'ib_map_mr_sg'
>  n = ib_map_mr_sg(mr, tx->tx_frags,
>  ^
> In file included from /home/sfr/next/next/include/rdma/ib_addr.h:47:0,
>  from /home/sfr/next/next/include/rdma/rdma_cm.h:39,
>  from 
> /home/sfr/next/next/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h:63,
>  from 
> /home/sfr/next/next/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:43:
> /home/sfr/next/next/include/rdma/ib_verbs.h:3147:5: note: declared here
>  int ib_map_mr_sg(struct ib_mr *mr, struct scatterlist *sg, int sg_nents,
>  ^
> 
> Caused by commit
> 
>   80e05b34f882 ("staging: lustre: o2iblnd: Add Fast Reg memory registration 
> support")
> 
> interacting with commits
> 
>   aa42d65b5e20 ("IB/core: allow passing mapping an offset into the SG in 
> ib_map_mr_sg")
>   f0cf99be3251 ("IB/core: Enhance ib_map_mr_sg()")
> 
> from the rdma-leon-test tree.
> 
> I added the following merge fix patch for today:
> 
> From: Stephen Rothwell 
> Date: Fri, 13 May 2016 13:10:47 +1000
> Subject: [PATCH] staging: lustre: o2iblnd: fix for ib_map_mr_sg() API changes
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c 
> b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
> index d99b4fac0c39..6c59f2ff2220 100644
> --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
> +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
> @@ -1704,7 +1704,7 @@ int kiblnd_fmr_pool_map(kib_fmr_poolset_t *fps, 
> kib_tx_t *tx,
>   }
>  
>   n = ib_map_mr_sg(mr, tx->tx_frags,
> -  tx->tx_nfrags, PAGE_SIZE);
> +  tx->tx_nfrags, NULL, 
> PAGE_SIZE);
>   if (unlikely(n != tx->tx_nfrags)) {
>   CERROR("Failed to map mr %d/%d 
> elements\n",
>  n, tx->tx_nfrags);

Looks good, thanks for the fix.

greg k-h

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

[Greg KH]

On Fri, May 13, 2016 at 01:15:38PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1706:9: 
> error: too few arguments to function 'ib_map_mr_sg'
>  n = ib_map_mr_sg(mr, tx->tx_frags,
>  ^
> In file included from /home/sfr/next/next/include/rdma/ib_addr.h:47:0,
>  from /home/sfr/next/next/include/rdma/rdma_cm.h:39,
>  from 
> /home/sfr/next/next/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h:63,
>  from 
> /home/sfr/next/next/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:43:
> /home/sfr/next/next/include/rdma/ib_verbs.h:3147:5: note: declared here
>  int ib_map_mr_sg(struct ib_mr *mr, struct scatterlist *sg, int sg_nents,
>  ^
> 
> Caused by commit
> 
>   80e05b34f882 ("staging: lustre: o2iblnd: Add Fast Reg memory registration 
> support")
> 
> interacting with commits
> 
>   aa42d65b5e20 ("IB/core: allow passing mapping an offset into the SG in 
> ib_map_mr_sg")
>   f0cf99be3251 ("IB/core: Enhance ib_map_mr_sg()")
> 
> from the rdma-leon-test tree.
> 
> I added the following merge fix patch for today:
> 
> From: Stephen Rothwell 
> Date: Fri, 13 May 2016 13:10:47 +1000
> Subject: [PATCH] staging: lustre: o2iblnd: fix for ib_map_mr_sg() API changes
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c 
> b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
> index d99b4fac0c39..6c59f2ff2220 100644
> --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
> +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
> @@ -1704,7 +1704,7 @@ int kiblnd_fmr_pool_map(kib_fmr_poolset_t *fps, 
> kib_tx_t *tx,
>   }
>  
>   n = ib_map_mr_sg(mr, tx->tx_frags,
> -  tx->tx_nfrags, PAGE_SIZE);
> +  tx->tx_nfrags, NULL, 
> PAGE_SIZE);
>   if (unlikely(n != tx->tx_nfrags)) {
>   CERROR("Failed to map mr %d/%d 
> elements\n",
>  n, tx->tx_nfrags);

Looks good, thanks for the fix.

greg k-h

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1706:9: 
error: too few arguments to function 'ib_map_mr_sg'
 n = ib_map_mr_sg(mr, tx->tx_frags,
 ^
In file included from /home/sfr/next/next/include/rdma/ib_addr.h:47:0,
 from /home/sfr/next/next/include/rdma/rdma_cm.h:39,
 from 
/home/sfr/next/next/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h:63,
 from 
/home/sfr/next/next/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:43:
/home/sfr/next/next/include/rdma/ib_verbs.h:3147:5: note: declared here
 int ib_map_mr_sg(struct ib_mr *mr, struct scatterlist *sg, int sg_nents,
 ^

Caused by commit

  80e05b34f882 ("staging: lustre: o2iblnd: Add Fast Reg memory registration 
support")

interacting with commits

  aa42d65b5e20 ("IB/core: allow passing mapping an offset into the SG in 
ib_map_mr_sg")
  f0cf99be3251 ("IB/core: Enhance ib_map_mr_sg()")

from the rdma-leon-test tree.

I added the following merge fix patch for today:

From: Stephen Rothwell 
Date: Fri, 13 May 2016 13:10:47 +1000
Subject: [PATCH] staging: lustre: o2iblnd: fix for ib_map_mr_sg() API changes

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c 
b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index d99b4fac0c39..6c59f2ff2220 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -1704,7 +1704,7 @@ int kiblnd_fmr_pool_map(kib_fmr_poolset_t *fps, kib_tx_t 
*tx,
}
 
n = ib_map_mr_sg(mr, tx->tx_frags,
-tx->tx_nfrags, PAGE_SIZE);
+tx->tx_nfrags, NULL, 
PAGE_SIZE);
if (unlikely(n != tx->tx_nfrags)) {
CERROR("Failed to map mr %d/%d 
elements\n",
   n, tx->tx_nfrags);
-- 
2.7.0

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1706:9: 
error: too few arguments to function 'ib_map_mr_sg'
 n = ib_map_mr_sg(mr, tx->tx_frags,
 ^
In file included from /home/sfr/next/next/include/rdma/ib_addr.h:47:0,
 from /home/sfr/next/next/include/rdma/rdma_cm.h:39,
 from 
/home/sfr/next/next/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h:63,
 from 
/home/sfr/next/next/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:43:
/home/sfr/next/next/include/rdma/ib_verbs.h:3147:5: note: declared here
 int ib_map_mr_sg(struct ib_mr *mr, struct scatterlist *sg, int sg_nents,
 ^

Caused by commit

  80e05b34f882 ("staging: lustre: o2iblnd: Add Fast Reg memory registration 
support")

interacting with commits

  aa42d65b5e20 ("IB/core: allow passing mapping an offset into the SG in 
ib_map_mr_sg")
  f0cf99be3251 ("IB/core: Enhance ib_map_mr_sg()")

from the rdma-leon-test tree.

I added the following merge fix patch for today:

From: Stephen Rothwell 
Date: Fri, 13 May 2016 13:10:47 +1000
Subject: [PATCH] staging: lustre: o2iblnd: fix for ib_map_mr_sg() API changes

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c 
b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index d99b4fac0c39..6c59f2ff2220 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -1704,7 +1704,7 @@ int kiblnd_fmr_pool_map(kib_fmr_poolset_t *fps, kib_tx_t 
*tx,
}
 
n = ib_map_mr_sg(mr, tx->tx_frags,
-tx->tx_nfrags, PAGE_SIZE);
+tx->tx_nfrags, NULL, 
PAGE_SIZE);
if (unlikely(n != tx->tx_nfrags)) {
CERROR("Failed to map mr %d/%d 
elements\n",
   n, tx->tx_nfrags);
-- 
2.7.0

-- 
Cheers,
Stephen Rothwell

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

[Johannes Berg]

Hi Stephen, all,

> Caused by commit c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11
> driver") from the staging tree interacting with commit 80279fb7ba5b
> ("cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in
> disconnect") from the net-next tree.

I thought I fixed it all, but it looks like this is a new driver.

> I applied the below merge fix patch (I didn't know if it should be
> "true" or "false" - advise would be nice).

As far as I can tell from looking at a few lines of context it's
handling a disconnect event from the firmware, which presumably sends
the event upon deauth from the AP; thus it should be 'true' instead,
since the argument says "from_ap".

johannes

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c:681:3: error: too few 
arguments to function 'cfg80211_disconnected'
   cfg80211_disconnected(dev, pstrDisconnectNotifInfo->u16reason, 
pstrDisconnectNotifInfo->ie,
   ^
In file included from drivers/staging/wilc1000/wilc_wfi_netdevice.h:40:0,
 from drivers/staging/wilc1000/wilc_wfi_cfgoperations.h:11,
 from drivers/staging/wilc1000/wilc_wfi_cfgoperations.c:13:
include/net/cfg80211.h:4584:6: note: declared here
 void cfg80211_disconnected(struct net_device *dev, u16 reason,
  ^

Caused by commit c5c77ba18ea6 ("staging: wilc1000: Add SDIO/SPI 802.11
driver") from the staging tree interacting with commit 80279fb7ba5b
("cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in
disconnect") from the net-next tree.

I applied the below merge fix patch (I didn't know if it should be
"true" or "false" - advise would be nice).  However, there are still
way to many warnings from this driver, so I have disabled it again.

From: Stephen Rothwell 
Date: Wed, 3 Jun 2015 17:09:03 +1000
Subject: [PATCH] staging: wilc1000: fix call to cfg80211_disconnecteddue to API 
change

Signed-off-by: Stephen Rothwell 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index f5eff0933e7d..1685669762e8 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -679,7 +679,7 @@ static void CfgConnectResult(tenuConnDisconnEvent 
enuConnDisconnEvent,
pstrDisconnectNotifInfo->u16reason = 1;
}
cfg80211_disconnected(dev, pstrDisconnectNotifInfo->u16reason, 
pstrDisconnectNotifInfo->ie,
- pstrDisconnectNotifInfo->ie_len, 
GFP_KERNEL);
+ pstrDisconnectNotifInfo->ie_len, false, 
GFP_KERNEL);
 
}
 
-- 
2.1.4

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpqy2ErgWnbv.pgp
Description: OpenPGP digital signature

linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

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

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c:681:3: error: too few 
arguments to function 'cfg80211_disconnected'
   cfg80211_disconnected(dev, pstrDisconnectNotifInfo-u16reason, 
pstrDisconnectNotifInfo-ie,
   ^
In file included from drivers/staging/wilc1000/wilc_wfi_netdevice.h:40:0,
 from drivers/staging/wilc1000/wilc_wfi_cfgoperations.h:11,
 from drivers/staging/wilc1000/wilc_wfi_cfgoperations.c:13:
include/net/cfg80211.h:4584:6: note: declared here
 void cfg80211_disconnected(struct net_device *dev, u16 reason,
  ^

Caused by commit c5c77ba18ea6 (staging: wilc1000: Add SDIO/SPI 802.11
driver) from the staging tree interacting with commit 80279fb7ba5b
(cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in
disconnect) from the net-next tree.

I applied the below merge fix patch (I didn't know if it should be
true or false - advise would be nice).  However, there are still
way to many warnings from this driver, so I have disabled it again.

From: Stephen Rothwell s...@canb.auug.org.au
Date: Wed, 3 Jun 2015 17:09:03 +1000
Subject: [PATCH] staging: wilc1000: fix call to cfg80211_disconnecteddue to API 
change

Signed-off-by: Stephen Rothwell s...@canb.auug.org.au
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index f5eff0933e7d..1685669762e8 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -679,7 +679,7 @@ static void CfgConnectResult(tenuConnDisconnEvent 
enuConnDisconnEvent,
pstrDisconnectNotifInfo-u16reason = 1;
}
cfg80211_disconnected(dev, pstrDisconnectNotifInfo-u16reason, 
pstrDisconnectNotifInfo-ie,
- pstrDisconnectNotifInfo-ie_len, 
GFP_KERNEL);
+ pstrDisconnectNotifInfo-ie_len, false, 
GFP_KERNEL);
 
}
 
-- 
2.1.4

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpqy2ErgWnbv.pgp
Description: OpenPGP digital signature

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

[Johannes Berg]

Hi Stephen, all,

 Caused by commit c5c77ba18ea6 (staging: wilc1000: Add SDIO/SPI 802.11
 driver) from the staging tree interacting with commit 80279fb7ba5b
 (cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in
 disconnect) from the net-next tree.

I thought I fixed it all, but it looks like this is a new driver.

 I applied the below merge fix patch (I didn't know if it should be
 true or false - advise would be nice).

As far as I can tell from looking at a few lines of context it's
handling a disconnect event from the firmware, which presumably sends
the event upon deauth from the AP; thus it should be 'true' instead,
since the argument says from_ap.

johannes

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

[Stephen Rothwell]

Hi Greg,

On Tue, 10 Mar 2015 16:08:15 +0100 Greg KH  wrote:
>
> Sorry about that.  Yes, I know it's a mess.  The build error on ppc
> should now be fixed in my tree.  The build warnings are still there
> (some are gone).  I should just go fix them up myself, and will do so
> tonight if I don't get a patch from someone else that does so first...
> 
> So it should be safe to enable again.

OK, will do.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpsv0Ca2GLqI.pgp
Description: OpenPGP digital signature

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

[Sudip Mukherjee]

On Tue, Mar 10, 2015 at 04:08:15PM +0100, Greg KH wrote:
> On Tue, Mar 10, 2015 at 04:07:28PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > After merging the staging tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > In file included from include/linux/module.h:17:0,
> >  from drivers/staging/sm750fb/sm750.c:2:
> > drivers/staging/sm750fb/sm750.c: In function '__check_g_option':
> > drivers/staging/sm750fb/sm750.c:1436:14: error: 'g_option' undeclared 
> > (first use in this function)
> >  module_param(g_option,charp,S_IRUGO);

> > to enable it again.
> 
> Sorry about that.  Yes, I know it's a mess.  The build error on ppc
> should now be fixed in my tree.  The build warnings are still there
> (some are gone).  I should just go fix them up myself, and will do so
> tonight if I don't get a patch from someone else that does so first...
> 
> So it should be safe to enable again.
i am so sorry for the mess. I thought patchset to fix the build failures will 
buy me some time to fix the other warnings.
I am sending another series to fix the remainig warnings.

reagrds
sudip

> 
> thanks,
> 
> greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

[Greg KH]

On Tue, Mar 10, 2015 at 04:07:28PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the staging tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> In file included from include/linux/module.h:17:0,
>  from drivers/staging/sm750fb/sm750.c:2:
> drivers/staging/sm750fb/sm750.c: In function '__check_g_option':
> drivers/staging/sm750fb/sm750.c:1436:14: error: 'g_option' undeclared (first 
> use in this function)
>  module_param(g_option,charp,S_IRUGO);
>   ^
> 
> Caused by commit 81dee67e215b ("staging: sm750fb: add sm750 to staging").
> 
> This driver also produced a large number of warnings ... a lot like this:
> 
> drivers/staging/sm750fb/sm750.c: In function 'lynxfb_ops_mmap':
> drivers/staging/sm750fb/sm750.c:533:2: warning: format '%x' expects argument 
> of type 'unsigned int', but argument 2 has type 'long unsigned int' 
> [-Wformat=]
>   printk("lynxfb mmap pgoff: %x\n", vma->vm_pgoff);
>   ^
> 
> Also note:
> 
> In file included from drivers/staging/sm750fb/ddk750_mode.h:4:0,
>  from drivers/staging/sm750fb/ddk750.h:15,
>  from drivers/staging/sm750fb/sm750_hw.c:24:
> drivers/staging/sm750fb/ddk750_chip.h:4:0: warning: "SM750LE_REVISION_ID" 
> redefined
>  #define SM750LE_REVISION_ID (char)0xfe
>  ^
> In file included from drivers/staging/sm750fb/sm750_hw.c:23:0:
> drivers/staging/sm750fb/sm750_hw.h:8:0: note: this is the location of the 
> previous definition
>  #define SM750LE_REVISION_ID (unsigned char)0xfe
>  ^
> 
> I have disabled this driver for now, please let me know when it is OK
> to enable it again.

Sorry about that.  Yes, I know it's a mess.  The build error on ppc
should now be fixed in my tree.  The build warnings are still there
(some are gone).  I should just go fix them up myself, and will do so
tonight if I don't get a patch from someone else that does so first...

So it should be safe to enable again.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

[Greg KH]

On Tue, Mar 10, 2015 at 04:07:28PM +1100, Stephen Rothwell wrote:
 Hi Greg,
 
 After merging the staging tree, today's linux-next build (powerpc
 allyesconfig) failed like this:
 
 In file included from include/linux/module.h:17:0,
  from drivers/staging/sm750fb/sm750.c:2:
 drivers/staging/sm750fb/sm750.c: In function '__check_g_option':
 drivers/staging/sm750fb/sm750.c:1436:14: error: 'g_option' undeclared (first 
 use in this function)
  module_param(g_option,charp,S_IRUGO);
   ^
 
 Caused by commit 81dee67e215b (staging: sm750fb: add sm750 to staging).
 
 This driver also produced a large number of warnings ... a lot like this:
 
 drivers/staging/sm750fb/sm750.c: In function 'lynxfb_ops_mmap':
 drivers/staging/sm750fb/sm750.c:533:2: warning: format '%x' expects argument 
 of type 'unsigned int', but argument 2 has type 'long unsigned int' 
 [-Wformat=]
   printk(lynxfb mmap pgoff: %x\n, vma-vm_pgoff);
   ^
 
 Also note:
 
 In file included from drivers/staging/sm750fb/ddk750_mode.h:4:0,
  from drivers/staging/sm750fb/ddk750.h:15,
  from drivers/staging/sm750fb/sm750_hw.c:24:
 drivers/staging/sm750fb/ddk750_chip.h:4:0: warning: SM750LE_REVISION_ID 
 redefined
  #define SM750LE_REVISION_ID (char)0xfe
  ^
 In file included from drivers/staging/sm750fb/sm750_hw.c:23:0:
 drivers/staging/sm750fb/sm750_hw.h:8:0: note: this is the location of the 
 previous definition
  #define SM750LE_REVISION_ID (unsigned char)0xfe
  ^
 
 I have disabled this driver for now, please let me know when it is OK
 to enable it again.

Sorry about that.  Yes, I know it's a mess.  The build error on ppc
should now be fixed in my tree.  The build warnings are still there
(some are gone).  I should just go fix them up myself, and will do so
tonight if I don't get a patch from someone else that does so first...

So it should be safe to enable again.

thanks,

greg k-h
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

[Sudip Mukherjee]

On Tue, Mar 10, 2015 at 04:08:15PM +0100, Greg KH wrote:
 On Tue, Mar 10, 2015 at 04:07:28PM +1100, Stephen Rothwell wrote:
  Hi Greg,
  
  After merging the staging tree, today's linux-next build (powerpc
  allyesconfig) failed like this:
  
  In file included from include/linux/module.h:17:0,
   from drivers/staging/sm750fb/sm750.c:2:
  drivers/staging/sm750fb/sm750.c: In function '__check_g_option':
  drivers/staging/sm750fb/sm750.c:1436:14: error: 'g_option' undeclared 
  (first use in this function)
   module_param(g_option,charp,S_IRUGO);
snip
  to enable it again.
 
 Sorry about that.  Yes, I know it's a mess.  The build error on ppc
 should now be fixed in my tree.  The build warnings are still there
 (some are gone).  I should just go fix them up myself, and will do so
 tonight if I don't get a patch from someone else that does so first...
 
 So it should be safe to enable again.
i am so sorry for the mess. I thought patchset to fix the build failures will 
buy me some time to fix the other warnings.
I am sending another series to fix the remainig warnings.

reagrds
sudip

 
 thanks,
 
 greg k-h
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/