From: davem@davemloft.net (David Miller)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm: sunxi: Revert changes merged through net-next.
Date: Sat, 01 Jul 2017 14:18:31 -0700 (PDT) [thread overview]
Message-ID: <20170701.141831.777812052121454399.davem@davemloft.net> (raw)
In-Reply-To: <20170630074617.20288-1-maxime.ripard@free-electrons.com>
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 30 Jun 2017 09:46:17 +0200
> This reverts commits 2c0cba482e79 ("arm: sun8i: sunxi-h3-h5: Add dt node
> for the syscon control module") to 2428fd0fe550 ("arm64: defconfig: Enable
> dwmac-sun8i driver on defconfig") and 3432a86e641c ("arm: sun8i:
> orangepipc: use internal phy-mode") to 5a79b4f2a5e7 ("arm: sun8i:
> orangepi-2: use internal phy-mode") that should be merged
> through the arm-soc tree, and end up in merge conflicts and build failures.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Applied to net-next, thanks.
prev parent reply other threads:[~2017-07-01 21:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-30 7:46 [PATCH] arm: sunxi: Revert changes merged through net-next Maxime Ripard
2017-07-01 21:18 ` David Miller [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=20170701.141831.777812052121454399.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=linux-arm-kernel@lists.infradead.org \
/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).