Brian Behlendorf
d190a5b9bd
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-02-18 14:28:23 -08:00
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
3ac1fca8dc
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-02-18 14:27:31 -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
9d88c314ef
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-02-18 14:04:10 -08:00
Brian Behlendorf
eb387a3281
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-02-18 14:04:09 -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
c694a929cf
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-02-18 14:04:05 -08:00
Brian Behlendorf
32d4d74b04
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-02-18 14:04:04 -08:00
Brian Behlendorf
6fa66816c1
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/arc.c
2009-02-18 14:03:55 -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
9a160959b6
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-02-18 13:12:59 -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
b0c6d9452e
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-02-18 13:12:55 -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
f499f3e5f4
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2009-02-18 13:12:49 -08:00
Brian Behlendorf
fc8954db24
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-02-18 13:12:48 -08:00
Brian Behlendorf
6d44b6b1da
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2009-02-18 13:12:45 -08:00
Brian Behlendorf
345705bdd4
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2009-02-18 13:12:44 -08:00
Brian Behlendorf
f97b1ae20f
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2009-02-18 13:12:41 -08:00
Brian Behlendorf
e7722c9f51
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2009-02-18 13:12:40 -08:00
Brian Behlendorf
f19f346366
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-02-18 13:12:36 -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
3b17164f71
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
...
Conflicts:
module/zfs/vdev.c
module/zfs/zio.c
2009-02-18 13:09:32 -08:00
Brian Behlendorf
d164b20935
Rebase master to b108
2009-02-18 12:51:31 -08:00
Brian Behlendorf
eb5e5a572f
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-06 15:01:48 -08:00
Brian Behlendorf
377637c8ce
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-06 15:01:47 -08:00
Brian Behlendorf
0093c4d036
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-06 15:01:39 -08:00
Brian Behlendorf
3c9fa95530
Add 2 new args for zpool_create to take extra args
2009-02-06 14:57:37 -08:00
Brian Behlendorf
cbbbf5d19d
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-06 11:51:15 -08:00
Brian Behlendorf
b11b5795de
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-06 11:51:14 -08:00
Brian Behlendorf
562a7cf544
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-06 11:51:06 -08:00
Brian Behlendorf
97e40aae09
Add 8 basic x4550 configurations which are of interest.
2009-02-06 11:47:09 -08:00
Brian Behlendorf
6ef3152d13
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-05 15:22:20 -08:00
Brian Behlendorf
2221b5e787
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-05 15:22:19 -08:00
Brian Behlendorf
831e788b86
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-05 15:22:11 -08:00
Brian Behlendorf
6c863d6aa1
Prep for zfs-0.4.2 tag
2009-02-05 15:19:27 -08:00
Brian Behlendorf
babb8a5b66
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-04 16:31:06 -08:00
Brian Behlendorf
3bb6130629
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-04 16:31:05 -08:00
Brian Behlendorf
2aaf656fe2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-04 16:30:48 -08:00
Brian Behlendorf
83ed5b4c5d
Update TODO
2009-02-04 16:25:09 -08:00
Brian Behlendorf
4bda97a842
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-03 10:02:47 -08:00
Brian Behlendorf
912735968e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-03 10:02:46 -08:00
Brian Behlendorf
555bf7577c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-03 10:02:38 -08:00
Brian Behlendorf
4365c44425
Properly detect and set HAVE_GPL_ONLY_SYMBOLS based on license
2009-02-03 09:59:54 -08:00
Brian Behlendorf
da2e5daaa3
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-03 09:46:42 -08:00
Brian Behlendorf
1c2fe3f2cb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-03 09:46:41 -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
e0ce2de1e3
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-26 22:10:23 -08:00