From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Matias Bjørling" <m@bjorling.me>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jens Axboe <axboe@fb.com>
Subject: linux-next: manual merge of the lightnvm tree with Linus' tree
Date: Tue, 22 Nov 2016 14:59:17 +1100 [thread overview]
Message-ID: <20161122145917.4f1d0e86@canb.auug.org.au> (raw)
Hi Matias,
Today's linux-next merge of the lightnvm tree got a conflict in:
drivers/nvme/host/lightnvm.c
between commit:
409ae5a76e05 ("lightnvm: invalid offset calculation for lba_shift")
from Linus' tree and commit:
2db3cb58a3dd ("nvme: lightnvm: attach lightnvm sysfs to nvme block device")
from the lightnvm tree.
I fixed it up (I just used the latter version) 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-11-22 3:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 3:59 Stephen Rothwell [this message]
2016-11-22 4:56 ` linux-next: manual merge of the lightnvm tree with Linus' tree Jens Axboe
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=20161122145917.4f1d0e86@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m@bjorling.me \
/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