From 1a6a050620e496abf42749a2e1d3882645cc053f Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Sun, 7 Jun 2020 16:33:01 +0200
Subject: [PATCH] md: remove the kernel version of md_u.h
Git-commit: 1a6a050620e496abf42749a2e1d3882645cc053f
Patch-mainline: v5.9-rc1
References: jsc#SLE-13984

mdp_major can just move to drivers/md/md.h.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Song Liu <song@kernel.org>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Coly Li <colyli@suse.de>

---
 drivers/md/md.h           |    3 +++
 include/linux/raid/md_u.h |   13 -------------
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 include/linux/raid/md_u.h

--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -805,4 +805,7 @@ static inline void mddev_check_write_zer
 	    !bio->bi_disk->queue->limits.max_write_zeroes_sectors)
 		mddev->queue->limits.max_write_zeroes_sectors = 0;
 }
+
+extern int mdp_major;
+
 #endif /* _MD_MD_H */
--- a/include/linux/raid/md_u.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
-   md_u.h : user <=> kernel API between Linux raidtools and RAID drivers
-          Copyright (C) 1998 Ingo Molnar
-	  
-*/
-#ifndef _MD_U_H
-#define _MD_U_H
-
-#include <uapi/linux/raid/md_u.h>
-
-extern int mdp_major;
-#endif