QRTR merge conflict resolution

linux-next: build failure after merge of the net-next tree · Stephen Rothwell <hidden> · 2016-05-10
Re: linux-next: build failure after merge of the net-next tree · Andy Gross <hidden> · 2016-05-10
Re: linux-next: build failure after merge of the net-next tree · Bjorn Andersson <hidden> · 2016-05-10
Re: linux-next: build failure after merge of the net-next tree · Arnd Bergmann <arnd@arndb.de> · 2016-05-13
QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree) · Bjorn Andersson <hidden> · 2016-05-13
Re: QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree) · Andy Gross <hidden> · 2016-05-13
Re: QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree) · Arnd Bergmann <arnd@arndb.de> · 2016-05-14
Re: QRTR merge conflict resolution · David Miller <davem@davemloft.net> · 2016-05-17
Re: QRTR merge conflict resolution · Stephen Rothwell <hidden> · 2016-05-18
Re: QRTR merge conflict resolution · Bjorn Andersson <hidden> · 2016-05-18

From: davem@davemloft.net (David Miller)
Date: 2016-05-17 18:11:58
Also in: linux-next, lkml, netdev

From: Bjorn Andersson <redacted>
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.

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help