]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7a3bd1 8c34e2d)
Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 21 Oct 2006 17:01:52 +0000 (10:01 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 21 Oct 2006 17:01:52 +0000 (10:01 -0700)
* 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Remove SUID when splicing into an inode
  [PATCH] Add lockless helpers for remove_suid()
  [PATCH] Introduce generic_file_splice_write_nolock()
  [PATCH] Take i_mutex in splice_from_pipe()

1  2 
mm/filemap.c patch | diff1 | diff2 | blob | history

diff --cc mm/filemap.c
Simple merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG