8f3c95798b
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-02-03 10:02:13 -08:00
a42fa01b1c
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-02-03 10:02:11 -08:00
dab2d43497
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-02-03 10:02:08 -08:00
8deace64ca
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-02-03 10:02:06 -08:00
06d62870d7
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-02-03 10:02:02 -08:00
066580cffa
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-02-03 10:02:01 -08:00
4365c44425
Properly detect and set HAVE_GPL_ONLY_SYMBOLS based on license
2009-02-03 09:59:54 -08:00
ef023af07b
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
2009-02-03 09:46:48 -08:00
27e7565a93
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-03 09:46:46 -08:00
ecaaa3dd15
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-02-03 09:46:43 -08:00
da2e5daaa3
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-03 09:46:42 -08:00
1c2fe3f2cb
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-03 09:46:41 -08:00
3d86fad730
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-02-03 09:46:36 -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
06c1a2a8fb
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-03 09:30:29 -08:00
59008dc2b2
Updated script to actually make name
2009-02-03 09:28:19 -08:00
f87ee881ee
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-01-26 22:11:25 -08:00
e4771dceb5
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-01-26 22:11:23 -08:00
84f38b877b
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-01-26 22:11:20 -08:00
f662c2d392
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-01-26 22:11:18 -08:00
3bfea2f67e
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-01-26 22:11:15 -08:00
c2e8b3e877
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-01-26 22:11:13 -08:00
334b00527f
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-01-26 22:11:10 -08:00
e78a09c811
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-01-26 22:11:08 -08:00
114d8b3e12
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-01-26 22:11:05 -08:00
ee61a7d32b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-01-26 22:11:03 -08:00
edb6921372
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-01-26 22:11:00 -08:00
024d02b4a2
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-01-26 22:10:58 -08:00
f1bc435610
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-01-26 22:10:55 -08:00
a58aa8cf29
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-01-26 22:10:53 -08:00
8e9eb1874f
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-01-26 22:10:50 -08:00
a54b6ef23f
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-01-26 22:10:48 -08:00
3e82f72e75
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-01-26 22:10:45 -08:00
39da6c585b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-01-26 22:10:43 -08:00
4c0081373d
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-01-26 22:10:40 -08:00
58a804146b
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-01-26 22:10:38 -08:00
00d00cabdc
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-01-26 22:10:35 -08:00
df8326e2f7
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-01-26 22:10:33 -08:00
69050c3c14
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
2009-01-26 22:10:30 -08:00
fda69f7b25
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-01-26 22:10:28 -08:00
640332be19
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-01-26 22:10:25 -08:00
e0ce2de1e3
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-01-26 22:10:23 -08:00
5241d7e2dc
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-01-26 22:10:23 -08:00
24516e79c9
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-01-26 22:10:17 -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
1c67fc1771
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-01-26 22:10:09 -08:00
23e6e866c9
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-01-26 22:10:08 -08:00
8ee291e306
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-01-26 22:10:04 -08:00
Brian Behlendorf