From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752618AbcBPEaP (ORCPT ); Mon, 15 Feb 2016 23:30:15 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:49695 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752002AbcBPEaN (ORCPT ); Mon, 15 Feb 2016 23:30:13 -0500 X-AuditID: cbfec7f5-f79b16d000005389-a7-56c2a5d23337 Subject: Re: linux-next: manual merge of the clk tree with the samsung-krzk tree To: Stephen Rothwell , Mike Turquette , Stephen Boyd References: <20160216151131.3e1d4cb5@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, James Liao , Sylwester Nawrocki , Arnd Bergmann From: Krzysztof Kozlowski X-Enigmail-Draft-Status: N1110 Message-id: <56C2A5CD.9040603@samsung.com> Date: Tue, 16 Feb 2016 13:30:05 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-version: 1.0 In-reply-to: <20160216151131.3e1d4cb5@canb.auug.org.au> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRmVeSWpSXmKPExsVy+t/xa7qXlh4KM3izQMni76Rj7BarL89g tHj9wtDi8q45bBYHF7YxWlw85Wpx+E07q8WPM90sFlv3XmV34PT4/WsSo8f7G63sHo03brB5 XO7rZfJoObmfxaNvyypGj8+b5ALYo7hsUlJzMstSi/TtErgy/h5YyV7QylkxcfontgbGCexd jJwcEgImEvO33GeCsMUkLtxbz9bFyMUhJLCUUWLRnt+MIAkhgaeMEnM+JYHYwgIBEs2H94DF RQRqJF69XcoMUWMmcbBzJytIM7PAFkaJVa+bwDawCRhLbF6+hA1ig5xEb/ckFhCbV0BL4seD jWCbWQRUJeYcXAZmiwpESBzu7GKHqBGU+DH5Hlg9p4C5xJml+4HmcAAt0JO4f1ELJMwsIC+x ec1b5gmMgrOQdMxCqJqFpGoBI/MqRtHU0uSC4qT0XCO94sTc4tK8dL3k/NxNjJD4+LqDcekx q0OMAhyMSjy8G1wPhQmxJpYVV+YeYpTgYFYS4U1YBBTiTUmsrEotyo8vKs1JLT7EKM3BoiTO O3PX+xAhgfTEktTs1NSC1CKYLBMHp1QD4+KEY+WldzQenVjW2B8iv3jbxFrnuoDk1rDVtwT4 Q51Db0QXKraa35tusTmibvrX61bPTs1he1KjsuTR/dI69bjKqUfuL3wV4O/cM11Huueybw7H /45Za87FCElrneV955krW31sj4vMLNEJx17ePTR7+21+d7HDTN52R/IacjvPGSradtavVWIp zkg01GIuKk4EAD1h552LAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 16.02.2016 13:11, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the clk tree got a conflict in: > > drivers/clk/Kconfig > drivers/clk/samsung/Kconfig > > between commit: > > fa6439544887 ("clk: samsung: Enable COMPILE_TEST for Samsung clocks") > > from the samsung-krzk tree and commit: > > b9e65ebc654d ("clk: Move vendor's Kconfig into CCF menu section") > > from the clk tree. > > I fixed it up (they both had similar effects) and can carry the fix as > necessary (no action is required). Thanks! Stephen, Mike, James' b9e65ebc654d looks like a simpler approach to the same problem - moving Samsung common clocks under COMMON_CLK. If you agree I can rebase my patch on top of it so only COMPILE_TEST would be added. However my third patch in that set ("arm64: EXYNOS: Consolidate ARCH_EXYNOS7 symbol into ARCH_EXYNOS" [0]) depends on it, so maybe you could prepare a tag with everything? James patch + two of mine (also "clk: samsung: Don't build ARMv8 clock drivers on ARMv7")? Best regards, Krzysztof [0] http://www.spinics.net/lists/devicetree/msg111893.html