Brian Behlendorf
7a08ef9d52
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/spa_boot.c
2009-03-11 11:17:23 -07:00
Brian Behlendorf
dff484a388
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-03-11 11:09:13 -07:00
Brian Behlendorf
5f30a3cb0e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-03-11 11:09:11 -07:00
Brian Behlendorf
8fe801fd8f
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-03-11 11:00:42 -07:00
Ricardo M. Correia
af45030850
Added 'gcc-ident-pragmas' branch.
2009-03-11 10:59:45 -07:00
Brian Behlendorf
b878be0ee1
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 15:21:35 -08:00
Brian Behlendorf
830ac5b109
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 15:20:11 -08:00
Brian Behlendorf
6f8f3b5532
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-02-18 15:20:10 -08:00
Brian Behlendorf
9d4d22a26e
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-02-18 15:20:08 -08:00
Brian Behlendorf
8c228734a3
Fix cast
2009-02-18 15:15:56 -08:00
Brian Behlendorf
9f4865e4ca
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-18 14:34:45 -08:00
Brian Behlendorf
7872d84be6
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-02-18 14:30:54 -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
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
da7151a89e
Resolve conflict with removed cleaner type
2009-01-15 14:11:19 -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