Hi all,
Today's linux-next merge of the akpm tree got conflicts in:
arch/alpha/kernel/syscalls/syscall.tbl
arch/arm/tools/syscall.tbl
arch/arm64/include/asm/unistd.h
arch/arm64/include/asm/unistd32.h
arch/ia64/kernel/syscalls/syscall.tbl
arch/m68k/kernel/syscalls/syscall.tbl
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
fs/block_dev.c
between commit:
6d46d2934aea ("fs/block_dev.c: remove unused include")
from the vfs tree and patch:
"fs/block_dev.c: Remove duplicate header"
from the akpm tree.
I fixed it up (see below) and can
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/vmalloc.c
between commits:
fddda2b7b521 ("proc: introduce proc_create_seq{,_data}")
44414d82cfe0 ("proc: introduce proc_create_seq_private")
from the vfs tree and patch:
"mm: use octal not symbolic
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/vmalloc.c
between commits:
fddda2b7b521 ("proc: introduce proc_create_seq{,_data}")
44414d82cfe0 ("proc: introduce proc_create_seq_private")
from the vfs tree and patch:
"mm: use octal not symbolic
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
ipc/mqueue.c
between commits:
3ec41d6c2257 ("tidy do_mq_open() up a bit")
946086abeddf ("mqueue: switch to on-demand creation of internal mount")
from the vfs tree and patch:
"ipc, mqueue: lazy call
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
ipc/mqueue.c
between commits:
3ec41d6c2257 ("tidy do_mq_open() up a bit")
946086abeddf ("mqueue: switch to on-demand creation of internal mount")
from the vfs tree and patch:
"ipc, mqueue: lazy call
On Mon, 2016-12-12 at 16:52 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Al let me know that he had put a newer version of the autofs patches
> into his vfs tree, so I have dropped the following patches from the akpm
> tree today:
>
> vfs: change d_manage() to take a struct path
> vfs: add
On Mon, 2016-12-12 at 16:52 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Al let me know that he had put a newer version of the autofs patches
> into his vfs tree, so I have dropped the following patches from the akpm
> tree today:
>
> vfs: change d_manage() to take a struct path
> vfs: add
Hi all,
Al let me know that he had put a newer version of the autofs patches
into his vfs tree, so I have dropped the following patches from the akpm
tree today:
vfs: change d_manage() to take a struct path
vfs: add path_is_mountpoint() helper
vfs: fix boolreturn.cocci warnings
vfs: add
Hi all,
Al let me know that he had put a newer version of the autofs patches
into his vfs tree, so I have dropped the following patches from the akpm
tree today:
vfs: change d_manage() to take a struct path
vfs: add path_is_mountpoint() helper
vfs: fix boolreturn.cocci warnings
vfs: add
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
include/linux/fs.h between commit ed44724b79d8 ("acct: switch to
__kernel_write()") from the vfs tree and commit "fs.h: remove
unnecessary extern prototypes" from the akpm tree.
I fixed it up (see below) and can carry the fix
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
include/linux/fs.h between commit ed44724b79d8 (acct: switch to
__kernel_write()) from the vfs tree and commit fs.h: remove
unnecessary extern prototypes from the akpm tree.
I fixed it up (see below) and can carry the fix as
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in fs/super.c
between commit d040790391f2 ("prune_super(): sb->s_op is never NULL")
from the vfs tree and commit "fs: convert inode and dentry shrinking to
be node aware" from the akpm tree.
I fixed it up (see below) and can
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in fs/super.c
between commit d040790391f2 (prune_super(): sb-s_op is never NULL)
from the vfs tree and commit fs: convert inode and dentry shrinking to
be node aware from the akpm tree.
I fixed it up (see below) and can carry
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
include/linux/fs.h between commit 7b7a8665edd8 ("direct-io: Implement
generic deferred AIO completions") from the vfs tree and commit "dcache:
convert to use new lru list infrastructure" from the akpm tree.
I fixed it up (see
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
include/linux/fs.h between commit 7b7a8665edd8 (direct-io: Implement
generic deferred AIO completions) from the vfs tree and commit dcache:
convert to use new lru list infrastructure from the akpm tree.
I fixed it up (see
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in ipc/util.c
between commit 823a5ed16606 ("ipc_schedule_free() can do vfree() now")
from the vfs tree and commit "ipc: make refcounter atomic" from the akpm
tree.
I fixed it up (I hope - see below) and can carry the fix as
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in ipc/msgutil.c
between commit b3ecda5869da ("proc: Split the namespace stuff out into
linux/proc_ns.h") from the vfs tree and commit "ipc/msgutil.c: use
linux/uaccess.h" from the akpm tree.
I fixed it up (see below) and can
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/proc/internal.h between commit 4608da4a9433 ("proc: Move non-public
stuff from linux/proc_fs.h to fs/proc/internal.h") from the vfs tree and
commit "mm, vmalloc: move get_vmalloc_info() to vmalloc.c" from the akpm
tree.
I
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/proc/internal.h between commit 4608da4a9433 (proc: Move non-public
stuff from linux/proc_fs.h to fs/proc/internal.h) from the vfs tree and
commit mm, vmalloc: move get_vmalloc_info() to vmalloc.c from the akpm
tree.
I
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in ipc/msgutil.c
between commit b3ecda5869da (proc: Split the namespace stuff out into
linux/proc_ns.h) from the vfs tree and commit ipc/msgutil.c: use
linux/uaccess.h from the akpm tree.
I fixed it up (see below) and can carry
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in ipc/util.c
between commit 823a5ed16606 (ipc_schedule_free() can do vfree() now)
from the vfs tree and commit ipc: make refcounter atomic from the akpm
tree.
I fixed it up (I hope - see below) and can carry the fix as
Hi Al,
On Thu, 4 Apr 2013 09:10:11 +0100 Al Viro wrote:
>
> On Thu, Apr 04, 2013 at 12:02:53AM -0700, Andrew Morton wrote:
>
> > > Well perhaps the vfs tree should start paying some attention to the
> > > rest of the world, particularly after -rc5.
> >
> > I can't even find this "lift
On 04/04/2013 03:02 AM, Al Viro wrote:
On Wed, Apr 03, 2013 at 11:56:34PM -0700, Andrew Morton wrote:
On Thu, 4 Apr 2013 17:26:48 +1100 Stephen Rothwell
wrote:
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/proc/generic.c between several commits from the vfs tree
On Thu 04-04-13 17:12:11, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got conflicts in mm/filemap.c,
> fs/xfs/xfs_file.c, fs/splice.c, fs/ocfs2/file.c, fs/ntfs/file.c,
> fs/fuse/file.c, fs/cifs/file.c and fs/btrfs/file.c between commit
> 36bd5dc0c4e2 ("lift
On Thu, Apr 04, 2013 at 12:02:53AM -0700, Andrew Morton wrote:
> > Well perhaps the vfs tree should start paying some attention to the
> > rest of the world, particularly after -rc5.
>
> I can't even find this "lift sb_start_write() out of ->write()". Not on
> fsdevel,
> not on lkml. What the
On Wed, Apr 03, 2013 at 11:56:34PM -0700, Andrew Morton wrote:
> On Thu, 4 Apr 2013 17:26:48 +1100 Stephen Rothwell
> wrote:
>
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm tree got a conflict in
> > fs/proc/generic.c between several commits from the vfs tree and commit
> >
On Wed, 3 Apr 2013 23:56:34 -0700 Andrew Morton
wrote:
> On Thu, 4 Apr 2013 17:26:48 +1100 Stephen Rothwell
> wrote:
>
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm tree got a conflict in
> > fs/proc/generic.c between several commits from the vfs tree and commit
> > "procfs:
On Thu, 4 Apr 2013 17:26:48 +1100 Stephen Rothwell
wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> fs/proc/generic.c between several commits from the vfs tree and commit
> "procfs: improve scaling in proc" from the akpm tree.
>
> I just dropped the akpm
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/proc/generic.c between several commits from the vfs tree and commit
"procfs: improve scaling in proc" from the akpm tree.
I just dropped the akpm tree patch (and the following
"procfs-improve-scaling-in-proc-v5") as the
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in fs/coredump.c
between commit d9fe6ea81efe ("lift sb_start_write() out of ->write()")
from the vfs tree and commit "coredump: sanitize the setting of
signal->group_exit_code" from the akpm tree.
I fixed it up (see below) and
Hi Andrew,
Today's linux-next merge of the akpm tree got conflicts in mm/filemap.c,
fs/xfs/xfs_file.c, fs/splice.c, fs/ocfs2/file.c, fs/ntfs/file.c,
fs/fuse/file.c, fs/cifs/file.c and fs/btrfs/file.c between commit
36bd5dc0c4e2 ("lift sb_start_write/sb_end_write out of ->aio_write()")
from the
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
sound/core/info.c between commit d1ffe1db6641 ("snd_info_register: switch
to proc_create_data/proc_mkdir_mode") from the vfs tree and commit
"sound: convert snd_info_register() to use proc_create_data()" from the
akpm tree.
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
sound/core/info.c between commit d1ffe1db6641 (snd_info_register: switch
to proc_create_data/proc_mkdir_mode) from the vfs tree and commit
sound: convert snd_info_register() to use proc_create_data() from the
akpm tree.
It
Hi Andrew,
Today's linux-next merge of the akpm tree got conflicts in mm/filemap.c,
fs/xfs/xfs_file.c, fs/splice.c, fs/ocfs2/file.c, fs/ntfs/file.c,
fs/fuse/file.c, fs/cifs/file.c and fs/btrfs/file.c between commit
36bd5dc0c4e2 (lift sb_start_write/sb_end_write out of -aio_write())
from the vfs
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in fs/coredump.c
between commit d9fe6ea81efe (lift sb_start_write() out of -write())
from the vfs tree and commit coredump: sanitize the setting of
signal-group_exit_code from the akpm tree.
I fixed it up (see below) and can
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/proc/generic.c between several commits from the vfs tree and commit
procfs: improve scaling in proc from the akpm tree.
I just dropped the akpm tree patch (and the following
procfs-improve-scaling-in-proc-v5) as the
On Thu, 4 Apr 2013 17:26:48 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/proc/generic.c between several commits from the vfs tree and commit
procfs: improve scaling in proc from the akpm tree.
I just
On Wed, 3 Apr 2013 23:56:34 -0700 Andrew Morton a...@linux-foundation.org
wrote:
On Thu, 4 Apr 2013 17:26:48 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/proc/generic.c between several commits from the
On Wed, Apr 03, 2013 at 11:56:34PM -0700, Andrew Morton wrote:
On Thu, 4 Apr 2013 17:26:48 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/proc/generic.c between several commits from the vfs tree and commit
On Thu, Apr 04, 2013 at 12:02:53AM -0700, Andrew Morton wrote:
Well perhaps the vfs tree should start paying some attention to the
rest of the world, particularly after -rc5.
I can't even find this lift sb_start_write() out of -write(). Not on
fsdevel,
not on lkml. What the heck is it
On Thu 04-04-13 17:12:11, Stephen Rothwell wrote:
Hi Andrew,
Today's linux-next merge of the akpm tree got conflicts in mm/filemap.c,
fs/xfs/xfs_file.c, fs/splice.c, fs/ocfs2/file.c, fs/ntfs/file.c,
fs/fuse/file.c, fs/cifs/file.c and fs/btrfs/file.c between commit
36bd5dc0c4e2 (lift
On 04/04/2013 03:02 AM, Al Viro wrote:
On Wed, Apr 03, 2013 at 11:56:34PM -0700, Andrew Morton wrote:
On Thu, 4 Apr 2013 17:26:48 +1100 Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/proc/generic.c between several
Hi Al,
On Thu, 4 Apr 2013 09:10:11 +0100 Al Viro v...@zeniv.linux.org.uk wrote:
On Thu, Apr 04, 2013 at 12:02:53AM -0700, Andrew Morton wrote:
Well perhaps the vfs tree should start paying some attention to the
rest of the world, particularly after -rc5.
I can't even find this lift
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/sysfs/bin.c between commit 496ad9aa8ef4 ("new helper: file_inode
(file)") from the vfs tree and commit "hlist: drop the node parameter
from iterators" from the akpm tree.
I fixed it up (see below) and can carry the fix as
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/sysfs/bin.c between commit 496ad9aa8ef4 (new helper: file_inode
(file)) from the vfs tree and commit hlist: drop the node parameter
from iterators from the akpm tree.
I fixed it up (see below) and can carry the fix as
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/proc/base.c between commit c8506285ded8 ("procfs: Move /proc/pid/fd
[info] handling code to fd.[ch]") from the vfs tree and commit "coredump:
use SUID_DUMPABLE_ENABLED rather than hardcoded 1" from the akpm tree.
I fixed
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/ia64/kernel/perfmon.c between commit f9bd4f3ed24d ("make get_file()
return its argument") from the vfs tree and commit "mm: kill vma flag
VM_RESERVED and mm->reserved_vm counter" from the akpm tree.
I fixed it up (see
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/nommu.c
between commit f9bd4f3ed24d ("make get_file() return its argument") from
the vfs tree and commit "mm: kill vma flag VM_EXECUTABLE and
mm->num_exe_file_vmas" from the akpm tree.
I fixed it up (see below) and can
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/nommu.c
between commit f9bd4f3ed24d (make get_file() return its argument) from
the vfs tree and commit mm: kill vma flag VM_EXECUTABLE and
mm-num_exe_file_vmas from the akpm tree.
I fixed it up (see below) and can carry
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/ia64/kernel/perfmon.c between commit f9bd4f3ed24d (make get_file()
return its argument) from the vfs tree and commit mm: kill vma flag
VM_RESERVED and mm-reserved_vm counter from the akpm tree.
I fixed it up (see below)
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/proc/base.c between commit c8506285ded8 (procfs: Move /proc/pid/fd
[info] handling code to fd.[ch]) from the vfs tree and commit coredump:
use SUID_DUMPABLE_ENABLED rather than hardcoded 1 from the akpm tree.
I fixed it up
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/cachefiles/rdwr.c between commit e89cdeffe531 ("switch dentry_open()
to struct path, make it grab references itself") from the vfs, tree and
commit "fs: cachefiles: add support for large files in filesystem
caching" from
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/cachefiles/rdwr.c between commit e89cdeffe531 (switch dentry_open()
to struct path, make it grab references itself) from the vfs, tree and
commit fs: cachefiles: add support for large files in filesystem
caching from the
54 matches
Mail list logo
