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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1192 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lustre/llite/file.c between commit bc281d072ba9
("lustre: opened file can't have negative dentry") from the vfs tree
and commit 57303e76c225 ("staging: lustre: Fix checkpatch.pl
spacing-related errors") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/lustre/lustre/llite/file.c
index a2ae9a68a9a0,a5acc98a1c99..000000000000
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@@ -266,10 -266,6 +266,11 @@@ static int ll_md_close(struct obd_expor
  {
  	struct ll_file_data *fd = LUSTRE_FPRIVATE(file);
  	struct ll_inode_info *lli = ll_i2info(inode);
 +	int lockmode;
 +	__u64 flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_TEST_LOCK;
 +	struct lustre_handle lockh;
- 	ldlm_policy_data_t policy = {.l_inodebits={MDS_INODELOCK_OPEN}};
++	ldlm_policy_data_t policy = {
++	.l_inodebits = {MDS_INODELOCK_OPEN} };
  	int rc = 0;
  
  	/* clear group lock, if present */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Greg KH]

On Mon, Nov 03, 2014 at 01:29:14PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/lustre/lustre/llite/file.c between commit bc281d072ba9
> ("lustre: opened file can't have negative dentry") from the vfs tree
> and commit 57303e76c225 ("staging: lustre: Fix checkpatch.pl
> spacing-related errors") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for all of these fixes, they look correct to me.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1532 bytes --]

Hi all,

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

  drivers/staging/exfat/Kconfig
  MAINTAINERS

between commits:

  88ab55f16aae ("MAINTAINERS: add exfat filesystem")
  1a3c0509ce83 ("staging: exfat: make staging/exfat and fs/exfat mutually exclusive")

from the vfs tree and commit:

  590a95e418d1 ("staging: exfat: remove staging version of exfat filesystem")

from the staging tree.

I fixed it up (I removed the first file and 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.

diff --cc MAINTAINERS
index 4698de48c727,836f1e262b4e..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6361,19 -6301,6 +6356,13 @@@ F:	include/trace/events/mdio.
  F:	include/uapi/linux/mdio.h
  F:	include/uapi/linux/mii.h
  
 +EXFAT FILE SYSTEM
 +M:	Namjae Jeon <namjae.jeon@samsung.com>
 +M:	Sungjong Seo <sj1557.seo@samsung.com>
 +L:	linux-fsdevel@vger.kernel.org
 +S:	Maintained
 +F:	fs/exfat/
 +
- EXFAT FILE SYSTEM
- M:	Valdis Kletnieks <valdis.kletnieks@vt.edu>
- L:	linux-fsdevel@vger.kernel.org
- S:	Maintained
- F:	drivers/staging/exfat/
- 
  EXT2 FILE SYSTEM
  M:	Jan Kara <jack@suse.com>
  L:	linux-ext4@vger.kernel.org

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Greg KH]

On Thu, Mar 12, 2020 at 04:16:57PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got conflicts in:
> 
>   drivers/staging/exfat/Kconfig
>   MAINTAINERS
> 
> between commits:
> 
>   88ab55f16aae ("MAINTAINERS: add exfat filesystem")
>   1a3c0509ce83 ("staging: exfat: make staging/exfat and fs/exfat mutually exclusive")
> 
> from the vfs tree and commit:
> 
>   590a95e418d1 ("staging: exfat: remove staging version of exfat filesystem")
> 
> from the staging tree.
> 
> I fixed it up (I removed the first file and 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.
> 
> diff --cc MAINTAINERS
> index 4698de48c727,836f1e262b4e..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -6361,19 -6301,6 +6356,13 @@@ F:	include/trace/events/mdio.
>   F:	include/uapi/linux/mdio.h
>   F:	include/uapi/linux/mii.h
>   
>  +EXFAT FILE SYSTEM
>  +M:	Namjae Jeon <namjae.jeon@samsung.com>
>  +M:	Sungjong Seo <sj1557.seo@samsung.com>
>  +L:	linux-fsdevel@vger.kernel.org
>  +S:	Maintained
>  +F:	fs/exfat/
>  +
> - EXFAT FILE SYSTEM
> - M:	Valdis Kletnieks <valdis.kletnieks@vt.edu>
> - L:	linux-fsdevel@vger.kernel.org
> - S:	Maintained
> - F:	drivers/staging/exfat/
> - 
>   EXT2 FILE SYSTEM
>   M:	Jan Kara <jack@suse.com>
>   L:	linux-ext4@vger.kernel.org
> 

Patch looks good to me, thanks!

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 925 bytes --]

Hi all,

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

  drivers/staging/dgnc/dgnc_tty.c

between commits:

  b68166ef8fd9 ("dgnc: leave TIOC[GS]SOFTCAR to ldisc")
  e002c6f1ccb9 ("dgnc: don't bother with (empty) stub for TCXONC")
  79273fc94ee9 ("dgnc: break-related ioctls won't reach ->ioctl()")
  246d394c9cc5 ("dgnc: TIOCM... won't reach ->ioctl()")

from the vfs tree and commit:

  3268357865d6 ("staging: dgnc: delete the driver")

from the staging tree.

I fixed it up (I just removed the file) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Greg KH]

On Tue, Oct 09, 2018 at 03:59:45PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/dgnc/dgnc_tty.c
> 
> between commits:
> 
>   b68166ef8fd9 ("dgnc: leave TIOC[GS]SOFTCAR to ldisc")
>   e002c6f1ccb9 ("dgnc: don't bother with (empty) stub for TCXONC")
>   79273fc94ee9 ("dgnc: break-related ioctls won't reach ->ioctl()")
>   246d394c9cc5 ("dgnc: TIOCM... won't reach ->ioctl()")
> 
> from the vfs tree and commit:
> 
>   3268357865d6 ("staging: dgnc: delete the driver")
> 
> from the staging tree.
> 
> I fixed it up (I just removed the file) and can carry the fix as
> necessary.

Removing the file is correct, thanks.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 904 bytes --]

Hi Greg,

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

  drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c
  drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c

between commit:

  304ec482f562 ("get rid of pointless includes of fs_struct.h")

from the vfs tree and commits:

  37d3b407dc14 ("staging: lustre: remove linux-curproc.c")
  6b7936ceefa7 ("staging: lustre: make signal-blocking functions inline")

from the staging tree.

I fixed it up (I just removed the files) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Greg KH]

On Tue, Mar 13, 2018 at 03:22:40PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in:
> 
>   drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c
>   drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
> 
> between commit:
> 
>   304ec482f562 ("get rid of pointless includes of fs_struct.h")
> 
> from the vfs tree and commits:
> 
>   37d3b407dc14 ("staging: lustre: remove linux-curproc.c")
>   6b7936ceefa7 ("staging: lustre: make signal-blocking functions inline")
> 
> from the staging tree.
> 
> I fixed it up (I just removed the files) and can carry the fix as
> necessary.

Sounds like the correct fix, thanks.

greg k-h

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

[Stephen Rothwell]

Hi Greg,

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

  drivers/staging/most/video/video.c

between commit:

  afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances")

from the vfs tree and commit:

  1b10a0316e2d ("staging: most: video: remove aim designators")

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/most/video/video.c
index 7783bc2dd9f5,098873851646..000000000000
--- a/drivers/staging/most/video/video.c
+++ b/drivers/staging/most/video/video.c
@@@ -209,11 -203,11 +203,11 @@@ static ssize_t comp_vdev_read(struct fi
  	return ret;
  }
  
- static __poll_t aim_vdev_poll(struct file *filp, poll_table *wait)
 -static unsigned int comp_vdev_poll(struct file *filp, poll_table *wait)
++static __poll_t comp_vdev_poll(struct file *filp, poll_table *wait)
  {
- 	struct aim_fh *fh = filp->private_data;
+ 	struct comp_fh *fh = filp->private_data;
  	struct most_video_dev *mdev = fh->mdev;
 -	unsigned int mask = 0;
 +	__poll_t mask = 0;
  
  	/* only wait if no data is available */
  	if (!data_ready(mdev))

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

[Greg KH]

On Mon, Dec 04, 2017 at 01:06:49PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/most/video/video.c
> 
> between commit:
> 
>   afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances")
> 
> from the vfs tree and commit:
> 
>   1b10a0316e2d ("staging: most: video: remove aim designators")
> 
> 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.

Fix looks correct to me, thanks.

greg k-h

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

[Stephen Rothwell]

Hi Greg,

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

  drivers/staging/most/cdev/cdev.c

between commit:

  afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances")

from the vfs tree and commit:

  1fd923f38610 ("staging: most: cdev: replace function prefix")

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/most/cdev/cdev.c
index 69f530972273,dd9456fd2cd6..000000000000
--- a/drivers/staging/most/cdev/cdev.c
+++ b/drivers/staging/most/cdev/cdev.c
@@@ -287,10 -283,10 +283,10 @@@ comp_read(struct file *filp, char __use
  	return copied;
  }
  
- static __poll_t aim_poll(struct file *filp, poll_table *wait)
 -static unsigned int comp_poll(struct file *filp, poll_table *wait)
++static __poll_t comp_poll(struct file *filp, poll_table *wait)
  {
- 	struct aim_channel *c = filp->private_data;
+ 	struct comp_channel *c = filp->private_data;
 -	unsigned int mask = 0;
 +	__poll_t mask = 0;
  
  	poll_wait(filp, &c->wq, wait);
  

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

[Greg KH]

On Mon, Dec 04, 2017 at 12:58:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/most/cdev/cdev.c
> 
> between commit:
> 
>   afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances")
> 
> from the vfs tree and commit:
> 
>   1fd923f38610 ("staging: most: cdev: replace function prefix")
> 
> 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.

Fix looks correct to me, thanks.

greg k-h

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

[Stephen Rothwell]

Hi Greg,

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

  drivers/staging/pi433/pi433_if.c

between commit:

  f81f0b5c9a30 ("pi433: sanitize ioctl")

from the vfs tree and commit:

  69af5d92da20 ("Staging: pi433: Fix the position of brace after if")

from the staging tree.

I fixed it up (I just used the vfs tree version (for the conflicting bits)
as suggested by Al) 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

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

[Greg KH]

On Thu, Nov 09, 2017 at 03:01:26PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/pi433/pi433_if.c
> 
> between commit:
> 
>   f81f0b5c9a30 ("pi433: sanitize ioctl")
> 
> from the vfs tree and commit:
> 
>   69af5d92da20 ("Staging: pi433: Fix the position of brace after if")
> 
> from the staging tree.
> 
> I fixed it up (I just used the vfs tree version (for the conflicting bits)
> as suggested by Al) and can carry the fix as necessary.

Sounds like the correct fix, thanks.

greg k-h

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

[Stephen Rothwell]

Hi Greg,

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

  drivers/staging/lustre/lustre/llite/statahead.c

between commit:

  7126bc2e8d60 ("lustre: switch to use of ->d_init()")

from the vfs tree and commit:

  3c8fb1b105cd ("staging: lustre: statahead: set sai_index_wait with lli_sa_lock held")

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/statahead.c
index 166323fddc44,4769a2230ae1..000000000000
--- a/drivers/staging/lustre/lustre/llite/statahead.c
+++ b/drivers/staging/lustre/lustre/llite/statahead.c
@@@ -1512,8 -1519,9 +1519,7 @@@ out_unplug
  	 * dentry_may_statahead().
  	 */
  	ldd = ll_d2d(*dentryp);
- 	lli = ll_i2info(dir);
 -	/* ldd can be NULL if llite lookup failed. */
 -	if (ldd)
 -		ldd->lld_sa_generation = lli->lli_sa_generation;
 +	ldd->lld_sa_generation = lli->lli_sa_generation;
  	sa_put(sai, entry);
  	return rc;
  }

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

[Stephen Rothwell]

Hi Greg,

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

  drivers/staging/lustre/lustre/llite/file.c

between commit:

  47b34458fc93 ("lustre: use %pD")

from the vfs tree and commit:

  bb5c7f2630de ("staging: lustre: changelog: fix comparison between signed and unsigned")

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/file.c
index 23249b3e6cad,5d4d17f2de61..000000000000
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@@ -1141,8 -1123,8 +1123,8 @@@ ll_file_io_generic(const struct lu_env 
  	struct cl_io	 *io;
  	ssize_t	       result;
  
- 	CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zd\n",
 -	CDEBUG(D_VFSTRACE, "file: %s, type: %d ppos: %llu, count: %zu\n",
 -	       file->f_path.dentry->d_name.name, iot, *ppos, count);
++	CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zu\n",
 +	       file, iot, *ppos, count);
  
  restart:
  	io = vvp_env_thread_io(env);

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

[Greg KH]

On Tue, Sep 20, 2016 at 03:03:27PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/lustre/lustre/llite/file.c
> 
> between commit:
> 
>   47b34458fc93 ("lustre: use %pD")
> 
> from the vfs tree and commit:
> 
>   bb5c7f2630de ("staging: lustre: changelog: fix comparison between signed and unsigned")
> 
> 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/file.c
> index 23249b3e6cad,5d4d17f2de61..000000000000
> --- a/drivers/staging/lustre/lustre/llite/file.c
> +++ b/drivers/staging/lustre/lustre/llite/file.c
> @@@ -1141,8 -1123,8 +1123,8 @@@ ll_file_io_generic(const struct lu_env 
>   	struct cl_io	 *io;
>   	ssize_t	       result;
>   
> - 	CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zd\n",
>  -	CDEBUG(D_VFSTRACE, "file: %s, type: %d ppos: %llu, count: %zu\n",
>  -	       file->f_path.dentry->d_name.name, iot, *ppos, count);
> ++	CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zu\n",
>  +	       file, iot, *ppos, count);

Fixup looks good to me, thanks for doing this.

greg k-h

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

[Stephen Rothwell]

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);

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

[Greg KH]

On Tue, May 03, 2016 at 04:44:22PM +1000, Stephen Rothwell wrote:
> 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.

Looks good, thanks.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lustre/llite/llite_lib.c between commit
6a661bd6ffba ("lustre: get rid of playing with ->fs") from the vfs tree
and commit 9c234f6cb4c4 ("drivers: staging: lustre: Fix "'foo* bar'
should be 'foo *bar'" errors") from the staging tree.

I fixed it up (the former removed te code changed by the latter) and
can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 7150 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in
drivers/staging/lustre/lustre/llite/dcache.c,
drivers/staging/lustre/lustre/llite/llite_internal.h,
drivers/staging/lustre/lustre/llite/llite_lib.c,
drivers/staging/lustre/lustre/llite/namei.c and
drivers/staging/lustre/lustre/llite/statahead.c between various commits
from the vfs tree and commit 2d00bd17a270 ("staging: lustre: Coalesce
string fragments") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/lustre/lustre/llite/dcache.c
index f692261e9b5c,5f03c5fbb098..000000000000
--- a/drivers/staging/lustre/lustre/llite/dcache.c
+++ b/drivers/staging/lustre/lustre/llite/dcache.c
@@@ -258,9 -258,10 +258,9 @@@ void ll_invalidate_aliases(struct inod
  	       inode->i_ino, inode->i_generation, inode);
  
  	ll_lock_dcache(inode);
 -	ll_d_hlist_for_each_entry(dentry, p, &inode->i_dentry, d_alias) {
 -		CDEBUG(D_DENTRY, "dentry in drop %.*s (%p) parent %p inode %p flags %d\n",
 -		       dentry->d_name.len, dentry->d_name.name,
 -		       dentry, dentry->d_parent,
 +	ll_d_hlist_for_each_entry(dentry, p, &inode->i_dentry, d_u.d_alias) {
- 		CDEBUG(D_DENTRY, "dentry in drop %pd (%p) parent %p "
- 		       "inode %p flags %d\n", dentry, dentry, dentry->d_parent,
++		CDEBUG(D_DENTRY, "dentry in drop %pd (%p) parent %p inode %p flags %d\n",
++		       dentry, dentry, dentry->d_parent,
  		       dentry->d_inode, dentry->d_flags);
  
  		if (unlikely(dentry == dentry->d_sb->s_root)) {
diff --cc drivers/staging/lustre/lustre/llite/llite_internal.h
index 77d1c12704b4,79fc29b3710c..000000000000
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@@ -1489,8 -1489,8 +1489,8 @@@ static inline void __d_lustre_invalidat
   */
  static inline void d_lustre_invalidate(struct dentry *dentry, int nested)
  {
- 	CDEBUG(D_DENTRY, "invalidate dentry %pd (%p) parent %p inode %p "
- 	       "refc %d\n", dentry, dentry,
 -	CDEBUG(D_DENTRY, "invalidate dentry %.*s (%p) parent %p inode %p refc %d\n",
 -	       dentry->d_name.len, dentry->d_name.name, dentry,
++	CDEBUG(D_DENTRY, "invalidate dentry %pd (%p) parent %p inode %p refc %d\n",
++	       dentry, dentry,
  	       dentry->d_parent, dentry->d_inode, d_count(dentry));
  
  	spin_lock_nested(&dentry->d_lock,
diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
index 7b6b9e2e0102,3b0336029da3..000000000000
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@@ -698,8 -690,10 +690,8 @@@ void lustre_dump_dentry(struct dentry *
  	list_for_each(tmp, &dentry->d_subdirs)
  		subdirs++;
  
- 	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u,"
- 	       " flags=0x%x, fsdata=%p, %d subdirs\n", dentry, dentry,
 -	CERROR("dentry %p dump: name=%.*s parent=%.*s (%p), inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
 -	       dentry,
 -	       dentry->d_name.len, dentry->d_name.name,
 -	       dentry->d_parent->d_name.len, dentry->d_parent->d_name.name,
++	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
++	       dentry, dentry,
  	       dentry->d_parent, dentry->d_inode, d_count(dentry),
  	       dentry->d_flags, dentry->d_fsdata, subdirs);
  	if (dentry->d_inode != NULL)
diff --cc drivers/staging/lustre/lustre/llite/namei.c
index 8e926b385a60,671d0cd2a6a2..000000000000
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@@ -598,9 -619,8 +598,8 @@@ static int ll_atomic_open(struct inode 
  	long long lookup_flags = LOOKUP_OPEN;
  	int rc = 0;
  
- 	CDEBUG(D_VFSTRACE, "VFS Op:name=%pd,dir=%lu/%u(%p),file %p,"
- 			   "open_flags %x,mode %x opened %d\n",
 -	CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p),file %p,open_flags %x,mode %x opened %d\n",
 -	       dentry->d_name.len, dentry->d_name.name, dir->i_ino,
++	CDEBUG(D_VFSTRACE, "VFS Op:name=%pd,dir=%lu/%u(%p),file %p, open_flags %x,mode %x opened %d\n",
 +	       dentry, dir->i_ino,
  	       dir->i_generation, dir, file, open_flags, mode, *opened);
  
  	it = kzalloc(sizeof(*it), GFP_NOFS);
@@@ -843,12 -862,11 +842,11 @@@ static int ll_create_nd(struct inode *d
  {
  	int rc;
  
- 	CDEBUG(D_VFSTRACE, "VFS Op:name=%pd,dir=%lu/%u(%p),"
- 			   "flags=%u, excl=%d\n",
 -	CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p),flags=%u, excl=%d\n",
 -	       dentry->d_name.len, dentry->d_name.name, dir->i_ino,
++	CDEBUG(D_VFSTRACE, "VFS Op:name=%pd,dir=%lu/%u(%p), flags=%u, excl=%d\n",
 +	       dentry, dir->i_ino,
  	       dir->i_generation, dir, mode, want_excl);
  
 -	rc = ll_mknod_generic(dir, &dentry->d_name, mode, 0, dentry);
 +	rc = ll_mknod(dir, dentry, mode, 0);
  
  	ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_CREATE, 1);
  
@@@ -974,7 -1101,8 +972,7 @@@ out
   * Instead, ll_ddelete() and ll_d_iput() will update it based upon if there
   * is any lock existing. They will recycle dentries and inodes based upon locks
   * too. b=20433 */
- static int ll_unlink(struct inode * dir, struct dentry *dentry)
 -static int ll_unlink_generic(struct inode *dir, struct dentry *dparent,
 -			     struct dentry *dchild, struct qstr *name)
++static int ll_unlink(struct inode *dir, struct dentry *dentry)
  {
  	struct ptlrpc_request *request = NULL;
  	struct md_op_data *op_data;
diff --cc drivers/staging/lustre/lustre/llite/statahead.c
index 09d965e76842,c4bd09edb0ce..000000000000
--- a/drivers/staging/lustre/lustre/llite/statahead.c
+++ b/drivers/staging/lustre/lustre/llite/statahead.c
@@@ -1612,9 -1609,9 +1609,8 @@@ int do_statahead_enter(struct inode *di
  				} else if ((*dentryp)->d_inode != inode) {
  					/* revalidate, but inode is recreated */
  					CDEBUG(D_READA,
- 					      "stale dentry %pd inode %lu/%u, "
- 					      "statahead inode %lu/%u\n",
 -					      "stale dentry %.*s inode %lu/%u, statahead inode %lu/%u\n",
 -					      (*dentryp)->d_name.len,
 -					      (*dentryp)->d_name.name,
++					      "stale dentry %pd inode %lu/%u, statahead inode %lu/%u\n",
 +					      *dentryp,
  					      (*dentryp)->d_inode->i_ino,
  					      (*dentryp)->d_inode->i_generation,
  					      inode->i_ino,
@@@ -1665,9 -1662,8 +1661,8 @@@
  	if (unlikely(sai->sai_inode != parent->d_inode)) {
  		struct ll_inode_info *nlli = ll_i2info(parent->d_inode);
  
- 		CWARN("Race condition, someone changed %pd just now: "
- 		      "old parent "DFID", new parent "DFID"\n",
 -		CWARN("Race condition, someone changed %.*s just now: old parent " DFID ", new parent " DFID "\n",
 -		      (*dentryp)->d_name.len, (*dentryp)->d_name.name,
++		CWARN("Race condition, someone changed %pd just now: old parent "DFID", new parent "DFID"\n",
 +		      *dentryp,
  		      PFID(&lli->lli_fid), PFID(&nlli->lli_fid));
  		dput(parent);
  		iput(sai->sai_inode);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2608 bytes --]

Hi all,

On Thu, 27 Nov 2014 20:11:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
> index 7b6b9e2e0102,3b0336029da3..000000000000
> --- a/drivers/staging/lustre/lustre/llite/llite_lib.c
> +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
> @@@ -698,8 -690,10 +690,8 @@@ void lustre_dump_dentry(struct dentry *
>   	list_for_each(tmp, &dentry->d_subdirs)
>   		subdirs++;
>   
> - 	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u,"
> - 	       " flags=0x%x, fsdata=%p, %d subdirs\n", dentry, dentry,
>  -	CERROR("dentry %p dump: name=%.*s parent=%.*s (%p), inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
>  -	       dentry,
>  -	       dentry->d_name.len, dentry->d_name.name,
>  -	       dentry->d_parent->d_name.len, dentry->d_parent->d_name.name,
> ++	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
> ++	       dentry, dentry,
>   	       dentry->d_parent, dentry->d_inode, d_count(dentry),
>   	       dentry->d_flags, dentry->d_fsdata, subdirs);
>   	if (dentry->d_inode != NULL)

The actual resolution for this file ended up being this:

diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
index 7b6b9e2e0102,3b0336029da3..52f0a7e40063
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@@ -698,8 -690,10 +690,8 @@@ void lustre_dump_dentry(struct dentry *
  	list_for_each(tmp, &dentry->d_subdirs)
  		subdirs++;
  
- 	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u,"
- 	       " flags=0x%x, fsdata=%p, %d subdirs\n", dentry, dentry,
 -	CERROR("dentry %p dump: name=%.*s parent=%.*s (%p), inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
 -	       dentry,
 -	       dentry->d_name.len, dentry->d_name.name,
 -	       dentry->d_parent->d_name.len, dentry->d_parent->d_name.name,
++	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
++	       dentry, dentry,
  	       dentry->d_parent, dentry->d_inode, d_count(dentry),
  	       dentry->d_flags, dentry->d_fsdata, subdirs);
  	if (dentry->d_inode != NULL)
@@@ -709,7 -703,8 +701,8 @@@
  		return;
  
  	list_for_each(tmp, &dentry->d_subdirs) {
 -		struct dentry *d = list_entry(tmp, struct dentry, d_u.d_child);
 +		struct dentry *d = list_entry(tmp, struct dentry, d_child);
+ 
  		lustre_dump_dentry(d, recur - 1);
  	}
  }

-- 
Cheers,
Stephen Rothwell                   <sfr@canb.auug.org.au>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Greg KH]

On Thu, Nov 27, 2014 at 08:31:01PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 27 Nov 2014 20:11:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
> > index 7b6b9e2e0102,3b0336029da3..000000000000
> > --- a/drivers/staging/lustre/lustre/llite/llite_lib.c
> > +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
> > @@@ -698,8 -690,10 +690,8 @@@ void lustre_dump_dentry(struct dentry *
> >   	list_for_each(tmp, &dentry->d_subdirs)
> >   		subdirs++;
> >   
> > - 	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u,"
> > - 	       " flags=0x%x, fsdata=%p, %d subdirs\n", dentry, dentry,
> >  -	CERROR("dentry %p dump: name=%.*s parent=%.*s (%p), inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
> >  -	       dentry,
> >  -	       dentry->d_name.len, dentry->d_name.name,
> >  -	       dentry->d_parent->d_name.len, dentry->d_parent->d_name.name,
> > ++	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
> > ++	       dentry, dentry,
> >   	       dentry->d_parent, dentry->d_inode, d_count(dentry),
> >   	       dentry->d_flags, dentry->d_fsdata, subdirs);
> >   	if (dentry->d_inode != NULL)
> 
> The actual resolution for this file ended up being this:
> 
> diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
> index 7b6b9e2e0102,3b0336029da3..52f0a7e40063
> --- a/drivers/staging/lustre/lustre/llite/llite_lib.c
> +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
> @@@ -698,8 -690,10 +690,8 @@@ void lustre_dump_dentry(struct dentry *
>   	list_for_each(tmp, &dentry->d_subdirs)
>   		subdirs++;
>   
> - 	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u,"
> - 	       " flags=0x%x, fsdata=%p, %d subdirs\n", dentry, dentry,
>  -	CERROR("dentry %p dump: name=%.*s parent=%.*s (%p), inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
>  -	       dentry,
>  -	       dentry->d_name.len, dentry->d_name.name,
>  -	       dentry->d_parent->d_name.len, dentry->d_parent->d_name.name,
> ++	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u, flags=0x%x, fsdata=%p, %d subdirs\n",
> ++	       dentry, dentry,
>   	       dentry->d_parent, dentry->d_inode, d_count(dentry),
>   	       dentry->d_flags, dentry->d_fsdata, subdirs);
>   	if (dentry->d_inode != NULL)
> @@@ -709,7 -703,8 +701,8 @@@
>   		return;
>   
>   	list_for_each(tmp, &dentry->d_subdirs) {
>  -		struct dentry *d = list_entry(tmp, struct dentry, d_u.d_child);
>  +		struct dentry *d = list_entry(tmp, struct dentry, d_child);
> + 
>   		lustre_dump_dentry(d, recur - 1);
>   	}
>   }

Looks good, thanks.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1293 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lustre/llite/namei.c between commits 8da673df2d77
("ll_get_child_fid(): callers already have the child") and  ("kill
ll_unlink_generic()") from the vfs tree and commit 2a80f844158b
("Staging: lustre: llite: Declare ptr args correctly") from the staging
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/lustre/lustre/llite/namei.c
index 8e926b385a60,2971a26370be..000000000000
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@@ -974,7 -1103,8 +974,7 @@@ out
   * Instead, ll_ddelete() and ll_d_iput() will update it based upon if there
   * is any lock existing. They will recycle dentries and inodes based upon locks
   * too. b=20433 */
- static int ll_unlink(struct inode * dir, struct dentry *dentry)
 -static int ll_unlink_generic(struct inode *dir, struct dentry *dparent,
 -			     struct dentry *dchild, struct qstr *name)
++static int ll_unlink(struct inode *dir, struct dentry *dentry)
  {
  	struct ptlrpc_request *request = NULL;
  	struct md_op_data *op_data;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1050 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/lustre/lustre/llite/llite_lib.c between commit
94b5670e78ce ("move d_rcu from overlapping d_child to overlapping
d_alias") from the vfs tree and commit cf29a7b6eae8 ("Staging: lustre:
Fix checkpatch warning: Missing blank line") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
index 7b6b9e2e0102,afb433a33d25..000000000000
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@@ -709,7 -712,8 +710,8 @@@ void lustre_dump_dentry(struct dentry *
  		return;
  
  	list_for_each(tmp, &dentry->d_subdirs) {
 -		struct dentry *d = list_entry(tmp, struct dentry, d_u.d_child);
 +		struct dentry *d = list_entry(tmp, struct dentry, d_child);
+ 
  		lustre_dump_dentry(d, recur - 1);
  	}
  }

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3322 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/vt6655/device_main.c between commit f805442e130c
("vt6655: slightly clean reading config file") from the vfs tree and
commits 915006cddc79 ("staging:vt6655:device_main: Whitespace cleanups")
and 5e0cc8a231be ("staging: vt6655: Convert to kernel brace style") from
the staging tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/vt6655/device_main.c
index a89ab9b,be4f6c2..0000000
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@@ -2933,39 -2723,61 +2724,39 @@@ static inline u32 ether_crc(int length
  
  //2008-8-4 <add> by chester
  static int Config_FileGetParameter(unsigned char *string,
- 		unsigned char *dest, unsigned char *source)
+ 				   unsigned char *dest, unsigned char *source)
  {
-   unsigned char buf1[100];
-   int source_len = strlen(source);
+ 	unsigned char buf1[100];
+ 	int source_len = strlen(source);
  
-     memset(buf1,0,100);
-     strcat(buf1, string);
-     strcat(buf1, "=");
-     source+=strlen(buf1);
+ 	memset(buf1, 0, 100);
+ 	strcat(buf1, string);
+ 	strcat(buf1, "=");
+ 	source += strlen(buf1);
  
-    memcpy(dest,source,source_len-strlen(buf1));
-  return true;
+ 	memcpy(dest, source, source_len - strlen(buf1));
+ 	return true;
  }
  
- int Config_FileOperation(PSDevice pDevice,bool fwrite,unsigned char *Parameter)
 -int Config_FileOperation(PSDevice pDevice, bool fwrite, unsigned char *Parameter) {
 -	unsigned char *config_path = CONFIG_PATH;
 -	unsigned char *buffer = NULL;
++int Config_FileOperation(PSDevice pDevice, bool fwrite, unsigned char *Parameter)
 +{
 +	unsigned char *buffer = kmalloc(1024, GFP_KERNEL);
  	unsigned char tmpbuffer[20];
 -	struct file   *filp = NULL;
 -	mm_segment_t old_fs = get_fs();
 -	//int oldfsuid=0,oldfsgid=0;
 +	struct file *file;
- 	int result=0;
+ 	int result = 0;
  
 -	set_fs(KERNEL_DS);
 -
 -	/* Can't do this anymore, so we rely on correct filesystem permissions:
 -	//Make sure a caller can read or write power as root
 -	oldfsuid=current->cred->fsuid;
 -	oldfsgid=current->cred->fsgid;
 -	current->cred->fsuid = 0;
 -	current->cred->fsgid = 0;
 -	*/
 -
 -	//open file
 -	filp = filp_open(config_path, O_RDWR, 0);
 -	if (IS_ERR(filp)) {
 -		printk("Config_FileOperation:open file fail?\n");
 -		result = -1;
 -		goto error2;
 -	}
 -
 -	if (!(filp->f_op) || !(filp->f_op->read) || !(filp->f_op->write)) {
 -		printk("file %s cann't readable or writable?\n", config_path);
 -		result = -1;
 -		goto error1;
 -	}
 -
 -	buffer = kmalloc(1024, GFP_KERNEL);
 -	if (buffer == NULL) {
 +	if (!buffer) {
  		printk("allocate mem for file fail?\n");
 -		result = -1;
 -		goto error1;
 +		return -1;
 +	}
 +	file = filp_open(CONFIG_PATH, O_RDONLY, 0);
 +	if (IS_ERR(file)) {
 +		kfree(buffer);
 +		printk("Config_FileOperation:open file fail?\n");
 +		return -1;
  	}
  
 -	if (filp->f_op->read(filp, buffer, 1024, &filp->f_pos) < 0) {
 +	if (kernel_read(file, 0, buffer, 1024) < 0) {
  		printk("read file error?\n");
  		result = -1;
  		goto error1;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Greg KH]

On Wed, Apr 10, 2013 at 03:54:51PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/vt6655/device_main.c between commit f805442e130c
> ("vt6655: slightly clean reading config file") from the vfs tree and
> commits 915006cddc79 ("staging:vt6655:device_main: Whitespace cleanups")
> and 5e0cc8a231be ("staging: vt6655: Convert to kernel brace style") from
> the staging tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).

Looks correct to me, thanks.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in
drivers/staging/ccg/f_fs.c and drivers/staging/ccg/rndis.c between
commits 465bced2e3ed ("ccg: don't bother with fops->owner") and
4dfac87dca02 ("procfs: new helper - PDE_DATA(inode)") from the vfs tree
and commit 515e6dd20b3f ("Staging: ccg: delete it from the tree") from
the staging tree.

The latter just deletes the files, so I did that and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Greg KH]

On Thu, Apr 04, 2013 at 03:43:29PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in
> drivers/staging/ccg/f_fs.c and drivers/staging/ccg/rndis.c between
> commits 465bced2e3ed ("ccg: don't bother with fops->owner") and
> 4dfac87dca02 ("procfs: new helper - PDE_DATA(inode)") from the vfs tree
> and commit 515e6dd20b3f ("Staging: ccg: delete it from the tree") from
> the staging tree.
> 
> The latter just deletes the files, so I did that and can carry the fix as
> necessary (no action is required).

Sounds correct, thanks.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 489 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/dgrp/dgrp_specproc.c between commit 464b4fd02caa ("dgrp
procfs fixes, part 2") and various other commits from the vfs tree and
commit 433121c6ef51 ("staging: dgrp: cleanup sparse warnings") from the
staging tree.

I just used the version from the vfs tree and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Greg KH]

On Thu, Apr 04, 2013 at 03:40:17PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/dgrp/dgrp_specproc.c between commit 464b4fd02caa ("dgrp
> procfs fixes, part 2") and various other commits from the vfs tree and
> commit 433121c6ef51 ("staging: dgrp: cleanup sparse warnings") from the
> staging tree.
> 
> I just used the version from the vfs tree and can carry the fix as
> necessary (no action is required).

That is correct, thanks.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 624 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in
drivers/staging/dgrp/dgrp_dpa_ops.c, drivers/staging/dgrp/dgrp_mon_ops.c,
drivers/staging/dgrp/dgrp_net_ops.c and
drivers/staging/dgrp/dgrp_ports_ops.c between commit 33633903f16f ("dgrp
procfs fixes, part 5: per-node files") from the vfs tree and commit
433121c6ef51 ("staging: dgrp: cleanup sparse warnings") from the staging
tree.

The former removed the code modified by the latter, so I just did that
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Greg KH]

On Thu, Apr 04, 2013 at 03:34:33PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in
> drivers/staging/dgrp/dgrp_dpa_ops.c, drivers/staging/dgrp/dgrp_mon_ops.c,
> drivers/staging/dgrp/dgrp_net_ops.c and
> drivers/staging/dgrp/dgrp_ports_ops.c between commit 33633903f16f ("dgrp
> procfs fixes, part 5: per-node files") from the vfs tree and commit
> 433121c6ef51 ("staging: dgrp: cleanup sparse warnings") from the staging
> tree.
> 
> The former removed the code modified by the latter, so I just did that
> and can carry the fix as necessary (no action is required).

That is correct, thanks.

greg k-h

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1232 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/android/binder.c between commit 004223461eee ("new
helper: __alloc_fd()") from the vfs tree and commits efde99cd281a
("Staging: android: binder: Make task_get_unused_fd_flags function
static") and bf2023614201 ("Staging: android: binder: Remove an
inconsequential conditional macro") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/android/binder.c
index f71d624,a807129..0000000
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@@ -362,9 -362,14 +362,9 @@@ struct binder_transaction 
  static void
  binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer);
  
- int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
 -/*
 - * copied from get_unused_fd_flags
 - */
+ static int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
  {
  	struct files_struct *files = proc->files;
 -	int fd, error;
 -	struct fdtable *fdt;
  	unsigned long rlim_cur;
  	unsigned long irqs;
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Greg KH]

On Mon, Sep 24, 2012 at 05:07:41PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/android/binder.c between commit 004223461eee ("new
> helper: __alloc_fd()") from the vfs tree and commits efde99cd281a
> ("Staging: android: binder: Make task_get_unused_fd_flags function
> static") and bf2023614201 ("Staging: android: binder: Remove an
> inconsequential conditional macro") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

greg k-h