Brian Behlendorf
6fe19bd252
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:28:15 -08:00
Brian Behlendorf
f0a8aedfbc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
lib/libzpool/kernel.c
module/zfs/arc.c
2009-02-18 14:27:12 -08:00
Brian Behlendorf
3eb7fa9afd
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-02-18 14:04:08 -08:00
Brian Behlendorf
5be9e325a1
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:22 -08:00
Brian Behlendorf
ba528721da
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-02-18 13:12:58 -08:00
Brian Behlendorf
0b8e48b813
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-02-18 13:12:53 -08:00
Brian Behlendorf
e203e7b48f
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-02-18 13:12:35 -08:00
Brian Behlendorf
f686a87058
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 13:12:26 -08:00
Brian Behlendorf
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
Brian Behlendorf
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
Brian Behlendorf
091a4a4ca4
Resolve conflict with removed cleaner type
2009-01-15 14:20:49 -08:00
Brian Behlendorf
ddaad20220
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-15 14:16:23 -08:00
Brian Behlendorf
48a55a0a10
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-01-15 14:13:54 -08:00
Brian Behlendorf
551838a6c8
Resolve conflict with removed cleaner type
2009-01-15 14:13:39 -08:00
Brian Behlendorf
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -08:00
Brian Behlendorf
7b54fe44dc
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-01-15 14:05:38 -08:00
Brian Behlendorf
977fef2ba7
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-01-15 14:05:32 -08:00
Brian Behlendorf
2f36bf5af4
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-01-15 14:05:29 -08:00
Brian Behlendorf
35a269c06c
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-01-15 14:05:26 -08:00
Brian Behlendorf
a2e601c6e3
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-01-15 14:04:39 -08:00
Brian Behlendorf
3fa768e21b
Resolve conflict with removed cleaner type
2009-01-15 14:04:35 -08:00
Brian Behlendorf
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
Brian Behlendorf
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
Brian Behlendorf
ef6d827a88
Don't check HAVE_SPL unavailable in userspace build
2009-01-13 09:53:35 -08:00
Brian Behlendorf
e22bfeab4e
Update load/unload message, mknod /dev/zfs when udev is unavailable
2009-01-09 16:50:08 -08:00
Brian Behlendorf
3bc01c0326
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-05 13:46:35 -08:00
Brian Behlendorf
c15fa0ceb0
Add include paths
2009-01-05 13:44:26 -08:00
Brian Behlendorf
8ffad5b6c0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 16:35:57 -08:00
Brian Behlendorf
7453ec0f2c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 16:34:09 -08:00
Brian Behlendorf
8bed8da925
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 16:34:07 -08:00
Brian Behlendorf
2d7f255945
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 16:34:04 -08:00
Brian Behlendorf
ebab24f633
Resolve shadow conflict
2008-12-16 16:26:50 -08:00
Brian Behlendorf
94dd45c46d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 16:20:54 -08:00
Brian Behlendorf
f2bc2f7b6f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 16:19:52 -08:00
Brian Behlendorf
fd4da48000
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 16:19:50 -08:00
Brian Behlendorf
29be0d44ba
Resolve conflict
2008-12-16 16:19:46 -08:00
Brian Behlendorf
4d21a1c977
Resolve two more shadow conflicts
2008-12-16 16:14:19 -08:00
Brian Behlendorf
cc53801767
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 15:51:54 -08:00
Brian Behlendorf
12c13fbafb
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 15:51:20 -08:00
Brian Behlendorf
4583b6d5ba
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 15:51:19 -08:00
Brian Behlendorf
e14e140b52
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 15:51:19 -08:00
Brian Behlendorf
3c515284a6
Remove double declaration of char *
2008-12-16 15:49:21 -08:00
Brian Behlendorf
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
Brian Behlendorf
a4c93e56cc
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 14:34:31 -08:00
Brian Behlendorf
79bc1b23ed
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 14:33:59 -08:00
Brian Behlendorf
804830a231
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 14:33:59 -08:00
Brian Behlendorf
a8a0f9ea2a
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 14:33:58 -08:00
Brian Behlendorf
53c0cdbc42
Resolve dirname shadow conflict with /usr/include/libgen.h:27 dirname
2008-12-16 14:29:35 -08:00
Brian Behlendorf
751ee4041e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 13:30:53 -08:00
Brian Behlendorf
527e38c72b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 13:30:21 -08:00
Brian Behlendorf
34b937c016
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 13:30:21 -08:00
Brian Behlendorf
f693a600d0
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 13:30:20 -08:00
Brian Behlendorf
206a3ac58c
Resolve 2 more shadow conflicts
2008-12-16 13:28:23 -08:00
Brian Behlendorf
d54cedd16c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 13:21:55 -08:00
Brian Behlendorf
60ad9afc28
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-16 13:21:23 -08:00
Brian Behlendorf
5af8235e41
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2008-12-16 13:21:23 -08:00
Brian Behlendorf
f82621d7cb
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2008-12-16 13:19:26 -08:00
Brian Behlendorf
5383875500
Create gcc-shadow branch
2008-12-16 13:19:01 -08:00
Brian Behlendorf
ef55a13da8
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-16 09:04:03 -08:00
Brian Behlendorf
a7b063d224
Add DEFAULT_INCLUDE to rules, adjust = to += accordingly
2008-12-16 08:58:41 -08:00
Brian Behlendorf
54cb07032d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-12 15:07:12 -08:00
Brian Behlendorf
d145044d80
Refresh Makefile
2008-12-12 15:04:48 -08:00
Brian Behlendorf
f5a62035c7
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-12 14:56:50 -08:00
Brian Behlendorf
f154348ca9
Update Makefile
2008-12-12 14:52:43 -08:00
Brian Behlendorf
96cb73d58b
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-12 14:44:09 -08:00
Brian Behlendorf
cf89e6e4b3
Refresh Makefile
2008-12-12 14:37:13 -08:00
Brian Behlendorf
bb4f48461e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-12 14:29:28 -08:00
Brian Behlendorf
50532fe67b
Refresh Makefile
2008-12-12 14:27:04 -08:00
Brian Behlendorf
2051c5740b
Refresh Makefile
2008-12-12 14:26:14 -08:00
Brian Behlendorf
8516e2d45e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-12 09:22:48 -08:00
Brian Behlendorf
7005de9a0c
Refresh Makefile.am's
2008-12-12 09:20:33 -08:00
Brian Behlendorf
515c1981f2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 14:59:39 -08:00
Brian Behlendorf
593aa3e10d
Move all current Makefiles to correct locations, updates still needed
2008-12-11 14:55:55 -08:00
Brian Behlendorf
5bb8f9ec25
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2008-12-11 11:36:00 -08:00
Brian Behlendorf
3053990c38
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2008-12-11 11:26:19 -08:00
Brian Behlendorf
84e65c5c1e
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2008-12-11 11:25:50 -08:00
Brian Behlendorf
756a122d37
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2008-12-11 11:25:42 -08:00
Brian Behlendorf
d6ccbb14c5
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2008-12-11 11:25:28 -08:00
Brian Behlendorf
ff282a978f
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2008-12-11 11:25:22 -08:00
Brian Behlendorf
cdd670cb2f
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2008-12-11 11:25:15 -08:00
Brian Behlendorf
b342e90e44
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2008-12-11 11:24:51 -08:00
Brian Behlendorf
4f5d567cfd
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2008-12-11 11:24:45 -08:00
Brian Behlendorf
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00
Brian Behlendorf
b6097ae55a
Remove stray stub kernel files which should be brought in my linux-kernel-module patch
2008-12-02 08:47:21 -08:00
Brian Behlendorf
34dc7c2f25
Initial Linux ZFS GIT Repo
2008-11-20 12:01:55 -08:00