David Howells 9db7372445 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: David Howells <dhowells@redhat.com>

2006-12-05 17:01:28 +00:00

..

9p

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 17:01:28 +00:00

adfs

[PATCH] Streamline generic_file_* interfaces and filemap cleanups

2006-10-01 00:39:28 -07:00

affs

[PATCH] Streamline generic_file_* interfaces and filemap cleanups

2006-10-01 00:39:28 -07:00

afs

[PATCH] fs/*: use BUILD_BUG_ON

2006-10-11 11:14:23 -07:00

autofs

[PATCH] autofs4: panic after mount fail

2006-11-14 09:09:27 -08:00

autofs4

[PATCH] autofs4: panic after mount fail

2006-11-14 09:09:27 -08:00

befs

[PATCH] befs: endianness annotations

2006-10-10 16:15:33 -07:00

bfs

[PATCH] r/o bind mount prepwork: inc_nlink() helper

2006-10-01 00:39:30 -07:00

cifs

[CIFS] Fix timezone handling on stat to os/2

2006-11-16 22:48:25 +00:00

coda

[PATCH] r/o bind mount prepwork: inc_nlink() helper

2006-10-01 00:39:30 -07:00

configfs

configfs: make configfs_dirent_exists() static

2006-12-01 18:29:12 -08:00

cramfs

[PATCH] cramfs: make cramfs_uncompress_exit() return void

2006-09-29 09:18:20 -07:00

debugfs

[PATCH] debugfs: add header file

2006-11-25 13:28:33 -08:00

devpts

[PATCH] inode-diet: Eliminate i_blksize from the inode structure

2006-09-27 08:26:18 -07:00

dlm

[DLM] fix oops in kref_put when removing a lockspace

2006-11-06 09:28:01 -05:00

ecryptfs

[PATCH] ecryptfs: fix crypto_alloc_blkcipher() error check

2006-11-28 17:26:50 -08:00

efs

[PATCH] Really ignore kmem_cache_destroy return value

2006-09-27 08:26:10 -07:00

exportfs

[PATCH] VFS: Make filldir_t and struct kstat deal in 64-bit inode numbers

2006-10-03 08:03:40 -07:00

ext2

[PATCH] ext2: errors behaviour fix

2006-10-11 11:14:21 -07:00

ext3

[PATCH] ext3: errors behaviour fix

2006-10-11 11:14:21 -07:00

ext4

[PATCH] ext4: fix printk format warnings

2006-10-28 11:30:51 -07:00

fat

[PATCH] fat: add fat_getattr()

2006-11-16 11:43:38 -08:00

freevxfs

[PATCH] freevxfs: fix leak on error path

2006-09-29 09:18:20 -07:00

fuse

[PATCH] fuse: fix Oops in lookup

2006-11-25 13:28:33 -08:00

gfs2

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 17:01:28 +00:00

hfs

[PATCH] hfs_fill_super returns success even if no root inode

2006-11-16 11:43:38 -08:00

hfsplus

fix file specification in comments

2006-10-03 23:01:26 +02:00

hostfs

[PATCH] Streamline generic_file_* interfaces and filemap cleanups

2006-10-01 00:39:28 -07:00

hpfs

[PATCH] hpfs endianness annotations

2006-10-10 16:15:34 -07:00

hppfs

[PATCH] hppfs: readdir callback missed in prototype change

2006-10-09 14:19:08 -07:00

hugetlbfs

[PATCH] hugetlb: prepare_hugepage_range check offset too

2006-11-14 09:09:27 -08:00

isofs

[PATCH] isofs endianness annotations

2006-10-10 16:15:34 -07:00

jbd

[PATCH] jbd: journal_dirty_data re-check for unmapped buffers

2006-10-28 11:30:51 -07:00

jbd2

[PATCH] jbd2: journal_dirty_data re-check for unmapped buffers

2006-10-28 11:30:51 -07:00

jffs

[PATCH] r/o bind mounts: unlink: monitor i_nlink

2006-10-01 00:39:30 -07:00

jffs2

[PATCH] severing fs.h, radix-tree.h -> sched.h

2006-12-04 02:00:24 -05:00

jfs

[PATCH] severing fs.h, radix-tree.h -> sched.h

2006-12-04 02:00:24 -05:00

lockd

[PATCH] sysctl: implement CTL_UNNUMBERED

2006-11-06 01:46:23 -08:00

minix

[PATCH] fs/*: use BUILD_BUG_ON

2006-10-11 11:14:23 -07:00

msdos

[PATCH] fat: add fat_getattr()

2006-11-16 11:43:38 -08:00

ncpfs

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

nfs

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

nfs_common

[PATCH] nfs_common endianness annotations

2006-10-20 10:26:41 -07:00

nfsd

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

nls

fix file specification in comments

2006-10-03 23:01:26 +02:00

ntfs

[PATCH] Streamline generic_file_* interfaces and filemap cleanups

2006-10-01 00:39:28 -07:00

ocfs2

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 17:01:28 +00:00

openpromfs

Move several *_SUPER_MAGIC symbols to include/linux/magic.h.

2006-09-24 11:13:19 -04:00

partitions

[PATCH] Enable RAID autorun on Mac partition tables.

2006-12-04 08:36:37 -08:00

proc

[PATCH] severing fs.h, radix-tree.h -> sched.h

2006-12-04 02:00:24 -05:00

qnx4

[PATCH] r/o bind mounts: monitor zeroing of i_nlink

2006-10-01 00:39:30 -07:00

ramfs

[PATCH] r/o bind mount prepwork: inc_nlink() helper

2006-10-01 00:39:30 -07:00

reiserfs

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

romfs

[PATCH] Really ignore kmem_cache_destroy return value

2006-09-27 08:26:10 -07:00

smbfs

[PATCH] Streamline generic_file_* interfaces and filemap cleanups

2006-10-01 00:39:28 -07:00

sysfs

driver core: Introduce device_move(): move a device to a new parent.

2006-12-01 14:52:01 -08:00

sysv

[PATCH] fs/*: use BUILD_BUG_ON

2006-10-11 11:14:23 -07:00

udf

[PATCH] UDF: Fix mounting read-write

2006-10-05 16:18:55 -07:00

ufs

[PATCH] ufs endianness annotations

2006-10-10 16:15:34 -07:00

vfat

[PATCH] fat: add fat_getattr()

2006-11-16 11:43:38 -08:00

xfs

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

aio.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

attr.c

[PATCH] capable/capability.h (fs/)

2006-01-11 18:42:13 -08:00

bad_inode.c

[PATCH] Remove readv/writev methods and use aio_read/aio_write instead

2006-10-01 00:39:28 -07:00

binfmt_aout.c

[PATCH] Require mmap handler for a.out executables

2006-09-29 09:18:08 -07:00

binfmt_elf_fdpic.c

[PATCH] elf_fdpic_core_dump: don't take tasklist_lock

2006-09-29 09:18:14 -07:00

binfmt_elf.c

[POWERPC] coredump: Add SPU elf notes to coredump.

2006-12-04 20:40:19 +11:00

binfmt_em86.c

…

binfmt_flat.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

binfmt_misc.c

[PATCH] Fix unserialized task->files changing

2006-09-29 09:18:12 -07:00

binfmt_script.c

…

binfmt_som.c

[PARISC] Fix fs/binfmt_som.c

2006-10-04 06:51:26 -06:00

bio.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-12-05 14:37:56 +00:00

block_dev.c

[PATCH] find_bd_holder() fix

2006-10-31 08:06:58 -08:00

buffer.c

[PATCH] Fix IO error reporting on fsync()

2006-10-17 08:18:46 -07:00

char_dev.c

[PATCH] BLOCK: Move extern declarations out of fs/*.c into header files [try #6]

2006-09-30 20:52:18 +02:00

compat_ioctl.c

[PATCH] 32-bit compatibility HDIO IOCTLs

2006-10-11 11:14:22 -07:00

compat.c

[PATCH] severing skbuff.h -> poll.h

2006-12-04 02:00:31 -05:00

dcache.c

[PATCH] VFS: Fix an error in unused dentry counting

2006-10-28 11:30:53 -07:00

dcookies.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

direct-io.c

[PATCH] lockdep: annotate direct io

2006-07-03 15:27:06 -07:00

dnotify.c

[PATCH] file: modify struct fown_struct to use a struct pid

2006-10-02 07:57:14 -07:00

dquot.c

[PATCH] dquot: add proper locking when using current->signal->tty

2006-09-29 09:18:14 -07:00

drop_caches.c

[PATCH] drop-pagecache

2006-01-08 20:12:40 -08:00

eventpoll.c

[PATCH] epoll_pwait()

2006-10-11 11:14:21 -07:00

exec.c

[PATCH] namespaces: utsname: switch to using uts namespaces

2006-10-02 07:57:21 -07:00

fcntl.c

[PATCH] file: Add locking to f_getown

2006-10-02 07:57:15 -07:00

fifo.c

[PATCH] pipe.c/fifo.c code cleanups

2006-04-11 13:53:33 +02:00

file_table.c

[PATCH] file: modify struct fown_struct to use a struct pid

2006-10-02 07:57:14 -07:00

file.c

WorkStruct: Pass the work_struct pointer instead of context data

2006-11-22 14:55:48 +00:00

filesystems.c

[PATCH] Ban register_filesystem(NULL);

2006-09-29 09:18:20 -07:00

fs-writeback.c

[PATCH] BLOCK: Remove dependence on existence of blockdev_superblock [try #6]

2006-09-30 20:52:26 +02:00

generic_acl.c

[PATCH] Generic infrastructure for acls

2006-09-29 09:18:24 -07:00

inode.c

[PATCH] Take i_mutex in splice_from_pipe()

2006-10-19 20:53:08 +02:00

inotify_user.c

[PATCH] inotify: fix deadlock found by lockdep

2006-07-31 13:28:41 -07:00

inotify.c

[PATCH] severing fs.h, radix-tree.h -> sched.h

2006-12-04 02:00:24 -05:00

internal.h

[PATCH] CONFIG_BLOCK internal.h cleanups

2006-09-30 20:52:32 +02:00

ioctl.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

ioprio.c

[PATCH] block layer: ioprio_best function fix

2006-10-12 15:09:51 +02:00

Kconfig

Fix typos in doc and comments

2006-11-30 05:32:19 +01:00

Kconfig.binfmt

[PATCH] frv: suppress configuration of certain features for FRV

2006-01-08 20:13:36 -08:00

libfs.c

[PATCH] r/o bind mount prepwork: inc_nlink() helper

2006-10-01 00:39:30 -07:00

locks.c

[PATCH] file: modify struct fown_struct to use a struct pid

2006-10-02 07:57:14 -07:00

Makefile

[PATCH] jbd2: enable building of jbd2 and have ext4 use it rather than jbd

2006-10-11 11:14:16 -07:00

mbcache.c

[PATCH] mbcache: add lock annotation for __mb_cache_entry_release_unlock()

2006-09-29 09:18:07 -07:00

mpage.c

[PATCH] BLOCK: Dissociate generic_writepages() from mpage stuff [try #6]

2006-09-30 20:52:26 +02:00

namei.c

[PATCH] r/o bind mount prepwork: move open_namei()'s vfs_create()

2006-10-01 00:39:30 -07:00

namespace.c

[PATCH] namespaces: incorporate fs namespace into nsproxy

2006-10-02 07:57:20 -07:00

nfsctl.c

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

no-block.c

[PATCH] BLOCK: Make it possible to disable the block layer [try #6]

2006-09-30 20:52:31 +02:00

open.c

[PATCH] r/o bind mounts: prepare for write access checks: collapse if()

2006-10-01 00:39:30 -07:00

pipe.c

[PATCH] Some cleanup in the pipe code

2006-10-01 00:39:33 -07:00

pnode.c

[PATCH] core: use list_move()

2006-06-26 09:58:17 -07:00

pnode.h

[PATCH] unbindable mounts

2005-11-07 18:18:11 -08:00

posix_acl.c

[PATCH] kmemdup: some users

2006-10-01 00:39:19 -07:00

quota_v1.c

…

quota_v2.c

[PATCH] sem2mutex: quota

2006-03-23 07:38:11 -08:00

quota.c

[PATCH] BLOCK: Make it possible to disable the block layer [try #6]

2006-09-30 20:52:31 +02:00

read_write.c

[PATCH] Add vector AIO support

2006-10-01 00:39:29 -07:00

read_write.h

[PATCH] Remove readv/writev methods and use aio_read/aio_write instead

2006-10-01 00:39:28 -07:00

readdir.c

[PATCH] VFS: Make filldir_t and struct kstat deal in 64-bit inode numbers

2006-10-03 08:03:40 -07:00

select.c

[PATCH] enforce RLIMIT_NOFILE in poll()

2006-09-29 09:18:23 -07:00

seq_file.c

[PATCH] sem2mutex: fs/seq_file.c

2006-03-23 07:38:12 -08:00

splice.c

[PATCH] splice: fix problem introduced with inode diet

2006-11-04 08:45:39 -08:00

stat.c

[PATCH] VFS: Make filldir_t and struct kstat deal in 64-bit inode numbers

2006-10-03 08:03:40 -07:00

super.c

[PATCH] severing fs.h, radix-tree.h -> sched.h

2006-12-04 02:00:24 -05:00

sync.c

[PATCH] severing fs.h, radix-tree.h -> sched.h

2006-12-04 02:00:24 -05:00

utimes.c

[PATCH] severing fs.h, radix-tree.h -> sched.h

2006-12-04 02:00:24 -05:00

xattr_acl.c

…

xattr.c

[PATCH] Fix user.* xattr permission check for sticky dirs

2006-11-03 12:27:59 -08:00