From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
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
Date: Wed, 18 May 2016 10:43:20 +1000 [thread overview]
Message-ID: <20160518104320.23ae8557@canb.auug.org.au> (raw)
In-Reply-To: <20160517.141154.1511755950068252376.davem@davemloft.net>
Hi David,
On Tue, 17 May 2016 14:11:54 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> From: Bjorn Andersson <bjorn.andersson@linaro.org>
> 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
next prev parent reply other threads:[~2016-05-18 0:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-10 1:29 linux-next: build failure after merge of the net-next tree Stephen Rothwell
2016-05-10 1:52 ` Andy Gross
2016-05-10 18:39 ` Bjorn Andersson
2016-05-13 21:01 ` Arnd Bergmann
2016-05-13 22:19 ` QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree) Bjorn Andersson
2016-05-13 22:47 ` Andy Gross
2016-05-14 19:47 ` Arnd Bergmann
2016-05-17 18:11 ` QRTR merge conflict resolution David Miller
2016-05-18 0:43 ` Stephen Rothwell [this message]
2016-05-18 4:09 ` Bjorn Andersson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160518104320.23ae8557@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andy.gross@linaro.org \
--cc=arnd@arndb.de \
--cc=bjorn.andersson@linaro.org \
--cc=davem@davemloft.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).