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
..
boot	powerpc/85xx: P3041DS - change espi input-clock from 40MHz to 35MHz	13 years ago
configs	memcg: rename config variables	13 years ago
include/asm	Merge branch 'akpm' (Andrew's patch-bomb)	13 years ago
kernel	Merge branch 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	13 years ago
kvm	powerpc/kvm/book3s_32: Fix MTMSR_EERI macro	13 years ago
lib	powerpc: Put the gpr save/restore functions in their own section	13 years ago
math-emu	…
mm	powerpc: Use CURRENT_THREAD_INFO instead of open coded assembly	13 years ago
net	powerpc: Start using ___PPC_RA/B/S/T where necessary	13 years ago
oprofile	…
perf	powerpc/perf: Use perf_instruction_pointer in callchains	13 years ago
platforms	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
sysdev	irqdomain changes for Linux v3.6	13 years ago
xmon	powerpc/xmon: Use cpumask iterator to avoid warning	13 years ago
Kconfig	ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION	13 years ago
Kconfig.debug	powerpc: IOMMU fault injection	13 years ago
Makefile	crypto: nx - move nx build to driver/crypto Makefile	13 years ago
relocs_check.pl	…