6c863d6aa1
Prep for zfs-0.4.2 tag
2009-02-05 15:19:27 -08:00
da60adbf86
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-02-04 16:30:50 -08:00
2aaf656fe2
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-04 16:30:48 -08:00
83ed5b4c5d
Update TODO
2009-02-04 16:25:09 -08:00
27051f6f6b
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-02-03 10:02:39 -08:00
555bf7577c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-02-03 10:02:38 -08:00
4365c44425
Properly detect and set HAVE_GPL_ONLY_SYMBOLS based on license
2009-02-03 09:59:54 -08:00
08ff240f70
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-02-03 09:46:34 -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
3119786dd7
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-26 22:10:16 -08:00
a5a8b2697a
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-26 22:10:15 -08:00
442ffc3574
Update bug assert in TODO
2009-01-26 22:07:34 -08:00
a1c0a26371
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-01-26 22:01:57 -08:00
9f9aeb4e3c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-01-26 22:01:56 -08:00
3417d4db34
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-01-26 22:01:17 -08:00
cd2a009e7c
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-01-26 22:01:16 -08:00
55d5d578e7
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-01-26 22:01:15 -08:00
16ef710f59
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2009-01-26 22:01:15 -08:00
3bac1c60c0
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-01-26 22:01:15 -08:00
fc9ccdaa2e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-01-26 22:01:13 -08:00
626939c8f1
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-01-26 22:01:12 -08:00
3d8d90cabd
Merge commit 'refs/top-bases/fix-list' into fix-list
2009-01-26 22:01:12 -08:00
1bc61f560c
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-01-26 22:01:12 -08:00
bd1377acda
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2009-01-26 22:01:11 -08:00
ab471b80aa
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-01-26 22:01:10 -08:00
8c29491191
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-01-26 22:01:09 -08:00
9adbf76871
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-01-26 22:01:09 -08:00
5f8aaed66f
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-01-26 22:01:08 -08:00
7cce398964
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-01-26 22:01:07 -08:00
542b40d70a
Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads
2009-01-26 22:01:06 -08:00
08467909fd
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2009-01-26 22:01:06 -08:00
cafee35f65
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2009-01-26 22:01:05 -08:00
e99b74eab4
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2009-01-26 22:01:05 -08:00
befef7b7f9
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2009-01-26 22:01:04 -08:00
3b37c2c237
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2009-01-26 22:01:03 -08:00
e0a3fdfaab
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-01-26 22:01:02 -08:00
589e75fda4
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-01-26 22:01:02 -08:00
2aed3d7b15
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2009-01-26 22:01:01 -08:00
839eb857b9
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2009-01-26 22:01:01 -08:00
b3fa877783
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2009-01-26 22:01:00 -08:00
c6b2bf169c
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-01-26 22:00:59 -08:00
505d6b27db
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-01-26 22:00:58 -08:00
e979ca15f6
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-01-26 22:00:58 -08:00
cc6db38461
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-01-26 22:00:57 -08:00
fb96d3c902
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2009-01-26 22:00:57 -08:00
df25caac4f
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-01-26 22:00:56 -08:00
58ae05321e
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-01-26 22:00:55 -08:00
dadd8b5c6e
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-01-26 22:00:53 -08:00
ad5be5dea3
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-01-26 22:00:52 -08:00
ac04bac1f5
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-01-26 22:00:52 -08:00
Brian Behlendorf