Trond Myklebust d9bc125caf Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ ...

Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.

2007-02-12 22:43:25 -08:00

..

9p

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

adfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

affs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

afs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

autofs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

autofs4

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

befs

[PATCH] mark struct inode_operations const 1

2007-02-12 09:48:46 -08:00

bfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

cifs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

coda

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

configfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

cramfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

debugfs

[PATCH] mark struct file_operations const 6

2007-02-12 09:48:45 -08:00

devpts

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

dlm

[PATCH] mark struct file_operations const 6

2007-02-12 09:48:45 -08:00

ecryptfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

efs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08: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] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

ext3

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

ext4

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

fat

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

freevxfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

fuse

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

gfs2

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

hfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

hfsplus

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

hostfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

hpfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

hppfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

hugetlbfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

isofs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

jbd

[PATCH] jbd: wait for already submitted t_sync_datalist buffer to complete

2006-12-22 08:55:51 -08:00

jbd2

[PATCH] jbd2: wait for already submitted t_sync_datalist buffer to complete

2006-12-07 08:39:42 -08:00

jffs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

jffs2

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

jfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

lockd

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2007-02-12 22:43:25 -08:00

minix

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

msdos

[PATCH] mark struct inode_operations const 2

2007-02-12 09:48:46 -08:00

ncpfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

nfs

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2007-02-12 22:43:25 -08:00

nfs_common

[PATCH] nfs_common endianness annotations

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

nfsd

[PATCH] knfsd: SUNRPC: Provide room in svc_rqst for larger addresses

2007-02-12 09:48:36 -08:00

nls

[PATCH] fs: make nls_cp936.c handle some U00XY characters and U20AC correctly

2006-12-07 08:39:46 -08:00

ntfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

ocfs2

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

openpromfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

partitions

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

2007-02-11 11:37:45 -08:00

proc

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

qnx4

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

ramfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

reiserfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

romfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

smbfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

sysfs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

sysv

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

udf

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

ufs

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

vfat

[PATCH] mark struct inode_operations const 3

2007-02-12 09:48:46 -08:00

xfs

[PATCH] mark struct inode_operations const 3

2007-02-12 09:48:46 -08:00

aio.c

[PATCH] Transform kmem_cache_alloc()+memset(0) -> kmem_cache_zalloc().

2007-02-11 10:51:27 -08:00

attr.c

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

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

bad_inode.c

[PATCH] mark struct inode_operations const 1

2007-02-12 09:48:46 -08:00

binfmt_aout.c

[PATCH] VFS: change struct file to use struct path

2006-12-08 08:28:41 -08:00

binfmt_elf_fdpic.c

[PATCH] Remove final references to deprecated "MAP_ANON" page protection flag

2007-02-11 10:51:17 -08:00

binfmt_elf.c

[PATCH] core-dumping unreadable binaries via PT_INTERP

2007-01-26 13:51:00 -08:00

binfmt_em86.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

binfmt_flat.c

[PATCH] uclinux: correctly remap bin_fmtflat exe allocated mem regions

2007-02-09 10:45:33 -08:00

binfmt_misc.c

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

binfmt_script.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

binfmt_som.c

[PARISC] Fix fs/binfmt_som.c

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

bio.c

[PATCH] optimize o_direct on block devices

2006-12-13 09:05:50 -08:00

block_dev.c

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

buffer.c

[PATCH] warning fix: unsigned->signed

2007-02-12 09:48:29 -08:00

char_dev.c

[PATCH] register_chrdev_region() don't hand out the LOCAL/EXPERIMENTAL majors

2007-02-12 09:48:27 -08:00

compat_ioctl.c

[PATCH] VFS: change struct file to use struct path

2006-12-08 08:28:41 -08:00

compat.c

[PATCH] fdtable: Make fdarray and fdsets equal in size

2006-12-10 09:57:22 -08:00

dcache.c

[PATCH] Fix d_path for lazy unmounts

2007-02-12 09:48:27 -08:00

dcookies.c

[PATCH] slab: remove kmem_cache_t

2006-12-07 08:39:25 -08:00

direct-io.c

[PATCH] dio: lock refcount operations

2006-12-10 09:57:21 -08:00

dnotify.c

[PATCH] VFS: change struct file to use struct path

2006-12-08 08:28:41 -08:00

dquot.c

[PATCH] remove sb->s_files and file_list_lock usage in dquot.c

2007-02-12 09:48:28 -08:00

drop_caches.c

[PATCH] remove invalidate_inode_pages()

2007-02-11 10:51:31 -08:00

eventpoll.c

[PATCH] VFS: change struct file to use struct path

2006-12-08 08:28:41 -08:00

exec.c

[PATCH] Transform kmem_cache_alloc()+memset(0) -> kmem_cache_zalloc().

2007-02-11 10:51:27 -08:00

fcntl.c

[PATCH] fdtable: Make fdarray and fdsets equal in size

2006-12-10 09:57:22 -08:00

fifo.c

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

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

file_table.c

[PATCH] VFS: change struct file to use struct path

2006-12-08 08:28:41 -08:00

file.c

[PATCH] fdtable: Provide free_fdtable() wrapper

2006-12-22 08:55:50 -08:00

filesystems.c

[PATCH] Ban register_filesystem(NULL);

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

fs-writeback.c

Write back inode data pages even when the inode itself is locked

2007-01-26 12:53:20 -08:00

generic_acl.c

[PATCH] Generic infrastructure for acls

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

inode.c

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

inotify_user.c

[PATCH] inotify: read return val fix

2007-02-12 09:48:28 -08: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

[PATCH] VFS: change struct file to use struct path

2006-12-08 08:28:41 -08:00

ioprio.c

[PATCH] pid: replace do/while_each_task_pid with do/while_each_pid_task

2007-02-12 09:48:32 -08:00

Kconfig

[PATCH] eCryptfs: Public key transport mechanism

2007-02-12 09:48:36 -08:00

Kconfig.binfmt

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

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

libfs.c

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

locks.c

[PATCH] VFS: change struct file to use struct path

2006-12-08 08:28:41 -08:00

Makefile

[PATCH] fsstack: Introduce fsstack_copy_{attr,inode}_*

2006-12-08 08:28:40 -08:00

mbcache.c

[PATCH] slab: remove kmem_cache_t

2006-12-07 08:39:25 -08:00

mpage.c

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

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

namei.c

[PATCH] mark struct inode_operations const 2

2007-02-12 09:48:46 -08:00

namespace.c

[PATCH] Transform kmem_cache_alloc()+memset(0) -> kmem_cache_zalloc().

2007-02-11 10:51:27 -08: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] fdtable: Make fdarray and fdsets equal in size

2006-12-10 09:57:22 -08:00

pipe.c

[PATCH] fix leaks on pipe(2) failure exits

2006-12-21 00:16:03 -08:00

pnode.c

[PATCH] rename struct namespace to struct mnt_namespace

2006-12-08 08:28:51 -08:00

pnode.h

[PATCH] rename struct namespace to struct mnt_namespace

2006-12-08 08:28:51 -08:00

posix_acl.c

[PATCH] kmemdup: some users

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

quota_v1.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

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] FS: speed up rw_verify_area()

2007-02-12 09:48:29 -08: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: change struct file to use struct path

2006-12-08 08:28:41 -08:00

select.c

[PATCH] fdtable: Make fdarray and fdsets equal in size

2006-12-10 09:57:22 -08:00

seq_file.c

[PATCH] VFS: change struct file to use struct path

2006-12-08 08:28:41 -08:00

splice.c

[PATCH] constify pipe_buf_operations

2006-12-13 09:05:47 -08:00

stack.c

[PATCH] fsstack: Remove inode copy

2006-12-22 08:55:48 -08:00

stat.c

[PATCH] VFS: change struct file to use struct path

2006-12-08 08:28:41 -08:00

super.c

[PATCH] Mark struct super_operations const

2007-02-12 09:48:47 -08:00

sync.c

[PATCH] VFS: change struct file to use struct path

2006-12-08 08:28:41 -08:00

utimes.c

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

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

xattr_acl.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

xattr.c

[PATCH] VFS: change struct file to use struct path

2006-12-08 08:28:41 -08:00