Commit Graph

18879 Commits

Author SHA1 Message Date
Brian Behlendorf 0dea6278a2 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-28 12:45:43 -07:00
Brian Behlendorf cfdf415000 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-05-28 12:45:43 -07:00
Brian Behlendorf 05d780f5c6 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-05-28 12:45:41 -07:00
Brian Behlendorf 2c2cc18ae1 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 12:45:41 -07:00
Brian Behlendorf 3dc76b991d Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-05-28 12:45:41 -07:00
Brian Behlendorf 0ca93c1c67 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-28 12:45:41 -07:00
Brian Behlendorf 1d715125b6 Remove gcc-shadow from gcc-branch 2010-05-28 12:44:01 -07:00
Brian Behlendorf de86e13755 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-05-28 12:43:04 -07:00
Brian Behlendorf 130c501938 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-05-28 12:43:04 -07:00
Brian Behlendorf ea356d9855 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-28 12:43:02 -07:00
Brian Behlendorf 6dc18db9b1 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-28 12:43:02 -07:00
Brian Behlendorf 6324adf280 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-28 12:43:01 -07:00
Brian Behlendorf 812f695448 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:58 -07:00
Brian Behlendorf 885089decd Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-28 12:42:57 -07:00
Brian Behlendorf 79e7a65233 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-28 12:42:55 -07:00
Brian Behlendorf e449a3758c Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:55 -07:00
Brian Behlendorf b3dfaa8f73 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-05-28 12:42:53 -07:00
Brian Behlendorf 2b222b4fba Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:53 -07:00
Brian Behlendorf b129779291 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-05-28 12:42:51 -07:00
Brian Behlendorf c071b7b5b1 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:51 -07:00
Brian Behlendorf 175e34e7e5 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-05-28 12:42:49 -07:00
Brian Behlendorf d243a7ce76 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:49 -07:00
Brian Behlendorf ca5eea6a7b Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:47 -07:00
Brian Behlendorf 975c590689 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-05-28 12:42:46 -07:00
Brian Behlendorf 6cb3dcf03e Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:45 -07:00
Brian Behlendorf 525b1f371b Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-28 12:42:44 -07:00
Brian Behlendorf f86bf1dc03 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-05-28 12:42:42 -07:00
Brian Behlendorf b6277ca5f6 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:42 -07:00
Brian Behlendorf 47cc34e51b Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-28 12:42:40 -07:00
Brian Behlendorf e77df38294 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:40 -07:00
Brian Behlendorf 0e19c10052 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-28 12:42:37 -07:00
Brian Behlendorf 7987b75202 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:37 -07:00
Brian Behlendorf 9f27168dfc Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 12:42:35 -07:00
Brian Behlendorf 5282b057d2 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:35 -07:00
Brian Behlendorf 649d4cdc0f Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-05-28 12:42:33 -07:00
Brian Behlendorf 92259871cb Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:33 -07:00
Brian Behlendorf 002809a885 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:31 -07:00
Brian Behlendorf 2c62b4294e Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-05-28 12:42:30 -07:00
Brian Behlendorf 06da6ccf97 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 12:42:30 -07:00
Brian Behlendorf 818eafca5b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-05-28 12:42:30 -07:00
Brian Behlendorf 73bd7b144f Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-05-28 12:42:30 -07:00
Brian Behlendorf 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
Brian Behlendorf 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
Brian Behlendorf 65f7b9c86e Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-05-28 12:24:30 -07:00
Brian Behlendorf 1a3567f131 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-05-28 12:24:30 -07:00
Brian Behlendorf bef5e9aab8 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-28 12:24:28 -07:00
Brian Behlendorf 3ccd0cd0f7 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-05-28 12:24:28 -07:00
Brian Behlendorf f838428eda Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-28 12:24:27 -07:00
Brian Behlendorf 096b74b4b2 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-05-28 12:24:24 -07:00
Brian Behlendorf d88f796796 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-28 12:24:23 -07:00