Brian Behlendorf
|
119b6893bf
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:35:54 -07:00 |
|
Brian Behlendorf
|
9d688fef79
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-05-27 13:35:51 -07:00 |
|
Brian Behlendorf
|
8e7d01c64f
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:35:51 -07:00 |
|
Brian Behlendorf
|
6ae751580c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:35:49 -07:00 |
|
Brian Behlendorf
|
853b63df77
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-05-27 13:35:48 -07:00 |
|
Brian Behlendorf
|
490242e7b7
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-05-27 13:35:46 -07:00 |
|
Brian Behlendorf
|
6ad808a6ba
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-05-27 13:35:46 -07:00 |
|
Brian Behlendorf
|
95885a2f68
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
Conflicts:
lib/libzpool/include/sys/zfs_context.h
lib/libzpool/kernel.c
|
2010-05-27 13:35:09 -07:00 |
|
Brian Behlendorf
|
06cd2491e5
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-05-27 13:32:58 -07:00 |
|
Brian Behlendorf
|
51536ea5f4
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2010-05-27 13:32:58 -07:00 |
|
Brian Behlendorf
|
c17d3e05eb
|
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
|
2010-05-27 13:32:58 -07:00 |
|
Brian Behlendorf
|
a082023842
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
Conflicts:
cmd/ztest/ztest.c
lib/libzpool/include/sys/zfs_context.h
lib/libzpool/kernel.c
lib/libzpool/taskq.c
|
2010-05-27 13:30:48 -07:00 |
|
Brian Behlendorf
|
3bd93e7103
|
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
|
2010-05-27 13:25:20 -07:00 |
|
Brian Behlendorf
|
099e8e493a
|
Remove feature-pthreads prior to b141 update.
The pthreads change will need to be reworked and reapplied.
This will be easier to do from scratch rather than sort out
the merge.
|
2010-05-27 13:23:58 -07:00 |
|
Brian Behlendorf
|
0e208016de
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:07:01 -07:00 |
|
Brian Behlendorf
|
9a4fcd301a
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-05-23 10:06:59 -07:00 |
|
Brian Behlendorf
|
3f96f76faa
|
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:06:50 -07:00 |
|
Brian Behlendorf
|
3eedad16a4
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2010-05-23 10:06:49 -07:00 |
|
Brian Behlendorf
|
c44e622925
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-05-23 10:06:48 -07:00 |
|
Brian Behlendorf
|
88e4a95eb7
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:06:30 -07:00 |
|
Brian Behlendorf
|
b191f4b414
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-05-23 10:06:29 -07:00 |
|
Brian Behlendorf
|
df896e2dab
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:06:19 -07:00 |
|
Brian Behlendorf
|
1d320c57d2
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-05-23 10:06:18 -07:00 |
|
Brian Behlendorf
|
346ccd2b21
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:06:09 -07:00 |
|
Brian Behlendorf
|
903d424083
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-05-23 10:06:08 -07:00 |
|
Brian Behlendorf
|
c5e7c80bd1
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:05:59 -07:00 |
|
Brian Behlendorf
|
e344312772
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-05-23 10:05:57 -07:00 |
|
Brian Behlendorf
|
4efc775e03
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:05:48 -07:00 |
|
Brian Behlendorf
|
9f84ecbbf1
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-05-23 10:05:47 -07:00 |
|
Brian Behlendorf
|
0ebc2cb17b
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:05:37 -07:00 |
|
Brian Behlendorf
|
6bebb5b8c3
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-05-23 10:05:36 -07:00 |
|
Brian Behlendorf
|
9ac9999c55
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:05:27 -07:00 |
|
Brian Behlendorf
|
e26975dea8
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-05-23 10:05:25 -07:00 |
|
Brian Behlendorf
|
c4b048ad54
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:05:16 -07:00 |
|
Brian Behlendorf
|
087c3a93c7
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-05-23 10:05:15 -07:00 |
|
Brian Behlendorf
|
497a76a3bf
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:05:05 -07:00 |
|
Brian Behlendorf
|
3e92dd2221
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-05-23 10:05:04 -07:00 |
|
Brian Behlendorf
|
c945f47663
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:04:55 -07:00 |
|
Brian Behlendorf
|
08116123b4
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-05-23 10:04:53 -07:00 |
|
Brian Behlendorf
|
a98dad352e
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:04:44 -07:00 |
|
Brian Behlendorf
|
6b50333d64
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-05-23 10:04:43 -07:00 |
|
Brian Behlendorf
|
db09c36d23
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:04:33 -07:00 |
|
Brian Behlendorf
|
d52ec12ed1
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-05-23 10:04:32 -07:00 |
|
Brian Behlendorf
|
8aa7455978
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-05-23 10:04:22 -07:00 |
|
Brian Behlendorf
|
e5bab36aec
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-05-23 10:04:21 -07:00 |
|
Brian Behlendorf
|
fd6bf51a0a
|
Use more correct /usr/bin/awk patch for default.
|
2010-05-23 09:57:05 -07:00 |
|
Brian Behlendorf
|
4eb91f73a1
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-23 09:45:42 -07:00 |
|
Brian Behlendorf
|
f36da16d36
|
Skip /dev/watchdog when scanning /dev/ for import.
Do not open /dev/watchdog to stat it because it requires a special
close or the watchdog with be triggered and the system reset.
|
2010-05-23 09:38:29 -07:00 |
|
Brian Behlendorf
|
b6a8003f70
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-05-21 16:49:52 -07:00 |
|
Brian Behlendorf
|
404ddb3a37
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-05-21 16:49:50 -07:00 |