From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751334AbbJOIEQ (ORCPT ); Thu, 15 Oct 2015 04:04:16 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:37278 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750807AbbJOIEL (ORCPT ); Thu, 15 Oct 2015 04:04:11 -0400 Date: Thu, 15 Oct 2015 09:04:06 +0100 From: Lee Jones To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Kukjin Kim Subject: Re: linux-next: manual merge of the mfd tree with the arm-soc tree Message-ID: <20151015080406.GL32409@x1> References: <20151015131911.3b3a7ca8@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20151015131911.3b3a7ca8@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 15 Oct 2015, Stephen Rothwell wrote: > Hi Lee, > > Today's linux-next merge of the mfd tree got a conflict in: > > Documentation/devicetree/bindings/mfd/s2mps11.txt > > between commit: > > 6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11") > > from the arm-soc tree and commit: > > db96ec728d69 ("mfd: dt-bindings: Document pulled down WRSTBI pin on S2MPS1X") > > from the mfd tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Yeah, I thought this might happen. Hence: http://www.spinics.net/lists/devicetree/msg97548.html. -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog