Brian Behlendorf
543a909e48
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-10-05 13:10:21 -07:00
Brian Behlendorf
0e6b275b26
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-10-05 13:10:12 -07:00
Brian Behlendorf
7726e6c1c6
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-05 13:10:11 -07:00
Brian Behlendorf
9c0dcc9a8a
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-05 13:10:10 -07:00
Brian Behlendorf
d8d8d6afb4
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-05 13:09:53 -07:00
Brian Behlendorf
4edd7c8505
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-10-05 13:09:52 -07:00
Brian Behlendorf
833277bc0e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-10-05 13:09:51 -07:00
Brian Behlendorf
c87a3a79f4
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-10-05 13:09:32 -07:00
Brian Behlendorf
bc44c49d19
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-05 13:09:31 -07:00
Brian Behlendorf
365f47b337
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-10-05 13:09:22 -07:00
Brian Behlendorf
f5fd5a7414
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-05 13:09:20 -07:00
Brian Behlendorf
0cc94ee29d
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-10-05 13:09:11 -07:00
Brian Behlendorf
ba2f476a1f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-10-05 13:09:03 -07:00
Brian Behlendorf
efa74a0928
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-10-05 13:08:54 -07:00
Brian Behlendorf
ae0698082d
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-10-05 13:08:52 -07:00
Brian Behlendorf
93cdc9bb2a
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-10-05 13:08:43 -07:00
Brian Behlendorf
fe26610e7d
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-10-05 13:08:41 -07:00
Brian Behlendorf
3249fcf328
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-10-05 13:08:33 -07:00
Brian Behlendorf
c62cdc13a0
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-10-05 13:08:31 -07:00
Brian Behlendorf
b615df53c8
Remove usage of the __id_u macro for portability.
...
This macro was removed from the default RPM macro file. Interestly,
some of the arch specific macro's add it back it based on your distro
but it should not be counted on. However, __id still exists and its
command line args have historically been fairly stable so we will
directly use %{__id} -un to get the user name.
2009-10-05 13:01:01 -07:00
Brian Behlendorf
5b09c7d99c
Merge commit 'refs/top-bases/top' into top
2009-10-02 16:35:44 -07:00
Brian Behlendorf
28b5533e9a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-02 16:35:43 -07:00
Brian Behlendorf
950031dbd2
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-10-02 16:35:42 -07:00
Brian Behlendorf
73ff39b18d
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-10-02 16:35:40 -07:00
Brian Behlendorf
b5b5b23cbf
Use kobject_set_name() for increased portability.
...
As of 2.6.25 kobj->k_name was replaced with kobj->name. Some distros
such as RHEL5 (2.6.18) add a patch to prevent this from being a problem
but other older distros such as SLES10 (2.6.16) have not. To avoid
the whole issue I'm updating the code to use kobject_set_name() which
does what I want and has existed all the way back to 2.6.11.
2009-10-02 16:31:23 -07:00
Brian Behlendorf
7e148fc1d4
Merge commit 'refs/top-bases/top' into top
2009-10-01 17:12:59 -07:00
Brian Behlendorf
8bc91a2ae6
Refresh autogen products
2009-10-01 17:11:35 -07:00
Brian Behlendorf
a096d62288
Merge commit 'refs/top-bases/top' into top
2009-10-01 17:10:25 -07:00
Brian Behlendorf
93f4668b9e
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-01 17:10:24 -07:00
Brian Behlendorf
0e957b2515
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-10-01 17:10:22 -07:00
Brian Behlendorf
449a75fda5
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-10-01 17:10:21 -07:00
Brian Behlendorf
ff90642129
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-10-01 17:10:19 -07:00
Brian Behlendorf
a869533da1
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-10-01 17:10:14 -07:00
Brian Behlendorf
8e8e3804d7
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-10-01 17:10:12 -07:00
Brian Behlendorf
1ca1ecbb28
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-10-01 17:10:07 -07:00
Brian Behlendorf
cabca237f3
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-01 17:10:05 -07:00
Brian Behlendorf
697359c3d4
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-10-01 17:10:00 -07:00
Brian Behlendorf
86694a106c
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-10-01 17:09:58 -07:00
Brian Behlendorf
8ee196e19c
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-10-01 17:09:53 -07:00
Brian Behlendorf
f9ab19bf6d
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-10-01 17:09:51 -07:00
Brian Behlendorf
48cc6b6565
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-10-01 17:09:46 -07:00
Brian Behlendorf
e02d23d347
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
...
Conflicts:
scripts/Makefile.am
2009-10-01 17:09:38 -07:00
Brian Behlendorf
8b9f836c99
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:55 -07:00
Brian Behlendorf
9ddc29794c
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-10-01 17:08:53 -07:00
Brian Behlendorf
ac13be8d7a
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:48 -07:00
Brian Behlendorf
d553271300
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-10-01 17:08:46 -07:00
Brian Behlendorf
faa7cc7ce6
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:41 -07:00
Brian Behlendorf
1e11cc0b7d
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-10-01 17:08:39 -07:00
Brian Behlendorf
3bd810a6c9
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-10-01 17:08:34 -07:00
Brian Behlendorf
b00eda8b35
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-01 17:08:32 -07:00
