Brian Behlendorf
|
bf200630f9
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
module/zfs/rrwlock.c
module/zfs/spa_boot.c
module/zfs/zfs_replay.c
|
2009-03-11 11:12:24 -07:00 |
|
Brian Behlendorf
|
dff484a388
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-03-11 11:09:13 -07:00 |
|
Brian Behlendorf
|
8fe801fd8f
|
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
|
2009-03-11 11:00:42 -07:00 |
|
Ricardo M. Correia
|
af45030850
|
Added 'gcc-ident-pragmas' branch.
|
2009-03-11 10:59:45 -07:00 |
|
Brian Behlendorf
|
36860ec1a8
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:
module/Makefile.in
|
2009-03-10 21:23:17 -07:00 |
|
Brian Behlendorf
|
c8e569dd1c
|
Build system and packaging (RPM support) (Part 2)
Complete support for dist install srpm and rpm make targets.
|
2009-03-10 21:13:30 -07:00 |
|
Brian Behlendorf
|
2f1ba85948
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 11:17:59 -08:00 |
|
Brian Behlendorf
|
86a5af4d25
|
Update HAVE_ZPL bits for zfs_ioctl
|
2009-01-09 11:13:22 -08:00 |
|
Brian Behlendorf
|
1c5ae9851b
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-07 15:51:51 -08:00 |
|
Brian Behlendorf
|
2a76f03369
|
Update distfiles
|
2009-01-07 15:49:36 -08:00 |
|
Brian Behlendorf
|
4b9683dcf7
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-05 15:44:35 -08:00 |
|
Brian Behlendorf
|
760d78b9f8
|
Move default include paths after custom include paths so local stuff gets picked up first
|
2009-01-05 15:42:56 -08:00 |
|
Brian Behlendorf
|
9a0cb95b1b
|
Resolve conflict
|
2009-01-05 12:38:23 -08:00 |
|
Brian Behlendorf
|
ce7115b807
|
Add unicode makefile references and support
|
2009-01-05 12:33:09 -08:00 |
|
Brian Behlendorf
|
f49886c003
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 13:13:29 -08:00 |
|
Brian Behlendorf
|
7725fe7431
|
Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon
|
2008-12-23 13:11:03 -08:00 |
|
Brian Behlendorf
|
e7e0111a7c
|
Update makefile
|
2008-12-23 13:07:27 -08:00 |
|
Brian Behlendorf
|
c22ff325ce
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 12:50:58 -08:00 |
|
Brian Behlendorf
|
0dfd5ebee8
|
module/zcommon/Makefile.in
|
2008-12-23 12:47:03 -08:00 |
|
Brian Behlendorf
|
82cd3659a2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-23 11:49:58 -08:00 |
|
Brian Behlendorf
|
5a0a9cc451
|
Update makefiles
|
2008-12-23 11:47:33 -08:00 |
|
Brian Behlendorf
|
c326f72cdc
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 13:11:15 -08:00 |
|
Brian Behlendorf
|
6ab9c098f1
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 13:10:39 -08:00 |
|
Brian Behlendorf
|
9842c708fa
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 13:10:38 -08:00 |
|
Brian Behlendorf
|
1e3aeaaef1
|
Resolve shadow conflict
|
2008-12-17 13:08:39 -08:00 |
|
Brian Behlendorf
|
56005b13e1
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 13:04:33 -08:00 |
|
Brian Behlendorf
|
b9fe30002e
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 13:03:57 -08:00 |
|
Brian Behlendorf
|
e41d37c49d
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 13:03:56 -08:00 |
|
Brian Behlendorf
|
fafeacb53f
|
Resolve shadow conflict
|
2008-12-17 13:01:56 -08:00 |
|
Brian Behlendorf
|
137b3bb57d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 12:46:57 -08:00 |
|
Brian Behlendorf
|
863ec76ff7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 12:45:53 -08:00 |
|
Brian Behlendorf
|
a1b865abee
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 12:45:51 -08:00 |
|
Brian Behlendorf
|
da718dd80a
|
Resolve shadow conflict
|
2008-12-17 12:42:17 -08:00 |
|
Brian Behlendorf
|
515c1981f2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 14:59:39 -08:00 |
|
Brian Behlendorf
|
593aa3e10d
|
Move all current Makefiles to correct locations, updates still needed
|
2008-12-11 14:55:55 -08:00 |
|
Brian Behlendorf
|
5bb8f9ec25
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 11:36:00 -08:00 |
|
Brian Behlendorf
|
4f5d567cfd
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-12-11 11:24:45 -08:00 |
|
Brian Behlendorf
|
3420896332
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-11 11:24:42 -08:00 |
|
Brian Behlendorf
|
172bb4bd5e
|
Move the world out of /zfs/ and seperate out module build tree
|
2008-12-11 11:08:09 -08:00 |
|