Brian Behlendorf
|
96bf80c3ed
|
Explicit check for requires_* rpm defines
Due to different distros and/or versions of rpm mishandling the shorthand
syntax simply use the longer version which get interpreted correctly.
|
2009-08-14 10:09:22 -07:00 |
|
Brian Behlendorf
|
b44fe72b7a
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:23:45 -07:00 |
|
Brian Behlendorf
|
8170803523
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-08-04 16:23:41 -07:00 |
|
Brian Behlendorf
|
2bec1f905d
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:23:34 -07:00 |
|
Brian Behlendorf
|
8889f32783
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-08-04 16:23:32 -07:00 |
|
Brian Behlendorf
|
bedd028d0c
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:23:24 -07:00 |
|
Brian Behlendorf
|
c287dffe04
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-08-04 16:23:22 -07:00 |
|
Brian Behlendorf
|
aa43709263
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:23:14 -07:00 |
|
Brian Behlendorf
|
8e2df384f2
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-08-04 16:23:11 -07:00 |
|
Brian Behlendorf
|
640c1bbd74
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:23:04 -07:00 |
|
Brian Behlendorf
|
e4bc8b0a49
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-08-04 16:23:00 -07:00 |
|
Brian Behlendorf
|
48ee04eb5d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:22:52 -07:00 |
|
Brian Behlendorf
|
4bfa2734b4
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-08-04 16:22:50 -07:00 |
|
Brian Behlendorf
|
3e18a6ae20
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:22:42 -07:00 |
|
Brian Behlendorf
|
f236e688e9
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-08-04 16:22:39 -07:00 |
|
Brian Behlendorf
|
f786f29a5c
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:22:31 -07:00 |
|
Brian Behlendorf
|
a849dfe835
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-08-04 16:22:24 -07:00 |
|
Brian Behlendorf
|
89281fcfbb
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:22:16 -07:00 |
|
Brian Behlendorf
|
aca94e0660
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-08-04 16:22:14 -07:00 |
|
Brian Behlendorf
|
1dd66b3a58
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:22:06 -07:00 |
|
Brian Behlendorf
|
9e192697ef
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-08-04 16:22:04 -07:00 |
|
Brian Behlendorf
|
b22872c4f8
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:21:56 -07:00 |
|
Brian Behlendorf
|
713c0c1bc9
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-08-04 16:21:54 -07:00 |
|
Brian Behlendorf
|
21effa3656
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:21:45 -07:00 |
|
Brian Behlendorf
|
99e7dfe1f7
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-08-04 16:21:43 -07:00 |
|
Brian Behlendorf
|
64661189e9
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:21:35 -07:00 |
|
Brian Behlendorf
|
0f41978f98
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-08-04 16:21:33 -07:00 |
|
Brian Behlendorf
|
c105d1fba7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-08-04 16:21:32 -07:00 |
|
Brian Behlendorf
|
9d16dea56a
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:21:17 -07:00 |
|
Brian Behlendorf
|
775b66c784
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-08-04 16:21:15 -07:00 |
|
Brian Behlendorf
|
96e04ab7bc
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-08-04 16:21:14 -07:00 |
|
Brian Behlendorf
|
3c61d22895
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:20:58 -07:00 |
|
Brian Behlendorf
|
0358c7ef50
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-08-04 16:20:56 -07:00 |
|
Brian Behlendorf
|
1c4c9f944c
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:20:46 -07:00 |
|
Brian Behlendorf
|
105c936838
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-08-04 16:20:44 -07:00 |
|
Brian Behlendorf
|
ab390b149c
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:20:36 -07:00 |
|
Brian Behlendorf
|
9287fd4ae7
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-08-04 16:20:30 -07:00 |
|
Brian Behlendorf
|
46ff822fd3
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:20:20 -07:00 |
|
Brian Behlendorf
|
b6204cf257
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-08-04 16:20:18 -07:00 |
|
Brian Behlendorf
|
3329adc19a
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:20:10 -07:00 |
|
Brian Behlendorf
|
ad0f0dc709
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-08-04 16:20:07 -07:00 |
|
Brian Behlendorf
|
3da342285d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-08-04 16:19:59 -07:00 |
|
Brian Behlendorf
|
f71251c6a5
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-08-04 16:19:57 -07:00 |
|
Brian Behlendorf
|
d80e2a5a1a
|
Tag zfs-0.4.5 for real
Update TODO list.
|
2009-08-04 16:12:28 -07:00 |
|
Brian Behlendorf
|
37cbbc0afb
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:59:07 -07:00 |
|
Brian Behlendorf
|
aa56b7a7d4
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-08-04 15:59:04 -07:00 |
|
Brian Behlendorf
|
542d39af40
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:58:54 -07:00 |
|
Brian Behlendorf
|
754c2e2025
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-08-04 15:58:52 -07:00 |
|
Brian Behlendorf
|
58f043dd7d
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-08-04 15:58:41 -07:00 |
|
Brian Behlendorf
|
0803564cbe
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-08-04 15:58:39 -07:00 |