Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751744AbdHQCsG (ORCPT ); Wed, 16 Aug 2017 22:48:06 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:20641 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751490AbdHQCsF (ORCPT ); Wed, 16 Aug 2017 22:48:05 -0400 Message-ID: <1502938079.4027.3.camel@mtksdaap41> Subject: Re: [PATCH 0/5] Add clk and scpsys support for MT6755 From: Yingjoe Chen To: Mars Cheng CC: Matthias Brugger , , , , Stephen Boyd , , Rob Herring , , Date: Thu, 17 Aug 2017 10:47:59 +0800 In-Reply-To: <1502855993.4599.1.camel@mtkswgap22> References: <1502180014-7995-1-git-send-email-mars.cheng@mediatek.com> <1502855993.4599.1.camel@mtkswgap22> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 682 Lines: 26 On Wed, 2017-08-16 at 11:59 +0800, Mars Cheng wrote: > Hi Rob, Stephen, Matthias > > gentle ping. > > Thanks. > > On Tue, 2017-08-08 at 16:13 +0800, Mars Cheng wrote: > > Mars Cheng (3): > > clk: mediatek: add mt6755 clock ID > > clk: mediatek: add clk support for MT6755 > > soc: mediatek: add MT6755 scpsys support Hi Mars, Sean reworked the scpsys driver to remove code duplication, see: http://lists.infradead.org/pipermail/linux-mediatek/2017-August/009687.html http://lists.infradead.org/pipermail/linux-mediatek/2017-August/009820.html I think current driver will have conflict and can't merge as-is, you'll need to rebase to Matthias' for-next branch. Joe.C