From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932295AbcGOI4N (ORCPT ); Fri, 15 Jul 2016 04:56:13 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:48374 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932094AbcGOI4G (ORCPT ); Fri, 15 Jul 2016 04:56:06 -0400 X-AuditID: cbfec7f4-f796c6d000001486-ae-5788a522ddd5 Subject: Re: linux-next: manual merge of the akpm tree with the arm tree To: Stephen Rothwell , Andrew Morton , Russell King References: <20160715182947.2ce9825a@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Gregory CLEMENT From: Krzysztof Kozlowski Message-id: <5788A521.8000207@samsung.com> Date: Fri, 15 Jul 2016 10:56:01 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-version: 1.0 In-reply-to: <20160715182947.2ce9825a@canb.auug.org.au> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHLMWRmVeSWpSXmKPExsVy+t/xq7pKSzvCDZqeWlvMWb+GzWJT21tG i9cvDC0u75rDZnFwYRujxfEHk1kttu69yu7A7nH52kVmj8YbN9g8nmy6yOhxYsZvFo++LasY PT5vkgtgi+KySUnNySxLLdK3S+DK+Px5OlNBB0fF1BlnWBsYN7F1MXJySAiYSLw8cZsZwhaT uHBvPVCci0NIYCmjxOw3BxkhnGeMEhOfb2cFqRIW8JDonPOGBcQWEaiR2HJ4EjuILSRgJrFn wnSwScwCJRJrVvczgthsAsYSm5cvAdvGK6Al8WzxArAaFgFViWfLusFqRAUiJGZt/8EEUSMo 8WPyPbD5nALmEqt3nQXq5QCaqSdx/6IWxHh5ic1r3jJPYBSYhaRjFkLVLCRVCxiZVzGKppYm FxQnpeca6hUn5haX5qXrJefnbmKEhPqXHYyLj1kdYhTgYFTi4RU42h4uxJpYVlyZe4hRgoNZ SYS3Y3FHuBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHeubvehwgJpCeWpGanphakFsFkmTg4pRoY 3fgze+ba/nj7n6nqHoNt9JuTzye1iasXnT6wMV/yrJKQVvHvXDnJojVyXy1Clt7ZwVPxy7DW NbV9S47qytOiS6zXy39xUZA/26iY/0z5zATeddL/z397f3j6cbF5SyYx3fh8XP+YCk+Wo1mB 9cQi5j6h/cfPfNJd1LXQyDfOKyjwUHJVSc5CJZbijERDLeai4kQAGYmshHECAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/15/2016 10:29 AM, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm tree got a conflict in: > > arch/arm/mm/dma-mapping.c > > between commits: > > f12708965069 ("ARM: 8561/3: dma-mapping: Don't use outer_flush_range when the L2C is coherent") > 565068221b90 ("ARM: 8561/4: dma-mapping: Fix the coherent case when iommu is used") > > from the arm tree and patch: > > "ARM: dma-mapping: use unsigned long for dma_attrs" > > from the akpm-current tree. > > I fixed it up (see below) 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. Looks correct, thanks. FWIW: Reviewed-by: Krzysztof Kozlowski Best regards, Krzysztof