On 10/04/2017 03:09 AM, Philipp Zabel wrote:
Hi Vineet,

On Mon, 2017-09-18 at 18:51 +0200, Philipp Zabel wrote:
Will it be OK for you to apply the corresponding DT update for
platform - that way
I don't have to keep track of when ur branch hits mainline etc.

The chances of any ensuing conflicts are pretty rare - and easy to resolve if 
at all.

If so, Eugeniy can send the patch ur way !

Maybe it is better to do this the other way around? I can put this patch
on a stable reset/arc branch for you to merge before applying the reset
DT updates.

Have you come to a decision on this?

Just in case, I have removed the AXS10x driver from the reset/next
branch and put it on its own branch:

   git://git.pengutronix.de/git/pza/linux.git reset/arc

This branch is immutable and I'll merge it into reset/next before
submitting the branch for v4.15-rc1.

I've git merge'ed this into ARC for-next !

@Eugeniy, can you please follow up with patches to undo any reset related hacks in axs10x ?

Thx,
-Vineet

Reply via email to