4.4rc1-1

3 files changed, 58 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fca52acc65d1..abff06c81a91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-mainline
-	pkgver = 4.3
+	pkgver = 4.4rc1
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = i686
@@ -12,13 +12,17 @@ pkgbase = linux-mainline
 	makedepends = bc
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/testing/patch-4.4-rc1.xz
+	source = libcfs-fix.patch
 	source = config
 	source = config.x86_64
 	source = linux.preset
 	source = change-default-console-loglevel.patch
 	sha256sums = 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae
-	sha256sums = f4c6a5c2fc0ee2b792e43f4c1846b995051901a502fb97885d2296af55fa193d
-	sha256sums = 58d49d4a3f6152394d903fd09113116fa3a0939d7d7ee419b2edbbd0c30e1755
+	sha256sums = 3870efdb5dfdbcb17d5a233e8e9c69156609825a3fb344b8f0fcecb92646360d
+	sha256sums = fd07e2d6ec71d2d87a977c4298f634fa1abfc75ddbd0d5b3ecf9befa7a4b82b4
+	sha256sums = 596958c9c4b632fdf5e0cdc677859dccac4304ad07a217c9bcb0e4fa58dbea16
+	sha256sums = 333c14024cc8948f0f205f4eceac30060494d1ef0a785127500f5f568d36d38a
 	sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 
diff --git a/PKGBUILD b/PKGBUILD
index 7f962abcd26f..13336aac1160 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 pkgbase=linux-mainline               # Build stock -ARCH kernel
 #pkgbase=linux-custom       # Build kernel with a different name
 _srcname=linux-4.3
-_patchname=patch-4.3-rc7
-pkgver=4.3
+_patchname=patch-4.4-rc1
+pkgver=4.4rc1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@@ -17,7 +17,8 @@ license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
-        #"https://www.kernel.org/pub/linux/kernel/v4.x/testing/${_patchname}.xz"
+        "https://www.kernel.org/pub/linux/kernel/v4.x/testing/${_patchname}.xz"
+        "libcfs-fix.patch"
         #"https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign"
         #"https://www.kernel.org/pub/linux/kernel/v4.x/testing/${_patchname}.sign"
         # the main kernel config files
@@ -26,8 +27,10 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'linux.preset'
         'change-default-console-loglevel.patch')
 sha256sums=('4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae'
-            'f4c6a5c2fc0ee2b792e43f4c1846b995051901a502fb97885d2296af55fa193d'
-            '58d49d4a3f6152394d903fd09113116fa3a0939d7d7ee419b2edbbd0c30e1755'
+            '3870efdb5dfdbcb17d5a233e8e9c69156609825a3fb344b8f0fcecb92646360d'
+            'fd07e2d6ec71d2d87a977c4298f634fa1abfc75ddbd0d5b3ecf9befa7a4b82b4'
+            '596958c9c4b632fdf5e0cdc677859dccac4304ad07a217c9bcb0e4fa58dbea16'
+            '333c14024cc8948f0f205f4eceac30060494d1ef0a785127500f5f568d36d38a'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99')
 validpgpkeys=(
@@ -44,7 +47,10 @@ prepare() {
   # patch -p1 -i "${srcdir}/patch-${pkgver}"
 
   # add mainline patch
-  #patch -p1 -i "${srcdir}/${_patchname}"
+  patch -p1 -i "${srcdir}/${_patchname}" | true
+
+  # libcfs fix
+  patch -p1 -i "${srcdir}/libcfs-fix.patch"
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
diff --git a/libcfs-fix.patch b/libcfs-fix.patch
new file mode 100644
index 000000000000..671534b2a5f9
--- /dev/null
+++ b/libcfs-fix.patch
@@ -0,0 +1,39 @@
+diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h
+index f5d741f..485ab26 100644
+--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h
++++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h
+@@ -110,7 +110,6 @@ struct libcfs_ioctl_handler {
+ #define IOC_LIBCFS_CLEAR_DEBUG	     _IOWR('e', 31, long)
+ #define IOC_LIBCFS_MARK_DEBUG	      _IOWR('e', 32, long)
+ #define IOC_LIBCFS_MEMHOG		  _IOWR('e', 36, long)
+-#define IOC_LIBCFS_PING_TEST	       _IOWR('e', 37, long)
+ /* lnet ioctls */
+ #define IOC_LIBCFS_GET_NI		  _IOWR('e', 50, long)
+ #define IOC_LIBCFS_FAIL_NID		_IOWR('e', 51, long)
+diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
+index 50e8fd2..5e22820 100644
+--- a/drivers/staging/lustre/lustre/libcfs/module.c
++++ b/drivers/staging/lustre/lustre/libcfs/module.c
+@@ -274,23 +274,6 @@ static int libcfs_ioctl_int(struct cfs_psdev_file *pfile, unsigned long cmd,
+ 		}
+ 		break;
+ 
+-	case IOC_LIBCFS_PING_TEST: {
+-		extern void (kping_client)(struct libcfs_ioctl_data *);
+-		void (*ping)(struct libcfs_ioctl_data *);
+-
+-		CDEBUG(D_IOCTL, "doing %d pings to nid %s (%s)\n",
+-		       data->ioc_count, libcfs_nid2str(data->ioc_nid),
+-		       libcfs_nid2str(data->ioc_nid));
+-		ping = symbol_get(kping_client);
+-		if (!ping)
+-			CERROR("symbol_get failed\n");
+-		else {
+-			ping(data);
+-			symbol_put(kping_client);
+-		}
+-		return 0;
+-	}
+-
+ 	default: {
+ 		struct libcfs_ioctl_handler *hand;