Hi all,
Today's linux-next merge of the notifications tree got a conflict in:
include/linux/pipe_fs_i.h
between commit:
f6dd975583bd ("pipe: merge anon_pipe_buf*_ops")
from the vfs tree and commits:
8cfba76383e9 ("pipe: Allow buffers to be marked read-whole-or-error for
notifications")
Hi all,
Today's linux-next merge of the notifications 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 notifications tree got a conflict in:
fs/mount.h
between commit:
9f6c61f96f2d ("proc/mounts: add cursor")
from the vfs tree and commit:
cd7109637b0b ("watch_queue: Implement mount topology and attribute change
notifications")
from the notificati
3 matches
Mail list logo