From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Wed, 30 Nov 2016 16:50:20 +0100 Subject: [GIT PULL] Renesas ARM Based SoC Match Updates for v4.10 In-Reply-To: References: Message-ID: <6791283.iMDbrK21lt@wuerfel> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wednesday, November 23, 2016 9:13:31 PM CET Simon Horman wrote: > This pull request is based on the pull request "soc_device_match() > interface for matching against soc_bus attributes" sent by Geert > Uytterhoeven which corresponds to the soc-device-match-tag1 tag in his > renesas-driver's tree. It provides infrastructure used by changes in this > pull request. > > This pull request is broken out of an earlier pull request, > "Second Round of Renesas ARM Based SoC Drivers Updates for v4.10". > The motivation for breaking up the pull request is to provide > branches with minimal dependencies. > > This pull request is targeted at the next/drivers branch of the arm-soc tree. > > It introduces some minor merge conflicts in drivers/soc/renesas/Makefile. > The resolution is to take both sides. A sample merge resolution is > provided in the renesas-next-20161123v2-v4.9-rc1 tag of the renesas tree. > Pulled into next/drivers, thanks! Arnd