On Fri, May 8, 2020 at 8:17 PM Jens Axboe <axboe@xxxxxxxxx> wrote:
>
> A few fixes that should go into this series:
Jens, wtf?
This doesn't even build. Commit 0f6438fca125 ("bdi: use bdi_dev_name()
to get device name") results in
In file included from ./include/linux/kernel.h:15,
from ./include/linux/list.h:9,
from ./include/linux/module.h:12,
from block/bfq-iosched.c:116:
block/bfq-iosched.c: In function ‘bfq_set_next_ioprio_data’:
block/bfq-iosched.c:4980:5: error: implicit declaration of function
‘bdi_dev_name’; did you mean ‘blkg_dev_name’?
[-Werror=implicit-function-declaration]
4980 | bdi_dev_name(bfqq->bfqd->queue->backing_dev_info),
| ^~~~~~~~~~~~
./include/linux/printk.h:299:33: note: in definition of macro ‘pr_err’
299 | printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~~~~~
In file included from ./include/linux/printk.h:7,
from ./include/linux/kernel.h:15,
from ./include/linux/list.h:9,
from ./include/linux/module.h:12,
from block/bfq-iosched.c:116:
./include/linux/kern_levels.h:5:18: warning: format ‘%s’ expects
argument of type ‘char *’, but argument 2 has type ‘int’ [-Wformat=]
5 | #define KERN_SOH "\001" /* ASCII Start Of Header */
| ^~~~~~
./include/linux/kern_levels.h:11:18: note: in expansion of macro ‘KERN_SOH’
11 | #define KERN_ERR KERN_SOH "3" /* error conditions */
| ^~~~~~~~
./include/linux/printk.h:299:9: note: in expansion of macro ‘KERN_ERR’
299 | printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
| ^~~~~~~~
block/bfq-iosched.c:4979:3: note: in expansion of macro ‘pr_err’
4979 | pr_err("bdi %s: bfq: bad prio class %d\n",
| ^~~~~~
cc1: some warnings being treated as errors
make[1]: *** [scripts/Makefile.build:267: block/bfq-iosched.o] Error 1
make: *** [Makefile:1722: block] Error 2
and no, it's not a merge error - at least not one by me. I tested the
tip-of-tree that you sent me, at commit ded3148fc653.
So that build error exists in your branch.
Unpulled. Get testing, and don't send me garbage.
Linus
