“a34746bc43eb63e545abf5eb002d96483a54ee32”上不存在“arch/x86/include/asm/asm.h”
-
由 Jens Axboe 提交于
Conflicts: drivers/block/hd.c drivers/block/mg_disk.c Signed-off-by: NJens Axboe <jens.axboe@oracle.com>e4b63636
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: NJens Axboe <jens.axboe@oracle.com>