From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Jens Axboe <axboe@kernel.dk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
James Simmons <jsimmons@infradead.org>,
Mike Christie <mchristi@redhat.com>
Subject: linux-next: manual merge of the staging tree with the block tree
Date: Tue, 14 Jun 2016 15:07:37 +1000 [thread overview]
Message-ID: <20160614150737.015362de@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/lustre/lustre/llite/lloop.c
between commit:
95fe6c1a209e ("block, fs, mm, drivers: use bio set/get op accessors")
from the block tree and commit:
67b1a24e883c ("staging: lustre: llite: remove lloop device")
from the staging tree.
I fixed it up (I 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
next reply other threads:[~2016-06-14 5:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-14 5:07 Stephen Rothwell [this message]
2016-07-25 6:32 ` linux-next: manual merge of the staging tree with the block tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-05-01 7:05 Stephen Rothwell
2019-05-01 8:09 ` Gao Xiang
2019-05-08 3:44 ` Stephen Rothwell
2019-05-08 6:02 ` Gao Xiang
2013-11-05 5:09 Stephen Rothwell
2013-11-05 5:20 ` Greg KH
2013-11-05 9:49 ` Christoph Hellwig
2013-11-05 13:08 ` Greg KH
2011-10-04 6:14 Stephen Rothwell
2011-10-04 15:25 ` 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=20160614150737.015362de@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=greg@kroah.com \
--cc=jsimmons@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchristi@redhat.com \
/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).