From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751357AbbLRFJ4 (ORCPT ); Fri, 18 Dec 2015 00:09:56 -0500 Received: from ozlabs.org ([103.22.144.67]:57524 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750707AbbLRFJy (ORCPT ); Fri, 18 Dec 2015 00:09:54 -0500 Date: Fri, 18 Dec 2015 16:09:52 +1100 From: Stephen Rothwell To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Williams Subject: linux-next: manual merge of the akpm-current tree with Linus' tree Message-ID: <20151218160952.79e44004@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.29; 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 Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/arm/mm/dma-mapping.c drivers/iommu/intel-iommu.c drivers/staging/android/ion/ion_chunk_heap.c between commit: 3e6110fd5480 ("Revert "scatterlist: use sg_phys()"") from Linus' tree and commit: 0504b8687491 ("scatterlist: fix sg_phys() masking") from the akpm-current tree. I fixed it up (I use the Linus' tree version for now, effectively removing the whole of the akpm-current tree patch) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au