From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Kirill A. Shutemov" <kirill.shutemov@linux•intel.com>
Subject: Re: linux-next: manual merge of the staging tree with Linus' tree
Date: Mon, 11 Apr 2016 09:57:25 -0700 [thread overview]
Message-ID: <20160411165725.GA3343@kroah.com> (raw)
In-Reply-To: <20160405134927.75b47655@canb.auug.org.au>
On Tue, Apr 05, 2016 at 01:49:27PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in:
>
> drivers/staging/lustre/lnet/selftest/brw_test.c
> drivers/staging/lustre/lustre/include/lu_object.h
> drivers/staging/lustre/lustre/lclient/lcommon_cl.c
> drivers/staging/lustre/lustre/llite/llite_internal.h
> drivers/staging/lustre/lustre/llite/llite_lib.c
> drivers/staging/lustre/lustre/llite/llite_mmap.c
> drivers/staging/lustre/lustre/llite/rw.c
> drivers/staging/lustre/lustre/llite/rw26.c
> drivers/staging/lustre/lustre/llite/vvp_io.c
> drivers/staging/lustre/lustre/llite/vvp_page.c
> drivers/staging/lustre/lustre/obdclass/class_obd.c
> drivers/staging/lustre/lustre/obdecho/echo_client.c
> drivers/staging/lustre/lustre/osc/lproc_osc.c
> drivers/staging/lustre/lustre/osc/osc_cache.c
> drivers/staging/lustre/lustre/osc/osc_page.c
> drivers/staging/lustre/lustre/osc/osc_request.c
>
> between commits:
>
> 09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros")
> ea1754a08476 ("mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage")
>
> from Linus' tree and lots of commits from the staging tree.
>
> I fixed it up (see below the signature) 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.
>
> I also added this merge fix patch:
Thanks for this, it should all now be resolved in my tree.
greg k-h
next prev parent reply other threads:[~2016-04-11 16:57 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-05 3:49 linux-next: manual merge of the staging tree with Linus' tree Stephen Rothwell
2016-04-11 16:57 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-07-20 5:25 Stephen Rothwell
2020-07-20 7:37 ` Greg KH
2018-06-06 9:12 Stephen Rothwell
2018-06-06 9:47 ` Greg KH
2018-06-06 9:08 Stephen Rothwell
2018-06-06 9:10 ` Greg KH
2014-09-22 5:01 Stephen Rothwell
2014-09-22 14:31 ` Greg KH
2013-03-15 4:13 Stephen Rothwell
2013-03-15 15:01 ` Greg KH
2013-01-17 2:35 Stephen Rothwell
2013-01-18 0:42 ` Greg KH
2012-04-27 4:37 Stephen Rothwell
2012-04-27 17:05 ` Greg KH
2012-05-02 21:23 ` Greg KH
2012-02-10 4:48 Stephen Rothwell
2012-02-10 5:30 ` Greg KH
2012-02-14 21:31 ` Ramirez Luna, Omar
2012-02-14 22:37 ` Greg KH
2012-02-14 23:33 ` Ramirez Luna, Omar
2012-02-14 23:42 ` Greg KH
2012-02-10 19:01 ` Greg KH
2012-02-10 4:47 Stephen Rothwell
2012-02-10 5:30 ` Greg KH
2011-11-28 4:18 Stephen Rothwell
2011-11-28 5:13 ` Greg KH
2011-09-20 6:46 Stephen Rothwell
2011-09-20 12:53 ` Greg KH
2011-05-13 4:08 Stephen Rothwell
2011-05-13 23:12 ` Greg KH
2011-04-28 2:59 Stephen Rothwell
2011-04-28 3:06 ` Greg KH
2011-04-08 6:02 Stephen Rothwell
2011-04-08 6:00 Stephen Rothwell
2011-04-08 5:57 Stephen Rothwell
2011-04-08 5:54 Stephen Rothwell
2011-04-08 5:51 Stephen Rothwell
2011-04-08 5:47 Stephen Rothwell
2011-04-08 20:55 ` Greg KH
2011-04-13 19:18 ` Greg KH
2009-12-09 5:34 Stephen Rothwell
2009-12-09 20:30 ` Greg KH
2009-12-09 23:08 ` 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=20160411165725.GA3343@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=kirill.shutemov@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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