From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751846AbbJaXgC (ORCPT ); Sat, 31 Oct 2015 19:36:02 -0400 Received: from ozlabs.org ([103.22.144.67]:46681 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751060AbbJaXgA (ORCPT ); Sat, 31 Oct 2015 19:36:00 -0400 Date: Sun, 1 Nov 2015 10:35:55 +1100 From: Stephen Rothwell To: Jason Cooper , , , , Olof Johansson , Arnd Bergmann Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Donnefort Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree Message-ID: <20151101103555.2464c0ee@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the mvebu tree got a conflict in: arch/arm/mach-mvebu/pmsu.c between commit: 9d2ea95a599a ("ARM: mvebu: add broken-idle option") from the arm-soc tree and commit: da6ee32a42c0 ("ARM: mvebu: add broken-idle option") from the mvebu tree. I fixed it up (looks like 2 version of the same thing (though different) so I just used the version from the arm-doc tree) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au