From: Arnd Bergmann <arnd@arndb.de>
To: Andy Gross <andy.gross@linaro.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
David Miller <davem@davemloft.net>,
linux-arm-kernel@lists.infradead.org,
Stephen Rothwell <sfr@canb.auug.org.au>,
netdev@vger.kernel.org,
Linux Kernel list <linux-kernel@vger.kernel.org>,
linux-next@vger.kernel.org, Olof Johansson <olof@lixom.net>
Subject: Re: QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree)
Date: Sat, 14 May 2016 21:47:11 +0200 [thread overview]
Message-ID: <3145757.u11669EZop@wuerfel> (raw)
In-Reply-To: <CAPBZ5Qfa+b1LLgqpxfKGysY5jXVrzmBzhga=ZYtpdDAKC9hnTQ@mail.gmail.com>
On Friday 13 May 2016 17:47:17 Andy Gross wrote:
> On 13 May 2016 at 17:19, Bjorn Andersson <bjorn.andersson@linaro.org> wrote:
> > On Fri 13 May 14:01 PDT 2016, Arnd Bergmann wrote:
> >
> >> On Tuesday 10 May 2016 11:39:34 Bjorn Andersson wrote:
> > [..]
> >> > I assume we could have the QRTR go through Andy and arm-soc, with
> >> > David's approval and this fix squashed in. But we're running rather late
> >> > in this cycle, perhaps we should just back the QRTR patches out and I
> >> > can respin and resend them after the merge window (for v4.8 instead)?
> >>
> >> I'd suggest you do a merge of next-next with the qcom/soc-2 branch that
> >> we have in arm-soc and resolve the conflict in the merge, then send
> >> a pull request with the merge to davem.
> >>
> >
> > Hi David,
> >
> > In case you missed this thread, linux-next highlighted an upcoming merge
> > conflict between the net-next and one of the branches included in the
> > arm-soc trees.
> >
> > 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.
> >
> > Regards,
> > Bjorn
> >
> > The following changes since commit ed7cbbce544856b20e5811de373cf92e92499771:
> >
> > udp: Resolve NULL pointer dereference over flow-based vxlan device (2016-05-13 01:56:14 -0400)
>
>
> OK. The contents look good to me.
>
> Acked-by: Andy Gross <andy.gross@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree)
Date: Sat, 14 May 2016 21:47:11 +0200 [thread overview]
Message-ID: <3145757.u11669EZop@wuerfel> (raw)
In-Reply-To: <CAPBZ5Qfa+b1LLgqpxfKGysY5jXVrzmBzhga=ZYtpdDAKC9hnTQ@mail.gmail.com>
On Friday 13 May 2016 17:47:17 Andy Gross wrote:
> On 13 May 2016 at 17:19, Bjorn Andersson <bjorn.andersson@linaro.org> wrote:
> > On Fri 13 May 14:01 PDT 2016, Arnd Bergmann wrote:
> >
> >> On Tuesday 10 May 2016 11:39:34 Bjorn Andersson wrote:
> > [..]
> >> > I assume we could have the QRTR go through Andy and arm-soc, with
> >> > David's approval and this fix squashed in. But we're running rather late
> >> > in this cycle, perhaps we should just back the QRTR patches out and I
> >> > can respin and resend them after the merge window (for v4.8 instead)?
> >>
> >> I'd suggest you do a merge of next-next with the qcom/soc-2 branch that
> >> we have in arm-soc and resolve the conflict in the merge, then send
> >> a pull request with the merge to davem.
> >>
> >
> > Hi David,
> >
> > In case you missed this thread, linux-next highlighted an upcoming merge
> > conflict between the net-next and one of the branches included in the
> > arm-soc trees.
> >
> > 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.
> >
> > Regards,
> > Bjorn
> >
> > The following changes since commit ed7cbbce544856b20e5811de373cf92e92499771:
> >
> > udp: Resolve NULL pointer dereference over flow-based vxlan device (2016-05-13 01:56:14 -0400)
>
>
> OK. The contents look good to me.
>
> Acked-by: Andy Gross <andy.gross@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
next prev parent reply other threads:[~2016-05-14 19:48 UTC|newest]
Thread overview: 21+ 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:29 ` Stephen Rothwell
2016-05-10 1:29 ` Stephen Rothwell
2016-05-10 1:52 ` Andy Gross
2016-05-10 1:52 ` Andy Gross
2016-05-10 18:39 ` Bjorn Andersson
2016-05-10 18:39 ` Bjorn Andersson
2016-05-13 21:01 ` Arnd Bergmann
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:19 ` Bjorn Andersson
2016-05-13 22:47 ` Andy Gross
2016-05-13 22:47 ` Andy Gross
2016-05-14 19:47 ` Arnd Bergmann [this message]
2016-05-14 19:47 ` Arnd Bergmann
2016-05-17 18:11 ` QRTR merge conflict resolution David Miller
2016-05-17 18:11 ` David Miller
2016-05-18 0:43 ` Stephen Rothwell
2016-05-18 0:43 ` Stephen Rothwell
2016-05-18 4:09 ` Bjorn Andersson
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=3145757.u11669EZop@wuerfel \
--to=arnd@arndb.de \
--cc=andy.gross@linaro.org \
--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 \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.