Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-13 00:29:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/fs
History
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
9p
fs/9p: Don't use dotl version of mknod for dotu inode operations
2010-09-13 08:13:03 -05:00
adfs
Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:01 -07:00
affs
Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:01 -07:00
afs
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
autofs
Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:01 -07:00
autofs4
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
befs
fix typos concerning "initiali[zs]e"
2010-06-16 18:05:05 +02:00
bfs
BKL: Remove BKL from BFS
2010-10-04 21:10:35 +02:00
btrfs
Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block
2010-10-22 17:07:18 -07:00
cachefiles
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
ceph
ceph: do not carry i_lock for readdir from dcache
2010-10-20 15:38:27 -07:00
cifs
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
2010-10-22 17:52:29 -07:00
coda
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
configfs
fix setattr error handling in sysfs, configfs
2010-06-04 17:16:29 -04:00
cramfs
cramfs: only unlock new inodes
2010-08-18 01:01:33 -04:00
debugfs
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
devpts
Simplify devpts_get_sb() failure exits
2010-05-21 18:31:12 -04:00
dlm
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
2010-10-22 17:33:16 -07:00
ecryptfs
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
efs
…
exofs
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
exportfs
…
ext2
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
ext3
Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block
2010-10-22 17:07:18 -07:00
ext4
Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block
2010-10-22 17:07:18 -07:00
fat
Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block
2010-10-22 17:07:18 -07:00
freevxfs
BKL: remove BKL from freevxfs
2010-10-21 18:48:09 +02:00
fscache
Add a dummy printk function for the maintenance of unused printks
2010-08-12 09:51:35 -07:00
fuse
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
gfs2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2010-10-22 17:13:10 -07:00
hfs
Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:01 -07:00
hfsplus
hfsplus: fix getxattr return value
2010-10-15 05:45:00 -07:00
hostfs
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
hpfs
Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:01 -07:00
hppfs
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
hugetlbfs
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
isofs
BKL: Remove BKL from isofs
2010-10-04 21:10:45 +02:00
jbd
Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block
2010-10-22 17:07:18 -07:00
jbd2
Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block
2010-10-22 17:07:18 -07:00
jffs2
BKL: Remove BKL from jffs2
2010-10-04 21:10:50 +02:00
jfs
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
lockd
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
logfs
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
minix
minix: fix regression in minix_mkdir()
2010-09-09 18:57:25 -07:00
ncpfs
ncpfs: Lock socket in ncpfs while setting its callbacks
2010-10-05 11:02:14 +02:00
nfs
Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:01 -07:00
nfs_common
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
nfsd
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
nilfs2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
2010-10-23 01:26:47 -07:00
nls
…
notify
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
ntfs
BKL: Remove BKL from NTFS
2010-10-04 21:10:41 +02:00
ocfs2
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
omfs
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs
2010-08-10 11:47:36 -07:00
openpromfs
…
partitions
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
proc
Revert "tty: Add a new file /proc/tty/consoles"
2010-10-23 08:14:12 -07:00
qnx4
BKL: remove BKL from qnx4
2010-10-21 18:48:04 +02:00
quota
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
2010-08-10 11:26:52 -07:00
ramfs
check ATTR_SIZE contraints in inode_change_ok
2010-08-09 16:47:39 -04:00
reiserfs
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
romfs
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
smbfs
Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:01 -07:00
squashfs
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
sysfs
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2010-10-22 19:36:42 -07:00
sysv
fs/sysv/super.c: add support for non-PDP11 v7 filesystems
2010-08-11 08:59:23 -07:00
ubifs
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
2010-10-22 16:34:03 -07:00
udf
Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:01 -07:00
ufs
Merge branch 'vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:01 -07:00
xfs
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
2010-10-22 17:32:27 -07:00
aio.c
aio: do not return ERESTARTSYS as a result of AIO
2010-09-22 17:22:39 -07:00
anon_inodes.c
Revert "anon_inode: set S_IFREG on the anon_inode"
2010-05-27 22:03:05 -04:00
attr.c
check ATTR_SIZE contraints in inode_change_ok
2010-08-09 16:47:39 -04:00
bad_inode.c
bkl: Remove locked .ioctl file operation
2010-08-14 00:24:24 +02:00
binfmt_aout.c
Don't dump task struct in a.out core-dumps
2010-10-14 10:57:40 -07:00
binfmt_elf_fdpic.c
binfmt_elf_fdpic: Fix clear_user() error handling
2010-06-01 08:11:06 -07:00
binfmt_elf.c
ARM: 6342/1: fix ASLR of PIE executables
2010-10-08 10:02:53 +01:00
binfmt_em86.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
binfmt_flat.c
flat: tweak default stack alignment
2010-06-29 15:29:31 -07:00
binfmt_misc.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
binfmt_script.c
Make do_execve() take a const filename pointer
2010-08-17 18:07:43 -07:00
binfmt_som.c
Split 'flush_old_exec' into two functions
2010-01-29 08:22:01 -08:00
bio-integrity.c
fs/bio-integrity.c: return -ENOMEM on kmalloc failure
2010-08-23 13:36:59 +02:00
bio.c
block: unify flags for struct bio and struct request
2010-08-07 18:20:39 +02:00
block_dev.c
block: remove BLKDEV_IFL_WAIT
2010-09-16 20:52:58 +02:00
buffer.c
block: remove the BH_Eopnotsupp flag
2010-09-10 12:35:40 +02:00
char_dev.c
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
2010-10-22 10:52:56 -07:00
compat_binfmt_elf.c
elf coredump: replace ELF_CORE_EXTRA_* macros by functions
2010-03-06 11:26:45 -08:00
compat_ioctl.c
fix rawctl compat ioctls breakage on amd64 and itanic
2010-10-19 11:29:54 +02:00
compat.c
Prevent freeing uninitialized pointer in compat_do_readv_writev
2010-09-22 17:22:38 -07:00
dcache.c
fs: brlock vfsmount_lock
2010-08-18 08:35:48 -04:00
dcookies.c
…
direct-io.c
O_DIRECT: fix the splitting up of contiguous I/O
2010-09-09 18:57:22 -07:00
drop_caches.c
simplify checks for I_CLEAR/I_FREEING
2010-08-09 16:47:44 -04:00
eventfd.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
eventpoll.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
exec.c
Export dump_{write,seek} to binary loader modules
2010-10-14 19:15:28 -07:00
fcntl.c
vfs: take O_NONBLOCK out of the O_* uniqueness test
2010-09-09 18:57:25 -07:00
fifo.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
file_table.c
fs: scale files_lock
2010-08-18 08:35:48 -04:00
file.c
vfs: use kmalloc() to allocate fdmem if possible
2010-08-11 08:59:02 -07:00
filesystems.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
fs_struct.c
fs: fs_struct rwlock to spinlock
2010-08-18 08:35:46 -04:00
fs-writeback.c
writeback: always use sb->s_bdi for writeback purposes
2010-10-04 14:25:33 +02:00
generic_acl.c
vfs: update ctime when changing the file's permission by setfacl
2010-08-18 01:04:22 -04:00
inode.c
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
2010-08-10 11:39:13 -07:00
internal.h
fs: brlock vfsmount_lock
2010-08-18 08:35:48 -04:00
ioctl.c
bkl: Remove locked .ioctl file operation
2010-08-14 00:24:24 +02:00
ioprio.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
Kconfig
BKL: introduce CONFIG_BKL.
2010-10-21 15:44:13 +02:00
Kconfig.binfmt
…
libfs.c
libfs: Fix shift bug in generic_check_addressable()
2010-09-10 08:42:48 -07:00
locks.c
fs/locks.c: prepare for BKL removal
2010-10-05 11:02:04 +02:00
Makefile
Take statfs variants to fs/statfs.c
2010-05-21 18:31:17 -04:00
mbcache.c
mbcache: Limit the maximum number of cache entries
2010-08-18 06:24:41 -04:00
mpage.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
namei.c
fs: brlock vfsmount_lock
2010-08-18 08:35:48 -04:00
namespace.c
BKL: Remove BKL from do_new_mount()
2010-10-04 21:10:43 +02:00
nfsctl.c
Switch may_open() and break_lease() to passing O_...
2010-03-03 13:00:21 -05:00
no-block.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
open.c
fs: cleanup files_lock locking
2010-08-18 08:35:47 -04:00
pipe.c
pipe: fix failure to return error code on ->confirm()
2010-10-21 14:56:33 +02:00
pnode.c
fs: brlock vfsmount_lock
2010-08-18 08:35:48 -04:00
pnode.h
VFS: Clean up shared mount flag propagation
2010-03-03 14:07:55 -05:00
posix_acl.c
…
read_write.c
vfs: make no_llseek the default
2010-10-15 15:53:46 +02:00
read_write.h
…
readdir.c
vfs: fix warning: 'dirent' is used uninitialized in this function
2010-08-09 20:45:05 -07:00
select.c
Add generic sys_old_select()
2010-03-12 15:52:32 -08:00
seq_file.c
fs/seq_file.c: Remove unnecessary casts of private_data
2010-09-23 13:28:23 +02:00
signalfd.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
splice.c
splice: fix misuse of SPLICE_F_NONBLOCK
2010-08-07 18:52:56 +02:00
stack.c
VFS/fsstack: handle 32-bit smp + preempt + large files in fsstack_copy_inode_size
2009-12-17 10:58:17 -05:00
stat.c
Mark arguments to certain syscalls as being const
2010-08-13 16:53:13 -07:00
statfs.c
add f_flags to struct statfs(64)
2010-08-09 16:48:44 -04:00
super.c
fs: scale files_lock
2010-08-18 08:35:48 -04:00
sync.c
get rid of file_fsync()
2010-08-09 16:47:43 -04:00
timerfd.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
utimes.c
Mark arguments to certain syscalls as being const
2010-08-13 16:53:13 -07:00
xattr_acl.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
xattr.c
fs: xattr_handler table should be const
2010-05-21 18:31:18 -04:00