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
2012-11-23 15:12:17 -10:00
..
9p
The following changes since commit 4cbe5a555f:
2012-10-12 09:59:23 +09:00
adfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
affs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
afs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
autofs4
autofs4 - fix reset pending flag on mount fail
2012-10-11 10:21:16 +09:00
befs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
bfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
btrfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
2012-10-26 09:34:04 -07:00
cachefiles
fs: cachefiles: add support for large files in filesystem caching
2012-07-30 17:25:21 -07:00
ceph
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-10-29 08:49:25 -07:00
cifs
cifs: Do not lookup hashed negative dentry in cifs_atomic_open
2012-11-05 06:45:54 -05:00
coda
fs: push rcu_barrier() from deactivate_locked_super() to filesystems
2012-10-02 21:35:55 -04:00
configfs
userns: Convert configfs to use kuid and kgid where appropriate
2012-09-18 01:01:37 -07:00
cramfs
userns: Convert cramfs to use kuid/kgid where appropriate
2012-09-21 03:13:08 -07:00
debugfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
devpts
dlm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
ecryptfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
efs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
exofs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-12 10:52:03 +09:00
exportfs
ext2
ext2: fix return values on parse_options() failure
2012-10-09 23:23:53 +02:00
ext3
ext3: Avoid underflow of in ext3_trim_fs()
2012-11-19 21:36:12 +01:00
ext4
ext4: fix unjournaled inode bitmap modification
2012-10-28 22:24:57 -04:00
fat
fat: drop lock/unlock super
2012-10-09 23:33:38 -04:00
freevxfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
fscache
fuse
mm: kill vma flag VM_CAN_NONLINEAR
2012-10-09 16:22:17 +09:00
gfs2
GFS2: Test bufdata with buffer locked and gfs2_log_lock held
2012-11-07 09:43:03 +00:00
hfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
hfsplus
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
hostfs
Merge branch 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
2012-10-10 11:15:20 +09:00
hpfs
hpfs: drop lock/unlock super
2012-10-09 23:33:38 -04:00
hppfs
hppfs: fix the return value of get_inode()
2012-10-09 22:34:52 +02:00
hugetlbfs
mm: replace vma prio_tree with an interval tree
2012-10-09 16:22:39 +09:00
isofs
tmpfs,ceph,gfs2,isofs,reiserfs,xfs: fix fh_len checking
2012-10-09 23:33:55 -04:00
jbd
jbd: Fix assertion failure in commit code due to lacking transaction credits
2012-09-12 15:52:03 +02:00
jbd2
The big new feature added this time is supporting online resizing
2012-10-08 06:36:39 +09:00
jffs2
jffs2: Fix lock acquisition order bug in jffs2_write_begin
2012-11-09 17:02:50 +02:00
jfs
jfs: Fix FITRIM argument handling
2012-10-17 09:18:38 -05:00
lockd
LOCKD: Clear ln->nsm_clnt only when ln->nsm_users is zero
2012-10-24 10:46:22 -04:00
logfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
minix
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
ncpfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
nfs
NFS4: nfs4_opendata_access should return errno
2012-11-02 18:51:54 -04:00
nfs_common
nfsd
UAPI Disintegration 2012-10-09
2012-10-09 18:35:22 -04:00
nilfs2
mm: kill vma flag VM_CAN_NONLINEAR
2012-10-09 16:22:17 +09:00
nls
notify
fanotify: fix FAN_Q_OVERFLOW case of fanotify_read()
2012-11-18 09:30:00 -10:00
ntfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
ocfs2
mm: kill vma flag VM_CAN_NONLINEAR
2012-10-09 16:22:17 +09:00
omfs
omfs: convert to use beXX_add_cpu()
2012-10-06 03:05:31 +09:00
openpromfs
fs: push rcu_barrier() from deactivate_locked_super() to filesystems
2012-10-02 21:35:55 -04:00
proc
mm, oom: reintroduce /proc/pid/oom_adj
2012-11-16 10:15:35 -08:00
pstore
pstore: Fix NULL pointer dereference in console writes
2012-11-14 18:30:21 -08:00
qnx4
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
qnx6
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
quota
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2012-10-16 18:12:38 -07:00
ramfs
reiserfs
reiserfs: Move quota calls out of write lock
2012-11-19 21:34:33 +01:00
romfs
fs: push rcu_barrier() from deactivate_locked_super() to filesystems
2012-10-02 21:35:55 -04:00
squashfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
sysfs
sysfs: sysfs_pathname/sysfs_add_one: Use strlcat() instead of strcat()
2012-10-24 15:57:14 -07:00
sysv
sysv: drop lock/unlock super
2012-10-09 23:33:39 -04:00
ubifs
UBIFS: fix mounting problems after power cuts
2012-10-26 16:26:44 +03:00
udf
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2012-10-04 09:14:01 -07:00
ufs
ufs: drop lock/unlock super
2012-10-09 23:33:39 -04:00
xfs
xfs: drop buffer io reference when a bad bio is built
2012-11-17 09:36:57 -06:00
aio.c
anon_inodes.c
attr.c
ima: add inode_post_setattr call
2012-09-07 14:57:46 -04:00
bad_inode.c
binfmt_aout.c
coredump: pass siginfo_t* to do_coredump() and below, not merely signr
2012-10-06 03:05:16 +09:00
binfmt_elf.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2012-10-10 12:02:25 +09:00
binfmt_elf_fdpic.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2012-10-10 12:02:25 +09:00
binfmt_em86.c
binfmt_flat.c
coredump: pass siginfo_t* to do_coredump() and below, not merely signr
2012-10-06 03:05:16 +09:00
binfmt_misc.c
binfmt_script.c
binfmt_som.c
bio-integrity.c
block: Ues bi_pool for bio_integrity_alloc()
2012-09-09 10:35:38 +02:00
bio.c
vfs: fix: don't increase bio_slab_max if krealloc() fails
2012-10-22 22:00:26 +02:00
block_dev.c
Lock splice_read and splice_write functions
2012-10-28 10:59:37 -07:00
buffer.c
The big new feature added this time is supporting online resizing
2012-10-08 06:36:39 +09:00
char_dev.c
char_dev: pin parent kobject
2012-10-22 08:50:37 +03:00
compat.c
vfs: define struct filename and have getname() return it
2012-10-12 20:14:55 -04:00
compat_binfmt_elf.c
coredump: extend core dump note section to contain file names of mapped files
2012-10-06 03:05:17 +09:00
compat_ioctl.c
fs/compat_ioctl.c: VIDEO_SET_SPU_PALETTE missing error check
2012-10-25 14:37:53 -07:00
coredump.c
fix a leak in replace_fd() users
2012-10-16 13:36:50 -04:00
coredump.h
coredump: update coredump-related headers
2012-10-06 03:05:15 +09:00
dcache.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
dcookies.c
direct-io.c
block: move down direct IO plugging
2012-08-09 15:23:09 +02:00
drop_caches.c
eventfd.c
eventpoll.c
revert "epoll: support for disabling items, and a self-test app"
2012-11-09 06:41:46 +01:00
exec.c
freezer: exec should clear PF_NOFREEZE along with PF_KTHREAD
2012-10-25 22:28:12 +02:00
fcntl.c
Fix F_DUPFD_CLOEXEC breakage
2012-10-09 15:52:31 +09:00
fhandle.c
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
fifo.c
file.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-11-18 09:13:48 -10:00
file_table.c
lglock: add DEFINE_STATIC_LGLOCK()
2012-10-10 01:15:44 -04:00
filesystems.c
vfs: define struct filename and have getname() return it
2012-10-12 20:14:55 -04:00
fs-writeback.c
Merge branch 'writeback-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
2012-10-12 10:46:03 +09:00
fs_struct.c
generic_acl.c
userns: Pass a userns parameter into posix_acl_to_xattr and posix_acl_from_xattr
2012-09-18 01:01:35 -07:00
inode.c
mm: replace vma prio_tree with an interval tree
2012-10-09 16:22:39 +09:00
internal.h
vfs: make path_openat take a struct filename pointer
2012-10-12 20:15:09 -04:00
ioctl.c
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
ioprio.c
Kconfig
Kconfig.binfmt
coredump: make core dump functionality optional
2012-10-06 03:05:15 +09:00
libfs.c
vfs: fix kerneldoc for generic_fh_to_parent()
2012-09-05 10:59:30 +02:00
locks.c
UAPI Disintegration 2012-10-09
2012-10-09 18:35:22 -04:00
Makefile
coredump: make core dump functionality optional
2012-10-06 03:05:15 +09:00
mbcache.c
mount.h
mpage.c
namei.c
VFS: don't do protected {sym,hard}links by default
2012-10-26 10:05:07 -07:00
namespace.c
vfs: define struct filename and have getname() return it
2012-10-12 20:14:55 -04:00
no-block.c
open.c
vfs: make path_openat take a struct filename pointer
2012-10-12 20:15:09 -04:00
pipe.c
pipe(2) - race-free error recovery
2012-09-26 21:08:52 -04:00
pnode.c
pnode.h
posix_acl.c
userns: Convert vfs posix_acl support to use kuids and kgids
2012-09-18 01:01:35 -07:00
proc_namespace.c
read_write.c
compat: fs: Generic compat_sys_sendfile implementation
2012-10-02 21:35:55 -04:00
read_write.h
compat: fs: Generic compat_sys_sendfile implementation
2012-10-02 21:35:55 -04:00
readdir.c
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
select.c
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
seq_file.c
userns: Make seq_file's user namespace accessible
2012-08-14 21:47:55 -07:00
signalfd.c
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
splice.c
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
stack.c
stat.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
statfs.c
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
super.c
vfs: drop lock/unlock super
2012-10-09 23:33:39 -04:00
sync.c
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
timerfd.c
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
utimes.c
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
xattr.c
fs, xattr: fix bug when removing a name not in xattr list
2012-10-18 12:35:58 -07:00
xattr_acl.c
userns: Fix posix_acl_file_xattr_userns gid conversion
2012-10-12 13:16:48 -07:00