From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753124AbcIPIvF (ORCPT ); Fri, 16 Sep 2016 04:51:05 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:39895 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752032AbcIPIvA (ORCPT ); Fri, 16 Sep 2016 04:51:00 -0400 X-AuditID: cbfec7f2-f79556d000002c42-10-57dbb26f37e7 Subject: Re: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree To: Stephen Rothwell , Olof Johansson , Arnd Bergmann , ARM Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Marc Zyngier From: Krzysztof Kozlowski Message-id: <531f80d6-4cf6-ae83-7cb6-e002a6e8f63f@kernel.org> Date: Fri, 16 Sep 2016 10:50:52 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-version: 1.0 In-reply-to: <20160905111948.553487be@canb.auug.org.au> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrGIsWRmVeSWpSXmKPExsWy7djPc7r5m26HG8yYx2Xxd9IxdovXLwwt Nj2+xmpxedccNouDC9sYLf7e+cdmcer6ZzaLrXuvsjtweKyZt4bR4/evSYwejTdusHlsXlLv ceVEE6tH35ZVjB6fN8kFsEdx2aSk5mSWpRbp2yVwZXR/f89YcIOzYs33g6wNjK/Zuxg5OSQE TCQW/NvDAmGLSVy4t54NxBYSWMoo8W9iahcjF5D9mVFi8+5jrDAN65dsZIVILGOUOL9pMztE xzNGiY5t/iC2sECYxPJzC5hAikQEZjNK7Dv/AGwss0CyxLVDXxi7GDk42AS0Jf5tKQYJ8wrY Snw695kJxGYRUJVYcHESM0iJqECExO67qRAlghI/Jt8DO5RTwFzi7t057BATDSRmTDnMBGHL S2xe85YZZK2EwD52iedfT7KDzJEQkJXYdIAZ4n4XiclnYZ4Xlnh1fAuULSNxeXI3C8QcPolJ 26YzQ7TySnS0CUGUeEj0PrjMCBF2lFjQwwcJhS5GiVMnvzFOYJSZheTSWUium4XkugWMzKsY RVJLi3PTU4uN9YoTc4tL89L1kvNzNzECU8Ppf8c/7WD8esLqEKMAB6MSD++KubfChVgTy4or cw8xSnAwK4nwmqy7HS7Em5JYWZValB9fVJqTWnyIUZqDRUmcd8+CK+FCAumJJanZqakFqUUw WSYOTqkGxjD1bd4du36f3tVmx173S6L7DnM9f8wNexuzZtP08OfsR+ukNgcHlHKm747ST92y qu+0tdcEjWqfkh6PiKT10tcv+myQY1ZYyLz8K98D3Z/yeZ9myJq4GvzLU38lXKj53/bbZfGG oItNRl95f6fvnmEU/yJdSzyH/cnJL//0jOMC+d1jV09UYinOSDTUYi4qTgQARlWOJQkDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsVy+t/xa7r2m26HG9yYwW/xd9IxdovXLwwt Nj2+xmpxedccNouDC9sYLf7e+cdmcer6ZzaLrXuvsjtweKyZt4bR4/evSYwejTdusHlsXlLv ceVEE6tH35ZVjB6fN8kFsEe52WSkJqakFimk5iXnp2TmpdsqhYa46VooKeQl5qbaKkXo+oYE KSmUJeaUAnlGBmjAwTnAPVhJ3y7BLaP7+3vGghucFWu+H2RtYHzN3sXIySEhYCKxfslGVghb TOLCvfVsXYxcHEICSxgllpybzQjhPGOU6Po8B6xDWCBMYvnBv6wgCRGBmYwSPxeeYAFJCAmY SWxceh6siFkgWeLEpjNANgcHm4C2xL8txSBhXgFbiU/nPjOB2CwCqhILLk5iBrFFBSIkbq36 yAhRIyjxY/I9sJGcAuYSd+/OARvDLKAncf+iFsR0eYnNa94yT2AUmIWkYxZC1SwkVQsYmVcx iqSWFuem5xYb6RUn5haX5qXrJefnbmIExty2Yz+37GDsehd8iFGAg1GJh3fF3FvhQqyJZcWV uYcYJTiYlUR4TdbdDhfiTUmsrEotyo8vKs1JLT7EaAr0wkRmKdHkfGA6yCuJNzQxNLc0NDK2 sDA3MlIS55364Uq4kEB6YklqdmpqQWoRTB8TB6dUA6PeRMklSs+rb2/9k/Dt/AFRmSU6vkVS dSveihaJ3DfW3cmpYncquGvdyp/1llNOxxbJJO48aNM8pcxGomqSxPLqh4nWp/yiTvJuv+0r v/DM2kQfvqlNF4vCrNbzbjk5ebOXjsBR7yD2ays52w0sUnnFFSNcfvCf38GfP+nzzS+TfLcb vNl+1FmJpTgj0VCLuag4EQDb4P5DzwIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20160916085054eucas1p261bf6f0fb00e860fb819139557ffe5bb X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20160916085054eucas1p261bf6f0fb00e860fb819139557ffe5bb X-RootMTR: 20160916085054eucas1p261bf6f0fb00e860fb819139557ffe5bb References: <20160905111948.553487be@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/05/2016 03:19 AM, Stephen Rothwell wrote: > Hi Krzysztof, > > Today's linux-next merge of the samsung-krzk tree got a conflict in: > > arch/arm64/boot/dts/exynos/exynos7.dtsi > > between commit: > > 585dcacac6bb ("arm64: dts: Fix broken architected timer interrupt trigger") > > from the arm-soc tree and commit: > > 36d1c9cd07cd ("arm64: dts: exynos: Use human-friendly symbols for timer interrupt flags") > > from the samsung-krzk tree. > > I fixed it up (I *think* - 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. The fix is correct, for the record: Reviewed-by: Krzysztof Kozlowski Merge conflict was (unfortunately) expected. In general, the multiple-platform-at-once patches are conflict prone. Especially in this case, Marc's patch ("arm64: dts: Fix broken architected...") could be split per architecture. Best regards, Krzysztof From mboxrd@z Thu Jan 1 00:00:00 1970 From: krzk@kernel.org (Krzysztof Kozlowski) Date: Fri, 16 Sep 2016 10:50:52 +0200 Subject: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree In-Reply-To: <20160905111948.553487be@canb.auug.org.au> References: <20160905111948.553487be@canb.auug.org.au> Message-ID: <531f80d6-4cf6-ae83-7cb6-e002a6e8f63f@kernel.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 09/05/2016 03:19 AM, Stephen Rothwell wrote: > Hi Krzysztof, > > Today's linux-next merge of the samsung-krzk tree got a conflict in: > > arch/arm64/boot/dts/exynos/exynos7.dtsi > > between commit: > > 585dcacac6bb ("arm64: dts: Fix broken architected timer interrupt trigger") > > from the arm-soc tree and commit: > > 36d1c9cd07cd ("arm64: dts: exynos: Use human-friendly symbols for timer interrupt flags") > > from the samsung-krzk tree. > > I fixed it up (I *think* - 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. The fix is correct, for the record: Reviewed-by: Krzysztof Kozlowski Merge conflict was (unfortunately) expected. In general, the multiple-platform-at-once patches are conflict prone. Especially in this case, Marc's patch ("arm64: dts: Fix broken architected...") could be split per architecture. Best regards, Krzysztof