You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds a0e881b7c1 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs ... Pull second vfs pile from Al Viro: "The stuff in there: fsfreeze deadlock fixes by Jan (essentially, the deadlock reproduced by xfstests 068), symlink and hardlink restriction patches, plus assorted cleanups and fixes. Note that another fsfreeze deadlock (emergency thaw one) is *not* dealt with - the series by Fernando conflicts a lot with Jan's, breaks userland ABI (FIFREEZE semantics gets changed) and trades the deadlock for massive vfsmount leak; this is going to be handled next cycle. There probably will be another pull request, but that stuff won't be in it." Fix up trivial conflicts due to unrelated changes next to each other in drivers/{staging/gdm72xx/usb_boot.c, usb/gadget/storage_common.c} * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (54 commits) delousing target_core_file a bit Documentation: Correct s_umount state for freeze_fs/unfreeze_fs fs: Remove old freezing mechanism ext2: Implement freezing btrfs: Convert to new freezing mechanism nilfs2: Convert to new freezing mechanism ntfs: Convert to new freezing mechanism fuse: Convert to new freezing mechanism gfs2: Convert to new freezing mechanism ocfs2: Convert to new freezing mechanism xfs: Convert to new freezing code ext4: Convert to new freezing mechanism fs: Protect write paths by sb_start_write - sb_end_write fs: Skip atime update on frozen filesystem fs: Add freezing handling to mnt_want_write() / mnt_drop_write() fs: Improve filesystem freezing handling switch the protection of percpu_counter list to spinlock nfsd: Push mnt_want_write() outside of i_mutex btrfs: Push mnt_want_write() outside of i_mutex fat: Push mnt_want_write() outside of i_mutex ...		13 years ago
..
8xx	Disintegrate asm/system.h for PowerPC	13 years ago
40x	…
44x	powerpc: Fix assmption of end_of_DRAM() returns end address	13 years ago
52xx	powerpc: Mark const init data with __initconst instead of __initdata	13 years ago
82xx	powerpc/82xx: add SPI support for mgcoge	13 years ago
83xx	powerpc/83xx: fix RGMII AC values workaround for km83xx	13 years ago
85xx	Merge remote-tracking branch 'kumar/merge' into merge	13 years ago
86xx	PCI changes for the 3.6 merge window:	13 years ago
512x	…
amigaone	…
cell	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
chrp	…
embedded6xx	Disintegrate asm/system.h for PowerPC	13 years ago
maple	Disintegrate and delete asm/system.h	13 years ago
pasemi	Disintegrate and delete asm/system.h	13 years ago
powermac	Merge branch 'merge' into next	13 years ago
powernv	PCI changes for the 3.6 merge window:	13 years ago
prep	…
ps3	powerpc/ps3: Minor Kconfig cleanup	13 years ago
pseries	PCI changes for the 3.6 merge window:	13 years ago
wsp	Disintegrate and delete asm/system.h	13 years ago
Kconfig	KVM: PPC: Factor out guest epapr initialization	13 years ago
Kconfig.cputype	powerpc/e500: add paravirt QEMU platform	13 years ago
Makefile	…
fsl_uli1575.c	Disintegrate asm/system.h for PowerPC	13 years ago