From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Stuebner Subject: [GIT PULL] ARM: rockchip: small fixes for 4.0-rc Date: Sun, 15 Mar 2015 00:57:29 +0100 Message-ID: <3637038.xZyfPJIQzf@phil> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+glpar-linux-rockchip=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: linux-rockchip.vger.kernel.org Hi Arnd, Olof, a small issue surfaced with the new gmac node on rk3288 which is missing a status = "disabled"; in the rk3288.dtsi and thus enabling the mac unconditionally. The second patch in that branch simply adds a rockchip regexp to MAINTAINERS, so that it also matches stuff like the (slightly) new rockchip drm stuff. So if acceptable, please pull Thanks Heiko The following changes since commit c517d838eb7d07bbe9507871fab3931deccff539: Linux 4.0-rc1 (2015-02-22 18:21:14 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v4.0-rockchip-armfixes1 for you to fetch changes up to 54b0bc602541fcc2dd9f2480623c00552e0b220e: ARM: dts: rockchip: disable gmac by default in rk3288.dtsi (2015-03-14 19:35:26 +0100) ---------------------------------------------------------------- Adding a default-disabled state to the new gmac node and an update to the MAINTAINERS entry adding a rockchip regexp entry. ---------------------------------------------------------------- Alexandru M Stan (1): ARM: dts: rockchip: disable gmac by default in rk3288.dtsi Heiko Stuebner (1): MAINTAINERS: add rockchip regexp to the ARM/Rockchip entry MAINTAINERS | 1 + arch/arm/boot/dts/rk3288.dtsi | 1 + 2 files changed, 2 insertions(+)