Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
kernel/cgroup/cgroup.c
between commit:
58e4e43911f8 ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")
from the vfs tree and commit:
dbe8cec5a8a3 ("mm, oom: add cgroup v2 mount option for cgroup-aware OOM
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/proc/base.c
between commit:
0168b9e38c42 ("procfs: switch instantiate_t to d_splice_alias()")
from the vfs tree and commit:
a1cb629945be ("proc: skip branch in /proc/*/* lookup")
from the akpm-current tree.
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/hugetlbfs/inode.c
between commit:
4a25220d4e43 ("hugetlbfs: Implement show_options")
from the vfs tree and commit:
25153b1fbd8a ("mm: hwpoison: dissolve in-use hugepage in unrecoverable memory
error")
f
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/adfs/adfs.h
since it appears that "adfs: constify adfs_dir_ops structures" has been applied
by Al Viro. There was no conflict to resolve but git still flagged it as a
conflict
for some reason.
pgp35AjwPaPEu.pgp
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/ufs/namei.c
between commit:
a50e4a02ad69 "ufs: don't bother with lock_ufs()/unlock_ufs() for directory
access"
from the vfs tree and commit:
2ce1efe3965b "fs/ufs: revert "ufs: fix deadlocks introduced by
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/hfsplus/xattr.h between commit 5dd3dc06371a ("VFS: normal
filesystems (and lustre): d_inode() annotations") from the vfs tree and
commits 2c14e8b354bd ("fs/hfsplus: move xattr_name allocation in
hfsplus_getxattr()")
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/befs/linuxvfs.c between commit 5dd3dc06371a ("VFS: normal
filesystems (and lustre): d_inode() annotations") from the vfs tree and
commit badfbaf2a80c ("befs: replace typedef befs_inode_info by
structure") from the ak
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/affs/amigaffs.c between commit 5dd3dc06371a ("VFS: normal
filesystems (and lustre): d_inode() annotations") from the vfs tree and
commit 18da6e382823 ("fs/affs: use AFFS_MOUNT prefix for mount
options") from the akpm
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
lib/Makefile between commit d879cb83417a ("move iov_iter.c from mm/ to
lib/") from the vfs tree and commits 2e731a72801a ("lib: move
find_last_bit to lib/find_next_bit.c") and 2bbf16381c7a ("lib: rename
lib/find_next_bi
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/fat/inode.c between commit 3737c63e1fb0 ("fs: move struct kiocb to
fs.h") from the vfs tree and commit be33247df543 ("fs/fat: remove
unnecessary includes") from the akpm-current tree.
I fixed it up (see below) and c
On Fri, Nov 08, 2013 at 06:38:06PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in
> include/linux/lglock.h between commit 4314ff760e8b ("no need to keep
> brlock macros anymore...") from the vfs tree and commit f5639052d567
> ("l
On 11/08, Oleg Nesterov wrote:
>
> On 11/08, Stephen Rothwell wrote:
> >
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in
> > fs/anon_inodes.c between commit 24b0303e9532 ("take anon inode allocation
> > to libfs.c") from the vfs tree and commit 02f3ac4386d
On 11/08, Stephen Rothwell wrote:
>
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in
> fs/anon_inodes.c between commit 24b0303e9532 ("take anon inode allocation
> to libfs.c") from the vfs tree and commit 02f3ac4386d9 ("anon_inodefs:
> forbid open via /proc") fro
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
include/linux/lglock.h between commit 4314ff760e8b ("no need to keep
brlock macros anymore...") from the vfs tree and commit f5639052d567
("lglock: map to spinlock when !CONFIG_SMP") from the akpm-current tree.
I fixed
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/autofs4/inode.c between commit baa40671d3e3 ("autofs4: make freeing
sbi rcu-delayed") from the vfs tree and commit e4af471815fc ("autofs4:
allow autofs to work outside the initial PID namespace") from the
akpm-curren
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/anon_inodes.c between commit 24b0303e9532 ("take anon inode allocation
to libfs.c") from the vfs tree and commit 02f3ac4386d9 ("anon_inodefs:
forbid open via /proc") from the akpm-current tree.
I just dropped the ak
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
fs/proc/inode.c between commit d3d009cb965e ("saner proc_get_inode()
calling conventions") from the vfs tree and commit "fs/proc: clean up
printks" from the akpm-current tree.
I fixed it up (see below) and can carry th
17 matches
Mail list logo
