From: Jan Kara <jack@suse.cz>
Subject: [PATCH] block: Fix kABI in blk-merge.c
Patch-mainline: Never, kABI fixup
References: bsc#1198020
Avoid defining new structures for exports from block/blk-merge.c.
Signed-off-by: Jan Kara <jack@suse.cz>
---
block/blk-merge.c | 2 ++
1 file changed, 2 insertions(+)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -7,7 +7,9 @@
#include <linux/bio.h>
#include <linux/blkdev.h>
#include <linux/scatterlist.h>
+#ifndef __GENKSYMS__
#include <linux/blk-cgroup.h>
+#endif
#include <trace/events/block.h>