linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Dmitry Eremin <dmitry.eremin@intel.com>,
	James Simmons <jsimmons@infradead.org>
Subject: Re: linux-next: manual merge of the staging tree with the vfs tree
Date: Tue, 20 Sep 2016 13:14:42 +0200	[thread overview]
Message-ID: <20160920111442.GA17516@kroah.com> (raw)
In-Reply-To: <20160920150327.7f646dee@canb.auug.org.au>

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

  reply	other threads:[~2016-09-20 11:14 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-20  5:03 linux-next: manual merge of the staging tree with the vfs tree Stephen Rothwell
2016-09-20 11:14 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-03-12  5:16 Stephen Rothwell
2020-03-12  7:36 ` Greg KH
2018-10-09  4:59 Stephen Rothwell
2018-10-09  9:18 ` Greg KH
2018-03-13  4:22 Stephen Rothwell
2018-03-13  8:47 ` Greg KH
2017-12-04  2:06 Stephen Rothwell
2017-12-04  9:10 ` Greg KH
2017-12-04  1:58 Stephen Rothwell
2017-12-04  9:09 ` Greg KH
2017-11-09  4:01 Stephen Rothwell
2017-11-09  8:34 ` Greg KH
2016-12-12  4:21 Stephen Rothwell
2016-05-03  6:44 Stephen Rothwell
2016-05-03 18:19 ` Greg KH
2014-12-15  4:06 Stephen Rothwell
2014-11-27  9:11 Stephen Rothwell
2014-11-27  9:31 ` Stephen Rothwell
2014-11-27 16:20   ` Greg KH
2014-11-03  2:39 Stephen Rothwell
2014-11-03  2:31 Stephen Rothwell
2014-11-03  2:29 Stephen Rothwell
2014-11-03 23:57 ` Greg KH
2013-04-10  5:54 Stephen Rothwell
2013-04-10 14:57 ` Greg KH
2013-04-04  4:43 Stephen Rothwell
2013-04-05  1:44 ` Greg KH
2013-04-04  4:40 Stephen Rothwell
2013-04-05  1:45 ` Greg KH
2013-04-04  4:34 Stephen Rothwell
2013-04-05  1:45 ` Greg KH
2012-09-24  7:07 Stephen Rothwell
2012-09-25 22:38 ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160920111442.GA17516@kroah.com \
    --to=greg@kroah.com \
    --cc=dmitry.eremin@intel.com \
    --cc=jsimmons@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=viro@ZenIV.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).