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

2019-03-19 Thread Stephen Rothwell
Hi James,

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

In file included from drivers/scsi/lpfc/lpfc_debugfs.c:46:
drivers/scsi/lpfc/lpfc_debugfs.c: In function 'lpfc_idiag_queacc_write':
drivers/scsi/lpfc/lpfc_sli4.h:1083:14: error: inlining failed in call to 
always_inline 'lpfc_sli4_qe': function body not available
 inline void *lpfc_sli4_qe(struct lpfc_queue *, uint16_t);
  ^~~~
drivers/scsi/lpfc/lpfc_debugfs.c:4488:12: note: called from here
   pentry = lpfc_sli4_qe(pque, index);
^
In file included from drivers/scsi/lpfc/lpfc_debugfs.c:46:
drivers/scsi/lpfc/lpfc_sli4.h:1083:14: error: inlining failed in call to 
always_inline 'lpfc_sli4_qe': function body not available
 inline void *lpfc_sli4_qe(struct lpfc_queue *, uint16_t);
  ^~~~
drivers/scsi/lpfc/lpfc_debugfs.c:4488:12: note: called from here
   pentry = lpfc_sli4_qe(pque, index);
^

Caused by commit

  9afbee3d62a4 ("scsi: lpfc: Reduce memory footprint for lpfc_queue")

I applied the following fix patch for today.

From: Stephen Rothwell 
Date: Wed, 20 Mar 2019 11:44:21 +1100
Subject: [PATCH] scsi: lpfc: remove inappropriate inline

Fixes: 9afbee3d62a4 ("scsi: lpfc: Reduce memory footprint for lpfc_queue")
Signed-off-by: Stephen Rothwell 
---
 drivers/scsi/lpfc/lpfc_sli4.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h
index bd5b5c3de35e..6670c6e7e28d 100644
--- a/drivers/scsi/lpfc/lpfc_sli4.h
+++ b/drivers/scsi/lpfc/lpfc_sli4.h
@@ -1080,4 +1080,4 @@ int lpfc_sli4_post_status_check(struct lpfc_hba *);
 uint8_t lpfc_sli_config_mbox_subsys_get(struct lpfc_hba *, LPFC_MBOXQ_t *);
 uint8_t lpfc_sli_config_mbox_opcode_get(struct lpfc_hba *, LPFC_MBOXQ_t *);
 void lpfc_sli4_ras_dma_free(struct lpfc_hba *phba);
-inline void *lpfc_sli4_qe(struct lpfc_queue *, uint16_t);
+void *lpfc_sli4_qe(struct lpfc_queue *, uint16_t);
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell


pgpqP4sMQCQy8.pgp
Description: OpenPGP digital signature


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

2017-08-28 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/qlogicpti.c:1285:27: error: initialization from incompatible 
pointer type [-Werror=incompatible-pointer-types]
  .eh_host_reset_handler = qlogicpti_reset,
   ^

Caused by commit

  af167bc42d86 ("scsi: qlogicpti: move bus reset to host reset")

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell


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

2017-08-28 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/qlogicpti.c:1285:27: error: initialization from incompatible 
pointer type [-Werror=incompatible-pointer-types]
  .eh_host_reset_handler = qlogicpti_reset,
   ^

Caused by commit

  af167bc42d86 ("scsi: qlogicpti: move bus reset to host reset")

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell


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

2017-02-13 Thread Jens Axboe
On 02/12/2017 05:32 PM, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 6 Feb 2017 16:04:51 +1100 Stephen Rothwell  
> wrote:
>>
>> After merging the scsi tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> In file included from include/uapi/linux/stddef.h:1:0,
>>  from include/linux/stddef.h:4,
>>  from include/uapi/linux/posix_types.h:4,
>>  from include/uapi/linux/types.h:13,
>>  from include/linux/types.h:5,
>>  from include/linux/list.h:4,
>>  from include/linux/module.h:9,
>>  from drivers/scsi/mpt3sas/mpt3sas_scsih.c:45:
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function '_scsih_io_done':
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:28: error: 'struct request' has no 
>> member named 'cmd_type'
>>   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>> ^
>> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>>  # define unlikely(x) __builtin_expect(!!(x), 0)
>>   ^
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: error: 'REQ_TYPE_FS' 
>> undeclared (first use in this function)
>>   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>>   ^
>> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>>  # define unlikely(x) __builtin_expect(!!(x), 0)
>>   ^
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: note: each undeclared 
>> identifier is reported only once for each function it appears in
>>   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>>   ^
>> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>>  # define unlikely(x) __builtin_expect(!!(x), 0)
>>   ^
>>
>> Caused by commit
>>
>>   f2e767bb5d6e ("scsi: mpt3sas: Force request partial completion alignment")
>>
>> interacting with commit
>>
>>   aebf526b53ae ("block: fold cmd_type into the REQ_OP_ space")
>>
>> from the block tree.
>>
>> I have applied teh following merge fix patch:
>>
>> From: Stephen Rothwell 
>> Date: Mon, 6 Feb 2017 16:00:54 +1100
>> Subject: [PATCH] scsi: mpt3sas: fix up for "block: fold cmd_type into the
>>  REQ_OP_ space"
>>
>> Signed-off-by: Stephen Rothwell 
>> ---
>>  drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c 
>> b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
>> index 5f7b0c7d7e4d..81a64678390d 100644
>> --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
>> +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
>> @@ -4747,7 +4747,7 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, 
>> u8 msix_index, u32 reply)
>>   * then scsi-ml does not need to handle this misbehavior.
>>   */
>>  sector_sz = scmd->device->sector_size;
>> -if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>> +if (unlikely(!blk_rq_is_passthrough(scmd->request) && sector_sz &&
>>   xfer_cnt % sector_sz)) {
>>  sdev_printk(KERN_INFO, scmd->device,
>>  "unaligned partial completion avoided (xfer_cnt=%u, 
>> sector_sz=%u)\n",
>> -- 
>> 2.10.2
> 
> The scsi tree commit has been merged into Linus' tree, so this
> interaction occurs between tyhe block tree and Linus' tree, now.

Thanks Stephen, I'll prepare a merged tree as well for Linus, so we
don't lose this when the block tree is merged for 4.11.

-- 
Jens Axboe



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

2017-02-13 Thread Jens Axboe
On 02/12/2017 05:32 PM, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 6 Feb 2017 16:04:51 +1100 Stephen Rothwell  
> wrote:
>>
>> After merging the scsi tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> In file included from include/uapi/linux/stddef.h:1:0,
>>  from include/linux/stddef.h:4,
>>  from include/uapi/linux/posix_types.h:4,
>>  from include/uapi/linux/types.h:13,
>>  from include/linux/types.h:5,
>>  from include/linux/list.h:4,
>>  from include/linux/module.h:9,
>>  from drivers/scsi/mpt3sas/mpt3sas_scsih.c:45:
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function '_scsih_io_done':
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:28: error: 'struct request' has no 
>> member named 'cmd_type'
>>   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>> ^
>> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>>  # define unlikely(x) __builtin_expect(!!(x), 0)
>>   ^
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: error: 'REQ_TYPE_FS' 
>> undeclared (first use in this function)
>>   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>>   ^
>> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>>  # define unlikely(x) __builtin_expect(!!(x), 0)
>>   ^
>> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: note: each undeclared 
>> identifier is reported only once for each function it appears in
>>   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>>   ^
>> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>>  # define unlikely(x) __builtin_expect(!!(x), 0)
>>   ^
>>
>> Caused by commit
>>
>>   f2e767bb5d6e ("scsi: mpt3sas: Force request partial completion alignment")
>>
>> interacting with commit
>>
>>   aebf526b53ae ("block: fold cmd_type into the REQ_OP_ space")
>>
>> from the block tree.
>>
>> I have applied teh following merge fix patch:
>>
>> From: Stephen Rothwell 
>> Date: Mon, 6 Feb 2017 16:00:54 +1100
>> Subject: [PATCH] scsi: mpt3sas: fix up for "block: fold cmd_type into the
>>  REQ_OP_ space"
>>
>> Signed-off-by: Stephen Rothwell 
>> ---
>>  drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c 
>> b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
>> index 5f7b0c7d7e4d..81a64678390d 100644
>> --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
>> +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
>> @@ -4747,7 +4747,7 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, 
>> u8 msix_index, u32 reply)
>>   * then scsi-ml does not need to handle this misbehavior.
>>   */
>>  sector_sz = scmd->device->sector_size;
>> -if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>> +if (unlikely(!blk_rq_is_passthrough(scmd->request) && sector_sz &&
>>   xfer_cnt % sector_sz)) {
>>  sdev_printk(KERN_INFO, scmd->device,
>>  "unaligned partial completion avoided (xfer_cnt=%u, 
>> sector_sz=%u)\n",
>> -- 
>> 2.10.2
> 
> The scsi tree commit has been merged into Linus' tree, so this
> interaction occurs between tyhe block tree and Linus' tree, now.

Thanks Stephen, I'll prepare a merged tree as well for Linus, so we
don't lose this when the block tree is merged for 4.11.

-- 
Jens Axboe



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

2017-02-12 Thread Stephen Rothwell
Hi all,

On Mon, 6 Feb 2017 16:04:51 +1100 Stephen Rothwell  
wrote:
>
> After merging the scsi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from include/uapi/linux/stddef.h:1:0,
>  from include/linux/stddef.h:4,
>  from include/uapi/linux/posix_types.h:4,
>  from include/uapi/linux/types.h:13,
>  from include/linux/types.h:5,
>  from include/linux/list.h:4,
>  from include/linux/module.h:9,
>  from drivers/scsi/mpt3sas/mpt3sas_scsih.c:45:
> drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function '_scsih_io_done':
> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:28: error: 'struct request' has no 
> member named 'cmd_type'
>   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
> ^
> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>  # define unlikely(x) __builtin_expect(!!(x), 0)
>   ^
> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: error: 'REQ_TYPE_FS' undeclared 
> (first use in this function)
>   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>   ^
> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>  # define unlikely(x) __builtin_expect(!!(x), 0)
>   ^
> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: note: each undeclared 
> identifier is reported only once for each function it appears in
>   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>   ^
> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>  # define unlikely(x) __builtin_expect(!!(x), 0)
>   ^
> 
> Caused by commit
> 
>   f2e767bb5d6e ("scsi: mpt3sas: Force request partial completion alignment")
> 
> interacting with commit
> 
>   aebf526b53ae ("block: fold cmd_type into the REQ_OP_ space")
> 
> from the block tree.
> 
> I have applied teh following merge fix patch:
> 
> From: Stephen Rothwell 
> Date: Mon, 6 Feb 2017 16:00:54 +1100
> Subject: [PATCH] scsi: mpt3sas: fix up for "block: fold cmd_type into the
>  REQ_OP_ space"
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c 
> b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> index 5f7b0c7d7e4d..81a64678390d 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> @@ -4747,7 +4747,7 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, 
> u8 msix_index, u32 reply)
>* then scsi-ml does not need to handle this misbehavior.
>*/
>   sector_sz = scmd->device->sector_size;
> - if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
> + if (unlikely(!blk_rq_is_passthrough(scmd->request) && sector_sz &&
>xfer_cnt % sector_sz)) {
>   sdev_printk(KERN_INFO, scmd->device,
>   "unaligned partial completion avoided (xfer_cnt=%u, 
> sector_sz=%u)\n",
> -- 
> 2.10.2

The scsi tree commit has been merged into Linus' tree, so this
interaction occurs between tyhe block tree and Linus' tree, now.

-- 
Cheers,
Stephen Rothwell


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

2017-02-12 Thread Stephen Rothwell
Hi all,

On Mon, 6 Feb 2017 16:04:51 +1100 Stephen Rothwell  
wrote:
>
> After merging the scsi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from include/uapi/linux/stddef.h:1:0,
>  from include/linux/stddef.h:4,
>  from include/uapi/linux/posix_types.h:4,
>  from include/uapi/linux/types.h:13,
>  from include/linux/types.h:5,
>  from include/linux/list.h:4,
>  from include/linux/module.h:9,
>  from drivers/scsi/mpt3sas/mpt3sas_scsih.c:45:
> drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function '_scsih_io_done':
> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:28: error: 'struct request' has no 
> member named 'cmd_type'
>   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
> ^
> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>  # define unlikely(x) __builtin_expect(!!(x), 0)
>   ^
> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: error: 'REQ_TYPE_FS' undeclared 
> (first use in this function)
>   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>   ^
> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>  # define unlikely(x) __builtin_expect(!!(x), 0)
>   ^
> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: note: each undeclared 
> identifier is reported only once for each function it appears in
>   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
>   ^
> include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
>  # define unlikely(x) __builtin_expect(!!(x), 0)
>   ^
> 
> Caused by commit
> 
>   f2e767bb5d6e ("scsi: mpt3sas: Force request partial completion alignment")
> 
> interacting with commit
> 
>   aebf526b53ae ("block: fold cmd_type into the REQ_OP_ space")
> 
> from the block tree.
> 
> I have applied teh following merge fix patch:
> 
> From: Stephen Rothwell 
> Date: Mon, 6 Feb 2017 16:00:54 +1100
> Subject: [PATCH] scsi: mpt3sas: fix up for "block: fold cmd_type into the
>  REQ_OP_ space"
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c 
> b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> index 5f7b0c7d7e4d..81a64678390d 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> @@ -4747,7 +4747,7 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, 
> u8 msix_index, u32 reply)
>* then scsi-ml does not need to handle this misbehavior.
>*/
>   sector_sz = scmd->device->sector_size;
> - if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
> + if (unlikely(!blk_rq_is_passthrough(scmd->request) && sector_sz &&
>xfer_cnt % sector_sz)) {
>   sdev_printk(KERN_INFO, scmd->device,
>   "unaligned partial completion avoided (xfer_cnt=%u, 
> sector_sz=%u)\n",
> -- 
> 2.10.2

The scsi tree commit has been merged into Linus' tree, so this
interaction occurs between tyhe block tree and Linus' tree, now.

-- 
Cheers,
Stephen Rothwell


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

2017-02-05 Thread Stephen Rothwell
Hi all,

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

In file included from include/uapi/linux/stddef.h:1:0,
 from include/linux/stddef.h:4,
 from include/uapi/linux/posix_types.h:4,
 from include/uapi/linux/types.h:13,
 from include/linux/types.h:5,
 from include/linux/list.h:4,
 from include/linux/module.h:9,
 from drivers/scsi/mpt3sas/mpt3sas_scsih.c:45:
drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function '_scsih_io_done':
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:28: error: 'struct request' has no 
member named 'cmd_type'
  if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
^
include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
 # define unlikely(x) __builtin_expect(!!(x), 0)
  ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: error: 'REQ_TYPE_FS' undeclared 
(first use in this function)
  if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
  ^
include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
 # define unlikely(x) __builtin_expect(!!(x), 0)
  ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: note: each undeclared identifier 
is reported only once for each function it appears in
  if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
  ^
include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
 # define unlikely(x) __builtin_expect(!!(x), 0)
  ^

Caused by commit

  f2e767bb5d6e ("scsi: mpt3sas: Force request partial completion alignment")

interacting with commit

  aebf526b53ae ("block: fold cmd_type into the REQ_OP_ space")

from the block tree.

I have applied teh following merge fix patch:

From: Stephen Rothwell 
Date: Mon, 6 Feb 2017 16:00:54 +1100
Subject: [PATCH] scsi: mpt3sas: fix up for "block: fold cmd_type into the
 REQ_OP_ space"

Signed-off-by: Stephen Rothwell 
---
 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c 
b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 5f7b0c7d7e4d..81a64678390d 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -4747,7 +4747,7 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
msix_index, u32 reply)
 * then scsi-ml does not need to handle this misbehavior.
 */
sector_sz = scmd->device->sector_size;
-   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
+   if (unlikely(!blk_rq_is_passthrough(scmd->request) && sector_sz &&
 xfer_cnt % sector_sz)) {
sdev_printk(KERN_INFO, scmd->device,
"unaligned partial completion avoided (xfer_cnt=%u, 
sector_sz=%u)\n",
-- 
2.10.2

-- 
Cheers,
Stephen Rothwell


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

2017-02-05 Thread Stephen Rothwell
Hi all,

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

In file included from include/uapi/linux/stddef.h:1:0,
 from include/linux/stddef.h:4,
 from include/uapi/linux/posix_types.h:4,
 from include/uapi/linux/types.h:13,
 from include/linux/types.h:5,
 from include/linux/list.h:4,
 from include/linux/module.h:9,
 from drivers/scsi/mpt3sas/mpt3sas_scsih.c:45:
drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function '_scsih_io_done':
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:28: error: 'struct request' has no 
member named 'cmd_type'
  if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
^
include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
 # define unlikely(x) __builtin_expect(!!(x), 0)
  ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: error: 'REQ_TYPE_FS' undeclared 
(first use in this function)
  if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
  ^
include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
 # define unlikely(x) __builtin_expect(!!(x), 0)
  ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4750:42: note: each undeclared identifier 
is reported only once for each function it appears in
  if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
  ^
include/linux/compiler.h:179:42: note: in definition of macro 'unlikely'
 # define unlikely(x) __builtin_expect(!!(x), 0)
  ^

Caused by commit

  f2e767bb5d6e ("scsi: mpt3sas: Force request partial completion alignment")

interacting with commit

  aebf526b53ae ("block: fold cmd_type into the REQ_OP_ space")

from the block tree.

I have applied teh following merge fix patch:

From: Stephen Rothwell 
Date: Mon, 6 Feb 2017 16:00:54 +1100
Subject: [PATCH] scsi: mpt3sas: fix up for "block: fold cmd_type into the
 REQ_OP_ space"

Signed-off-by: Stephen Rothwell 
---
 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c 
b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 5f7b0c7d7e4d..81a64678390d 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -4747,7 +4747,7 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
msix_index, u32 reply)
 * then scsi-ml does not need to handle this misbehavior.
 */
sector_sz = scmd->device->sector_size;
-   if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
+   if (unlikely(!blk_rq_is_passthrough(scmd->request) && sector_sz &&
 xfer_cnt % sector_sz)) {
sdev_printk(KERN_INFO, scmd->device,
"unaligned partial completion avoided (xfer_cnt=%u, 
sector_sz=%u)\n",
-- 
2.10.2

-- 
Cheers,
Stephen Rothwell


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

2016-12-24 Thread James Bottomley
On Sat, 2016-12-24 at 12:46 +0100, Thomas Gleixner wrote:
> On Sat, 24 Dec 2016, Stephen Rothwell wrote:
> > On Thu, 22 Dec 2016 16:56:34 -0800 James Bottomley <
> > james.bottom...@hansenpartnership.com> wrote:
> > > 
> > > On Fri, 2016-12-23 at 11:45 +1100, Stephen Rothwell wrote:
> > > > Hi James,
> > > > 
> > > > After merging the scsi tree, today's linux-next build (x86_64
> > > > allmodconfig) failed like this:
> > > > 
> > > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_init':
> > > > drivers/scsi/qedi/qedi_main.c:2073:2: error: implicit
> > > > declaration of
> > > > function 'register_hotcpu_notifier' [-Werror=implicit-function
> > > > -declaration]
> > > >   register_hotcpu_notifier(_cpu_notifier);
> > > >   ^
> > > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_cleanup':
> > > > drivers/scsi/qedi/qedi_main.c:2113:2: error: implicit
> > > > declaration of
> > > > function 'unregister_hotcpu_notifier' [-Werror=implicit
> > > > -function
> > > > -declaration]
> > > >   unregister_hotcpu_notifier(_cpu_notifier);
> > > >   ^
> > > > 
> > > > Caused by commit
> > > > 
> > > >   ace7f46ba5fd ("scsi: qedi: Add QLogic FastLinQ offload iSCSI
> > > > driver
> > > > framework.")
> > > > 
> > > > Interacting with commit
> > > > 
> > > >   8e38db753d95 ("cpu/hotplug: Remove obsolete cpu hotplug
> > > > register/unregister functions")
> > > > 
> > > > from the tip tree.  
> > > 
> > > Well, that's a bit of a problem given that the SCSI tree has a 
> > > pending pull request including this driver.
> > > 
> > > Thomas, can you do another fixup in your tip tree like you did 
> > > for the two BNX2* drivers?
> > 
> > OK, so this is now a problem for the tip tree merge since James 
> > tree has been pulled by Linus.
> 
> Sure, because SSCI people merge broken crap and I can wipe up the 
> mess they create.

Well, the driver was reviewed, but I don't think biting the heads of
the reviewers would help.

> Dammit, SCSI folks knew for a long time that the old interface goes
> away, but just waving crap through and let other people deal with the
> outcome is way simpler.

So this is the problem: I don't think this was actually communicated
this in a meaningful way; I think that's because we don't really have a
functional process for deprecating stuff.  Saying "this is broken or
deprecated" doesn't work because people don't necessarily see it and
even if they do, they often forget.  Putting it in some document
doesn't work either because we can't agree which one (and even if we
could, I bet the reviewers won't always consult it).

So here's the thing: if you want me to notice that a driver is using a
deprecated API, the API must be *marked* as deprecated so that I get a
build warning to investigate.  Absent that, I'm going to assume the
reviewers knew what they were talking about ... and likely a build
warning is the only way they'd know as well.

> And of course that hotplug code in this new driver is broken as hell. 
> It leaks notifiers in cases of errors and is racy against cpu 
> hotplug. The proper thing would be to mark this trainwreck broken and 
> be done with it.
> 
> I'm seriously pissed off as I now have to rebase my stuff and cleanup 
> that sad affair in order to not break bisects completely.

Well, I'm sorry, but it's a timing thing.  I could have removed this
driver from the pull it if I'd got the next failure before it was in
-flight.  I did incubate this final pull tree in next for a week which
was supposed to catch all the issues like this.

James




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

2016-12-24 Thread James Bottomley
On Sat, 2016-12-24 at 12:46 +0100, Thomas Gleixner wrote:
> On Sat, 24 Dec 2016, Stephen Rothwell wrote:
> > On Thu, 22 Dec 2016 16:56:34 -0800 James Bottomley <
> > james.bottom...@hansenpartnership.com> wrote:
> > > 
> > > On Fri, 2016-12-23 at 11:45 +1100, Stephen Rothwell wrote:
> > > > Hi James,
> > > > 
> > > > After merging the scsi tree, today's linux-next build (x86_64
> > > > allmodconfig) failed like this:
> > > > 
> > > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_init':
> > > > drivers/scsi/qedi/qedi_main.c:2073:2: error: implicit
> > > > declaration of
> > > > function 'register_hotcpu_notifier' [-Werror=implicit-function
> > > > -declaration]
> > > >   register_hotcpu_notifier(_cpu_notifier);
> > > >   ^
> > > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_cleanup':
> > > > drivers/scsi/qedi/qedi_main.c:2113:2: error: implicit
> > > > declaration of
> > > > function 'unregister_hotcpu_notifier' [-Werror=implicit
> > > > -function
> > > > -declaration]
> > > >   unregister_hotcpu_notifier(_cpu_notifier);
> > > >   ^
> > > > 
> > > > Caused by commit
> > > > 
> > > >   ace7f46ba5fd ("scsi: qedi: Add QLogic FastLinQ offload iSCSI
> > > > driver
> > > > framework.")
> > > > 
> > > > Interacting with commit
> > > > 
> > > >   8e38db753d95 ("cpu/hotplug: Remove obsolete cpu hotplug
> > > > register/unregister functions")
> > > > 
> > > > from the tip tree.  
> > > 
> > > Well, that's a bit of a problem given that the SCSI tree has a 
> > > pending pull request including this driver.
> > > 
> > > Thomas, can you do another fixup in your tip tree like you did 
> > > for the two BNX2* drivers?
> > 
> > OK, so this is now a problem for the tip tree merge since James 
> > tree has been pulled by Linus.
> 
> Sure, because SSCI people merge broken crap and I can wipe up the 
> mess they create.

Well, the driver was reviewed, but I don't think biting the heads of
the reviewers would help.

> Dammit, SCSI folks knew for a long time that the old interface goes
> away, but just waving crap through and let other people deal with the
> outcome is way simpler.

So this is the problem: I don't think this was actually communicated
this in a meaningful way; I think that's because we don't really have a
functional process for deprecating stuff.  Saying "this is broken or
deprecated" doesn't work because people don't necessarily see it and
even if they do, they often forget.  Putting it in some document
doesn't work either because we can't agree which one (and even if we
could, I bet the reviewers won't always consult it).

So here's the thing: if you want me to notice that a driver is using a
deprecated API, the API must be *marked* as deprecated so that I get a
build warning to investigate.  Absent that, I'm going to assume the
reviewers knew what they were talking about ... and likely a build
warning is the only way they'd know as well.

> And of course that hotplug code in this new driver is broken as hell. 
> It leaks notifiers in cases of errors and is racy against cpu 
> hotplug. The proper thing would be to mark this trainwreck broken and 
> be done with it.
> 
> I'm seriously pissed off as I now have to rebase my stuff and cleanup 
> that sad affair in order to not break bisects completely.

Well, I'm sorry, but it's a timing thing.  I could have removed this
driver from the pull it if I'd got the next failure before it was in
-flight.  I did incubate this final pull tree in next for a week which
was supposed to catch all the issues like this.

James




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

2016-12-24 Thread Thomas Gleixner
On Sat, 24 Dec 2016, Stephen Rothwell wrote:
> On Thu, 22 Dec 2016 16:56:34 -0800 James Bottomley 
>  wrote:
> >
> > On Fri, 2016-12-23 at 11:45 +1100, Stephen Rothwell wrote:
> > > Hi James,
> > > 
> > > After merging the scsi tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_init':
> > > drivers/scsi/qedi/qedi_main.c:2073:2: error: implicit declaration of
> > > function 'register_hotcpu_notifier' [-Werror=implicit-function
> > > -declaration]
> > >   register_hotcpu_notifier(_cpu_notifier);
> > >   ^
> > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_cleanup':
> > > drivers/scsi/qedi/qedi_main.c:2113:2: error: implicit declaration of
> > > function 'unregister_hotcpu_notifier' [-Werror=implicit-function
> > > -declaration]
> > >   unregister_hotcpu_notifier(_cpu_notifier);
> > >   ^
> > > 
> > > Caused by commit
> > > 
> > >   ace7f46ba5fd ("scsi: qedi: Add QLogic FastLinQ offload iSCSI driver
> > > framework.")
> > > 
> > > Interacting with commit
> > > 
> > >   8e38db753d95 ("cpu/hotplug: Remove obsolete cpu hotplug
> > > register/unregister functions")
> > > 
> > > from the tip tree.  
> > 
> > Well, that's a bit of a problem given that the SCSI tree has a pending
> > pull request including this driver.
> > 
> > Thomas, can you do another fixup in your tip tree like you did for the
> > two BNX2* drivers?
> 
> OK, so this is now a problem for the tip tree merge since James tree
> has been pulled by Linus.

Sure, because SSCI people merge broken crap and I can wipe up the mess they
create.

Dammit, SCSI folks knew for a long time that the old interface goes away,
but just waving crap through and let other people deal with the outcome is
way simpler.

And of course that hotplug code in this new driver is broken as hell. It
leaks notifiers in cases of errors and is racy against cpu hotplug. The
proper thing would be to mark this trainwreck broken and be done with it.

I'm seriously pissed off as I now have to rebase my stuff and cleanup that
sad affair in order to not break bisects completely.

Yours grumpy,

tglx

.



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

2016-12-24 Thread Thomas Gleixner
On Sat, 24 Dec 2016, Stephen Rothwell wrote:
> On Thu, 22 Dec 2016 16:56:34 -0800 James Bottomley 
>  wrote:
> >
> > On Fri, 2016-12-23 at 11:45 +1100, Stephen Rothwell wrote:
> > > Hi James,
> > > 
> > > After merging the scsi tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_init':
> > > drivers/scsi/qedi/qedi_main.c:2073:2: error: implicit declaration of
> > > function 'register_hotcpu_notifier' [-Werror=implicit-function
> > > -declaration]
> > >   register_hotcpu_notifier(_cpu_notifier);
> > >   ^
> > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_cleanup':
> > > drivers/scsi/qedi/qedi_main.c:2113:2: error: implicit declaration of
> > > function 'unregister_hotcpu_notifier' [-Werror=implicit-function
> > > -declaration]
> > >   unregister_hotcpu_notifier(_cpu_notifier);
> > >   ^
> > > 
> > > Caused by commit
> > > 
> > >   ace7f46ba5fd ("scsi: qedi: Add QLogic FastLinQ offload iSCSI driver
> > > framework.")
> > > 
> > > Interacting with commit
> > > 
> > >   8e38db753d95 ("cpu/hotplug: Remove obsolete cpu hotplug
> > > register/unregister functions")
> > > 
> > > from the tip tree.  
> > 
> > Well, that's a bit of a problem given that the SCSI tree has a pending
> > pull request including this driver.
> > 
> > Thomas, can you do another fixup in your tip tree like you did for the
> > two BNX2* drivers?
> 
> OK, so this is now a problem for the tip tree merge since James tree
> has been pulled by Linus.

Sure, because SSCI people merge broken crap and I can wipe up the mess they
create.

Dammit, SCSI folks knew for a long time that the old interface goes away,
but just waving crap through and let other people deal with the outcome is
way simpler.

And of course that hotplug code in this new driver is broken as hell. It
leaks notifiers in cases of errors and is racy against cpu hotplug. The
proper thing would be to mark this trainwreck broken and be done with it.

I'm seriously pissed off as I now have to rebase my stuff and cleanup that
sad affair in order to not break bisects completely.

Yours grumpy,

tglx

.



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

2016-12-24 Thread Stephen Rothwell
Hi Ingo,

On Sat, 24 Dec 2016 11:15:08 +0100 Ingo Molnar  wrote:
>
> Yeah, we'll handle it - that's why the final chunk of changes were left to 
> after 
> -rc1, to not cause such merge conflicts upstream.

Excellent, thanks.

> For now I've excluded the relevant -tip side commits from the linux-next 
> branch.

Well, there probably won't be any linux-next releases until Jan 3, so that's ok.

-- 
Cheers,
Stephen Rothwell


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

2016-12-24 Thread Stephen Rothwell
Hi Ingo,

On Sat, 24 Dec 2016 11:15:08 +0100 Ingo Molnar  wrote:
>
> Yeah, we'll handle it - that's why the final chunk of changes were left to 
> after 
> -rc1, to not cause such merge conflicts upstream.

Excellent, thanks.

> For now I've excluded the relevant -tip side commits from the linux-next 
> branch.

Well, there probably won't be any linux-next releases until Jan 3, so that's ok.

-- 
Cheers,
Stephen Rothwell


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

2016-12-24 Thread Ingo Molnar

* Stephen Rothwell  wrote:

> Hi All,
> 
> On Thu, 22 Dec 2016 16:56:34 -0800 James Bottomley 
>  wrote:
> >
> > On Fri, 2016-12-23 at 11:45 +1100, Stephen Rothwell wrote:
> > > Hi James,
> > > 
> > > After merging the scsi tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_init':
> > > drivers/scsi/qedi/qedi_main.c:2073:2: error: implicit declaration of
> > > function 'register_hotcpu_notifier' [-Werror=implicit-function
> > > -declaration]
> > >   register_hotcpu_notifier(_cpu_notifier);
> > >   ^
> > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_cleanup':
> > > drivers/scsi/qedi/qedi_main.c:2113:2: error: implicit declaration of
> > > function 'unregister_hotcpu_notifier' [-Werror=implicit-function
> > > -declaration]
> > >   unregister_hotcpu_notifier(_cpu_notifier);
> > >   ^
> > > 
> > > Caused by commit
> > > 
> > >   ace7f46ba5fd ("scsi: qedi: Add QLogic FastLinQ offload iSCSI driver
> > > framework.")
> > > 
> > > Interacting with commit
> > > 
> > >   8e38db753d95 ("cpu/hotplug: Remove obsolete cpu hotplug
> > > register/unregister functions")
> > > 
> > > from the tip tree.  
> > 
> > Well, that's a bit of a problem given that the SCSI tree has a pending
> > pull request including this driver.
> > 
> > Thomas, can you do another fixup in your tip tree like you did for the
> > two BNX2* drivers?
> 
> OK, so this is now a problem for the tip tree merge since James tree
> has been pulled by Linus.

Yeah, we'll handle it - that's why the final chunk of changes were left to 
after 
-rc1, to not cause such merge conflicts upstream.

For now I've excluded the relevant -tip side commits from the linux-next branch.

Thanks,

Ingo


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

2016-12-24 Thread Ingo Molnar

* Stephen Rothwell  wrote:

> Hi All,
> 
> On Thu, 22 Dec 2016 16:56:34 -0800 James Bottomley 
>  wrote:
> >
> > On Fri, 2016-12-23 at 11:45 +1100, Stephen Rothwell wrote:
> > > Hi James,
> > > 
> > > After merging the scsi tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_init':
> > > drivers/scsi/qedi/qedi_main.c:2073:2: error: implicit declaration of
> > > function 'register_hotcpu_notifier' [-Werror=implicit-function
> > > -declaration]
> > >   register_hotcpu_notifier(_cpu_notifier);
> > >   ^
> > > drivers/scsi/qedi/qedi_main.c: In function 'qedi_cleanup':
> > > drivers/scsi/qedi/qedi_main.c:2113:2: error: implicit declaration of
> > > function 'unregister_hotcpu_notifier' [-Werror=implicit-function
> > > -declaration]
> > >   unregister_hotcpu_notifier(_cpu_notifier);
> > >   ^
> > > 
> > > Caused by commit
> > > 
> > >   ace7f46ba5fd ("scsi: qedi: Add QLogic FastLinQ offload iSCSI driver
> > > framework.")
> > > 
> > > Interacting with commit
> > > 
> > >   8e38db753d95 ("cpu/hotplug: Remove obsolete cpu hotplug
> > > register/unregister functions")
> > > 
> > > from the tip tree.  
> > 
> > Well, that's a bit of a problem given that the SCSI tree has a pending
> > pull request including this driver.
> > 
> > Thomas, can you do another fixup in your tip tree like you did for the
> > two BNX2* drivers?
> 
> OK, so this is now a problem for the tip tree merge since James tree
> has been pulled by Linus.

Yeah, we'll handle it - that's why the final chunk of changes were left to 
after 
-rc1, to not cause such merge conflicts upstream.

For now I've excluded the relevant -tip side commits from the linux-next branch.

Thanks,

Ingo


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

2016-12-22 Thread James Bottomley
On Fri, 2016-12-23 at 11:45 +1100, Stephen Rothwell wrote:
> Hi James,
> 
> After merging the scsi tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/scsi/qedi/qedi_main.c: In function 'qedi_init':
> drivers/scsi/qedi/qedi_main.c:2073:2: error: implicit declaration of
> function 'register_hotcpu_notifier' [-Werror=implicit-function
> -declaration]
>   register_hotcpu_notifier(_cpu_notifier);
>   ^
> drivers/scsi/qedi/qedi_main.c: In function 'qedi_cleanup':
> drivers/scsi/qedi/qedi_main.c:2113:2: error: implicit declaration of
> function 'unregister_hotcpu_notifier' [-Werror=implicit-function
> -declaration]
>   unregister_hotcpu_notifier(_cpu_notifier);
>   ^
> 
> Caused by commit
> 
>   ace7f46ba5fd ("scsi: qedi: Add QLogic FastLinQ offload iSCSI driver
> framework.")
> 
> Interacting with commit
> 
>   8e38db753d95 ("cpu/hotplug: Remove obsolete cpu hotplug
> register/unregister functions")
> 
> from the tip tree.

Well, that's a bit of a problem given that the SCSI tree has a pending
pull request including this driver.

Thomas, can you do another fixup in your tip tree like you did for the
two BNX2* drivers?

Thanks,

James




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

2016-12-22 Thread James Bottomley
On Fri, 2016-12-23 at 11:45 +1100, Stephen Rothwell wrote:
> Hi James,
> 
> After merging the scsi tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/scsi/qedi/qedi_main.c: In function 'qedi_init':
> drivers/scsi/qedi/qedi_main.c:2073:2: error: implicit declaration of
> function 'register_hotcpu_notifier' [-Werror=implicit-function
> -declaration]
>   register_hotcpu_notifier(_cpu_notifier);
>   ^
> drivers/scsi/qedi/qedi_main.c: In function 'qedi_cleanup':
> drivers/scsi/qedi/qedi_main.c:2113:2: error: implicit declaration of
> function 'unregister_hotcpu_notifier' [-Werror=implicit-function
> -declaration]
>   unregister_hotcpu_notifier(_cpu_notifier);
>   ^
> 
> Caused by commit
> 
>   ace7f46ba5fd ("scsi: qedi: Add QLogic FastLinQ offload iSCSI driver
> framework.")
> 
> Interacting with commit
> 
>   8e38db753d95 ("cpu/hotplug: Remove obsolete cpu hotplug
> register/unregister functions")
> 
> from the tip tree.

Well, that's a bit of a problem given that the SCSI tree has a pending
pull request including this driver.

Thomas, can you do another fixup in your tip tree like you did for the
two BNX2* drivers?

Thanks,

James




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

2016-12-22 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/qedi/qedi_main.c: In function 'qedi_init':
drivers/scsi/qedi/qedi_main.c:2073:2: error: implicit declaration of function 
'register_hotcpu_notifier' [-Werror=implicit-function-declaration]
  register_hotcpu_notifier(_cpu_notifier);
  ^
drivers/scsi/qedi/qedi_main.c: In function 'qedi_cleanup':
drivers/scsi/qedi/qedi_main.c:2113:2: error: implicit declaration of function 
'unregister_hotcpu_notifier' [-Werror=implicit-function-declaration]
  unregister_hotcpu_notifier(_cpu_notifier);
  ^

Caused by commit

  ace7f46ba5fd ("scsi: qedi: Add QLogic FastLinQ offload iSCSI driver 
framework.")

Interacting with commit

  8e38db753d95 ("cpu/hotplug: Remove obsolete cpu hotplug register/unregister 
functions")

from the tip tree.

I have disabled that driver for now:

From: Stephen Rothwell 
Date: Fri, 23 Dec 2016 11:39:41 +1100
Subject: [PATCH] scsi: disable the QEDI driver for now

until it can be converted to cope with the removal of
register_hotcpu_notifier.

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

diff --git a/drivers/scsi/qedi/Kconfig b/drivers/scsi/qedi/Kconfig
index 23ca8a274586..8261f0abd807 100644
--- a/drivers/scsi/qedi/Kconfig
+++ b/drivers/scsi/qedi/Kconfig
@@ -2,6 +2,7 @@ config QEDI
tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support"
depends on PCI && SCSI
depends on QED
+   depends on BROKEN
select SCSI_ISCSI_ATTRS
select QED_LL2
select QED_ISCSI
-- 
2.10.2

-- 
Cheers,
Stephen Rothwell


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

2016-12-22 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/qedi/qedi_main.c: In function 'qedi_init':
drivers/scsi/qedi/qedi_main.c:2073:2: error: implicit declaration of function 
'register_hotcpu_notifier' [-Werror=implicit-function-declaration]
  register_hotcpu_notifier(_cpu_notifier);
  ^
drivers/scsi/qedi/qedi_main.c: In function 'qedi_cleanup':
drivers/scsi/qedi/qedi_main.c:2113:2: error: implicit declaration of function 
'unregister_hotcpu_notifier' [-Werror=implicit-function-declaration]
  unregister_hotcpu_notifier(_cpu_notifier);
  ^

Caused by commit

  ace7f46ba5fd ("scsi: qedi: Add QLogic FastLinQ offload iSCSI driver 
framework.")

Interacting with commit

  8e38db753d95 ("cpu/hotplug: Remove obsolete cpu hotplug register/unregister 
functions")

from the tip tree.

I have disabled that driver for now:

From: Stephen Rothwell 
Date: Fri, 23 Dec 2016 11:39:41 +1100
Subject: [PATCH] scsi: disable the QEDI driver for now

until it can be converted to cope with the removal of
register_hotcpu_notifier.

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

diff --git a/drivers/scsi/qedi/Kconfig b/drivers/scsi/qedi/Kconfig
index 23ca8a274586..8261f0abd807 100644
--- a/drivers/scsi/qedi/Kconfig
+++ b/drivers/scsi/qedi/Kconfig
@@ -2,6 +2,7 @@ config QEDI
tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support"
depends on PCI && SCSI
depends on QED
+   depends on BROKEN
select SCSI_ISCSI_ATTRS
select QED_LL2
select QED_ISCSI
-- 
2.10.2

-- 
Cheers,
Stephen Rothwell


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

2015-11-13 Thread Sreekanth Reddy
Thanks Stephen.

Please consider this patch as Ack-by: Sreekanth Reddy


Thanks,
Sreekanth

On Fri, Nov 13, 2015 at 7:05 AM, Stephen Rothwell  wrote:
> Hi James,
>
> After merging the scsi tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:59:0:
> drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function '_scsih_io_done':
> drivers/scsi/mpt3sas/mpt3sas_base.h:1414:1: error: inlining failed in call to 
> always_inline 'mpt3sas_scsi_direct_io_get': function body not available
>  mpt3sas_scsi_direct_io_get(struct MPT3SAS_ADAPTER *ioc, u16 smid);
>  ^
> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4448:6: error: called from here
>   if (mpt3sas_scsi_direct_io_get(ioc, smid) &&
>   ^
> In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:59:0:
> drivers/scsi/mpt3sas/mpt3sas_base.h:1416:1: error: inlining failed in call to 
> always_inline 'mpt3sas_scsi_direct_io_set': function body not available
>  mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
> direct_io);
>  ^
> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4454:3: error: called from here
>mpt3sas_scsi_direct_io_set(ioc, smid, 0);
>^
> In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:5
> 9:0:
> drivers/scsi/mpt3sas/mpt3sas_base.h:1416:1: error: inlining failed in call to 
> always_inline 'mpt3sas_scsi_direct_io_set': function body not available
>  mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
> direct_io);
>  ^
> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4454:3: error: called from here
>mpt3sas_scsi_direct_io_set(ioc, smid, 0);
>^
>
> Presumably caused by commit
>
>   c84b06a48c4d ("mpt3sas: Single driver module which supports both SAS 2.0 & 
> SAS 3.0 HBAs")
>
> I applied the following fix patch for today:
>
> From: Stephen Rothwell 
> Date: Fri, 13 Nov 2015 12:31:09 +1100
> Subject: [PATCH] mpt3sas: fix inline markers on non inline function
>  declarations
>
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/scsi/mpt3sas/mpt3sas_base.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h 
> b/drivers/scsi/mpt3sas/mpt3sas_base.h
> index a17bea95b0c5..5ad271efbd45 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_base.h
> +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
> @@ -1410,9 +1410,9 @@ void mpt3sas_trigger_mpi(struct MPT3SAS_ADAPTER *ioc, 
> u16 ioc_status,
>  u8 mpt3sas_get_num_volumes(struct MPT3SAS_ADAPTER *ioc);
>  void mpt3sas_init_warpdrive_properties(struct MPT3SAS_ADAPTER *ioc,
> struct _raid_device *raid_device);
> -inline u8
> +u8
>  mpt3sas_scsi_direct_io_get(struct MPT3SAS_ADAPTER *ioc, u16 smid);
> -inline void
> +void
>  mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
> direct_io);
>  void
>  mpt3sas_setup_direct_io(struct MPT3SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,
> --
> 2.6.2
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
--
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 scsi tree

2015-11-13 Thread Sreekanth Reddy
Thanks Stephen.

Please consider this patch as Ack-by: Sreekanth Reddy


Thanks,
Sreekanth

On Fri, Nov 13, 2015 at 7:05 AM, Stephen Rothwell  wrote:
> Hi James,
>
> After merging the scsi tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:59:0:
> drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function '_scsih_io_done':
> drivers/scsi/mpt3sas/mpt3sas_base.h:1414:1: error: inlining failed in call to 
> always_inline 'mpt3sas_scsi_direct_io_get': function body not available
>  mpt3sas_scsi_direct_io_get(struct MPT3SAS_ADAPTER *ioc, u16 smid);
>  ^
> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4448:6: error: called from here
>   if (mpt3sas_scsi_direct_io_get(ioc, smid) &&
>   ^
> In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:59:0:
> drivers/scsi/mpt3sas/mpt3sas_base.h:1416:1: error: inlining failed in call to 
> always_inline 'mpt3sas_scsi_direct_io_set': function body not available
>  mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
> direct_io);
>  ^
> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4454:3: error: called from here
>mpt3sas_scsi_direct_io_set(ioc, smid, 0);
>^
> In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:5
> 9:0:
> drivers/scsi/mpt3sas/mpt3sas_base.h:1416:1: error: inlining failed in call to 
> always_inline 'mpt3sas_scsi_direct_io_set': function body not available
>  mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
> direct_io);
>  ^
> drivers/scsi/mpt3sas/mpt3sas_scsih.c:4454:3: error: called from here
>mpt3sas_scsi_direct_io_set(ioc, smid, 0);
>^
>
> Presumably caused by commit
>
>   c84b06a48c4d ("mpt3sas: Single driver module which supports both SAS 2.0 & 
> SAS 3.0 HBAs")
>
> I applied the following fix patch for today:
>
> From: Stephen Rothwell 
> Date: Fri, 13 Nov 2015 12:31:09 +1100
> Subject: [PATCH] mpt3sas: fix inline markers on non inline function
>  declarations
>
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/scsi/mpt3sas/mpt3sas_base.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h 
> b/drivers/scsi/mpt3sas/mpt3sas_base.h
> index a17bea95b0c5..5ad271efbd45 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_base.h
> +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
> @@ -1410,9 +1410,9 @@ void mpt3sas_trigger_mpi(struct MPT3SAS_ADAPTER *ioc, 
> u16 ioc_status,
>  u8 mpt3sas_get_num_volumes(struct MPT3SAS_ADAPTER *ioc);
>  void mpt3sas_init_warpdrive_properties(struct MPT3SAS_ADAPTER *ioc,
> struct _raid_device *raid_device);
> -inline u8
> +u8
>  mpt3sas_scsi_direct_io_get(struct MPT3SAS_ADAPTER *ioc, u16 smid);
> -inline void
> +void
>  mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
> direct_io);
>  void
>  mpt3sas_setup_direct_io(struct MPT3SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,
> --
> 2.6.2
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
--
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 scsi tree

2015-11-12 Thread Stephen Rothwell
Hi James,

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

In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:59:0:
drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function '_scsih_io_done':
drivers/scsi/mpt3sas/mpt3sas_base.h:1414:1: error: inlining failed in call to 
always_inline 'mpt3sas_scsi_direct_io_get': function body not available
 mpt3sas_scsi_direct_io_get(struct MPT3SAS_ADAPTER *ioc, u16 smid);
 ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4448:6: error: called from here
  if (mpt3sas_scsi_direct_io_get(ioc, smid) &&
  ^
In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:59:0:
drivers/scsi/mpt3sas/mpt3sas_base.h:1416:1: error: inlining failed in call to 
always_inline 'mpt3sas_scsi_direct_io_set': function body not available
 mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
direct_io);
 ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4454:3: error: called from here
   mpt3sas_scsi_direct_io_set(ioc, smid, 0);
   ^
In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:5
9:0:
drivers/scsi/mpt3sas/mpt3sas_base.h:1416:1: error: inlining failed in call to 
always_inline 'mpt3sas_scsi_direct_io_set': function body not available
 mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
direct_io);
 ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4454:3: error: called from here
   mpt3sas_scsi_direct_io_set(ioc, smid, 0);
   ^

Presumably caused by commit

  c84b06a48c4d ("mpt3sas: Single driver module which supports both SAS 2.0 & 
SAS 3.0 HBAs")

I applied the following fix patch for today:

From: Stephen Rothwell 
Date: Fri, 13 Nov 2015 12:31:09 +1100
Subject: [PATCH] mpt3sas: fix inline markers on non inline function
 declarations

Signed-off-by: Stephen Rothwell 
---
 drivers/scsi/mpt3sas/mpt3sas_base.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h 
b/drivers/scsi/mpt3sas/mpt3sas_base.h
index a17bea95b0c5..5ad271efbd45 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@ -1410,9 +1410,9 @@ void mpt3sas_trigger_mpi(struct MPT3SAS_ADAPTER *ioc, u16 
ioc_status,
 u8 mpt3sas_get_num_volumes(struct MPT3SAS_ADAPTER *ioc);
 void mpt3sas_init_warpdrive_properties(struct MPT3SAS_ADAPTER *ioc,
struct _raid_device *raid_device);
-inline u8
+u8
 mpt3sas_scsi_direct_io_get(struct MPT3SAS_ADAPTER *ioc, u16 smid);
-inline void
+void
 mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
direct_io);
 void
 mpt3sas_setup_direct_io(struct MPT3SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,
-- 
2.6.2

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au
--
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 scsi tree

2015-11-12 Thread Stephen Rothwell
Hi James,

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

In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:59:0:
drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function '_scsih_io_done':
drivers/scsi/mpt3sas/mpt3sas_base.h:1414:1: error: inlining failed in call to 
always_inline 'mpt3sas_scsi_direct_io_get': function body not available
 mpt3sas_scsi_direct_io_get(struct MPT3SAS_ADAPTER *ioc, u16 smid);
 ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4448:6: error: called from here
  if (mpt3sas_scsi_direct_io_get(ioc, smid) &&
  ^
In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:59:0:
drivers/scsi/mpt3sas/mpt3sas_base.h:1416:1: error: inlining failed in call to 
always_inline 'mpt3sas_scsi_direct_io_set': function body not available
 mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
direct_io);
 ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4454:3: error: called from here
   mpt3sas_scsi_direct_io_set(ioc, smid, 0);
   ^
In file included from drivers/scsi/mpt3sas/mpt3sas_scsih.c:5
9:0:
drivers/scsi/mpt3sas/mpt3sas_base.h:1416:1: error: inlining failed in call to 
always_inline 'mpt3sas_scsi_direct_io_set': function body not available
 mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
direct_io);
 ^
drivers/scsi/mpt3sas/mpt3sas_scsih.c:4454:3: error: called from here
   mpt3sas_scsi_direct_io_set(ioc, smid, 0);
   ^

Presumably caused by commit

  c84b06a48c4d ("mpt3sas: Single driver module which supports both SAS 2.0 & 
SAS 3.0 HBAs")

I applied the following fix patch for today:

From: Stephen Rothwell 
Date: Fri, 13 Nov 2015 12:31:09 +1100
Subject: [PATCH] mpt3sas: fix inline markers on non inline function
 declarations

Signed-off-by: Stephen Rothwell 
---
 drivers/scsi/mpt3sas/mpt3sas_base.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h 
b/drivers/scsi/mpt3sas/mpt3sas_base.h
index a17bea95b0c5..5ad271efbd45 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@ -1410,9 +1410,9 @@ void mpt3sas_trigger_mpi(struct MPT3SAS_ADAPTER *ioc, u16 
ioc_status,
 u8 mpt3sas_get_num_volumes(struct MPT3SAS_ADAPTER *ioc);
 void mpt3sas_init_warpdrive_properties(struct MPT3SAS_ADAPTER *ioc,
struct _raid_device *raid_device);
-inline u8
+u8
 mpt3sas_scsi_direct_io_get(struct MPT3SAS_ADAPTER *ioc, u16 smid);
-inline void
+void
 mpt3sas_scsi_direct_io_set(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 
direct_io);
 void
 mpt3sas_setup_direct_io(struct MPT3SAS_ADAPTER *ioc, struct scsi_cmnd *scmd,
-- 
2.6.2

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au
--
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 scsi tree

2015-06-02 Thread James Bottomley
On Tue, 2015-06-02 at 18:06 +1000, Stephen Rothwell wrote:
> Hi James,
> 
> After merging the scsi tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/usb/gadget/function/f_mass_storage.c:280:12: error: 
> 'MAX_COMMAND_SIZE' undeclared here (not in a function)
>   u8   cmnd[MAX_COMMAND_SIZE];
> ^
> 
> Caused by commit 0e640c799103 ("Replace MAX_COMMAND_SIZE with BLK_MAX_CDB").
> 
> I have used the scsi tree from next-20150601 for today.

Hm, yes, the commit causes a dependency on blkdev.h but doesn't pull it
in.  I'll drop it for a resubmit.

James


--
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 scsi tree

2015-06-02 Thread Stephen Rothwell
Hi James,

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

drivers/usb/gadget/function/f_mass_storage.c:280:12: error: 'MAX_COMMAND_SIZE' 
undeclared here (not in a function)
  u8   cmnd[MAX_COMMAND_SIZE];
^

Caused by commit 0e640c799103 ("Replace MAX_COMMAND_SIZE with BLK_MAX_CDB").

I have used the scsi tree from next-20150601 for today.
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpi5garnXreM.pgp
Description: OpenPGP digital signature


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

2015-06-02 Thread Stephen Rothwell
Hi James,

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

drivers/usb/gadget/function/f_mass_storage.c:280:12: error: 'MAX_COMMAND_SIZE' 
undeclared here (not in a function)
  u8   cmnd[MAX_COMMAND_SIZE];
^

Caused by commit 0e640c799103 (Replace MAX_COMMAND_SIZE with BLK_MAX_CDB).

I have used the scsi tree from next-20150601 for today.
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpi5garnXreM.pgp
Description: OpenPGP digital signature


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

2015-06-02 Thread James Bottomley
On Tue, 2015-06-02 at 18:06 +1000, Stephen Rothwell wrote:
 Hi James,
 
 After merging the scsi tree, today's linux-next build (x86_64
 allmodconfig) failed like this:
 
 drivers/usb/gadget/function/f_mass_storage.c:280:12: error: 
 'MAX_COMMAND_SIZE' undeclared here (not in a function)
   u8   cmnd[MAX_COMMAND_SIZE];
 ^
 
 Caused by commit 0e640c799103 (Replace MAX_COMMAND_SIZE with BLK_MAX_CDB).
 
 I have used the scsi tree from next-20150601 for today.

Hm, yes, the commit causes a dependency on blkdev.h but doesn't pull it
in.  I'll drop it for a resubmit.

James


--
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 scsi tree

2015-02-04 Thread James Bottomley
On Wed, 2015-02-04 at 17:29 +1100, Stephen Rothwell wrote:
> Hi James,
> 
> After merging the scsi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/scsi/scsi_logging.c: In function 'sdev_prefix_printk':
> drivers/scsi/scsi_logging.c:119:6: error: void value not ignored as it ought 
> to be
>   ret = dev_printk(level, >sdev_gendev, "%s", logbuf);
>   ^
> drivers/scsi/scsi_logging.c: In function 'scmd_printk':
> drivers/scsi/scsi_logging.c:146:6: error: void value not ignored as it ought 
> to be
>   ret = dev_printk(level, >device->sdev_gendev, "%s", logbuf);
>   ^
> 
> Caused by commit ded85c193a39 ("scsi: Implement per-cpu logging
> buffer") interacting with commit d1f1052c5204 ("device: Change
> dev_ logging functions to return void") from the driver-core
> tree.
> 
> I added the following merge resolution patch.  Someone will have to
> remember to tell Linus.  Also, the void return may be able to be
> propagated further up the chain since these two new affected functions
> now always return 0.

Hannes posted a more correct fix for it today to the scsi list.
However, sorting this out isn't just about the short term fix:  We can't
afford the bisection failure of SCSI not building over a wide range of
commits, so our tree will need to be pulled ahead of the driver-core
tree.

I've got to say, while it's great that linux-next spotted this ahead of
time (saves us all a massive beating from Linus, thanks Stephen) it's
unfortunate to have this type of thing turn up on the edge of a merge
window, especially caused by a trivial commit which perhaps shouldn't
have gone in so late.

James


--
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 scsi tree

2015-02-04 Thread James Bottomley
On Wed, 2015-02-04 at 17:29 +1100, Stephen Rothwell wrote:
 Hi James,
 
 After merging the scsi tree, today's linux-next build (powerpc
 ppc64_defconfig) failed like this:
 
 drivers/scsi/scsi_logging.c: In function 'sdev_prefix_printk':
 drivers/scsi/scsi_logging.c:119:6: error: void value not ignored as it ought 
 to be
   ret = dev_printk(level, sdev-sdev_gendev, %s, logbuf);
   ^
 drivers/scsi/scsi_logging.c: In function 'scmd_printk':
 drivers/scsi/scsi_logging.c:146:6: error: void value not ignored as it ought 
 to be
   ret = dev_printk(level, scmd-device-sdev_gendev, %s, logbuf);
   ^
 
 Caused by commit ded85c193a39 (scsi: Implement per-cpu logging
 buffer) interacting with commit d1f1052c5204 (device: Change
 dev_level logging functions to return void) from the driver-core
 tree.
 
 I added the following merge resolution patch.  Someone will have to
 remember to tell Linus.  Also, the void return may be able to be
 propagated further up the chain since these two new affected functions
 now always return 0.

Hannes posted a more correct fix for it today to the scsi list.
However, sorting this out isn't just about the short term fix:  We can't
afford the bisection failure of SCSI not building over a wide range of
commits, so our tree will need to be pulled ahead of the driver-core
tree.

I've got to say, while it's great that linux-next spotted this ahead of
time (saves us all a massive beating from Linus, thanks Stephen) it's
unfortunate to have this type of thing turn up on the edge of a merge
window, especially caused by a trivial commit which perhaps shouldn't
have gone in so late.

James


--
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 scsi tree

2015-02-03 Thread Joe Perches
(adding Christoph Hellwig)

On Wed, 2015-02-04 at 17:29 +1100, Stephen Rothwell wrote:
> Hi James,
> 
> After merging the scsi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/scsi/scsi_logging.c: In function 'sdev_prefix_printk':
> drivers/scsi/scsi_logging.c:119:6: error: void value not ignored as it ought 
> to be
>   ret = dev_printk(level, >sdev_gendev, "%s", logbuf);
>   ^
> drivers/scsi/scsi_logging.c: In function 'scmd_printk':
> drivers/scsi/scsi_logging.c:146:6: error: void value not ignored as it ought 
> to be
>   ret = dev_printk(level, >device->sdev_gendev, "%s", logbuf);
>   ^
> 
> Caused by commit ded85c193a39 ("scsi: Implement per-cpu logging
> buffer") interacting with commit d1f1052c5204 ("device: Change
> dev_ logging functions to return void") from the driver-core
> tree.
> 
> I added the following merge resolution patch.  Someone will have to
> remember to tell Linus.  Also, the void return may be able to be
> propagated further up the chain since these two new affected functions
> now always return 0.

Thanks and just so.

It seems that nothing uses either return value,
so it's probably better to use void for both
sdev_prefix_printk and scmd_printk.


--
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 scsi tree

2015-02-03 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/scsi_logging.c: In function 'sdev_prefix_printk':
drivers/scsi/scsi_logging.c:119:6: error: void value not ignored as it ought to 
be
  ret = dev_printk(level, >sdev_gendev, "%s", logbuf);
  ^
drivers/scsi/scsi_logging.c: In function 'scmd_printk':
drivers/scsi/scsi_logging.c:146:6: error: void value not ignored as it ought to 
be
  ret = dev_printk(level, >device->sdev_gendev, "%s", logbuf);
  ^

Caused by commit ded85c193a39 ("scsi: Implement per-cpu logging
buffer") interacting with commit d1f1052c5204 ("device: Change
dev_ logging functions to return void") from the driver-core
tree.

I added the following merge resolution patch.  Someone will have to
remember to tell Linus.  Also, the void return may be able to be
propagated further up the chain since these two new affected functions
now always return 0.

From: Stephen Rothwell 
Date: Wed, 4 Feb 2015 17:18:08 +1100
Subject: [PATCH] scsi: merge resolution for dev_printk API change

Signed-off-by: Stephen Rothwell 
---
 drivers/scsi/scsi_logging.c | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/scsi_logging.c b/drivers/scsi/scsi_logging.c
index ecc5918e372a..0810e92874d2 100644
--- a/drivers/scsi/scsi_logging.c
+++ b/drivers/scsi/scsi_logging.c
@@ -99,7 +99,6 @@ int sdev_prefix_printk(const char *level, const struct 
scsi_device *sdev,
va_list args;
char *logbuf;
size_t off = 0, logbuf_len;
-   int ret;
 
if (!sdev)
return 0;
@@ -116,9 +115,9 @@ int sdev_prefix_printk(const char *level, const struct 
scsi_device *sdev,
off += vscnprintf(logbuf + off, logbuf_len - off, fmt, args);
va_end(args);
}
-   ret = dev_printk(level, >sdev_gendev, "%s", logbuf);
+   dev_printk(level, >sdev_gendev, "%s", logbuf);
scsi_log_release_buffer(logbuf);
-   return ret;
+   return 0;
 }
 EXPORT_SYMBOL(sdev_prefix_printk);
 
@@ -128,7 +127,6 @@ int scmd_printk(const char *level, const struct scsi_cmnd 
*scmd,
va_list args;
char *logbuf;
size_t off = 0, logbuf_len;
-   int ret;
 
if (!scmd || !scmd->cmnd)
return 0;
@@ -143,9 +141,9 @@ int scmd_printk(const char *level, const struct scsi_cmnd 
*scmd,
off += vscnprintf(logbuf + off, logbuf_len - off, fmt, args);
va_end(args);
}
-   ret = dev_printk(level, >device->sdev_gendev, "%s", logbuf);
+   dev_printk(level, >device->sdev_gendev, "%s", logbuf);
scsi_log_release_buffer(logbuf);
-   return ret;
+   return 0;
 }
 EXPORT_SYMBOL(scmd_printk);
 
-- 
2.1.4

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


pgp_z2UFqxAAJ.pgp
Description: OpenPGP digital signature


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

2015-02-03 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/scsi_logging.c: In function 'sdev_prefix_printk':
drivers/scsi/scsi_logging.c:119:6: error: void value not ignored as it ought to 
be
  ret = dev_printk(level, sdev-sdev_gendev, %s, logbuf);
  ^
drivers/scsi/scsi_logging.c: In function 'scmd_printk':
drivers/scsi/scsi_logging.c:146:6: error: void value not ignored as it ought to 
be
  ret = dev_printk(level, scmd-device-sdev_gendev, %s, logbuf);
  ^

Caused by commit ded85c193a39 (scsi: Implement per-cpu logging
buffer) interacting with commit d1f1052c5204 (device: Change
dev_level logging functions to return void) from the driver-core
tree.

I added the following merge resolution patch.  Someone will have to
remember to tell Linus.  Also, the void return may be able to be
propagated further up the chain since these two new affected functions
now always return 0.

From: Stephen Rothwell s...@canb.auug.org.au
Date: Wed, 4 Feb 2015 17:18:08 +1100
Subject: [PATCH] scsi: merge resolution for dev_printk API change

Signed-off-by: Stephen Rothwell s...@canb.auug.org.au
---
 drivers/scsi/scsi_logging.c | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/scsi_logging.c b/drivers/scsi/scsi_logging.c
index ecc5918e372a..0810e92874d2 100644
--- a/drivers/scsi/scsi_logging.c
+++ b/drivers/scsi/scsi_logging.c
@@ -99,7 +99,6 @@ int sdev_prefix_printk(const char *level, const struct 
scsi_device *sdev,
va_list args;
char *logbuf;
size_t off = 0, logbuf_len;
-   int ret;
 
if (!sdev)
return 0;
@@ -116,9 +115,9 @@ int sdev_prefix_printk(const char *level, const struct 
scsi_device *sdev,
off += vscnprintf(logbuf + off, logbuf_len - off, fmt, args);
va_end(args);
}
-   ret = dev_printk(level, sdev-sdev_gendev, %s, logbuf);
+   dev_printk(level, sdev-sdev_gendev, %s, logbuf);
scsi_log_release_buffer(logbuf);
-   return ret;
+   return 0;
 }
 EXPORT_SYMBOL(sdev_prefix_printk);
 
@@ -128,7 +127,6 @@ int scmd_printk(const char *level, const struct scsi_cmnd 
*scmd,
va_list args;
char *logbuf;
size_t off = 0, logbuf_len;
-   int ret;
 
if (!scmd || !scmd-cmnd)
return 0;
@@ -143,9 +141,9 @@ int scmd_printk(const char *level, const struct scsi_cmnd 
*scmd,
off += vscnprintf(logbuf + off, logbuf_len - off, fmt, args);
va_end(args);
}
-   ret = dev_printk(level, scmd-device-sdev_gendev, %s, logbuf);
+   dev_printk(level, scmd-device-sdev_gendev, %s, logbuf);
scsi_log_release_buffer(logbuf);
-   return ret;
+   return 0;
 }
 EXPORT_SYMBOL(scmd_printk);
 
-- 
2.1.4

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


pgp_z2UFqxAAJ.pgp
Description: OpenPGP digital signature


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

2015-02-03 Thread Joe Perches
(adding Christoph Hellwig)

On Wed, 2015-02-04 at 17:29 +1100, Stephen Rothwell wrote:
 Hi James,
 
 After merging the scsi tree, today's linux-next build (powerpc
 ppc64_defconfig) failed like this:
 
 drivers/scsi/scsi_logging.c: In function 'sdev_prefix_printk':
 drivers/scsi/scsi_logging.c:119:6: error: void value not ignored as it ought 
 to be
   ret = dev_printk(level, sdev-sdev_gendev, %s, logbuf);
   ^
 drivers/scsi/scsi_logging.c: In function 'scmd_printk':
 drivers/scsi/scsi_logging.c:146:6: error: void value not ignored as it ought 
 to be
   ret = dev_printk(level, scmd-device-sdev_gendev, %s, logbuf);
   ^
 
 Caused by commit ded85c193a39 (scsi: Implement per-cpu logging
 buffer) interacting with commit d1f1052c5204 (device: Change
 dev_level logging functions to return void) from the driver-core
 tree.
 
 I added the following merge resolution patch.  Someone will have to
 remember to tell Linus.  Also, the void return may be able to be
 propagated further up the chain since these two new affected functions
 now always return 0.

Thanks and just so.

It seems that nothing uses either return value,
so it's probably better to use void for both
sdev_prefix_printk and scmd_printk.


--
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 scsi tree

2014-11-10 Thread Christoph Hellwig
On Mon, Nov 10, 2014 at 07:50:16AM -0800, James Bottomley wrote:
> So your idea is Fenguang first then linux-next.

Exactly.
--
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 scsi tree

2014-11-10 Thread James Bottomley
On Mon, 2014-11-10 at 16:48 +0100, Christoph Hellwig wrote:
> On Mon, Nov 10, 2014 at 07:21:30AM -0800, James Bottomley wrote:
> > so that's adding the 3.18-incoming trees?
> 
> Not yet.  Those are for the buildbolt to find any issues before pushing
> it to the actual for-3.x branch.  It's a trick I picked up from the nfsd tree.

So your idea is Fenguang first then linux-next.

OK.

James


--
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 scsi tree

2014-11-10 Thread Christoph Hellwig
On Mon, Nov 10, 2014 at 07:21:30AM -0800, James Bottomley wrote:
> so that's adding the 3.18-incoming trees?

Not yet.  Those are for the buildbolt to find any issues before pushing
it to the actual for-3.x branch.  It's a trick I picked up from the nfsd tree.
--
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 scsi tree

2014-11-10 Thread James Bottomley
On Mon, 2014-11-10 at 14:46 +0100, Christoph Hellwig wrote:
> On Mon, Nov 10, 2014 at 06:27:13AM +, Anish Bhatt wrote:
> > Fix for this was sent out on thursday itself, but does not seem to be 
> > applied yet :
> > http://marc.info/?l=linux-scsi=141529629911520=2
> 
> And I pulled it from drivers-for-3.18 early on Thursday, but that didn't
> propagate to James' tree it seems.  I'll do another range of patch merging
> these afternoon and will add the proper version.

so that's adding the 3.18-incoming trees?

James


--
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 scsi tree

2014-11-10 Thread Christoph Hellwig
On Mon, Nov 10, 2014 at 06:27:13AM +, Anish Bhatt wrote:
> Fix for this was sent out on thursday itself, but does not seem to be applied 
> yet :
> http://marc.info/?l=linux-scsi=141529629911520=2

And I pulled it from drivers-for-3.18 early on Thursday, but that didn't
propagate to James' tree it seems.  I'll do another range of patch merging
these afternoon and will add the proper version.
--
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 scsi tree

2014-11-10 Thread Christoph Hellwig
On Mon, Nov 10, 2014 at 06:27:13AM +, Anish Bhatt wrote:
 Fix for this was sent out on thursday itself, but does not seem to be applied 
 yet :
 http://marc.info/?l=linux-scsim=141529629911520w=2

And I pulled it from drivers-for-3.18 early on Thursday, but that didn't
propagate to James' tree it seems.  I'll do another range of patch merging
these afternoon and will add the proper version.
--
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 scsi tree

2014-11-10 Thread James Bottomley
On Mon, 2014-11-10 at 14:46 +0100, Christoph Hellwig wrote:
 On Mon, Nov 10, 2014 at 06:27:13AM +, Anish Bhatt wrote:
  Fix for this was sent out on thursday itself, but does not seem to be 
  applied yet :
  http://marc.info/?l=linux-scsim=141529629911520w=2
 
 And I pulled it from drivers-for-3.18 early on Thursday, but that didn't
 propagate to James' tree it seems.  I'll do another range of patch merging
 these afternoon and will add the proper version.

so that's adding the 3.18-incoming trees?

James


--
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 scsi tree

2014-11-10 Thread Christoph Hellwig
On Mon, Nov 10, 2014 at 07:21:30AM -0800, James Bottomley wrote:
 so that's adding the 3.18-incoming trees?

Not yet.  Those are for the buildbolt to find any issues before pushing
it to the actual for-3.x branch.  It's a trick I picked up from the nfsd tree.
--
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 scsi tree

2014-11-10 Thread James Bottomley
On Mon, 2014-11-10 at 16:48 +0100, Christoph Hellwig wrote:
 On Mon, Nov 10, 2014 at 07:21:30AM -0800, James Bottomley wrote:
  so that's adding the 3.18-incoming trees?
 
 Not yet.  Those are for the buildbolt to find any issues before pushing
 it to the actual for-3.x branch.  It's a trick I picked up from the nfsd tree.

So your idea is Fenguang first then linux-next.

OK.

James


--
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 scsi tree

2014-11-10 Thread Christoph Hellwig
On Mon, Nov 10, 2014 at 07:50:16AM -0800, James Bottomley wrote:
 So your idea is Fenguang first then linux-next.

Exactly.
--
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 scsi tree

2014-11-09 Thread Anish Bhatt
Fix for this was sent out on thursday itself, but does not seem to be applied 
yet :
http://marc.info/?l=linux-scsi=141529629911520=2

From: Stephen Rothwell [s...@canb.auug.org.au]
Sent: Sunday, November 09, 2014 10:15 PM
To: James Bottomley
Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; Anish Bhatt; 
Christoph Hellwig; Karen Xie
Subject: linux-next: build failure after merge of the scsi tree

Hi James,

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

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c: In function 'do_abort_req_rss':
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:942:3: error: too many arguments to function 
'send_tx_flowc_wr'
   send_tx_flowc_wr(csk, 0);
   ^
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:492:20: note: declared here
 static inline void send_tx_flowc_wr(struct cxgbi_sock *csk)
^

Caused by commit 4be50d4f7649 ("cxgb4i: send abort_rpl correctly").

I have used the scsi tree from next-20141106 for today.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
--
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 scsi tree

2014-11-09 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c: In function 'do_abort_req_rss':
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:942:3: error: too many arguments to function 
'send_tx_flowc_wr'
   send_tx_flowc_wr(csk, 0);
   ^
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:492:20: note: declared here
 static inline void send_tx_flowc_wr(struct cxgbi_sock *csk)
^

Caused by commit 4be50d4f7649 ("cxgb4i: send abort_rpl correctly").

I have used the scsi tree from next-20141106 for today.
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpb4Igw5bUXD.pgp
Description: OpenPGP digital signature


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

2014-11-09 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c: In function 'do_abort_req_rss':
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:942:3: error: too many arguments to function 
'send_tx_flowc_wr'
   send_tx_flowc_wr(csk, 0);
   ^
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:492:20: note: declared here
 static inline void send_tx_flowc_wr(struct cxgbi_sock *csk)
^

Caused by commit 4be50d4f7649 (cxgb4i: send abort_rpl correctly).

I have used the scsi tree from next-20141106 for today.
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpb4Igw5bUXD.pgp
Description: OpenPGP digital signature


RE: linux-next: build failure after merge of the scsi tree

2014-11-09 Thread Anish Bhatt
Fix for this was sent out on thursday itself, but does not seem to be applied 
yet :
http://marc.info/?l=linux-scsim=141529629911520w=2

From: Stephen Rothwell [s...@canb.auug.org.au]
Sent: Sunday, November 09, 2014 10:15 PM
To: James Bottomley
Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; Anish Bhatt; 
Christoph Hellwig; Karen Xie
Subject: linux-next: build failure after merge of the scsi tree

Hi James,

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

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c: In function 'do_abort_req_rss':
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:942:3: error: too many arguments to function 
'send_tx_flowc_wr'
   send_tx_flowc_wr(csk, 0);
   ^
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c:492:20: note: declared here
 static inline void send_tx_flowc_wr(struct cxgbi_sock *csk)
^

Caused by commit 4be50d4f7649 (cxgb4i: send abort_rpl correctly).

I have used the scsi tree from next-20141106 for today.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
--
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 scsi tree

2014-11-04 Thread Stephen Rothwell
Hi Hannes,

On Tue, 04 Nov 2014 08:07:51 +0100 Hannes Reinecke  wrote:
>
> On 11/04/2014 05:43 AM, Stephen Rothwell wrote:
> > 
> > After merging the scsi tree, today's linux-next build (arm 
> > multi_v7_defconfig) failed like this:
> > 
> > In file included from include/linux/sched.h:17:0, from
> > include/linux/blkdev.h:4, from drivers/scsi/constants.c:10: 
> > drivers/scsi/constants.c: In function 'scsi_opcode_sa_name': 
> > include/linux/kernel.h:54:32: error: invalid application of
> > 'sizeof' to incomplete type 'const char *[]' #define
> > ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
> > __must_be_array(arr)) ^ drivers/scsi/constants.c:300:15: note:
> > in expansion of macro 'ARRAY_SIZE' if (opcode <
> > ARRAY_SIZE(cdb_byte0_names)) ^
> > 
> > Caused by 94bafab0008c ("scsi: consolidate opcode lookup in 
> > scsi_opcode_sa_name()").  This build does not have 
> > CONFIG_SCSI_CONSTANTS set.
> > 
> > I have used the scsi tree from next-20141031 again (since
> > yesterday's tree had a different build problem).
> > 
> Sorry. Here's the patch.

I applied that patch to linux-next today (pending James adding it to
the scsi tree).

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


pgpwtFwr0u1MJ.pgp
Description: OpenPGP digital signature


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

2014-11-04 Thread Stephen Rothwell
Hi Hannes,

On Tue, 04 Nov 2014 08:07:51 +0100 Hannes Reinecke h...@suse.de wrote:

 On 11/04/2014 05:43 AM, Stephen Rothwell wrote:
  
  After merging the scsi tree, today's linux-next build (arm 
  multi_v7_defconfig) failed like this:
  
  In file included from include/linux/sched.h:17:0, from
  include/linux/blkdev.h:4, from drivers/scsi/constants.c:10: 
  drivers/scsi/constants.c: In function 'scsi_opcode_sa_name': 
  include/linux/kernel.h:54:32: error: invalid application of
  'sizeof' to incomplete type 'const char *[]' #define
  ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
  __must_be_array(arr)) ^ drivers/scsi/constants.c:300:15: note:
  in expansion of macro 'ARRAY_SIZE' if (opcode 
  ARRAY_SIZE(cdb_byte0_names)) ^
  
  Caused by 94bafab0008c (scsi: consolidate opcode lookup in 
  scsi_opcode_sa_name()).  This build does not have 
  CONFIG_SCSI_CONSTANTS set.
  
  I have used the scsi tree from next-20141031 again (since
  yesterday's tree had a different build problem).
  
 Sorry. Here's the patch.

I applied that patch to linux-next today (pending James adding it to
the scsi tree).

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


pgpwtFwr0u1MJ.pgp
Description: OpenPGP digital signature


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

2014-11-03 Thread Hannes Reinecke
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 11/04/2014 05:43 AM, Stephen Rothwell wrote:
> Hi James,
> 
> After merging the scsi tree, today's linux-next build (arm 
> multi_v7_defconfig) failed like this:
> 
> In file included from include/linux/sched.h:17:0, from
> include/linux/blkdev.h:4, from drivers/scsi/constants.c:10: 
> drivers/scsi/constants.c: In function 'scsi_opcode_sa_name': 
> include/linux/kernel.h:54:32: error: invalid application of
> 'sizeof' to incomplete type 'const char *[]' #define
> ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
> __must_be_array(arr)) ^ drivers/scsi/constants.c:300:15: note:
> in expansion of macro 'ARRAY_SIZE' if (opcode <
> ARRAY_SIZE(cdb_byte0_names)) ^
> 
> Caused by 94bafab0008c ("scsi: consolidate opcode lookup in 
> scsi_opcode_sa_name()").  This build does not have 
> CONFIG_SCSI_CONSTANTS set.
> 
> I have used the scsi tree from next-20141031 again (since
> yesterday's tree had a different build problem).
> 
Sorry. Here's the patch.

Cheers,

Hannes
- -- 
Dr. Hannes Reinecke   zSeries & Storage
h...@suse.de  +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBAgAGBQJUWHtHAAoJEGz4yi9OyKjPfdgP+wZweCbK1HJ7PBz8CCqT6n6d
HDOv0oX4Ia3Oo53NhdIAD9745sCWWegSBYZf7C/gTXVtmBxJ30NnuI+Cg0otaTHA
DPJZ26mBCNijYvpVGqgcSkXRdQQMiBGo6TLmsdpXxn4NFuh3IoRS+8gMgEFxpQdK
aAsHnRBTbfaeYpuNR2P5IJVc1L89rg3DkLWMw3ybSO5WzAcjg4yDiasCsGNHq/T4
e9t+V7/+YA14UOMAHfsAnD/B7UI/7B0ealDbepr/cq1NdJ1F0G7JoCS0yAExRumv
3KBznE29YMZTXCqJg6DNQqkV1xmuB2l2/eAZrM/pHTHGWBQk27WI/KsmqISt9Vb+
vmowDuJQNwZG784KSmbRcjSnuNTIltUybhgF/r+m3dNq4j+H/SroBIi5xI+5HJR+
m7G0tjQkpI3Hie3kf9Egwj09goMZ5ka8tIETMqgJFa2AZ3VpnBekxXGe1OtFgfeo
3nOCnYNNADUSIFUmGmAUusPlgFyMGoWvTHs+koYN8cS+q+X9WJgI3mihnMuiVIux
jG2W7IDCimiss/g0Bnol7M7FdL4QMVeg9/LX5wIl2G1b9Nz4ZDCSI/ooHL+xMFrm
H1wwBF9/xjpc0J6RWimkSvFa4iRCti4Ac8w41l+APwEtH2mWdrefTaadV0JXH/wh
brJGtCQhTrCLGuyLluPx
=xaoW
-END PGP SIGNATURE-
>From 355eac426aea2e1f98b99a41707b37e9ba3ef02b Mon Sep 17 00:00:00 2001
From: Hannes Reinecke 
Date: Tue, 4 Nov 2014 08:06:03 +0100
Subject: [PATCH] scsi: Fixup compilation warning when SCSI_CONSTANTS is not
 set

ARRAY_SIZE() requires the array to actually have a size.

Signed-off-by: Hannes Reinecke 
---
 drivers/scsi/constants.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index b3cbf3a..a1a7fca 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -267,7 +267,7 @@ static struct sa_name_list sa_names_arr[] = {
 };
 
 #else /* ifndef CONFIG_SCSI_CONSTANTS */
-static const char *cdb_byte0_names[];
+static const char *cdb_byte0_names[0];
 
 static struct sa_name_list sa_names_arr[] = {
 	{VARIABLE_LENGTH_CMD, NULL, 0},
-- 
1.8.5.2



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

2014-11-03 Thread Stephen Rothwell
Hi James,

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

In file included from include/linux/sched.h:17:0,
 from include/linux/blkdev.h:4,
 from drivers/scsi/constants.c:10:
drivers/scsi/constants.c: In function 'scsi_opcode_sa_name':
include/linux/kernel.h:54:32: error: invalid application of 'sizeof' to 
incomplete type 'const char *[]'
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
drivers/scsi/constants.c:300:15: note: in expansion of macro 'ARRAY_SIZE'
  if (opcode < ARRAY_SIZE(cdb_byte0_names))
   ^

Caused by 94bafab0008c ("scsi: consolidate opcode lookup in
scsi_opcode_sa_name()").  This build does not have
CONFIG_SCSI_CONSTANTS set.

I have used the scsi tree from next-20141031 again (since yesterday's
tree had a different build problem).
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgp8NKTZ61UVm.pgp
Description: OpenPGP digital signature


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

2014-11-03 Thread Christoph Hellwig
Thanks, I've folded that patch into the one that caused the issue.
--
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 scsi tree

2014-11-03 Thread Christoph Hellwig
Thanks, I've folded that patch into the one that caused the issue.
--
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 scsi tree

2014-11-03 Thread Stephen Rothwell
Hi James,

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

In file included from include/linux/sched.h:17:0,
 from include/linux/blkdev.h:4,
 from drivers/scsi/constants.c:10:
drivers/scsi/constants.c: In function 'scsi_opcode_sa_name':
include/linux/kernel.h:54:32: error: invalid application of 'sizeof' to 
incomplete type 'const char *[]'
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
drivers/scsi/constants.c:300:15: note: in expansion of macro 'ARRAY_SIZE'
  if (opcode  ARRAY_SIZE(cdb_byte0_names))
   ^

Caused by 94bafab0008c (scsi: consolidate opcode lookup in
scsi_opcode_sa_name()).  This build does not have
CONFIG_SCSI_CONSTANTS set.

I have used the scsi tree from next-20141031 again (since yesterday's
tree had a different build problem).
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgp8NKTZ61UVm.pgp
Description: OpenPGP digital signature


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

2014-11-03 Thread Hannes Reinecke
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 11/04/2014 05:43 AM, Stephen Rothwell wrote:
 Hi James,
 
 After merging the scsi tree, today's linux-next build (arm 
 multi_v7_defconfig) failed like this:
 
 In file included from include/linux/sched.h:17:0, from
 include/linux/blkdev.h:4, from drivers/scsi/constants.c:10: 
 drivers/scsi/constants.c: In function 'scsi_opcode_sa_name': 
 include/linux/kernel.h:54:32: error: invalid application of
 'sizeof' to incomplete type 'const char *[]' #define
 ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) +
 __must_be_array(arr)) ^ drivers/scsi/constants.c:300:15: note:
 in expansion of macro 'ARRAY_SIZE' if (opcode 
 ARRAY_SIZE(cdb_byte0_names)) ^
 
 Caused by 94bafab0008c (scsi: consolidate opcode lookup in 
 scsi_opcode_sa_name()).  This build does not have 
 CONFIG_SCSI_CONSTANTS set.
 
 I have used the scsi tree from next-20141031 again (since
 yesterday's tree had a different build problem).
 
Sorry. Here's the patch.

Cheers,

Hannes
- -- 
Dr. Hannes Reinecke   zSeries  Storage
h...@suse.de  +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBAgAGBQJUWHtHAAoJEGz4yi9OyKjPfdgP+wZweCbK1HJ7PBz8CCqT6n6d
HDOv0oX4Ia3Oo53NhdIAD9745sCWWegSBYZf7C/gTXVtmBxJ30NnuI+Cg0otaTHA
DPJZ26mBCNijYvpVGqgcSkXRdQQMiBGo6TLmsdpXxn4NFuh3IoRS+8gMgEFxpQdK
aAsHnRBTbfaeYpuNR2P5IJVc1L89rg3DkLWMw3ybSO5WzAcjg4yDiasCsGNHq/T4
e9t+V7/+YA14UOMAHfsAnD/B7UI/7B0ealDbepr/cq1NdJ1F0G7JoCS0yAExRumv
3KBznE29YMZTXCqJg6DNQqkV1xmuB2l2/eAZrM/pHTHGWBQk27WI/KsmqISt9Vb+
vmowDuJQNwZG784KSmbRcjSnuNTIltUybhgF/r+m3dNq4j+H/SroBIi5xI+5HJR+
m7G0tjQkpI3Hie3kf9Egwj09goMZ5ka8tIETMqgJFa2AZ3VpnBekxXGe1OtFgfeo
3nOCnYNNADUSIFUmGmAUusPlgFyMGoWvTHs+koYN8cS+q+X9WJgI3mihnMuiVIux
jG2W7IDCimiss/g0Bnol7M7FdL4QMVeg9/LX5wIl2G1b9Nz4ZDCSI/ooHL+xMFrm
H1wwBF9/xjpc0J6RWimkSvFa4iRCti4Ac8w41l+APwEtH2mWdrefTaadV0JXH/wh
brJGtCQhTrCLGuyLluPx
=xaoW
-END PGP SIGNATURE-
From 355eac426aea2e1f98b99a41707b37e9ba3ef02b Mon Sep 17 00:00:00 2001
From: Hannes Reinecke h...@suse.de
Date: Tue, 4 Nov 2014 08:06:03 +0100
Subject: [PATCH] scsi: Fixup compilation warning when SCSI_CONSTANTS is not
 set

ARRAY_SIZE() requires the array to actually have a size.

Signed-off-by: Hannes Reinecke h...@suse.de
---
 drivers/scsi/constants.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index b3cbf3a..a1a7fca 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -267,7 +267,7 @@ static struct sa_name_list sa_names_arr[] = {
 };
 
 #else /* ifndef CONFIG_SCSI_CONSTANTS */
-static const char *cdb_byte0_names[];
+static const char *cdb_byte0_names[0];
 
 static struct sa_name_list sa_names_arr[] = {
 	{VARIABLE_LENGTH_CMD, NULL, 0},
-- 
1.8.5.2



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

2014-11-02 Thread Hannes Reinecke
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 11/03/2014 03:52 AM, Stephen Rothwell wrote:
> Hi James,
> 
> After merging the scsi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/scsi/scsi_lib.c: In function 'scsi_io_completion': 
> drivers/scsi/scsi_lib.c:1048:5: error: implicit declaration of
> function 'SCSI_LOG_LEVEL'
> [-Werror=implicit-function-declaration] level =
> SCSI_LOG_LEVEL(SCSI_LOG_MLCOMPLETE_SHIFT, ^
> 
> Caused by commit b6568e80be82 ("scsi: simplify 
> scsi_log_(send|completion)").  SCSI_LOG_LEVEL is defined in 
> drivers/scsi/scsi_logging.h, but only if CONFIG_SCSI_LOGGING is
> defined.
> 
> I have used the version of the scsi tree from next-20141031 for
> today.
> 
Ah, missed that. Here's the patch.

Cheers,

Hannes
- -- 
Dr. Hannes Reinecke   zSeries & Storage
h...@suse.de  +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBAgAGBQJUVzPtAAoJEGz4yi9OyKjPX/YP/2CmPtJDed4+ckb0gjJ8bdlW
i6F532mihXN1WuFYahFujCmZczF8aPEZrViKp/6BZGaqezhqg7BdoH/dXzsYzWAh
Slwlqu52WIj4Eo0B39dN8uuWRPJXV+jvSRE2NucVVhICYYYghR8YhK3HeY2Mw/g7
M1G82a3Ry0g/NpJePzdLImvWj8QoLhua9p61aias0kJjf3p+JskMV3PK9QbroVp/
QsubWkj2yaSs/j21E77JMMzLaQsRK0SIwDvN7AdGxh+h5e9r+eWJrpfdJscAZ4td
FsPApfQR9fxtG9mDPZigf2Oy3XX++N1TPQN6Y7s1KE78d+XGJFxtXEIf1gmp07Pg
lCQACp2WVA14mA+A5PTN7xYtYwvPgMPez63XnAjFkVVXpSMYilRqSPQs82ruN42w
0GGX293ay2s6o1CcFNk/xJp/l7KomKlQbjdIMCkWVbKb3gpO8ivxThPzJv001SN8
zOF7u9YxATQS5EG0Cja9/aLVrhjg0GWFjtmvs9ToSrSgsFrrLycg7zP+DtfP4uz8
2hsAU9Ss9PlxfgbOIMoH42S0YZe4vo6RJmY25POuSfHQVsn+FTVpxqYErMUnNql6
dPfcQq+YqcfcT4n0rBV8VtzRulU11SzNZBEwbJhML4zUs4DCLteemYCWyp/5F+hw
hmmeOMsJfUW8EiLgoLbf
=nK00
-END PGP SIGNATURE-
>From e5c943164a981e32d88c7083c84a85ff513bb0ee Mon Sep 17 00:00:00 2001
From: Hannes Reinecke 
Date: Mon, 3 Nov 2014 08:03:48 +0100
Subject: [PATCH] scsi: define SCSI_LOG_LEVEL

SCSI_LOG_LEVEL needs to be defined even if CONFIG_SCSI_LOGGING
is not enabled.

Reported-by: Stephen Rothwell 
Signed-off-by: Hannes Reinecke 
---
 drivers/scsi/scsi_logging.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/scsi/scsi_logging.h b/drivers/scsi/scsi_logging.h
index 1f65139..7fe64a8 100644
--- a/drivers/scsi/scsi_logging.h
+++ b/drivers/scsi/scsi_logging.h
@@ -51,6 +51,7 @@ do {\
 		} while (0);	\
 } while (0)
 #else
+#define SCSI_LOG_LEVEL(SHIFT, BITS) 0
 #define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD)
 #endif /* CONFIG_SCSI_LOGGING */
 
-- 
1.8.4.5



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

2014-11-02 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/scsi_lib.c: In function 'scsi_io_completion':
drivers/scsi/scsi_lib.c:1048:5: error: implicit declaration of function 
'SCSI_LOG_LEVEL' [-Werror=implicit-function-declaration]
 level = SCSI_LOG_LEVEL(SCSI_LOG_MLCOMPLETE_SHIFT,
 ^

Caused by commit b6568e80be82 ("scsi: simplify
scsi_log_(send|completion)").  SCSI_LOG_LEVEL is defined in
drivers/scsi/scsi_logging.h, but only if CONFIG_SCSI_LOGGING is defined.

I have used the version of the scsi tree from next-20141031 for today.
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpdcFB4Ysnyn.pgp
Description: OpenPGP digital signature


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

2014-11-02 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/scsi_lib.c: In function 'scsi_io_completion':
drivers/scsi/scsi_lib.c:1048:5: error: implicit declaration of function 
'SCSI_LOG_LEVEL' [-Werror=implicit-function-declaration]
 level = SCSI_LOG_LEVEL(SCSI_LOG_MLCOMPLETE_SHIFT,
 ^

Caused by commit b6568e80be82 (scsi: simplify
scsi_log_(send|completion)).  SCSI_LOG_LEVEL is defined in
drivers/scsi/scsi_logging.h, but only if CONFIG_SCSI_LOGGING is defined.

I have used the version of the scsi tree from next-20141031 for today.
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpdcFB4Ysnyn.pgp
Description: OpenPGP digital signature


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

2014-11-02 Thread Hannes Reinecke
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 11/03/2014 03:52 AM, Stephen Rothwell wrote:
 Hi James,
 
 After merging the scsi tree, today's linux-next build (powerpc
 ppc64_defconfig) failed like this:
 
 drivers/scsi/scsi_lib.c: In function 'scsi_io_completion': 
 drivers/scsi/scsi_lib.c:1048:5: error: implicit declaration of
 function 'SCSI_LOG_LEVEL'
 [-Werror=implicit-function-declaration] level =
 SCSI_LOG_LEVEL(SCSI_LOG_MLCOMPLETE_SHIFT, ^
 
 Caused by commit b6568e80be82 (scsi: simplify 
 scsi_log_(send|completion)).  SCSI_LOG_LEVEL is defined in 
 drivers/scsi/scsi_logging.h, but only if CONFIG_SCSI_LOGGING is
 defined.
 
 I have used the version of the scsi tree from next-20141031 for
 today.
 
Ah, missed that. Here's the patch.

Cheers,

Hannes
- -- 
Dr. Hannes Reinecke   zSeries  Storage
h...@suse.de  +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBAgAGBQJUVzPtAAoJEGz4yi9OyKjPX/YP/2CmPtJDed4+ckb0gjJ8bdlW
i6F532mihXN1WuFYahFujCmZczF8aPEZrViKp/6BZGaqezhqg7BdoH/dXzsYzWAh
Slwlqu52WIj4Eo0B39dN8uuWRPJXV+jvSRE2NucVVhICYYYghR8YhK3HeY2Mw/g7
M1G82a3Ry0g/NpJePzdLImvWj8QoLhua9p61aias0kJjf3p+JskMV3PK9QbroVp/
QsubWkj2yaSs/j21E77JMMzLaQsRK0SIwDvN7AdGxh+h5e9r+eWJrpfdJscAZ4td
FsPApfQR9fxtG9mDPZigf2Oy3XX++N1TPQN6Y7s1KE78d+XGJFxtXEIf1gmp07Pg
lCQACp2WVA14mA+A5PTN7xYtYwvPgMPez63XnAjFkVVXpSMYilRqSPQs82ruN42w
0GGX293ay2s6o1CcFNk/xJp/l7KomKlQbjdIMCkWVbKb3gpO8ivxThPzJv001SN8
zOF7u9YxATQS5EG0Cja9/aLVrhjg0GWFjtmvs9ToSrSgsFrrLycg7zP+DtfP4uz8
2hsAU9Ss9PlxfgbOIMoH42S0YZe4vo6RJmY25POuSfHQVsn+FTVpxqYErMUnNql6
dPfcQq+YqcfcT4n0rBV8VtzRulU11SzNZBEwbJhML4zUs4DCLteemYCWyp/5F+hw
hmmeOMsJfUW8EiLgoLbf
=nK00
-END PGP SIGNATURE-
From e5c943164a981e32d88c7083c84a85ff513bb0ee Mon Sep 17 00:00:00 2001
From: Hannes Reinecke h...@suse.de
Date: Mon, 3 Nov 2014 08:03:48 +0100
Subject: [PATCH] scsi: define SCSI_LOG_LEVEL

SCSI_LOG_LEVEL needs to be defined even if CONFIG_SCSI_LOGGING
is not enabled.

Reported-by: Stephen Rothwell s...@canb.auug.org.au
Signed-off-by: Hannes Reinecke h...@suse.de
---
 drivers/scsi/scsi_logging.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/scsi/scsi_logging.h b/drivers/scsi/scsi_logging.h
index 1f65139..7fe64a8 100644
--- a/drivers/scsi/scsi_logging.h
+++ b/drivers/scsi/scsi_logging.h
@@ -51,6 +51,7 @@ do {\
 		} while (0);	\
 } while (0)
 #else
+#define SCSI_LOG_LEVEL(SHIFT, BITS) 0
 #define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD)
 #endif /* CONFIG_SCSI_LOGGING */
 
-- 
1.8.4.5



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

2014-09-26 Thread Brian King
On 09/26/2014 04:57 AM, James Bottomley wrote:
> On Fri, 2014-09-26 at 10:36 +0200, Christoph Hellwig wrote:
>> On Fri, Sep 26, 2014 at 06:34:50PM +1000, Stephen Rothwell wrote:
>>> Hi James,
>>>
>>> After merging the scsi tree, today's linux-next build (powerpc
>>> ppc64_defconfig) failed like this:
>>>
>>> drivers/scsi/ipr.c: In function 'ipr_handle_log_data':
>>> drivers/scsi/ipr.c:2468:15: error: 'IPR_IOASC_HW_CMD_FAILED' undeclared 
>>> (first use in this function)
>>>   if (ioasc == IPR_IOASC_HW_CMD_FAILED &&
>>>^
>>>
>>> Caused by commit 3185ea63907c ("ipr: don't log error messages when
>>> applications issues illegal requests").  Someone typoed that name in
>>> ipr.h ...
>>>
>>> I have reverted that commit for today.
>>
>> Thanks.  The fix should be here:
>>
>> http://git.infradead.org/users/hch/scsi-queue.git/commitdiff/d247a70a4d67623eb738176ee703a7bb8b6c325c
> 
> OK, Pushed out.
> 
> I'll wait for the next couple of build cycles before pushing (assuming
> merge window opens on Sunday) just in case more things show up.

Hi James,

Anything preventing this patch set from getting picked up? Do you need a resend?

http://marc.info/?l=linux-scsi=140657929221696=2

Thanks,

Brian

-- 
Brian King
Power Linux I/O
IBM Linux Technology Center


--
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 scsi tree

2014-09-26 Thread James Bottomley
On Fri, 2014-09-26 at 10:36 +0200, Christoph Hellwig wrote:
> On Fri, Sep 26, 2014 at 06:34:50PM +1000, Stephen Rothwell wrote:
> > Hi James,
> > 
> > After merging the scsi tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > drivers/scsi/ipr.c: In function 'ipr_handle_log_data':
> > drivers/scsi/ipr.c:2468:15: error: 'IPR_IOASC_HW_CMD_FAILED' undeclared 
> > (first use in this function)
> >   if (ioasc == IPR_IOASC_HW_CMD_FAILED &&
> >^
> > 
> > Caused by commit 3185ea63907c ("ipr: don't log error messages when
> > applications issues illegal requests").  Someone typoed that name in
> > ipr.h ...
> > 
> > I have reverted that commit for today.
> 
> Thanks.  The fix should be here:
> 
> http://git.infradead.org/users/hch/scsi-queue.git/commitdiff/d247a70a4d67623eb738176ee703a7bb8b6c325c

OK, Pushed out.

I'll wait for the next couple of build cycles before pushing (assuming
merge window opens on Sunday) just in case more things show up.

James


--
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 scsi tree

2014-09-26 Thread Christoph Hellwig
On Fri, Sep 26, 2014 at 06:34:50PM +1000, Stephen Rothwell wrote:
> Hi James,
> 
> After merging the scsi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/scsi/ipr.c: In function 'ipr_handle_log_data':
> drivers/scsi/ipr.c:2468:15: error: 'IPR_IOASC_HW_CMD_FAILED' undeclared 
> (first use in this function)
>   if (ioasc == IPR_IOASC_HW_CMD_FAILED &&
>^
> 
> Caused by commit 3185ea63907c ("ipr: don't log error messages when
> applications issues illegal requests").  Someone typoed that name in
> ipr.h ...
> 
> I have reverted that commit for today.

Thanks.  The fix should be here:

http://git.infradead.org/users/hch/scsi-queue.git/commitdiff/d247a70a4d67623eb738176ee703a7bb8b6c325c

--
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 scsi tree

2014-09-26 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/ipr.c: In function 'ipr_handle_log_data':
drivers/scsi/ipr.c:2468:15: error: 'IPR_IOASC_HW_CMD_FAILED' undeclared (first 
use in this function)
  if (ioasc == IPR_IOASC_HW_CMD_FAILED &&
   ^

Caused by commit 3185ea63907c ("ipr: don't log error messages when
applications issues illegal requests").  Someone typoed that name in
ipr.h ...

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


signature.asc
Description: PGP signature


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

2014-09-26 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/ipr.c: In function 'ipr_handle_log_data':
drivers/scsi/ipr.c:2468:15: error: 'IPR_IOASC_HW_CMD_FAILED' undeclared (first 
use in this function)
  if (ioasc == IPR_IOASC_HW_CMD_FAILED 
   ^

Caused by commit 3185ea63907c (ipr: don't log error messages when
applications issues illegal requests).  Someone typoed that name in
ipr.h ...

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


signature.asc
Description: PGP signature


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

2014-09-26 Thread Christoph Hellwig
On Fri, Sep 26, 2014 at 06:34:50PM +1000, Stephen Rothwell wrote:
 Hi James,
 
 After merging the scsi tree, today's linux-next build (powerpc
 ppc64_defconfig) failed like this:
 
 drivers/scsi/ipr.c: In function 'ipr_handle_log_data':
 drivers/scsi/ipr.c:2468:15: error: 'IPR_IOASC_HW_CMD_FAILED' undeclared 
 (first use in this function)
   if (ioasc == IPR_IOASC_HW_CMD_FAILED 
^
 
 Caused by commit 3185ea63907c (ipr: don't log error messages when
 applications issues illegal requests).  Someone typoed that name in
 ipr.h ...
 
 I have reverted that commit for today.

Thanks.  The fix should be here:

http://git.infradead.org/users/hch/scsi-queue.git/commitdiff/d247a70a4d67623eb738176ee703a7bb8b6c325c

--
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 scsi tree

2014-09-26 Thread James Bottomley
On Fri, 2014-09-26 at 10:36 +0200, Christoph Hellwig wrote:
 On Fri, Sep 26, 2014 at 06:34:50PM +1000, Stephen Rothwell wrote:
  Hi James,
  
  After merging the scsi tree, today's linux-next build (powerpc
  ppc64_defconfig) failed like this:
  
  drivers/scsi/ipr.c: In function 'ipr_handle_log_data':
  drivers/scsi/ipr.c:2468:15: error: 'IPR_IOASC_HW_CMD_FAILED' undeclared 
  (first use in this function)
if (ioasc == IPR_IOASC_HW_CMD_FAILED 
 ^
  
  Caused by commit 3185ea63907c (ipr: don't log error messages when
  applications issues illegal requests).  Someone typoed that name in
  ipr.h ...
  
  I have reverted that commit for today.
 
 Thanks.  The fix should be here:
 
 http://git.infradead.org/users/hch/scsi-queue.git/commitdiff/d247a70a4d67623eb738176ee703a7bb8b6c325c

OK, Pushed out.

I'll wait for the next couple of build cycles before pushing (assuming
merge window opens on Sunday) just in case more things show up.

James


--
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 scsi tree

2014-09-26 Thread Brian King
On 09/26/2014 04:57 AM, James Bottomley wrote:
 On Fri, 2014-09-26 at 10:36 +0200, Christoph Hellwig wrote:
 On Fri, Sep 26, 2014 at 06:34:50PM +1000, Stephen Rothwell wrote:
 Hi James,

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

 drivers/scsi/ipr.c: In function 'ipr_handle_log_data':
 drivers/scsi/ipr.c:2468:15: error: 'IPR_IOASC_HW_CMD_FAILED' undeclared 
 (first use in this function)
   if (ioasc == IPR_IOASC_HW_CMD_FAILED 
^

 Caused by commit 3185ea63907c (ipr: don't log error messages when
 applications issues illegal requests).  Someone typoed that name in
 ipr.h ...

 I have reverted that commit for today.

 Thanks.  The fix should be here:

 http://git.infradead.org/users/hch/scsi-queue.git/commitdiff/d247a70a4d67623eb738176ee703a7bb8b6c325c
 
 OK, Pushed out.
 
 I'll wait for the next couple of build cycles before pushing (assuming
 merge window opens on Sunday) just in case more things show up.

Hi James,

Anything preventing this patch set from getting picked up? Do you need a resend?

http://marc.info/?l=linux-scsim=140657929221696w=2

Thanks,

Brian

-- 
Brian King
Power Linux I/O
IBM Linux Technology Center


--
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 scsi tree

2013-01-11 Thread wenxiong


Quoting James Bottomley :


On Fri, 2013-01-11 at 11:35 -0600, Brian King wrote:

On 01/11/2013 10:05 AM, Greg KH wrote:
> On Fri, Jan 11, 2013 at 03:37:17PM +, James Bottomley wrote:
>> On Fri, 2013-01-11 at 09:27 -0600, Brian King wrote:
>>> It looks like this was a due to the fact that the new patches
>>> added __devinit tags in the same merge window the __devinit tag
>>> itself was getting removed.
>>
>> Not exactly.  The patch which makes them nops went into 3.8.  Now
>> there's a patch queued in, Gregs tree I presume, to remove them all and
>> the #defines which causes the compile failure.
>>
>>> As to the sparse warnings, this patch fixed the ones that
>>> were actual bugs in the new code, although we could have
>>> made that more clear in the patch description.
>>>
>>> http://marc.info/?l=linux-scsi=135716576204083=2
>>
>> Ah, thanks ... I've been on holiday for a while, so I did miss that.
>>
>>> There is one outstanding issue I am aware of which was an
>>> array bounds compiler warning which looks to be a misdetection
>>> by the compiler. Wendy and I discussed adding a BUG_ON
>>> to stop the compiler from complaining.
>>>
>>> Wendy - lets queue these two changes up ASAP. They should both
>>> be very simple changes.
>>
>> If it's a simple gcc bug, just ignore it.
>>
>> I do need you to redo the patches to remove the __dev annotations,
>> though.  We can't risk introducing a bisect killing compile breakage if
>> Greg's tree merges before mine in the next merge window.
>
> This change should be pushed to Linus in time for 3.8-final, so there
> should not be any bisect issues.

We can do this either way.

James - what is your preference? Drop everything and do a resend of the
entire series or delta patches on top of what is currently in your tree?


Drop everything and resend still, I think.  There's still a rebase
problem, because the merge failure will happen if I rebase the misc tree
to beyond Greg's merge point and I'd rather not have to worry about it.

Thanks,

James


Hi James, I just re-sent all patches which are against
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git.
This kernel already have Greg's "Drivers: scsi: remove _dev*  
attributes" patch.


Let me know if you have any questions for these patches.

Thanks for for your help!
Wendy

--
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 scsi tree

2013-01-11 Thread James Bottomley
On Fri, 2013-01-11 at 11:35 -0600, Brian King wrote:
> On 01/11/2013 10:05 AM, Greg KH wrote:
> > On Fri, Jan 11, 2013 at 03:37:17PM +, James Bottomley wrote:
> >> On Fri, 2013-01-11 at 09:27 -0600, Brian King wrote:
> >>> It looks like this was a due to the fact that the new patches
> >>> added __devinit tags in the same merge window the __devinit tag
> >>> itself was getting removed.
> >>
> >> Not exactly.  The patch which makes them nops went into 3.8.  Now
> >> there's a patch queued in, Gregs tree I presume, to remove them all and
> >> the #defines which causes the compile failure.
> >>
> >>> As to the sparse warnings, this patch fixed the ones that
> >>> were actual bugs in the new code, although we could have
> >>> made that more clear in the patch description.
> >>>
> >>> http://marc.info/?l=linux-scsi=135716576204083=2
> >>
> >> Ah, thanks ... I've been on holiday for a while, so I did miss that.
> >>
> >>> There is one outstanding issue I am aware of which was an
> >>> array bounds compiler warning which looks to be a misdetection
> >>> by the compiler. Wendy and I discussed adding a BUG_ON
> >>> to stop the compiler from complaining.
> >>>
> >>> Wendy - lets queue these two changes up ASAP. They should both
> >>> be very simple changes.
> >>
> >> If it's a simple gcc bug, just ignore it.
> >>
> >> I do need you to redo the patches to remove the __dev annotations,
> >> though.  We can't risk introducing a bisect killing compile breakage if
> >> Greg's tree merges before mine in the next merge window.
> > 
> > This change should be pushed to Linus in time for 3.8-final, so there
> > should not be any bisect issues.
> 
> We can do this either way.
> 
> James - what is your preference? Drop everything and do a resend of the
> entire series or delta patches on top of what is currently in your tree?

Drop everything and resend still, I think.  There's still a rebase
problem, because the merge failure will happen if I rebase the misc tree
to beyond Greg's merge point and I'd rather not have to worry about it.

Thanks,

James


--
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 scsi tree

2013-01-11 Thread Brian King
On 01/11/2013 10:05 AM, Greg KH wrote:
> On Fri, Jan 11, 2013 at 03:37:17PM +, James Bottomley wrote:
>> On Fri, 2013-01-11 at 09:27 -0600, Brian King wrote:
>>> It looks like this was a due to the fact that the new patches
>>> added __devinit tags in the same merge window the __devinit tag
>>> itself was getting removed.
>>
>> Not exactly.  The patch which makes them nops went into 3.8.  Now
>> there's a patch queued in, Gregs tree I presume, to remove them all and
>> the #defines which causes the compile failure.
>>
>>> As to the sparse warnings, this patch fixed the ones that
>>> were actual bugs in the new code, although we could have
>>> made that more clear in the patch description.
>>>
>>> http://marc.info/?l=linux-scsi=135716576204083=2
>>
>> Ah, thanks ... I've been on holiday for a while, so I did miss that.
>>
>>> There is one outstanding issue I am aware of which was an
>>> array bounds compiler warning which looks to be a misdetection
>>> by the compiler. Wendy and I discussed adding a BUG_ON
>>> to stop the compiler from complaining.
>>>
>>> Wendy - lets queue these two changes up ASAP. They should both
>>> be very simple changes.
>>
>> If it's a simple gcc bug, just ignore it.
>>
>> I do need you to redo the patches to remove the __dev annotations,
>> though.  We can't risk introducing a bisect killing compile breakage if
>> Greg's tree merges before mine in the next merge window.
> 
> This change should be pushed to Linus in time for 3.8-final, so there
> should not be any bisect issues.

We can do this either way.

James - what is your preference? Drop everything and do a resend of the
entire series or delta patches on top of what is currently in your tree?

Thanks,

Brian


-- 
Brian King
Power Linux I/O
IBM Linux Technology Center


--
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 scsi tree

2013-01-11 Thread Greg KH
On Fri, Jan 11, 2013 at 03:37:17PM +, James Bottomley wrote:
> On Fri, 2013-01-11 at 09:27 -0600, Brian King wrote:
> > It looks like this was a due to the fact that the new patches
> > added __devinit tags in the same merge window the __devinit tag
> > itself was getting removed.
> 
> Not exactly.  The patch which makes them nops went into 3.8.  Now
> there's a patch queued in, Gregs tree I presume, to remove them all and
> the #defines which causes the compile failure.
> 
> > As to the sparse warnings, this patch fixed the ones that
> > were actual bugs in the new code, although we could have
> > made that more clear in the patch description.
> > 
> > http://marc.info/?l=linux-scsi=135716576204083=2
> 
> Ah, thanks ... I've been on holiday for a while, so I did miss that.
> 
> > There is one outstanding issue I am aware of which was an
> > array bounds compiler warning which looks to be a misdetection
> > by the compiler. Wendy and I discussed adding a BUG_ON
> > to stop the compiler from complaining.
> > 
> > Wendy - lets queue these two changes up ASAP. They should both
> > be very simple changes.
> 
> If it's a simple gcc bug, just ignore it.
> 
> I do need you to redo the patches to remove the __dev annotations,
> though.  We can't risk introducing a bisect killing compile breakage if
> Greg's tree merges before mine in the next merge window.

This change should be pushed to Linus in time for 3.8-final, so there
should not be any bisect issues.

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 scsi tree

2013-01-11 Thread James Bottomley
On Fri, 2013-01-11 at 09:27 -0600, Brian King wrote:
> It looks like this was a due to the fact that the new patches
> added __devinit tags in the same merge window the __devinit tag
> itself was getting removed.

Not exactly.  The patch which makes them nops went into 3.8.  Now
there's a patch queued in, Gregs tree I presume, to remove them all and
the #defines which causes the compile failure.

> As to the sparse warnings, this patch fixed the ones that
> were actual bugs in the new code, although we could have
> made that more clear in the patch description.
> 
> http://marc.info/?l=linux-scsi=135716576204083=2

Ah, thanks ... I've been on holiday for a while, so I did miss that.

> There is one outstanding issue I am aware of which was an
> array bounds compiler warning which looks to be a misdetection
> by the compiler. Wendy and I discussed adding a BUG_ON
> to stop the compiler from complaining.
> 
> Wendy - lets queue these two changes up ASAP. They should both
> be very simple changes.

If it's a simple gcc bug, just ignore it.

I do need you to redo the patches to remove the __dev annotations,
though.  We can't risk introducing a bisect killing compile breakage if
Greg's tree merges before mine in the next merge window.

James


--
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 scsi tree

2013-01-11 Thread Brian King
It looks like this was a due to the fact that the new patches
added __devinit tags in the same merge window the __devinit tag
itself was getting removed.

As to the sparse warnings, this patch fixed the ones that
were actual bugs in the new code, although we could have
made that more clear in the patch description.

http://marc.info/?l=linux-scsi=135716576204083=2

There is one outstanding issue I am aware of which was an
array bounds compiler warning which looks to be a misdetection
by the compiler. Wendy and I discussed adding a BUG_ON
to stop the compiler from complaining.

Wendy - lets queue these two changes up ASAP. They should both
be very simple changes.

Thanks,

Brian


On 01/11/2013 01:34 AM, James Bottomley wrote:
> On Fri, 2013-01-11 at 12:03 +1100, Stephen Rothwell wrote:
>> Hi James,
>>
>> After merging the scsi tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> drivers/scsi/ipr.c:9138:22: error: expected '=', ',', ';', 'asm' or 
>> '__attribute__' before 'ipr_enable_msix'
>> drivers/scsi/ipr.c:9165:22: error: expected '=', ',', ';', 'asm' or 
>> '__attribute__' before 'ipr_enable_msi'
>> drivers/scsi/ipr.c:9188:23: error: expected '=', ',', ';', 'asm' or 
>> '__attribute__' before 'name_msi_vectors'
>> drivers/scsi/ipr.c:9200:22: error: expected '=', ',', ';', 'asm' or 
>> '__attribute__' before 'ipr_request_other_msi_irqs'
>> drivers/scsi/ipr.c: In function 'ipr_probe_ioa':
>> drivers/scsi/ipr.c:9422:4: error: implicit declaration of function 
>> 'ipr_enable_msix' [-Werror=implicit-function-declaration]
>> drivers/scsi/ipr.c:9425:4: error: implicit declaration of function 
>> 'ipr_enable_msi' [-Werror=implicit-function-declaration]
>> drivers/scsi/ipr.c:9517:3: error: implicit declaration of function 
>> 'name_msi_vectors' [-Werror=implicit-function-declaration]
>> drivers/scsi/ipr.c:9523:4: error: implicit declaration of function 
>> 'ipr_request_other_msi_irqs' [-Werror=implicit-function-declaration]
> 
> OK, fine, I'll drop all the ipr patches.  I've been waiting for a month
> for them to fix the smatch and sparse warnings.  Please resend the
> series with all the fixes.
> 
> Thanks,
> 
> James
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


-- 
Brian King
Power Linux I/O
IBM Linux Technology Center


--
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 scsi tree

2013-01-11 Thread Brian King
It looks like this was a due to the fact that the new patches
added __devinit tags in the same merge window the __devinit tag
itself was getting removed.

As to the sparse warnings, this patch fixed the ones that
were actual bugs in the new code, although we could have
made that more clear in the patch description.

http://marc.info/?l=linux-scsim=135716576204083w=2

There is one outstanding issue I am aware of which was an
array bounds compiler warning which looks to be a misdetection
by the compiler. Wendy and I discussed adding a BUG_ON
to stop the compiler from complaining.

Wendy - lets queue these two changes up ASAP. They should both
be very simple changes.

Thanks,

Brian


On 01/11/2013 01:34 AM, James Bottomley wrote:
 On Fri, 2013-01-11 at 12:03 +1100, Stephen Rothwell wrote:
 Hi James,

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

 drivers/scsi/ipr.c:9138:22: error: expected '=', ',', ';', 'asm' or 
 '__attribute__' before 'ipr_enable_msix'
 drivers/scsi/ipr.c:9165:22: error: expected '=', ',', ';', 'asm' or 
 '__attribute__' before 'ipr_enable_msi'
 drivers/scsi/ipr.c:9188:23: error: expected '=', ',', ';', 'asm' or 
 '__attribute__' before 'name_msi_vectors'
 drivers/scsi/ipr.c:9200:22: error: expected '=', ',', ';', 'asm' or 
 '__attribute__' before 'ipr_request_other_msi_irqs'
 drivers/scsi/ipr.c: In function 'ipr_probe_ioa':
 drivers/scsi/ipr.c:9422:4: error: implicit declaration of function 
 'ipr_enable_msix' [-Werror=implicit-function-declaration]
 drivers/scsi/ipr.c:9425:4: error: implicit declaration of function 
 'ipr_enable_msi' [-Werror=implicit-function-declaration]
 drivers/scsi/ipr.c:9517:3: error: implicit declaration of function 
 'name_msi_vectors' [-Werror=implicit-function-declaration]
 drivers/scsi/ipr.c:9523:4: error: implicit declaration of function 
 'ipr_request_other_msi_irqs' [-Werror=implicit-function-declaration]
 
 OK, fine, I'll drop all the ipr patches.  I've been waiting for a month
 for them to fix the smatch and sparse warnings.  Please resend the
 series with all the fixes.
 
 Thanks,
 
 James
 
 
 --
 To unsubscribe from this list: send the line unsubscribe linux-scsi in
 the body of a message to majord...@vger.kernel.org
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 


-- 
Brian King
Power Linux I/O
IBM Linux Technology Center


--
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 scsi tree

2013-01-11 Thread James Bottomley
On Fri, 2013-01-11 at 09:27 -0600, Brian King wrote:
 It looks like this was a due to the fact that the new patches
 added __devinit tags in the same merge window the __devinit tag
 itself was getting removed.

Not exactly.  The patch which makes them nops went into 3.8.  Now
there's a patch queued in, Gregs tree I presume, to remove them all and
the #defines which causes the compile failure.

 As to the sparse warnings, this patch fixed the ones that
 were actual bugs in the new code, although we could have
 made that more clear in the patch description.
 
 http://marc.info/?l=linux-scsim=135716576204083w=2

Ah, thanks ... I've been on holiday for a while, so I did miss that.

 There is one outstanding issue I am aware of which was an
 array bounds compiler warning which looks to be a misdetection
 by the compiler. Wendy and I discussed adding a BUG_ON
 to stop the compiler from complaining.
 
 Wendy - lets queue these two changes up ASAP. They should both
 be very simple changes.

If it's a simple gcc bug, just ignore it.

I do need you to redo the patches to remove the __dev annotations,
though.  We can't risk introducing a bisect killing compile breakage if
Greg's tree merges before mine in the next merge window.

James


--
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 scsi tree

2013-01-11 Thread Greg KH
On Fri, Jan 11, 2013 at 03:37:17PM +, James Bottomley wrote:
 On Fri, 2013-01-11 at 09:27 -0600, Brian King wrote:
  It looks like this was a due to the fact that the new patches
  added __devinit tags in the same merge window the __devinit tag
  itself was getting removed.
 
 Not exactly.  The patch which makes them nops went into 3.8.  Now
 there's a patch queued in, Gregs tree I presume, to remove them all and
 the #defines which causes the compile failure.
 
  As to the sparse warnings, this patch fixed the ones that
  were actual bugs in the new code, although we could have
  made that more clear in the patch description.
  
  http://marc.info/?l=linux-scsim=135716576204083w=2
 
 Ah, thanks ... I've been on holiday for a while, so I did miss that.
 
  There is one outstanding issue I am aware of which was an
  array bounds compiler warning which looks to be a misdetection
  by the compiler. Wendy and I discussed adding a BUG_ON
  to stop the compiler from complaining.
  
  Wendy - lets queue these two changes up ASAP. They should both
  be very simple changes.
 
 If it's a simple gcc bug, just ignore it.
 
 I do need you to redo the patches to remove the __dev annotations,
 though.  We can't risk introducing a bisect killing compile breakage if
 Greg's tree merges before mine in the next merge window.

This change should be pushed to Linus in time for 3.8-final, so there
should not be any bisect issues.

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 scsi tree

2013-01-11 Thread Brian King
On 01/11/2013 10:05 AM, Greg KH wrote:
 On Fri, Jan 11, 2013 at 03:37:17PM +, James Bottomley wrote:
 On Fri, 2013-01-11 at 09:27 -0600, Brian King wrote:
 It looks like this was a due to the fact that the new patches
 added __devinit tags in the same merge window the __devinit tag
 itself was getting removed.

 Not exactly.  The patch which makes them nops went into 3.8.  Now
 there's a patch queued in, Gregs tree I presume, to remove them all and
 the #defines which causes the compile failure.

 As to the sparse warnings, this patch fixed the ones that
 were actual bugs in the new code, although we could have
 made that more clear in the patch description.

 http://marc.info/?l=linux-scsim=135716576204083w=2

 Ah, thanks ... I've been on holiday for a while, so I did miss that.

 There is one outstanding issue I am aware of which was an
 array bounds compiler warning which looks to be a misdetection
 by the compiler. Wendy and I discussed adding a BUG_ON
 to stop the compiler from complaining.

 Wendy - lets queue these two changes up ASAP. They should both
 be very simple changes.

 If it's a simple gcc bug, just ignore it.

 I do need you to redo the patches to remove the __dev annotations,
 though.  We can't risk introducing a bisect killing compile breakage if
 Greg's tree merges before mine in the next merge window.
 
 This change should be pushed to Linus in time for 3.8-final, so there
 should not be any bisect issues.

We can do this either way.

James - what is your preference? Drop everything and do a resend of the
entire series or delta patches on top of what is currently in your tree?

Thanks,

Brian


-- 
Brian King
Power Linux I/O
IBM Linux Technology Center


--
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 scsi tree

2013-01-11 Thread James Bottomley
On Fri, 2013-01-11 at 11:35 -0600, Brian King wrote:
 On 01/11/2013 10:05 AM, Greg KH wrote:
  On Fri, Jan 11, 2013 at 03:37:17PM +, James Bottomley wrote:
  On Fri, 2013-01-11 at 09:27 -0600, Brian King wrote:
  It looks like this was a due to the fact that the new patches
  added __devinit tags in the same merge window the __devinit tag
  itself was getting removed.
 
  Not exactly.  The patch which makes them nops went into 3.8.  Now
  there's a patch queued in, Gregs tree I presume, to remove them all and
  the #defines which causes the compile failure.
 
  As to the sparse warnings, this patch fixed the ones that
  were actual bugs in the new code, although we could have
  made that more clear in the patch description.
 
  http://marc.info/?l=linux-scsim=135716576204083w=2
 
  Ah, thanks ... I've been on holiday for a while, so I did miss that.
 
  There is one outstanding issue I am aware of which was an
  array bounds compiler warning which looks to be a misdetection
  by the compiler. Wendy and I discussed adding a BUG_ON
  to stop the compiler from complaining.
 
  Wendy - lets queue these two changes up ASAP. They should both
  be very simple changes.
 
  If it's a simple gcc bug, just ignore it.
 
  I do need you to redo the patches to remove the __dev annotations,
  though.  We can't risk introducing a bisect killing compile breakage if
  Greg's tree merges before mine in the next merge window.
  
  This change should be pushed to Linus in time for 3.8-final, so there
  should not be any bisect issues.
 
 We can do this either way.
 
 James - what is your preference? Drop everything and do a resend of the
 entire series or delta patches on top of what is currently in your tree?

Drop everything and resend still, I think.  There's still a rebase
problem, because the merge failure will happen if I rebase the misc tree
to beyond Greg's merge point and I'd rather not have to worry about it.

Thanks,

James


--
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 scsi tree

2013-01-11 Thread wenxiong


Quoting James Bottomley james.bottom...@hansenpartnership.com:


On Fri, 2013-01-11 at 11:35 -0600, Brian King wrote:

On 01/11/2013 10:05 AM, Greg KH wrote:
 On Fri, Jan 11, 2013 at 03:37:17PM +, James Bottomley wrote:
 On Fri, 2013-01-11 at 09:27 -0600, Brian King wrote:
 It looks like this was a due to the fact that the new patches
 added __devinit tags in the same merge window the __devinit tag
 itself was getting removed.

 Not exactly.  The patch which makes them nops went into 3.8.  Now
 there's a patch queued in, Gregs tree I presume, to remove them all and
 the #defines which causes the compile failure.

 As to the sparse warnings, this patch fixed the ones that
 were actual bugs in the new code, although we could have
 made that more clear in the patch description.

 http://marc.info/?l=linux-scsim=135716576204083w=2

 Ah, thanks ... I've been on holiday for a while, so I did miss that.

 There is one outstanding issue I am aware of which was an
 array bounds compiler warning which looks to be a misdetection
 by the compiler. Wendy and I discussed adding a BUG_ON
 to stop the compiler from complaining.

 Wendy - lets queue these two changes up ASAP. They should both
 be very simple changes.

 If it's a simple gcc bug, just ignore it.

 I do need you to redo the patches to remove the __dev annotations,
 though.  We can't risk introducing a bisect killing compile breakage if
 Greg's tree merges before mine in the next merge window.

 This change should be pushed to Linus in time for 3.8-final, so there
 should not be any bisect issues.

We can do this either way.

James - what is your preference? Drop everything and do a resend of the
entire series or delta patches on top of what is currently in your tree?


Drop everything and resend still, I think.  There's still a rebase
problem, because the merge failure will happen if I rebase the misc tree
to beyond Greg's merge point and I'd rather not have to worry about it.

Thanks,

James


Hi James, I just re-sent all patches which are against
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git.
This kernel already have Greg's Drivers: scsi: remove _dev*  
attributes patch.


Let me know if you have any questions for these patches.

Thanks for for your help!
Wendy

--
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 scsi tree

2013-01-10 Thread James Bottomley
On Fri, 2013-01-11 at 12:03 +1100, Stephen Rothwell wrote:
> Hi James,
> 
> After merging the scsi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/scsi/ipr.c:9138:22: error: expected '=', ',', ';', 'asm' or 
> '__attribute__' before 'ipr_enable_msix'
> drivers/scsi/ipr.c:9165:22: error: expected '=', ',', ';', 'asm' or 
> '__attribute__' before 'ipr_enable_msi'
> drivers/scsi/ipr.c:9188:23: error: expected '=', ',', ';', 'asm' or 
> '__attribute__' before 'name_msi_vectors'
> drivers/scsi/ipr.c:9200:22: error: expected '=', ',', ';', 'asm' or 
> '__attribute__' before 'ipr_request_other_msi_irqs'
> drivers/scsi/ipr.c: In function 'ipr_probe_ioa':
> drivers/scsi/ipr.c:9422:4: error: implicit declaration of function 
> 'ipr_enable_msix' [-Werror=implicit-function-declaration]
> drivers/scsi/ipr.c:9425:4: error: implicit declaration of function 
> 'ipr_enable_msi' [-Werror=implicit-function-declaration]
> drivers/scsi/ipr.c:9517:3: error: implicit declaration of function 
> 'name_msi_vectors' [-Werror=implicit-function-declaration]
> drivers/scsi/ipr.c:9523:4: error: implicit declaration of function 
> 'ipr_request_other_msi_irqs' [-Werror=implicit-function-declaration]

OK, fine, I'll drop all the ipr patches.  I've been waiting for a month
for them to fix the smatch and sparse warnings.  Please resend the
series with all the fixes.

Thanks,

James


--
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 scsi tree

2013-01-10 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/ipr.c:9138:22: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before 'ipr_enable_msix'
drivers/scsi/ipr.c:9165:22: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before 'ipr_enable_msi'
drivers/scsi/ipr.c:9188:23: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before 'name_msi_vectors'
drivers/scsi/ipr.c:9200:22: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before 'ipr_request_other_msi_irqs'
drivers/scsi/ipr.c: In function 'ipr_probe_ioa':
drivers/scsi/ipr.c:9422:4: error: implicit declaration of function 
'ipr_enable_msix' [-Werror=implicit-function-declaration]
drivers/scsi/ipr.c:9425:4: error: implicit declaration of function 
'ipr_enable_msi' [-Werror=implicit-function-declaration]
drivers/scsi/ipr.c:9517:3: error: implicit declaration of function 
'name_msi_vectors' [-Werror=implicit-function-declaration]
drivers/scsi/ipr.c:9523:4: error: implicit declaration of function 
'ipr_request_other_msi_irqs' [-Werror=implicit-function-declaration]

Caused by commit 7af0de314b73 ("[SCSI] ipr: Add support for MSI-X and
distributed completion") interacting with commit 54b956b90360 ("Remove
__dev* markings from init.h") from the drover-core.current tree.

I have added the following merge fix patch for today which could be added
directly to the scsi tree (please).

From: Stephen Rothwell 
Date: Fri, 11 Jan 2013 11:59:34 +1100
Subject: [PATCH] [SCSI] ipr: remove new __dev* annotations

CONFIG_HOTPLUG is always true now and the __dev* macros have been removed.

Signed-off-by: Stephen Rothwell 
---
 drivers/scsi/ipr.c |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index e1ef0b1..8fe61da 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -9135,7 +9135,7 @@ ipr_get_chip_info(const struct pci_device_id *dev_id)
return NULL;
 }
 
-static int __devinit ipr_enable_msix(struct ipr_ioa_cfg *ioa_cfg)
+static int ipr_enable_msix(struct ipr_ioa_cfg *ioa_cfg)
 {
struct msix_entry entries[IPR_MAX_MSIX_VECTORS];
int i, err, vectors;
@@ -9162,7 +9162,7 @@ static int __devinit ipr_enable_msix(struct ipr_ioa_cfg 
*ioa_cfg)
return err;
 }
 
-static int __devinit ipr_enable_msi(struct ipr_ioa_cfg *ioa_cfg)
+static int ipr_enable_msi(struct ipr_ioa_cfg *ioa_cfg)
 {
int i, err, vectors;
 
@@ -9185,7 +9185,7 @@ static int __devinit ipr_enable_msi(struct ipr_ioa_cfg 
*ioa_cfg)
return err;
 }
 
-static void __devinit name_msi_vectors(struct ipr_ioa_cfg *ioa_cfg)
+static void name_msi_vectors(struct ipr_ioa_cfg *ioa_cfg)
 {
int vec_idx, n = sizeof(ioa_cfg->vectors_info[0].desc) - 1;
 
@@ -9197,7 +9197,7 @@ static void __devinit name_msi_vectors(struct ipr_ioa_cfg 
*ioa_cfg)
}
 }
 
-static int __devinit ipr_request_other_msi_irqs(struct ipr_ioa_cfg *ioa_cfg)
+static int ipr_request_other_msi_irqs(struct ipr_ioa_cfg *ioa_cfg)
 {
int i, rc;
 
-- 
1.7.10.280.gaa39

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


pgpIk1w0Da6ma.pgp
Description: PGP signature


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

2013-01-10 Thread Stephen Rothwell
Hi James,

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

drivers/scsi/ipr.c:9138:22: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before 'ipr_enable_msix'
drivers/scsi/ipr.c:9165:22: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before 'ipr_enable_msi'
drivers/scsi/ipr.c:9188:23: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before 'name_msi_vectors'
drivers/scsi/ipr.c:9200:22: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before 'ipr_request_other_msi_irqs'
drivers/scsi/ipr.c: In function 'ipr_probe_ioa':
drivers/scsi/ipr.c:9422:4: error: implicit declaration of function 
'ipr_enable_msix' [-Werror=implicit-function-declaration]
drivers/scsi/ipr.c:9425:4: error: implicit declaration of function 
'ipr_enable_msi' [-Werror=implicit-function-declaration]
drivers/scsi/ipr.c:9517:3: error: implicit declaration of function 
'name_msi_vectors' [-Werror=implicit-function-declaration]
drivers/scsi/ipr.c:9523:4: error: implicit declaration of function 
'ipr_request_other_msi_irqs' [-Werror=implicit-function-declaration]

Caused by commit 7af0de314b73 ([SCSI] ipr: Add support for MSI-X and
distributed completion) interacting with commit 54b956b90360 (Remove
__dev* markings from init.h) from the drover-core.current tree.

I have added the following merge fix patch for today which could be added
directly to the scsi tree (please).

From: Stephen Rothwell s...@canb.auug.org.au
Date: Fri, 11 Jan 2013 11:59:34 +1100
Subject: [PATCH] [SCSI] ipr: remove new __dev* annotations

CONFIG_HOTPLUG is always true now and the __dev* macros have been removed.

Signed-off-by: Stephen Rothwell s...@canb.auug.org.au
---
 drivers/scsi/ipr.c |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index e1ef0b1..8fe61da 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -9135,7 +9135,7 @@ ipr_get_chip_info(const struct pci_device_id *dev_id)
return NULL;
 }
 
-static int __devinit ipr_enable_msix(struct ipr_ioa_cfg *ioa_cfg)
+static int ipr_enable_msix(struct ipr_ioa_cfg *ioa_cfg)
 {
struct msix_entry entries[IPR_MAX_MSIX_VECTORS];
int i, err, vectors;
@@ -9162,7 +9162,7 @@ static int __devinit ipr_enable_msix(struct ipr_ioa_cfg 
*ioa_cfg)
return err;
 }
 
-static int __devinit ipr_enable_msi(struct ipr_ioa_cfg *ioa_cfg)
+static int ipr_enable_msi(struct ipr_ioa_cfg *ioa_cfg)
 {
int i, err, vectors;
 
@@ -9185,7 +9185,7 @@ static int __devinit ipr_enable_msi(struct ipr_ioa_cfg 
*ioa_cfg)
return err;
 }
 
-static void __devinit name_msi_vectors(struct ipr_ioa_cfg *ioa_cfg)
+static void name_msi_vectors(struct ipr_ioa_cfg *ioa_cfg)
 {
int vec_idx, n = sizeof(ioa_cfg-vectors_info[0].desc) - 1;
 
@@ -9197,7 +9197,7 @@ static void __devinit name_msi_vectors(struct ipr_ioa_cfg 
*ioa_cfg)
}
 }
 
-static int __devinit ipr_request_other_msi_irqs(struct ipr_ioa_cfg *ioa_cfg)
+static int ipr_request_other_msi_irqs(struct ipr_ioa_cfg *ioa_cfg)
 {
int i, rc;
 
-- 
1.7.10.280.gaa39

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


pgpIk1w0Da6ma.pgp
Description: PGP signature


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

2013-01-10 Thread James Bottomley
On Fri, 2013-01-11 at 12:03 +1100, Stephen Rothwell wrote:
 Hi James,
 
 After merging the scsi tree, today's linux-next build (powerpc
 ppc64_defconfig) failed like this:
 
 drivers/scsi/ipr.c:9138:22: error: expected '=', ',', ';', 'asm' or 
 '__attribute__' before 'ipr_enable_msix'
 drivers/scsi/ipr.c:9165:22: error: expected '=', ',', ';', 'asm' or 
 '__attribute__' before 'ipr_enable_msi'
 drivers/scsi/ipr.c:9188:23: error: expected '=', ',', ';', 'asm' or 
 '__attribute__' before 'name_msi_vectors'
 drivers/scsi/ipr.c:9200:22: error: expected '=', ',', ';', 'asm' or 
 '__attribute__' before 'ipr_request_other_msi_irqs'
 drivers/scsi/ipr.c: In function 'ipr_probe_ioa':
 drivers/scsi/ipr.c:9422:4: error: implicit declaration of function 
 'ipr_enable_msix' [-Werror=implicit-function-declaration]
 drivers/scsi/ipr.c:9425:4: error: implicit declaration of function 
 'ipr_enable_msi' [-Werror=implicit-function-declaration]
 drivers/scsi/ipr.c:9517:3: error: implicit declaration of function 
 'name_msi_vectors' [-Werror=implicit-function-declaration]
 drivers/scsi/ipr.c:9523:4: error: implicit declaration of function 
 'ipr_request_other_msi_irqs' [-Werror=implicit-function-declaration]

OK, fine, I'll drop all the ipr patches.  I've been waiting for a month
for them to fix the smatch and sparse warnings.  Please resend the
series with all the fixes.

Thanks,

James


--
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 scsi tree

2012-07-20 Thread James Bottomley
On Fri, 2012-07-20 at 10:41 +1000, Stephen Rothwell wrote:
> Hi James,
> 
> After merging the scsi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/base/dd.c:27:28: fatal error: scsi/scsi_scan.h: No such file or 
> directory
> 
> Caused by commit eea03c20ae38 ("Make wait_for_device_probe() also do
> scsi_complete_async_scans()") from Linus' tree interacting with commit
> 758da9dc2be8 ("[SCSI] cleanup usages of scsi_complete_async_scans") from
> the scsi tree.
> 
> I have reverted commit 758da9dc2be8 for today (which may not be the best
> thing to do).

That probably just about works, since 758da9dc2be8 is just removing
redundant code.

I've got this all fixed up properly in for-next now.

James


--
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 scsi tree

2012-07-20 Thread James Bottomley
On Fri, 2012-07-20 at 10:41 +1000, Stephen Rothwell wrote:
 Hi James,
 
 After merging the scsi tree, today's linux-next build (powerpc
 ppc64_defconfig) failed like this:
 
 drivers/base/dd.c:27:28: fatal error: scsi/scsi_scan.h: No such file or 
 directory
 
 Caused by commit eea03c20ae38 (Make wait_for_device_probe() also do
 scsi_complete_async_scans()) from Linus' tree interacting with commit
 758da9dc2be8 ([SCSI] cleanup usages of scsi_complete_async_scans) from
 the scsi tree.
 
 I have reverted commit 758da9dc2be8 for today (which may not be the best
 thing to do).

That probably just about works, since 758da9dc2be8 is just removing
redundant code.

I've got this all fixed up properly in for-next now.

James


--
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 scsi tree

2012-07-19 Thread Stephen Rothwell
Hi James,

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

drivers/base/dd.c:27:28: fatal error: scsi/scsi_scan.h: No such file or 
directory

Caused by commit eea03c20ae38 ("Make wait_for_device_probe() also do
scsi_complete_async_scans()") from Linus' tree interacting with commit
758da9dc2be8 ("[SCSI] cleanup usages of scsi_complete_async_scans") from
the scsi tree.

I have reverted commit 758da9dc2be8 for today (which may not be the best
thing to do).
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpWOECPjb1na.pgp
Description: PGP signature


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

2012-07-19 Thread Stephen Rothwell
Hi James,

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

drivers/base/dd.c:27:28: fatal error: scsi/scsi_scan.h: No such file or 
directory

Caused by commit eea03c20ae38 (Make wait_for_device_probe() also do
scsi_complete_async_scans()) from Linus' tree interacting with commit
758da9dc2be8 ([SCSI] cleanup usages of scsi_complete_async_scans) from
the scsi tree.

I have reverted commit 758da9dc2be8 for today (which may not be the best
thing to do).
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpWOECPjb1na.pgp
Description: PGP signature