Message ID | cover.1479928995.git.horms+renesas@verge.net.au |
---|---|
State | New |
Headers | show |
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
On Wed, Nov 30, 2016 at 04:50:20PM +0100, Arnd Bergmann wrote: > 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! Thanks for pulling this and other outstanding pull requests from Geert and myself. I don't think we have anything more outstanding at this time.
On Thursday, December 1, 2016 9:47:58 AM CET Simon Horman wrote: > Thanks for pulling this and other outstanding pull requests from Geert and > myself. I don't think we have anything more outstanding at this time. Ok, thanks for the confirmation! Arnd