[GIT PULL] ARM: mvebu: fixes for v4.12 (#1)

[GIT PULL] ARM: mvebu: fixes for v4.12 (#1)

[Gregory CLEMENT]

Hi,

Here is the first pull request for fixes for mvebu for v4.12.

Gregory

The following changes since commit 08332893e37af6ae779367e78e444f8f9571511d:

  Linux 4.12-rc2 (2017-05-21 19:30:23 -0700)

are available in the git repository at:

  git://git.infradead.org/linux-mvebu.git tags/mvebu-fixes-4.12-1

for you to fetch changes up to 44f73dc42c11398d7b84e94365a485ebd6420798:

  arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes (2017-05-24 17:12:59 +0200)

----------------------------------------------------------------
mvebu fixes for 4.12

Fix the interrupt description of the crypto node for device tree of
the Armada 7K/8K SoCs

----------------------------------------------------------------
Antoine Tenart (1):
      arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes

 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 3 +--
 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

[GIT PULL] ARM: mvebu: fixes for v4.12 (#1)

[Olof Johansson]

On Thu, Jun 01, 2017 at 05:06:35PM +0200, Gregory CLEMENT wrote:
> Hi,
> 
> Here is the first pull request for fixes for mvebu for v4.12.
> 
> Gregory
> 
> The following changes since commit 08332893e37af6ae779367e78e444f8f9571511d:
> 
>   Linux 4.12-rc2 (2017-05-21 19:30:23 -0700)
> 
> are available in the git repository at:
> 
>   git://git.infradead.org/linux-mvebu.git tags/mvebu-fixes-4.12-1

So, it's really appreciated from our side if you take a look at our tree to see
what the base for our own fixes branch is, and pick the same or older base for
your contents.

In this case, we're still at -rc1 and you're on -rc2, so this included
a backmerge of -rc2 into our branch. It's nice to avoid if we can, but it's
also not a huge deal.


Merged to fixes.


-Olof

[GIT PULL] ARM: mvebu: fixes for v4.12 (#1)

[Gregory CLEMENT]

Hi Olof,
 
 On ven., juin 02 2017, Olof Johansson <olof@lixom.net> wrote:

> On Thu, Jun 01, 2017 at 05:06:35PM +0200, Gregory CLEMENT wrote:
>> Hi,
>> 
>> Here is the first pull request for fixes for mvebu for v4.12.
>> 
>> Gregory
>> 
>> The following changes since commit 08332893e37af6ae779367e78e444f8f9571511d:
>> 
>>   Linux 4.12-rc2 (2017-05-21 19:30:23 -0700)
>> 
>> are available in the git repository at:
>> 
>>   git://git.infradead.org/linux-mvebu.git tags/mvebu-fixes-4.12-1
>
> So, it's really appreciated from our side if you take a look at our tree to see
> what the base for our own fixes branch is, and pick the same or older base for
> your contents.
>
> In this case, we're still at -rc1 and you're on -rc2, so this included
> a backmerge of -rc2 into our branch. It's nice to avoid if we can, but it's
> also not a huge deal.

I used the rc2 as a base because some mvebu related patches I sent close
to the opening of the 4.12 merge windows were merged in 4.12-rc2.

I wanted to avoid future potential conflict on hte fixes branch.

Thanks,

Gregory

>
>
> Merged to fixes.
>
>
> -Olof

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com