ac530d9237
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-02-03 10:03:28 -08:00
02862a5f7e
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-02-03 10:03:26 -08:00
6df23ef9b5
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-02-03 10:03:23 -08:00
f89b7cf3ae
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-02-03 10:03:21 -08:00
babda8abc4
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-02-03 10:03:18 -08:00
e2151bd1cb
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-02-03 10:03:16 -08:00
6934fd0077
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-02-03 10:03:13 -08:00
addb546d4e
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-02-03 10:03:11 -08:00
83bfa9c228
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-02-03 10:03:08 -08:00
72fad808be
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-02-03 10:03:06 -08:00
d4f3c9d2a5
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-02-03 10:03:03 -08:00
bcf08d95de
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-02-03 10:03:01 -08:00
7d03884ec3
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-02-03 10:02:58 -08:00
96251d2dde
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-02-03 10:02:56 -08:00
86a2b8261f
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
2009-02-03 10:02:53 -08:00
a567098f14
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
2009-02-03 10:02:52 -08:00
a2a6c3bdf5
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-02-03 10:02:48 -08:00
4bda97a842
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-02-03 10:02:47 -08:00
912735968e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-02-03 10:02:46 -08:00
2e7cfa901f
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-02-03 10:02:41 -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
82756bde70
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-02-03 10:02:33 -08:00
6f247f2669
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-02-03 10:02:31 -08:00
8c2f0eb444
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-02-03 10:02:28 -08:00
05497abdfd
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-02-03 10:02:26 -08:00
bab98337e9
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-02-03 10:02:23 -08:00
95c10d4378
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-02-03 10:02:21 -08:00
c7f46c8d82
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-02-03 10:02:18 -08:00
745519bc08
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-02-03 10:02:16 -08:00
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
Brian Behlendorf