5be9e325a1
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:22 -08:00
ba528721da
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-02-18 13:12:58 -08:00
0b8e48b813
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-02-18 13:12:53 -08:00
e203e7b48f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-02-18 13:12:35 -08:00
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
27e7565a93
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-03 09:46:46 -08:00
3d86fad730
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-02-03 09:46:36 -08:00
9cd029b543
Remove mknod from library.
...
This is all nowhandled in the SPL. When HAVE_GPL_ONLY_SYMBOLS is defined
because the module license is set to GPL we can leverage the udev interfaces
which will create the device. When HAVE_GPL_ONLY_SYMBOLS is not defined
we resort to an ugly hack and the SPL invokes a usermode helper to create
to missing device file for us in /dev/. Using GPL version modules is off
course preperable when possible.
2009-02-03 09:38:53 -08:00
ca804c66f8
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-01-16 14:55:26 -08:00
7c5b7d2a94
This should always be success when zvol support is disabled
2009-01-16 14:52:35 -08:00
476261f2d5
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-15 14:21:18 -08:00
2c83372734
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-15 14:21:11 -08:00
091a4a4ca4
Resolve conflict with removed cleaner type
2009-01-15 14:20:49 -08:00
cb8e50168e
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-15 14:19:06 -08:00
1f372d9030
Resolve conflict with removed cleaner type
2009-01-15 14:18:01 -08:00
ddaad20220
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:16:23 -08:00
551838a6c8
Resolve conflict with removed cleaner type
2009-01-15 14:13:39 -08:00
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
977fef2ba7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-15 14:05:32 -08:00
2f36bf5af4
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-15 14:05:29 -08:00
35a269c06c
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-15 14:05:26 -08:00
a2e601c6e3
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-15 14:04:39 -08:00
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
aff2252263
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-14 14:27:42 -08:00
fd93449de9
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-14 14:27:31 -08:00
4fdb04d0a1
A little hackery to handle using zdb when the module stack isn't loaded. This is a hack and should be addressed upstream, zdb should not be attempting to initialize services it doesn't need
2009-01-14 14:25:25 -08:00
97073208f8
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-01-14 10:42:45 -08:00
bdde0d9d40
Return success here not failure
2009-01-14 10:37:35 -08:00
7f9ce14e58
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-13 09:55:40 -08:00
09b6f64e2d
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-13 09:55:30 -08:00
ef6d827a88
Don't check HAVE_SPL unavailable in userspace build
2009-01-13 09:53:35 -08:00
a62a385848
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-09 16:54:15 -08:00
13ab1d30be
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-09 16:53:53 -08:00
e22bfeab4e
Update load/unload message, mknod /dev/zfs when udev is unavailable
2009-01-09 16:50:08 -08:00
77c4ef21ab
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-05 13:47:29 -08:00
dbcb8f3921
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-05 13:46:51 -08:00
a9bfb78b5a
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-05 13:46:47 -08:00
3bc01c0326
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 13:46:35 -08:00
f88ab3c355
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-01-05 13:46:21 -08:00
80ed6c342d
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-01-05 13:46:06 -08:00
c15fa0ceb0
Add include paths
2009-01-05 13:44:26 -08:00
1e9c6b3020
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2008-12-22 12:24:47 -08:00
79491b69f4
Start linux-have-zpl layer
2008-12-22 12:23:27 -08:00
a6d6f31db6
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-22 12:09:08 -08:00
d7d260b870
Removing branch to readd under new name
2008-12-22 12:05:11 -08:00
42344f04c1
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-22 10:15:20 -08:00
8fdc6ee079
Stub out two more funcs until zpl support exists
2008-12-22 10:13:31 -08:00
b07886e188
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-17 16:00:29 -08:00
9ab4c93028
Wrap more stuff in HAVE_ZPL
2008-12-17 15:58:20 -08:00
9877a35f9f
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-17 15:35:41 -08:00
06005641bb
Stub out mount/share related func
2008-12-17 15:33:45 -08:00
daa6dfed96
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 16:37:05 -08:00
4ece62233d
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 16:36:52 -08:00
8f160abede
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 16:36:39 -08:00
8ffad5b6c0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 16:35:57 -08:00
158d07270f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 16:35:09 -08:00
715ac6ca88
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 16:34:16 -08:00
7453ec0f2c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 16:34:09 -08:00
8bed8da925
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 16:34:07 -08:00
2d7f255945
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 16:34:04 -08:00
ebab24f633
Resolve shadow conflict
2008-12-16 16:26:50 -08:00
015fcbe3b2
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 16:21:32 -08:00
5477876bdb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 16:21:25 -08:00
a56dee01f5
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 16:21:17 -08:00
94dd45c46d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 16:20:54 -08:00
b5550a0079
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 16:20:25 -08:00
6a902fe21c
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 16:19:56 -08:00
f2bc2f7b6f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 16:19:52 -08:00
fd4da48000
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 16:19:50 -08:00
29be0d44ba
Resolve conflict
2008-12-16 16:19:46 -08:00
4d21a1c977
Resolve two more shadow conflicts
2008-12-16 16:14:19 -08:00
4ee4891d66
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-16 16:10:16 -08:00
862436f8c9
Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand
2008-12-16 16:06:24 -08:00
70c7936ebf
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 15:52:15 -08:00
bad9c6965c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 15:52:11 -08:00
afc91005b1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 15:52:06 -08:00
cc53801767
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 15:51:54 -08:00
a77d20e66b
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 15:51:39 -08:00
e5000a1073
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 15:51:22 -08:00
12c13fbafb
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 15:51:20 -08:00
4583b6d5ba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 15:51:19 -08:00
e14e140b52
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 15:51:19 -08:00
3c515284a6
Remove double declaration of char *
2008-12-16 15:49:21 -08:00
f73c835830
Add include patch to pick up fletcher.c which for some unknown reason is included instead of simply being build as source. This should be fixed eventually, but it is how the OpenSolaris source handles it.
2008-12-16 15:44:02 -08:00
7e43e16395
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2008-12-16 15:34:50 -08:00
35f607040f
Wrap additional new efi code in HAVE_LIBEFI macros
2008-12-16 15:33:00 -08:00
ca161b928b
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-16 15:17:54 -08:00
36722eee12
Comment out most of the file until ZPL support arrives
2008-12-16 15:16:04 -08:00
ef919ac403
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-16 14:45:31 -08:00
66587f0fee
Remove all the share stuff
2008-12-16 14:43:38 -08:00
e213f59844
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 14:34:51 -08:00
b17ad01f98
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 14:34:47 -08:00
5840198e26
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 14:34:43 -08:00
a4c93e56cc
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 14:34:31 -08:00
bb20fd94fc
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 14:34:17 -08:00
047a942f42
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 14:34:01 -08:00
79bc1b23ed
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 14:33:59 -08:00
804830a231
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 14:33:59 -08:00
a8a0f9ea2a
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 14:33:58 -08:00
53c0cdbc42
Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname
2008-12-16 14:29:35 -08:00
554defd465
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
2008-12-16 14:07:00 -08:00
12cb53ce52
Make SHARENFS condition with ZPL
2008-12-16 14:05:09 -08:00
33072dc1bc
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 13:31:13 -08:00
48b059e690
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 13:31:08 -08:00
2f68235cc8
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 13:31:04 -08:00
751ee4041e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 13:30:53 -08:00
8342056a8a
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 13:30:38 -08:00
1d4b1187d7
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 13:30:23 -08:00
527e38c72b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 13:30:21 -08:00
34b937c016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 13:30:21 -08:00
f693a600d0
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 13:30:20 -08:00
206a3ac58c
Resolve 2 more shadow conflicts
2008-12-16 13:28:23 -08:00
c78fdcb14a
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 13:22:15 -08:00
2bfe519e8b
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 13:22:11 -08:00
4a52a4dfb1
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 13:22:07 -08:00
d54cedd16c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 13:21:55 -08:00
1d4d3c5fa8
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 13:21:41 -08:00
b22a5e18fe
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 13:21:25 -08:00
60ad9afc28
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 13:21:23 -08:00
5af8235e41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 13:21:23 -08:00
f82621d7cb
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 13:19:26 -08:00
5383875500
Create gcc-shadow branch
2008-12-16 13:19:01 -08:00
01918870b4
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2008-12-16 10:16:00 -08:00
e7d7f1803f
Remove unused hunk
2008-12-16 10:14:08 -08:00
3112028a39
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2008-12-16 10:13:43 -08:00
b62b556896
Moving unused hunk to unused patch
2008-12-16 10:11:41 -08:00
4f488ec6e4
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2008-12-16 09:06:01 -08:00
151ee60cbf
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-16 09:05:02 -08:00
e07281deb9
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-16 09:04:47 -08:00
9fabbb14ad
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-16 09:04:35 -08:00
ef55a13da8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 09:04:03 -08:00
589a6c72d6
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-16 09:03:27 -08:00
3ba34afff8
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-16 09:02:49 -08:00
a7b063d224
Add DEFAULT_INCLUDE to rules, adjust = to += accordingly
2008-12-16 08:58:41 -08:00
5fd645e47a
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2008-12-15 09:36:37 -08:00
579f6e603f
Remove incorrect mapping from verify to assert. We should be using the more correct version in lib/libzpool/include/sys/zfs_context.h which will not optimize out the actual call in the assert based on NDEBUG
2008-12-15 09:29:26 -08:00
7b363155b3
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2008-12-12 15:28:31 -08:00
5b4fa8eb54
Revert libzfs hunk
2008-12-12 15:26:39 -08:00
faf6c753bd
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-12 15:07:33 -08:00
f6421585ad
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-12 15:07:29 -08:00
a74ec0ff24
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2008-12-12 15:07:24 -08:00
54cb07032d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-12 15:07:12 -08:00
2e7dffd82a
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2008-12-12 15:07:06 -08:00
8917e616ba
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2008-12-12 15:06:57 -08:00
3ce8541e83
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2008-12-12 15:06:41 -08:00
d145044d80
Refresh Makefile
2008-12-12 15:04:48 -08:00
9787903adb
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
2008-12-12 14:57:13 -08:00
06a700c073
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2008-12-12 14:57:08 -08:00
Brian Behlendorf