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 35f95d228e Most important part of this is that it fixes a regression in Samsung ... NAND chip detection, introduced by some rework which went into 3.7. The initial fix wasn't quite complete, so it's in two parts. In fact the first part is committed twice (Artem committed his own copy of the same patch) and I've merged Artem's tree into mine which already had that fix. I'd have recommitted that to make it somewhat cleaner, but figured by this point in the release cycle it was better to merge *exactly* the commits which have been in linux-next. If I'd recommitted, I'd also omit the sparse warning fix. But it's there, and it's harmless — just marking one function as 'static' in onenand code. This also includes a couple more fixes for stable: an AB-BA deadlock in JFFS2, and an invalid range check in slram. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlCwEIsACgkQdwG7hYl686NfZgCfSYFA2q8yp7jEMdDaxpFPuuDm FFMAoI3V27BpWxRab6GylYh8erHp9ful =Wo+T -----END PGP SIGNATURE----- Merge tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6 Pull MTD fixes from David Woodhouse: "The most important part of this is that it fixes a regression in Samsung NAND chip detection, introduced by some rework which went into 3.7. The initial fix wasn't quite complete, so it's in two parts. In fact the first part is committed twice (Artem committed his own copy of the same patch) and I've merged Artem's tree into mine which already had that fix. I'd have recommitted that to make it somewhat cleaner, but figured by this point in the release cycle it was better to merge *exactly* the commits which have been in linux-next. If I'd recommitted, I'd also omit the sparse warning fix. But it's there, and it's harmless — just marking one function as 'static' in onenand code. This also includes a couple more fixes for stable: an AB-BA deadlock in JFFS2, and an invalid range check in slram." * tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6: mtd: nand: fix Samsung SLC detection regression mtd: nand: fix Samsung SLC NAND identification regression jffs2: Fix lock acquisition order bug in jffs2_write_begin mtd: onenand: Make flexonenand_set_boundary static mtd: slram: invalid checking of absolute end address mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions() mtd: nand: fix Samsung SLC NAND identification regression		12 years ago
..
9p	The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:	13 years ago
adfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
affs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
afs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
autofs4	autofs4 - fix reset pending flag on mount fail	13 years ago
befs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
bfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
btrfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	12 years ago
cachefiles	fs: cachefiles: add support for large files in filesystem caching	13 years ago
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	12 years ago
cifs	cifs: Do not lookup hashed negative dentry in cifs_atomic_open	12 years ago
coda	fs: push rcu_barrier() from deactivate_locked_super() to filesystems	13 years ago
configfs	userns: Convert configfs to use kuid and kgid where appropriate	13 years ago
cramfs	userns: Convert cramfs to use kuid/kgid where appropriate	13 years ago
debugfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	13 years ago
devpts	…
dlm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	13 years ago
ecryptfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
efs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
exofs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
exportfs	…
ext2	ext2: fix return values on parse_options() failure	13 years ago
ext3	ext3: Avoid underflow of in ext3_trim_fs()	12 years ago
ext4	ext4: fix unjournaled inode bitmap modification	12 years ago
fat	fat: drop lock/unlock super	13 years ago
freevxfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
fscache	…
fuse	mm: kill vma flag VM_CAN_NONLINEAR	13 years ago
gfs2	GFS2: Test bufdata with buffer locked and gfs2_log_lock held	12 years ago
hfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
hfsplus	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
hostfs	Merge branch 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	13 years ago
hpfs	hpfs: drop lock/unlock super	13 years ago
hppfs	hppfs: fix the return value of get_inode()	13 years ago
hugetlbfs	mm: replace vma prio_tree with an interval tree	13 years ago
isofs	tmpfs,ceph,gfs2,isofs,reiserfs,xfs: fix fh_len checking	13 years ago
jbd	jbd: Fix assertion failure in commit code due to lacking transaction credits	13 years ago
jbd2	The big new feature added this time is supporting online resizing	13 years ago
jffs2	jffs2: Fix lock acquisition order bug in jffs2_write_begin	12 years ago
jfs	jfs: Fix FITRIM argument handling	13 years ago
lockd	LOCKD: Clear ln->nsm_clnt only when ln->nsm_users is zero	12 years ago
logfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
minix	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
ncpfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
nfs	NFS4: nfs4_opendata_access should return errno	12 years ago
nfs_common	…
nfsd	UAPI Disintegration 2012-10-09	13 years ago
nilfs2	mm: kill vma flag VM_CAN_NONLINEAR	13 years ago
nls	…
notify	fanotify: fix FAN_Q_OVERFLOW case of fanotify_read()	12 years ago
ntfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
ocfs2	mm: kill vma flag VM_CAN_NONLINEAR	13 years ago
omfs	omfs: convert to use beXX_add_cpu()	13 years ago
openpromfs	fs: push rcu_barrier() from deactivate_locked_super() to filesystems	13 years ago
proc	mm, oom: reintroduce /proc/pid/oom_adj	12 years ago
pstore	pstore: Fix NULL pointer dereference in console writes	12 years ago
qnx4	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
qnx6	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
quota	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs	13 years ago
ramfs	…
reiserfs	reiserfs: Move quota calls out of write lock	12 years ago
romfs	fs: push rcu_barrier() from deactivate_locked_super() to filesystems	13 years ago
squashfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
sysfs	sysfs: sysfs_pathname/sysfs_add_one: Use strlcat() instead of strcat()	12 years ago
sysv	sysv: drop lock/unlock super	13 years ago
ubifs	UBIFS: fix mounting problems after power cuts	12 years ago
udf	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs	13 years ago
ufs	ufs: drop lock/unlock super	13 years ago
xfs	xfs: drop buffer io reference when a bad bio is built	12 years ago
Kconfig	…
Kconfig.binfmt	coredump: make core dump functionality optional	13 years ago
Makefile	coredump: make core dump functionality optional	13 years ago
aio.c	…
anon_inodes.c	…
attr.c	ima: add inode_post_setattr call	13 years ago
bad_inode.c	…
binfmt_aout.c	coredump: pass siginfo_t* to do_coredump() and below, not merely signr	13 years ago
binfmt_elf.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	13 years ago
binfmt_elf_fdpic.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	13 years ago
binfmt_em86.c	…
binfmt_flat.c	coredump: pass siginfo_t* to do_coredump() and below, not merely signr	13 years ago
binfmt_misc.c	…
binfmt_script.c	…
binfmt_som.c	…
bio-integrity.c	block: Ues bi_pool for bio_integrity_alloc()	13 years ago
bio.c	vfs: fix: don't increase bio_slab_max if krealloc() fails	12 years ago
block_dev.c	Lock splice_read and splice_write functions	12 years ago
buffer.c	The big new feature added this time is supporting online resizing	13 years ago
char_dev.c	char_dev: pin parent kobject	12 years ago
compat.c	vfs: define struct filename and have getname() return it	13 years ago
compat_binfmt_elf.c	coredump: extend core dump note section to contain file names of mapped files	13 years ago
compat_ioctl.c	fs/compat_ioctl.c: VIDEO_SET_SPU_PALETTE missing error check	12 years ago
coredump.c	fix a leak in replace_fd() users	13 years ago
coredump.h	coredump: update coredump-related headers	13 years ago
dcache.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
dcookies.c	…
direct-io.c	block: move down direct IO plugging	13 years ago
drop_caches.c	…
eventfd.c	…
eventpoll.c	revert "epoll: support for disabling items, and a self-test app"	12 years ago
exec.c	freezer: exec should clear PF_NOFREEZE along with PF_KTHREAD	12 years ago
fcntl.c	Fix F_DUPFD_CLOEXEC breakage	13 years ago
fhandle.c	switch simple cases of fget_light to fdget	13 years ago
fifo.c	…
file.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	12 years ago
file_table.c	lglock: add DEFINE_STATIC_LGLOCK()	13 years ago
filesystems.c	vfs: define struct filename and have getname() return it	13 years ago
fs-writeback.c	Merge branch 'writeback-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux	13 years ago
fs_struct.c	…
generic_acl.c	userns: Pass a userns parameter into posix_acl_to_xattr and posix_acl_from_xattr	13 years ago
inode.c	mm: replace vma prio_tree with an interval tree	13 years ago
internal.h	vfs: make path_openat take a struct filename pointer	13 years ago
ioctl.c	switch simple cases of fget_light to fdget	13 years ago
ioprio.c	…
libfs.c	vfs: fix kerneldoc for generic_fh_to_parent()	13 years ago
locks.c	UAPI Disintegration 2012-10-09	13 years ago
mbcache.c	…
mount.h	…
mpage.c	…
namei.c	VFS: don't do protected {sym,hard}links by default	12 years ago
namespace.c	vfs: define struct filename and have getname() return it	13 years ago
no-block.c	…
open.c	vfs: make path_openat take a struct filename pointer	13 years ago
pipe.c	pipe(2) - race-free error recovery	13 years ago
pnode.c	…
pnode.h	…
posix_acl.c	userns: Convert vfs posix_acl support to use kuids and kgids	13 years ago
proc_namespace.c	…
read_write.c	compat: fs: Generic compat_sys_sendfile implementation	13 years ago
read_write.h	compat: fs: Generic compat_sys_sendfile implementation	13 years ago
readdir.c	switch simple cases of fget_light to fdget	13 years ago
select.c	switch simple cases of fget_light to fdget	13 years ago
seq_file.c	userns: Make seq_file's user namespace accessible	13 years ago
signalfd.c	switch simple cases of fget_light to fdget	13 years ago
splice.c	switch simple cases of fget_light to fdget	13 years ago
stack.c	…
stat.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
statfs.c	switch simple cases of fget_light to fdget	13 years ago
super.c	vfs: drop lock/unlock super	13 years ago
sync.c	switch simple cases of fget_light to fdget	13 years ago
timerfd.c	switch simple cases of fget_light to fdget	13 years ago
utimes.c	switch simple cases of fget_light to fdget	13 years ago
xattr.c	fs, xattr: fix bug when removing a name not in xattr list	13 years ago
xattr_acl.c	userns: Fix posix_acl_file_xattr_userns gid conversion	13 years ago