Linus Torvalds ce004178be Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc ...

Pull sparc changes from David S. Miller:
 "This has the generic strncpy_from_user() implementation architectures
  can now use, which we've been developing on linux-arch over the past
  few days.

  For good measure I ran both a 32-bit and a 64-bit glibc testsuite run,
  and the latter of which pointed out an adjustment I needed to make to
  sparc's user_addr_max() definition.  Linus, you were right, STACK_TOP
  was not the right thing to use, even on sparc itself :-)

  From Sam Ravnborg, we have a conversion of sparc32 over to the common
  alloc_thread_info_node(), since the aspect which originally blocked
  our doing so (sun4c) has been removed."

Fix up trivial arch/sparc/Kconfig and lib/Makefile conflicts.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Fix user_addr_max() definition.
  lib: Sparc's strncpy_from_user is generic enough, move under lib/
  kernel: Move REPEAT_BYTE definition into linux/kernel.h
  sparc: Increase portability of strncpy_from_user() implementation.
  sparc: Optimize strncpy_from_user() zero byte search.
  sparc: Add full proper error handling to strncpy_from_user().
  sparc32: use the common implementation of alloc_thread_info_node()

2012-05-24 15:10:28 -07:00

..

9p

9p changes for the 3.4 merge window

2012-03-28 09:58:38 -07:00

adfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

affs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

afs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

autofs4

autofs: make the autofsv5 packet file descriptor use a packetized pipe

2012-04-29 13:30:08 -07:00

befs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

bfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

btrfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-05-22 19:22:50 -07:00

cachefiles

switch touch_atime to struct path

2012-03-20 21:29:41 -04:00

ceph

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2012-03-28 10:01:29 -07:00

cifs

cifs: fix misspelling of "forcedirectio"

2012-05-16 11:26:25 -05:00

coda

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

configfs

make configfs_pin_fs() return root dentry on success

2012-03-20 21:29:48 -04:00

cramfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

debugfs

simple_open: automatically convert to simple_open()

2012-04-05 15:25:50 -07:00

devpts

userns: Convert devpts to use kuid/kgid where appropriate

2012-05-15 14:59:26 -07:00

dlm

dlm: NULL dereference on failure in kmem_cache_create()

2012-05-15 10:39:28 -05:00

ecryptfs

userns: Use cred->user_ns instead of cred->user->user_ns

2012-04-07 16:55:51 -07:00

efs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

exofs

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

2012-03-28 20:04:27 -07:00

exportfs

…

ext2

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-05-23 17:42:39 -07:00

ext3

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-05-23 17:42:39 -07:00

ext4

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-05-23 17:42:39 -07:00

fat

fat: fix bug in enforcing Long File Name length

2012-03-23 16:58:40 -07:00

freevxfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

fscache

…

fuse

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

2012-04-18 17:29:05 -07:00

gfs2

dlm for 3.5

2012-05-22 19:31:38 -07:00

hfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

hfsplus

hfsplus: Fix potential buffer overflows

2012-05-04 17:11:24 -07:00

hostfs

Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

2012-03-27 18:29:53 -07:00

hpfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

hppfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

hugetlbfs

hugetlbfs: lockdep annotate root inode properly

2012-04-25 21:26:34 -07:00

isofs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

jbd

Power management updates for 3.4

2012-03-21 10:15:51 -07:00

jbd2

jbd2: use GFP_NOFS for blkdev_issue_flush

2012-04-23 21:43:41 -04:00

jffs2

jffs2: Fix lock acquisition order bug in gc path

2012-05-07 20:30:14 +01:00

jfs

jfs: mising cleanup on register_filesystem() failure

2012-03-20 21:29:48 -04:00

lockd

lockd: fix the endianness bug

2012-04-13 13:50:52 -04:00

logfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

minix

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

ncpfs

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

nfs

vfs: make it possible to access the dentry hash/len as one 64-bit entry

2012-05-10 19:54:35 -07:00

nfs_common

…

nfsd

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-05-23 17:42:39 -07:00

nilfs2

vfs: make it possible to access the dentry hash/len as one 64-bit entry

2012-05-10 19:54:35 -07:00

nls

NLS: raname "maxlen" to "maxout" in UTF conversion routines

2011-11-26 19:58:47 -08:00

notify

fs/notify/notification.c: make subsys_initcall function static

2012-03-23 16:58:31 -07:00

ntfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

ocfs2

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-04-23 23:15:17 -04:00

omfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

openpromfs

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

proc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-05-23 17:42:39 -07:00

pstore

pstore/ram: Add ECC support

2012-05-17 08:51:59 -07:00

qnx4

qnx4: new helper - try_extent()

2012-03-20 21:29:52 -04:00

qnx6

fs: initial qnx6fs addition

2012-03-20 21:29:38 -04:00

quota

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

2012-03-28 10:00:14 -07:00

ramfs

tidy up after d_make_root() conversion

2012-03-20 21:29:37 -04:00

reiserfs

Disintegrate and delete asm/system.h

2012-03-28 15:58:21 -07:00

romfs

MTD merge for 3.4

2012-03-30 17:31:56 -07:00

squashfs

Add an extra mount time sanity check, plus some code cleanups and bug fixes.

2012-03-28 18:05:54 -07:00

sysfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-05-23 17:42:39 -07:00

sysv

switch open-coded instances of d_make_root() to new helper

2012-03-20 21:29:35 -04:00

ubifs

UBIFS:

2012-05-22 19:30:27 -07:00

udf

vfs: make it possible to access the dentry hash/len as one 64-bit entry

2012-05-10 19:54:35 -07:00

ufs

vfs: make it possible to access the dentry hash/len as one 64-bit entry

2012-05-10 19:54:35 -07:00

xfs

xfs: add trace points for log forces

2012-05-21 10:45:44 -05:00

aio.c

vfs: make AIO use the proper rw_verify_area() area helpers

2012-05-21 16:06:20 -07:00

anon_inodes.c

anon_inodes: move allocation of anon_inode into ->mount()

2012-03-20 21:29:45 -04:00

attr.c

userns: Use uid_eq gid_eq helpers when comparing kuids and kgids in the vfs

2012-05-03 03:29:34 -07:00

bad_inode.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

binfmt_aout.c

VM: add "vm_mmap()" helper function

2012-04-20 17:29:13 -07:00

binfmt_elf_fdpic.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-05-23 17:42:39 -07:00

binfmt_elf.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-05-23 17:42:39 -07:00

binfmt_em86.c

__register_binfmt() made void

2012-03-20 21:29:46 -04:00

binfmt_flat.c

VM: add "vm_mmap()" helper function

2012-04-20 17:29:13 -07:00

binfmt_misc.c

magic.h: move some FS magic numbers into magic.h

2012-03-23 16:58:31 -07:00

binfmt_script.c

__register_binfmt() made void

2012-03-20 21:29:46 -04:00

binfmt_som.c

VM: add "vm_mmap()" helper function

2012-04-20 17:29:13 -07:00

bio-integrity.c

fs: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:21 +08:00

bio.c

bio allocation failure due to bio_get_nr_vecs()

2012-05-11 16:45:12 +02:00

block_dev.c

block: don't mark buffers beyond end of disk as mapped

2012-05-11 16:42:14 +02:00

buffer.c

block: don't mark buffers beyond end of disk as mapped

2012-05-11 16:42:14 +02:00

char_dev.c

char_dev.c: fix up some whitespace errors

2011-12-13 11:18:17 -08:00

compat_binfmt_elf.c

…

compat_ioctl.c

The following text was taken from the original review request:

2012-03-24 10:24:31 -07:00

compat.c

userns: Convert stat to return values mapped from kuids and kgids

2012-05-15 14:08:35 -07:00

dcache.c

mm: add a low limit to alloc_large_system_hash

2012-05-24 00:28:21 -04:00

dcookies.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

direct-io.c

Restore direct_io / truncate locking API

2012-02-23 15:56:21 -08:00

drop_caches.c

…

eventfd.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

eventpoll.c

epoll: Fix user space breakage related to EPOLLWAKEUP

2012-05-22 20:57:06 +02:00

exec.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-05-23 17:42:39 -07:00

fcntl.c

userns: Use uid_eq gid_eq helpers when comparing kuids and kgids in the vfs

2012-05-03 03:29:34 -07:00

fhandle.c

vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb

2012-01-06 23:16:53 -05:00

fifo.c

…

file_table.c

vfs: drop_file_write_access() made static

2012-03-20 21:29:32 -04:00

file.c

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

filesystems.c

vfs: convert fs_supers to hlist

2012-01-03 22:52:39 -05:00

fs_struct.c

The following text was taken from the original review request:

2012-03-24 10:24:31 -07:00

fs-writeback.c

trivial writeback fixes

2012-03-28 10:07:27 -07:00

generic_acl.c

…

inode.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-05-24 11:54:29 -07:00

internal.h

vfs: protect remounting superblock read-only

2012-01-06 23:20:12 -05:00

ioctl.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

ioprio.c

userns: Use uid_eq gid_eq helpers when comparing kuids and kgids in the vfs

2012-05-03 03:29:34 -07:00

Kconfig

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2012-03-21 13:36:41 -07:00

Kconfig.binfmt

C6X: add support to build with BINFMT_ELF_FDPIC

2012-05-15 09:17:34 -04:00

libfs.c

vfs: make it possible to access the dentry hash/len as one 64-bit entry

2012-05-10 19:54:35 -07:00

locks.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-05-23 17:42:39 -07:00

Makefile

fs: initial qnx6fs addition

2012-03-20 21:29:38 -04:00

mbcache.c

…

mount.h

vfs: keep list of mounts for each superblock

2012-01-06 23:20:12 -05:00

mpage.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

namei.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

2012-05-24 15:10:28 -07:00

namespace.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-01-08 13:21:22 -08:00

no-block.c

…

open.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-05-23 17:42:39 -07:00

pipe.c

pipes: add a "packetized pipe" mode for writing

2012-04-29 13:12:42 -07:00

pnode.c

vfs: switch pnode.h macros to struct mount *

2012-01-03 22:57:11 -05:00

pnode.h

vfs: switch pnode.h macros to struct mount *

2012-01-03 22:57:11 -05:00

posix_acl.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

proc_namespace.c

vfs: switch ->show_options() to struct dentry *

2012-01-06 23:19:54 -05:00

read_write.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

read_write.h

…

readdir.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

select.c

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

seq_file.c

The following text was taken from the original review request:

2012-03-24 10:24:31 -07:00

signalfd.c

epoll: ep_unregister_pollwait() can use the freed pwq->whead

2012-02-24 11:42:50 -08:00

splice.c

tcp: tcp_sendpages() should call tcp_push() once

2012-04-05 19:04:27 -04:00

stack.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

stat.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2012-05-23 17:42:39 -07:00

statfs.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

super.c

The following text was taken from the original review request:

2012-03-24 10:24:31 -07:00

sync.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

timerfd.c

…

utimes.c

…

xattr_acl.c

fs: reduce the use of module.h wherever possible

2012-02-28 19:31:58 -05:00

xattr.c

fs/xattr.c:setxattr(): improve handling of allocation failures

2012-04-05 15:25:50 -07:00