From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Arnd Bergmann" <arnd@arndb.de>,
"Matias Bjørling" <m@bjorling.me>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Paul Gortmaker" <paul.gortmaker@windriver.com>,
"Javier González" <jg@lightnvm.io>
Subject: Re: linux-next: manual merge of the char-misc tree with the lightnvm tree
Date: Tue, 22 Nov 2016 08:58:18 +0100 [thread overview]
Message-ID: <20161122075818.GA7768@kroah.com> (raw)
In-Reply-To: <20161122182908.4c961d64@canb.auug.org.au>
On Tue, Nov 22, 2016 at 06:29:08PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/lightnvm/core.c
>
> between commit:
>
> 7b0d392f6957 ("lightnvm: remove sysfs configuration interface")
>
> from the lightnvm tree and commit:
>
> 389b2a1c0e90 ("lightnvm: make core.c explicitly non-modular")
>
> from the char-misc tree.
>
> I fixed it up (the former removed the code that was commented by the
> latter, so I just removed it) 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 do wonder why commit 389b2a1c0e90 is in the char-misc tree and not
> the lightnvm or block trees?
Because of a call to builtin_misc_device() which came into the char-misc
tree. Thanks for resolving the merge issue.
greg k-h
next prev parent reply other threads:[~2016-11-22 7:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 7:29 linux-next: manual merge of the char-misc tree with the lightnvm tree Stephen Rothwell
2016-11-22 7:58 ` Greg KH [this message]
2016-11-22 7:59 ` Matias Bjørling
2016-11-22 15:45 ` Paul Gortmaker
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=20161122075818.GA7768@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=jg@lightnvm.io \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m@bjorling.me \
--cc=paul.gortmaker@windriver.com \
--cc=sfr@canb.auug.org.au \
/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).