From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753972AbcCMCIx (ORCPT ); Sat, 12 Mar 2016 21:08:53 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:32887 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753903AbcCMCIL (ORCPT ); Sat, 12 Mar 2016 21:08:11 -0500 Date: Sat, 12 Mar 2016 17:16:04 -0800 From: Olof Johansson To: Arnd Bergmann Cc: Krzysztof Kozlowski , Kevin Hilman , arm@kernel.org, Kukjin Kim , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [GIT PULL] ARM: EXYNOS: SROM driver for v4.6, 2nd try Message-ID: <20160313011604.GL17502@localhost> References: <1456825042-23733-1-git-send-email-k.kozlowski@samsung.com> <1456825042-23733-3-git-send-email-k.kozlowski@samsung.com> <56D77FA6.5070500@samsung.com> <2210448.V5gsMerLz6@wuerfel> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2210448.V5gsMerLz6@wuerfel> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 03, 2016 at 02:11:32PM +0100, Arnd Bergmann wrote: > On Thursday 03 March 2016 09:04:54 Krzysztof Kozlowski wrote: > > On 01.03.2016 18:37, Krzysztof Kozlowski wrote: > > > Hi, > > > > > > > > > After Olof comments, second pull request with movement of SROM code > > > to separate driver - under drivers/memory/samsung (more are planned for > > > that directory). > > > > > > This depends on (included here): > > > 1. tag samsung-dt-srom-4.6: SROM-DT changes, merged already to arm-soc, > > > 2. tag samsung-soc-4.6-2: next/soc changes, sent few days ago, not merged yet. > > > > > > This may conflict in the future (in linux-next or Linus) around > > > drivers/memory/Kconfig with iommu tree. Just add all the changes. > > > > > > > > > The diff at the end contains both samsung-soc-4.6-2 and this stuff. > > > To make finding changes easier, below you will find difference between > > > this tag and samsung-soc-4.6-2: > > > > I see you did not pull this yet so can you wait a little bit? Rob > > Herring posted some comments on bindings so this might be revisited... > > > > This is an unlucky patchset... > > It was a bit late last night, and I didn't want to check that the > dependencies were correct. I also saw that you had discussed these > contents with Olof before, but didn't follow the thread there, so > I was hoping that Olof could get back to it and check that his > concerns are all addressed before picking it up. Hi, I've merged the other SoC branches now (that were respun without this SROM contents). I think it's safe given the feedback from Rob to wait with this driver for the next cycle. That way the dependencies are gone too since they will have been merged. -Olof