From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755504AbbLGEQj (ORCPT ); Sun, 6 Dec 2015 23:16:39 -0500 Received: from ozlabs.org ([103.22.144.67]:46340 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755246AbbLGEQi (ORCPT ); Sun, 6 Dec 2015 23:16:38 -0500 Date: Mon, 7 Dec 2015 15:16:36 +1100 From: Stephen Rothwell To: Jens Axboe Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Keith Busch , Matias =?UTF-8?B?QmrDuHJsaW5n?= , Christoph Hellwig Subject: linux-next: manual merge of the block tree with Linus' tree Message-ID: <20151207151636.0ef047f0@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jens, Today's linux-next merge of the block tree got a conflict in: drivers/nvme/host/Makefile between commit: c4699e70d1db ("lightnvm: Simplify config when disabled") from Linus' tree and commit: 21d34711e1b5 ("nvme: split command submission helpers out of pci.c") from the block tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/nvme/host/Makefile index a5fe23952586,3e26dc921c38..000000000000 --- a/drivers/nvme/host/Makefile +++ b/drivers/nvme/host/Makefile @@@ -1,5 -1,4 +1,5 @@@ obj-$(CONFIG_BLK_DEV_NVME) += nvme.o -nvme-y += core.o pci.o scsi.o lightnvm.o +lightnvm-$(CONFIG_NVM) := lightnvm.o - nvme-y += pci.o scsi.o $(lightnvm-y) ++nvme-y += core.o pci.o scsi.o $(lightnvm-y)