Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
arch/x86/kernel/fpu/xstate.c
between commit:
5714ee50bb43 ("copy_xstate_to_kernel: Fix typo which caused GDB regression")
from Linus' tree and commit:
0557d64d983e ("x86: switch to ->regset_get()")
from the vfs tree.
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
arch/x86/kernel/fpu/xstate.c
between commit:
5714ee50bb43 ("copy_xstate_to_kernel: Fix typo which caused GDB regression")
from Linus' tree and commit:
c196049cc732 ("x86: switch to ->regset_get()")
from the vfs tree.
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
kernel/cgroup/cgroup-v1.c
between commit:
3fc9c12d27b4 ("cgroup: Add named hierarchy disabling to cgroup_no_v1 boot
param")
from Linus' tree and commit:
b3678086951a ("kernfs, sysfs, cgroup, intel_rdt: Support fs_conte
Hi Al,
Today's linux-next merge of the vfs tree got conflicts in:
kernel/cgroup/cgroup.c
between commit:
e250d91d6575 ("cgroup: fix parsing empty mount option string")
from Linus' tree and commit:
b3678086951a ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")
from the vfs tree.
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/compat_ioctl.c
between commit:
77654350306a ("take compat TIOC[SG]SERIAL treatment into tty_compat_ioctl()")
from Linus' tree and commit:
69374d063be0 ("compat_ioctl: remove pointless HCI... ioctls")
from the vfs tre
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/afs/fsclient.c
between commit:
684b0f68cf1c ("afs: Fix AFSFetchStatus decoder to provide OpenAFS
compatibility")
from Linus' tree and commit:
c875c76a061d ("afs: Fix a Sparse warning in xdr_decode_AFSFetchStatus()")
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
ipc/mqueue.c
between commit:
1751e8a6cb93 ("Rename superblock flags (MS_xyz -> SB_xyz)")
from Linus' tree and commit:
946086abeddf ("mqueue: switch to on-demand creation of internal mount")
from the vfs tree.
I fixed i
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
drivers/net/ethernet/via/via-rhine.c
between commit:
a7e4fbbfdf79 ("net: via: via-rhine: use %p to format void * address instead
of %x")
from Linus' tree and commit:
68fef306c2a5 ("via: trivial sparse annotations")
fro
Hi Al,
On Wed, 29 Nov 2017 10:53:29 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the vfs tree got conflicts in several files
> due to commit:
>
> 1751e8a6cb93 ("Rename superblock flags (MS_xyz -> SB_xyz)")
>
> from Linus' tree and commit:
>
> c2c6773f9942 ("VFS: Roll out
Hi Al,
Today's linux-next merge of the vfs tree got conflicts in several files
due to commit:
1751e8a6cb93 ("Rename superblock flags (MS_xyz -> SB_xyz)")
from Linus' tree and commit:
c2c6773f9942 ("VFS: Roll out mount flag differentiation (MS_* -> SB_*)
generally")
from the vfs tree.
I j
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/afs/super.c
between commits:
f044c8847bb6 ("afs: Lay the groundwork for supporting network namespaces")
49566f6f06b3 ("afs: Note the cell in the superblock info also")
from Linus' tree and commit:
c2c6773f9942 ("VFS
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
drivers/block/nbd.c
between commit:
9dd5d3ab49f7 ("nbd: handle ERESTARTSYS properly")
from Linus' tree and commit:
7c09d0a53c27 ("backmerge of nbd.c changes, resolving conflicts")
from the vfs tree.
I fixed it up (I us
Stephen Rothwell wrote:
> Today's linux-next merge of the vfs tree got a conflict in:
>
> fs/proc/base.c
>
> between commit:
>
> 68eb94f16227 ("proc: Better ownership of files for non-dumpable tasks in
> user namespaces")
>
> from Linus' tree and commit:
>
> caffc373c573 ("statx: Add
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/proc/base.c
between commit:
68eb94f16227 ("proc: Better ownership of files for non-dumpable tasks in user
namespaces")
from Linus' tree and commit:
caffc373c573 ("statx: Add a system call to make enhanced file info
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
drivers/block/nbd.c
between commit:
d61b7f972dab ("nbd: only set MSG_MORE when we have more to send")
from Linus' tree and commit:
c9f2b6aeb922 ("[nbd] pass iov_iter to nbd_xmit()")
from the vfs tree.
I fixed it up (se
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/fuse/dir.c
between commits:
5e2b8828ff3d ("fuse: invalidate dir dentry after chmod")
a09f99eddef4 ("fuse: fix killing s[ug]id in setattr")
5e940c1dd3c1 ("fuse: handle killpriv in userspace fs")
60bcc88ad185 ("fuse:
As noted below, it is easier to remove the obsolete comments and I
just pushed the following trivial patch to cifs-2.6.git for-next to do
that.
https://git.samba.org/?p=sfrench/cifs-2.6.git;a=commit;h=fea17ae8ac1c8c44b2fd1c02ae2e15b847d327d1
On Wed, May 18, 2016 at 8:17 PM, Stephen Rothwell wr
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/cifs/cifsfs.c
between commit:
a9ae008f407b ("cifs: Switch to generic xattr handlers")
from Linus' tree and commit:
51085a1f913a ("cifs: use C99 syntax for inode_operations initializer")
from the vfs tree.
I fixed it
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/nfs/dir.c
between commit:
09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release}
macros")
from Linus' tree and commit:
586cf0326586 ("nfs: switch to ->iterate_shared()")
7d2dbb9faf05 ("fixups f
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/ecryptfs/mmap.c
between commit:
09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release}
macros")
from Linus' tree and commits:
ce23e6401334 ("->getxattr(): pass dentry and inode as separate argume
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/cifs/file.c
between commit:
09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release}
macros")
from Linus' tree and commits:
71335664c38f ("cifs: don't bother with kmap on read_pages side")
7d2dbb
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/nfs/nfs4proc.c
between commit:
d9dfd8d74168 ("NFSv4: Fix a dentry leak on alias use")
from Linus' tree and commit:
7635e19a39f6 ("replace d_add_unique() with saner primitive")
from the vfs tree.
I fixed it up (I jus
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/overlayfs/inode.c
between commit:
0f7ff2dabbc9 ("ovl: get rid of the dead code left from broken (and disabled)
optimizations")
from Linus' tree and commit:
58809fadd08b ("broken permission checks in overlayfs ->setattr
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/nfs/write.c between commit d15bc38df607 ("nfs: Provide and use
helper functions for marking a page as unstable") from Linus' tree and
commit d92dd5c34974 ("VFS: (Scripted) Convert ->d_inode to fs_inode()
in fs/nfs/") from the vfs
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/nfs/flexfilelayout/flexfilelayout.c between commit d15bc38df607
("nfs: Provide and use helper functions for marking a page as
unstable") from Linus' tree and commit d92dd5c34974 ("VFS: (Scripted)
Convert ->d_inode to fs_inode() i
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/nfs/filelayout/filelayout.c between commit 338d00cfef07 ("pnfs:
Refactor the *_layout_mark_request_commit to use
pnfs_layout_mark_request_commit") from Linus' tree and commit
d92dd5c34974 ("VFS: (Scripted) Convert ->d_inode to fs
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
drivers/infiniband/hw/qib/qib_fs.c between commit 041af0bb765a
("IB/qib: Fix sizeof checkpatch warnings") from Linus' tree and commit
271b063723fd ("VFS: (Scripted) Convert ->d_inode to fs_inode() in
drivers/infiniband/hw/qib/qib_fs
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
kernel/auditsc.c between commit fcf22d8267ad ("audit: create private
file name copies when auditing inodes") from Linus' tree and various
commits from the vfs tree.
I fixed it up (I used the vfs tree version as advised by Al) and c
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/splice.c
between commitb6dd6f473883 ("vfs: fix vmplice_to_user()") from Linus'
tree and commit 71d8e532b154 ("start adding the tag to iov_iter") from
the vfs tree.
I fixed it up (see below) and can carry the fix as necessary (n
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in mm/filemap.c
between commit b59b8cbca629 ("mm: fix new kernel-doc warning in
filemap.c") from Linus' tree and commit cbabd10029a4 ("write_iter
variants of {__,}generic_file_aio_write()") from the vfs tree.
I fixed it up (I used the
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/cifs/file.c
between commit c11f1df5003d ("cifs: Wait for writebacks to complete
before attempting write") from Linus' tree and commit 30b11990262e
("cifs: switch to ->write_iter()") from the vfs tree.
I fixed it up (I think - se
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/cifs/cifsfs.c between commit c11f1df5003d ("cifs: Wait for writebacks
to complete before attempting write") from Linus' tree and commit
30b11990262e ("cifs: switch to ->write_iter()") from the vfs tree.
I fixed it up (maybe - se
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
drivers/usb/core/file.c between commit 469271f8c48f ("drivers: usb: core:
{file,hub,sysfs,usb}.c: Whitespace fixes") from Linus' tree and commit
e84f9e57b90c ("consolidate the reassignments of ->f_op in ->open()
instances") from the
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/dcache.c
between commit 98474236f72e ("vfs: make the dentry cache use the lockref
infrastructure") from Linus' tree and commit 590fb51f1cf9 ("vfs: call
d_op->d_prune() before unhashing dentry") from the vfs tree.
I fixed it up (
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/coredump.c
between commit acdedd99b0f3 ("coredump: sanitize the setting of
signal->group_exit_code") from Linus' tree and commit 03d95eb2f257 ("lift
sb_start_write() out of ->write()") from the vfs tree.
I fixed it up (see below
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/compat.c
between commit 76b021d053ed ("convert vmsplice to COMPAT_SYSCALL_DEFINE")
from Linus' tree and commit 72ec35163f9f ("switch compat readv/writev
variants to COMPAT_SYSCALL_DEFINE") from the vfs tree.
I fixed it up (see b
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/proc/internal.h between commit db3808c1bac6 ("mm, vmalloc: move
get_vmalloc_info() to vmalloc.c") from Linus' tree and commit
ae8970dd9ccb ("proc: Move non-public stuff from linux/proc_fs.h to
fs/proc/internal.h") from the vfs tr
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
drivers/firmware/efivars.c between commit 0635eb8a54cf ("Move utf16
functions to kernel core and rename") from Linus' tree and commit
a2162ae42bc4 ("Include missing linux/magic.h inclusions") from the vfs
tree.
I fixed it up (see b
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/stat.c
between commit 55815f70147d ("vfs: make O_PATH file descriptors usable
for 'fstat()'") from Linus' tree and commit 19ba95358327 ("switch simple
cases of fget_light to fdget") from the vfs tree.
I just used the vfs tree ve
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
drivers/usb/gadget/storage_common.c between commit d6e16a89578f ("usb:
gadget: mass_storage: fail fsg_store_file() early if colud not open
file") from Linus' tree and commit 20818a0caa84 ("gadgetfs: clean up")
from the vfs tree.
Co
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
drivers/staging/gdm72xx/usb_boot.c between commit d67030d215ac
("staging/gdm72xx: return PTR_ERR rather -ENOENT") from Linus' tree and
commit 09fada5b5f1f ("slightly reduce lossage in gdm72xx") from the vfs
tree.
Just context chang
41 matches
Mail list logo
