975c590689
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-28 12:42:46 -07:00
6cb3dcf03e
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-28 12:42:45 -07:00
525b1f371b
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-28 12:42:44 -07:00
f86bf1dc03
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-28 12:42:42 -07:00
b6277ca5f6
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-28 12:42:42 -07:00
47cc34e51b
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-28 12:42:40 -07:00
e77df38294
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-28 12:42:40 -07:00
0e19c10052
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-28 12:42:37 -07:00
7987b75202
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-28 12:42:37 -07:00
9f27168dfc
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-28 12:42:35 -07:00
5282b057d2
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-28 12:42:35 -07:00
649d4cdc0f
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-28 12:42:33 -07:00
92259871cb
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-28 12:42:33 -07:00
002809a885
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-28 12:42:31 -07:00
06da6ccf97
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 12:42:30 -07:00
818eafca5b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-05-28 12:42:30 -07:00
2c62b4294e
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-28 12:42:30 -07:00
73bd7b144f
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-05-28 12:42:30 -07:00
c91169c7c5
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
...
Conflicts:
lib/libzfs/libzfs_util.c
2010-05-28 12:42:27 -07:00
fb72c6ef81
Revert gcc-shadow using -Wno-shadow I can live with
...
While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts. Anyway, this ends up being
more simply gratutous change than I care for.
2010-05-28 12:34:45 -07:00
65f7b9c86e
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-28 12:24:30 -07:00
1a3567f131
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:30 -07:00
bef5e9aab8
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-28 12:24:28 -07:00
3ccd0cd0f7
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:28 -07:00
f838428eda
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-28 12:24:27 -07:00
096b74b4b2
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:24 -07:00
d88f796796
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-28 12:24:23 -07:00
a1b3d58d85
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:22 -07:00
14c00f084b
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-28 12:24:21 -07:00
82bb02e99d
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:20 -07:00
91d12c3847
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-28 12:24:19 -07:00
648803c45e
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-28 12:24:17 -07:00
6519ea159e
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:17 -07:00
10624c45ed
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-28 12:24:15 -07:00
a669fc02c6
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:15 -07:00
4c3cb33fea
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-28 12:24:13 -07:00
b729d37587
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:13 -07:00
94ea79d481
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-28 12:24:11 -07:00
f38a715ed5
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:11 -07:00
47d50501f2
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-28 12:24:09 -07:00
8be787553b
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:09 -07:00
88e6e78e11
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:07 -07:00
492e0d5adb
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-28 12:24:06 -07:00
4482f27062
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:05 -07:00
5a0bd2164c
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-28 12:24:04 -07:00
a57300b294
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-28 12:24:02 -07:00
2b70345091
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:02 -07:00
cc2011ecec
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-28 12:24:00 -07:00
866c26d17d
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-28 12:24:00 -07:00
9942fb0e01
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-28 12:23:58 -07:00
Brian Behlendorf