From d56d872c61b0e22350c93e10132c5ae4082c1fd0 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:37:19 -0800 Subject: [PATCH 01/27] Refresh linux-zfs-branch --- .topdeps | 2 +- .topmsg | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.topdeps b/.topdeps index 7f16cbcdd5..eab26459d6 100644 --- a/.topdeps +++ b/.topdeps @@ -1 +1 @@ -zfs-branch +linux-arc diff --git a/.topmsg b/.topmsg index f0b4e43e63..ed2b1e5428 100644 --- a/.topmsg +++ b/.topmsg @@ -1,6 +1,7 @@ From: Brian Behlendorf -Subject: [PATCH] linux-arc +Subject: [PATCH] linux-zfs-branch - +Merged result of all expected upstream ZFS changes and modifications +required to make ZFS Linux friendly Signed-off-by: Brian Behlendorf From f4630d1dbcedc567b80672361831ab9f8d8d9a4e Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:37:43 -0800 Subject: [PATCH 02/27] New TopGit dependency: linux-docs --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index eab26459d6..58072c72f2 100644 --- a/.topdeps +++ b/.topdeps @@ -1 +1,2 @@ linux-arc +linux-docs From 1753e62039f8e523019ebbcfb273b2082f08851c Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:38:02 -0800 Subject: [PATCH 03/27] New TopGit dependency: linux-have-fm --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 58072c72f2..1f8d67a971 100644 --- a/.topdeps +++ b/.topdeps @@ -1,2 +1,3 @@ linux-arc linux-docs +linux-have-fm From 791b1acb61e35875c77b091df311b7b020b16d1b Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:38:29 -0800 Subject: [PATCH 04/27] New TopGit dependency: linux-have-libdiskmgt --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 1f8d67a971..54e2f49f48 100644 --- a/.topdeps +++ b/.topdeps @@ -1,3 +1,4 @@ linux-arc linux-docs linux-have-fm +linux-have-libdiskmgt From 19effa9917e46844589823fab70998b905ec78ee Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:38:58 -0800 Subject: [PATCH 05/27] New TopGit dependency: linux-have-libefi --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 54e2f49f48..b27837368e 100644 --- a/.topdeps +++ b/.topdeps @@ -2,3 +2,4 @@ linux-arc linux-docs linux-have-fm linux-have-libdiskmgt +linux-have-libefi From 7614d68f982b7fa86a4f5941e2d73cc19eda4d28 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:39:27 -0800 Subject: [PATCH 06/27] New TopGit dependency: linux-have-mntent --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index b27837368e..c4f1daa44a 100644 --- a/.topdeps +++ b/.topdeps @@ -3,3 +3,4 @@ linux-docs linux-have-fm linux-have-libdiskmgt linux-have-libefi +linux-have-mntent From 6581347b802f144d954d3fb6b77588ed9012f6b3 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:39:58 -0800 Subject: [PATCH 07/27] New TopGit dependency: linux-have-spl-debug --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index c4f1daa44a..23f473c664 100644 --- a/.topdeps +++ b/.topdeps @@ -4,3 +4,4 @@ linux-have-fm linux-have-libdiskmgt linux-have-libefi linux-have-mntent +linux-have-spl-debug From 62020af57b4ce0ea02f5a229da7cea2d1db695db Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:40:28 -0800 Subject: [PATCH 08/27] New TopGit dependency: linux-have-sysevent --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 23f473c664..b3c3c628cc 100644 --- a/.topdeps +++ b/.topdeps @@ -5,3 +5,4 @@ linux-have-libdiskmgt linux-have-libefi linux-have-mntent linux-have-spl-debug +linux-have-sysevent From 94724baa9295522e3efcf8298c91e094bc8096fe Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:41:06 -0800 Subject: [PATCH 09/27] New TopGit dependency: linux-have-uio-rw --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index b3c3c628cc..fc7a3b4fe4 100644 --- a/.topdeps +++ b/.topdeps @@ -6,3 +6,4 @@ linux-have-libefi linux-have-mntent linux-have-spl-debug linux-have-sysevent +linux-have-uio-rw From 8b957b729b5682fb285329e6b56ad0171a65c79a Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:41:49 -0800 Subject: [PATCH 10/27] New TopGit dependency: linux-have-xdr --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index fc7a3b4fe4..ce0b87c170 100644 --- a/.topdeps +++ b/.topdeps @@ -7,3 +7,4 @@ linux-have-mntent linux-have-spl-debug linux-have-sysevent linux-have-uio-rw +linux-have-xdr From c2361d500f0f72b17dfcb1dd7ad1a44b27bcb122 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:42:32 -0800 Subject: [PATCH 11/27] New TopGit dependency: linux-have-zvol --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index ce0b87c170..f9411abaf0 100644 --- a/.topdeps +++ b/.topdeps @@ -8,3 +8,4 @@ linux-have-spl-debug linux-have-sysevent linux-have-uio-rw linux-have-xdr +linux-have-zvol From 98bcf064c315d621c1e186774b1bfe4ee9d24352 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:43:17 -0800 Subject: [PATCH 12/27] New TopGit dependency: linux-ioctl --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index f9411abaf0..ea0b273246 100644 --- a/.topdeps +++ b/.topdeps @@ -9,3 +9,4 @@ linux-have-sysevent linux-have-uio-rw linux-have-xdr linux-have-zvol +linux-ioctl From 4c34738691a6aa2b05c8a4b509a634204c5f2d44 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:44:05 -0800 Subject: [PATCH 13/27] New TopGit dependency: linux-kernel-disk --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index ea0b273246..ba5841565e 100644 --- a/.topdeps +++ b/.topdeps @@ -10,3 +10,4 @@ linux-have-uio-rw linux-have-xdr linux-have-zvol linux-ioctl +linux-kernel-disk From db12b0b1eba8787b6494d2760c11f7e886ea961e Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:44:55 -0800 Subject: [PATCH 14/27] New TopGit dependency: linux-kernel-mem --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index ba5841565e..6b6f4c236f 100644 --- a/.topdeps +++ b/.topdeps @@ -11,3 +11,4 @@ linux-have-xdr linux-have-zvol linux-ioctl linux-kernel-disk +linux-kernel-mem From 13a9cddf73b38c03de6c3e6d4d5e6f0347ea6915 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:45:52 -0800 Subject: [PATCH 15/27] New TopGit dependency: linux-legacy --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 6b6f4c236f..5cc7d816a8 100644 --- a/.topdeps +++ b/.topdeps @@ -12,3 +12,4 @@ linux-have-zvol linux-ioctl linux-kernel-disk linux-kernel-mem +linux-legacy From ee208ca1c5b87ef28dfcafb13230ec37f6eef127 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:46:47 -0800 Subject: [PATCH 16/27] New TopGit dependency: linux-symbol-collisions --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 5cc7d816a8..3df45e3c0b 100644 --- a/.topdeps +++ b/.topdeps @@ -13,3 +13,4 @@ linux-ioctl linux-kernel-disk linux-kernel-mem linux-legacy +linux-symbol-collisions From 3345f933ddc89e4b440b4629a95afec327382625 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:47:43 -0800 Subject: [PATCH 17/27] New TopGit dependency: linux-user-disk --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 3df45e3c0b..818faa0f0b 100644 --- a/.topdeps +++ b/.topdeps @@ -14,3 +14,4 @@ linux-kernel-disk linux-kernel-mem linux-legacy linux-symbol-collisions +linux-user-disk From e8c52a1cc4bdca325808b680c6a98cce4d5c39f3 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 12:48:54 -0800 Subject: [PATCH 18/27] New TopGit dependency: linux-zpios --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 818faa0f0b..5dffd35263 100644 --- a/.topdeps +++ b/.topdeps @@ -15,3 +15,4 @@ linux-kernel-mem linux-legacy linux-symbol-collisions linux-user-disk +linux-zpios From 4215753468d75954699bae416bdd74ee721d9599 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 17:07:24 -0800 Subject: [PATCH 19/27] New TopGit dependency: linux-libspl --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 5dffd35263..438dfc6814 100644 --- a/.topdeps +++ b/.topdeps @@ -16,3 +16,4 @@ linux-legacy linux-symbol-collisions linux-user-disk linux-zpios +linux-libspl From 0bff1d6d3b45ffff068b45928b5009080b0a8c75 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 12 Dec 2008 15:35:40 -0800 Subject: [PATCH 20/27] New TopGit dependency: linux-context --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 438dfc6814..8ed206c9cd 100644 --- a/.topdeps +++ b/.topdeps @@ -17,3 +17,4 @@ linux-symbol-collisions linux-user-disk linux-zpios linux-libspl +linux-context From 4a8e1c343f800eb89b20e3006b01c6f453fe9cab Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 12 Dec 2008 16:32:46 -0800 Subject: [PATCH 21/27] Remove dependency --- .topdeps | 1 - 1 file changed, 1 deletion(-) diff --git a/.topdeps b/.topdeps index 8ed206c9cd..438dfc6814 100644 --- a/.topdeps +++ b/.topdeps @@ -17,4 +17,3 @@ linux-symbol-collisions linux-user-disk linux-zpios linux-libspl -linux-context From b2f61b3b6866973e778a094dfcc36873aabc3356 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 16 Dec 2008 09:43:00 -0800 Subject: [PATCH 22/27] New TopGit dependency: linux-unused --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 438dfc6814..a082e1361b 100644 --- a/.topdeps +++ b/.topdeps @@ -17,3 +17,4 @@ linux-symbol-collisions linux-user-disk linux-zpios linux-libspl +linux-unused From 7d65d6498c4a1c1c7c6374a7f969c06c56b81bf5 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 22 Dec 2008 12:09:51 -0800 Subject: [PATCH 23/27] Remove dependency --- .topdeps | 1 - 1 file changed, 1 deletion(-) diff --git a/.topdeps b/.topdeps index a082e1361b..501cb283da 100644 --- a/.topdeps +++ b/.topdeps @@ -9,7 +9,6 @@ linux-have-sysevent linux-have-uio-rw linux-have-xdr linux-have-zvol -linux-ioctl linux-kernel-disk linux-kernel-mem linux-legacy From d68d5481363b14812400b8f417e25071fa47dc68 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 22 Dec 2008 12:23:51 -0800 Subject: [PATCH 24/27] New TopGit dependency: linux-have-zpl --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 501cb283da..bc2b9e52e1 100644 --- a/.topdeps +++ b/.topdeps @@ -17,3 +17,4 @@ linux-user-disk linux-zpios linux-libspl linux-unused +linux-have-zpl From 3af20e2b2f9e0831d4789ebc347038d93b548e24 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 14 Jan 2009 13:38:26 -0800 Subject: [PATCH 25/27] New TopGit dependency: linux-ztest --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index bc2b9e52e1..0b73537b5f 100644 --- a/.topdeps +++ b/.topdeps @@ -18,3 +18,4 @@ linux-zpios linux-libspl linux-unused linux-have-zpl +linux-ztest From a342c341fac112c1354d5f70ad31620e12bc7cf5 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 14 Jan 2009 13:43:23 -0800 Subject: [PATCH 26/27] Update topmsg --- .topmsg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.topmsg b/.topmsg index ed2b1e5428..fed9372c39 100644 --- a/.topmsg +++ b/.topmsg @@ -1,5 +1,5 @@ From: Brian Behlendorf -Subject: [PATCH] linux-zfs-branch +Subject: [PATCH] linux zfs branch Merged result of all expected upstream ZFS changes and modifications required to make ZFS Linux friendly From edefdba9c0cf59efa37d2b064652273c50422073 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 11 Mar 2009 14:45:42 -0700 Subject: [PATCH 27/27] Updated 'linux-zfs-branch' to not depend on 'linux-have-xdr'. --- .topdeps | 1 - 1 file changed, 1 deletion(-) diff --git a/.topdeps b/.topdeps index 0b73537b5f..b75834b912 100644 --- a/.topdeps +++ b/.topdeps @@ -7,7 +7,6 @@ linux-have-mntent linux-have-spl-debug linux-have-sysevent linux-have-uio-rw -linux-have-xdr linux-have-zvol linux-kernel-disk linux-kernel-mem