Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: David Miller <davem@davemloft.net>
To: bjorn.andersson@linaro.org
Cc: arnd@arndb.de, linux-arm-kernel@lists.infradead.org,
	sfr@canb.auug.org.au, 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: Tue, 17 May 2016 14:11:54 -0400 (EDT)
Message-ID: <20160517.141154.1511755950068252376.davem@davemloft.net> (raw)
In-Reply-To: <20160513221909.GC1256@tuxbot>

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.

  parent reply index

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       ` David Miller [this message]
2016-05-18  0:43         ` QRTR merge conflict resolution Stephen Rothwell
2016-05-18  4:09           ` Bjorn Andersson

Reply instructions:

You may reply publically 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=20160517.141154.1511755950068252376.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=andy.gross@linaro.org \
    --cc=arnd@arndb.de \
    --cc=bjorn.andersson@linaro.org \
    --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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git