[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <62938018-d3b8-d184-9498-e471811e6e27@bjorling.me>
Date: Tue, 22 Nov 2016 08:59:11 +0100
From: Matias Bjørling <m@...rling.me>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Greg KH <greg@...ah.com>,
Arnd Bergmann <arnd@...db.de>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Paul Gortmaker <paul.gortmaker@...driver.com>,
Javier González <jg@...htnvm.io>
Subject: Re: linux-next: manual merge of the char-misc tree with the lightnvm
tree
On 11/22/2016 08:29 AM, 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?
>
greg beat me to it. Thanks for fixing it up Stephen.
-matias
Powered by blists - more mailing lists