linux-kernel - linux-next: manual merge of the staging tree with the vfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160503164422.78369452@canb.auug.org.au>
Date:	Tue, 3 May 2016 16:44:22 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@....de>,
	"John L. Hammond" <john.hammond@...el.com>
Subject: linux-next: manual merge of the staging tree with the vfs tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/lustre/lustre/llite/rw26.c

between commit:

  c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO")

from the vfs tree and commit:

  8c7b0e1a6747 ("staging/lustre/llite: rename ccc_object to vvp_object")

from the staging tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/lustre/lustre/llite/rw26.c
index 0c3459c1a518,93411896aef0..000000000000
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@@ -364,8 -351,7 +350,8 @@@ static ssize_t ll_direct_IO_26(struct k
  	struct cl_io *io;
  	struct file *file = iocb->ki_filp;
  	struct inode *inode = file->f_mapping->host;
- 	struct ccc_object *obj = cl_inode2ccc(inode);
+ 	struct vvp_object *obj = cl_inode2vvp(inode);
 +	loff_t file_offset = iocb->ki_pos;
  	ssize_t count = iov_iter_count(iter);
  	ssize_t tot_bytes = 0, result = 0;
  	struct ll_inode_info *lli = ll_i2info(inode);