Linux-Next discussions
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Yury Norov <ynorov@caviumnetworks.com>,
	Sumit Semwal <sumit.semwal@linaro.org>,
	"David S. Miller" <davem@davemloft.net>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	LABBE Corentin <clabbe.montjoie@gmail.com>,
	Chen-Yu Tsai <wens@csie.org>,
	Linux-Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: arm64: build is broken on next-20170609 with merge-commit 9afca2c4e379 (arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver)
Date: Thu, 29 Jun 2017 09:48:25 +0200	[thread overview]
Message-ID: <20170629074825.pgeg2ut3nb3tj36u@flea> (raw)
In-Reply-To: <20170628160711.08763ee7@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 650 bytes --]

Hi,

On Wed, Jun 28, 2017 at 04:07:11PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> [Yes, top posted :-)]
> 
> With the merge window approaching, this is just a reminder that this
> merge problem still exists.  I assume that the sunxi tree will be
> merged into the arm-soc tree before going to Linus.

It's already been merged in arm-soc. I haven't had any news from Dave
on this despite my mails, so I don't really know how to solve this.

Those patches really should never have been in net-next in the first
place.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

      reply	other threads:[~2017-06-29  7:48 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20170609124325.p7b6fhdbwtki4w2z@yury-thinkpad>
2017-06-09 23:29 ` arm64: build is broken on next-20170609 with merge-commit 9afca2c4e379 (arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver) Stephen Rothwell
2017-06-28  6:07   ` Stephen Rothwell
2017-06-29  7:48     ` Maxime Ripard [this message]

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=20170629074825.pgeg2ut3nb3tj36u@flea \
    --to=maxime.ripard@free-electrons.com \
    --cc=arnd@arndb.de \
    --cc=clabbe.montjoie@gmail.com \
    --cc=davem@davemloft.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    --cc=sumit.semwal@linaro.org \
    --cc=wens@csie.org \
    --cc=ynorov@caviumnetworks.com \
    /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