From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org (bilbo.ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zVJrF3jh1zDr00 for ; Mon, 29 Jan 2018 17:04:45 +1100 (AEDT) Date: Mon, 29 Jan 2018 17:04:45 +1100 From: Stephen Rothwell To: Dan Williams , Michael Ellerman , Benjamin Herrenschmidt , PowerPC Cc: Linux-Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the nvdimm tree with the powerpc tree Message-ID: <20180129170445.0e3cc514@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Hi Dan, Today's linux-next merge of the nvdimm tree got a conflict in: arch/powerpc/sysdev/axonram.c between commit: 1d65b1c886be ("powerpc/cell: Remove axonram driver") from the powerpc tree and commit: 785a3fab4adb ("mm, dax: introduce pfn_t_special()") from the nvdimm tree. I fixed it up (I just 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