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

[Stephen Rothwell]

Hi all,

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

drivers/scsi/sg.c: In function 'sg_find_srp_by_id':
drivers/scsi/sg.c:2908:4: error: expected '}' before 'else'
 2908 |    else
      |    ^~~~
drivers/scsi/sg.c:2902:16: warning: unused variable 'cptp' [-Wunused-variable]
 2902 |    const char *cptp = "pack_id=";
      |                ^~~~
drivers/scsi/sg.c:2896:5: error: label 'good' used but not defined
 2896 |     goto good;
      |     ^~~~
drivers/scsi/sg.c: At top level:
drivers/scsi/sg.c:2913:2: error: expected identifier or '(' before 'return'
 2913 |  return NULL;
      |  ^~~~~~
drivers/scsi/sg.c:2914:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before ':' token
 2914 | good:
      |     ^
drivers/scsi/sg.c:2917:2: error: expected identifier or '(' before 'return'
 2917 |  return srp;
      |  ^~~~~~
drivers/scsi/sg.c:2918:1: error: expected identifier or '(' before '}' token
 2918 | }
      | ^
drivers/scsi/sg.c: In function 'sg_find_srp_by_id':
drivers/scsi/sg.c:2912:2: error: control reaches end of non-void function [-Werror=return-type]
 2912 |  }
      |  ^

Caused by commit

  7323ad3618b6 ("scsi: sg: Replace rq array with xarray")

SG_LOG() degenerates to "{}" in some configs ...

I have used the scsi-mkp tree from next-20210122 for today.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp5wAwMRx5lP.pgp
Description: OpenPGP digital signature