From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Miklos Szeredi <miklos@szeredi•hu>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Al Viro <viro@zeniv•linux.org.uk>,
Prakash Surya <surya1@llnl•gov>,
"John L. Hammond" <john.hammond@intel•com>
Subject: Re: linux-next: manual merge of the staging tree with the vfs-miklos tree
Date: Wed, 28 Sep 2016 08:25:01 +0200 [thread overview]
Message-ID: <20160928062501.GA19141@kroah.com> (raw)
In-Reply-To: <20160928150022.7e87b6e3@canb.auug.org.au>
On Wed, Sep 28, 2016 at 03:00: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/file.c
>
> between commit:
>
> 302d50e7203e ("switch generic_file_splice_read() to use of ->read_iter()")
>
> from the vfs-miklos tree and commits:
>
> 5b8a39c53a16 ("staging: lustre: llite: Replace write mutex with range lock")
> ee5532436a7d ("staging: lustre: lov: remove LL_IOC_RECREATE_{FID, OBJ}")
>
> from the staging tree.
>
> I fixed it up (I think - 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 to me, one of these days we will get lustre out of staging to
make this easier...
thanks,
greg k-h
next prev parent reply other threads:[~2016-09-28 6:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-28 5:00 linux-next: manual merge of the staging tree with the vfs-miklos tree Stephen Rothwell
2016-09-28 6:25 ` Greg KH [this message]
2016-09-28 7:02 ` Stephen Rothwell
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=20160928062501.GA19141@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=john.hammond@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=surya1@llnl$(echo .)gov \
--cc=viro@zeniv$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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