This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

Lachlan McIlroy 0a8c5395f9 [XFS] Fix merge failures ...

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/xfs/linux-2.6/xfs_cred.h
	fs/xfs/linux-2.6/xfs_globals.h
	fs/xfs/linux-2.6/xfs_ioctl.c
	fs/xfs/xfs_vnodeops.h

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

2008-12-29 16:47:18 +11:00

..

configfs

…

9p.txt

…

00-INDEX

…

adfs.txt

…

affs.txt

…

afs.txt

…

autofs4-mount-control.txt

autofs4: device node ioctl documentation

2008-10-16 11:21:39 -07:00

automount-support.txt

…

befs.txt

…

bfs.txt

…

cifs.txt

…

coda.txt

…

cramfs.txt

…

dentry-locking.txt

…

directory-locking

…

dlmfs.txt

…

dnotify.txt

…

ecryptfs.txt

…

Exporting

…

ext2.txt

…

ext3.txt

ext3: add an option to control error handling on file data

2008-10-20 08:52:37 -07:00

ext4.txt

ext4: Update Documentation/filesystems/ext4.txt

2008-10-17 09:15:14 -04:00

fiemap.txt

vfs: vfs-level fiemap interface

2008-10-08 19:44:18 -04:00

files.txt

…

fuse.txt

…

gfs2-glocks.txt

…

gfs2.txt

…

hfs.txt

…

hfsplus.txt

…

hpfs.txt

…

inotify.txt

…

isofs.txt

…

jfs.txt

…

Locking

fs: remove prepare_write/commit_write

2008-10-30 11:38:45 -07:00

locks.txt

…

mandatory-locking.txt

…

ncpfs.txt

…

nfs-rdma.txt

…

nfsroot.txt

doc: typo in Documentation/filesystems/nfsroot.txt

2008-10-16 11:21:31 -07:00

ntfs.txt

NTFS: update homepage

2008-09-02 19:21:37 -07:00

ocfs2.txt

ocfs2: Small documentation update

2008-12-01 14:46:49 -08:00

omfs.txt

…

porting

…

proc.txt

Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core

2008-12-23 16:27:23 +01:00

quota.txt

…

ramfs-rootfs-initramfs.txt

Trivial Documentation/filesystems/ramfs-rootfs-initramfs.txt fix

2008-11-30 11:40:56 -08:00

relay.txt

…

romfs.txt

…

rpc-cache.txt

…

seq_file.txt

…

sharedsubtree.txt

…

smbfs.txt

…

spufs.txt

…

sysfs-pci.txt

…

sysfs.txt

…

sysv-fs.txt

…

tmpfs.txt

…

ubifs.txt

UBIFS: add no_chk_data_crc mount option

2008-09-30 11:12:56 +03:00

udf.txt

…

ufs.txt

…

vfat.txt

fat: Fix ATTR_RO for directory

2008-11-06 15:41:21 -08:00

vfs.txt

fs: remove prepare_write/commit_write

2008-10-30 11:38:45 -07:00

xfs.txt

[XFS] remove restricted chown parameter from xfs linux

2008-10-30 18:30:09 +11:00

xip.txt

DOC: update xip method info

2008-11-12 17:17:17 -08:00