ebd24f
blacklist.conf: add "block: blk-mq.c: fix @at_head kernel-doc warning" Also removed a remnant of a merge conflict.