From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755375AbcERAnY (ORCPT ); Tue, 17 May 2016 20:43:24 -0400 Received: from ozlabs.org ([103.22.144.67]:49583 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755287AbcERAnW (ORCPT ); Tue, 17 May 2016 20:43:22 -0400 Date: Wed, 18 May 2016 10:43:20 +1000 From: Stephen Rothwell To: David Miller Cc: bjorn.andersson@linaro.org, arnd@arndb.de, linux-arm-kernel@lists.infradead.org, andy.gross@linaro.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, olof@lixom.net Subject: Re: QRTR merge conflict resolution Message-ID: <20160518104320.23ae8557@canb.auug.org.au> In-Reply-To: <20160517.141154.1511755950068252376.davem@davemloft.net> References: <20160510183934.GJ1256@tuxbot> <2606282.lG9qK7uBW0@wuerfel> <20160513221909.GC1256@tuxbot> <20160517.141154.1511755950068252376.davem@davemloft.net> 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 David, On Tue, 17 May 2016 14:11:54 -0400 (EDT) David Miller wrote: > > From: Bjorn Andersson > Date: Fri, 13 May 2016 15:19:09 -0700 > > > I have prepared the merge of net-next and the conflicting tag from the > > Qualcomm SOC, please include this in your pull towards Linus to avoid > > the merge conflict. > > Pulled, thanks. Except in the merge resolution, the 2 new functions added to include/linux/soc/qcom/smd.h (qcom_smd_get_drvdata and qcom_smd_set_drvdata) were not marked "static inline" :-( -- Cheers, Stephen Rothwell