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... Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html