Messages in this thread | | | Date | Mon, 12 May 2014 15:16:47 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the gpio tree with the net-next tree |
| |
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in Documentation/driver-model/devres.txt between commit 6d48f44b7b2a ("mdio_bus: implement devm_mdiobus_alloc/devm_mdiobus_free") from the net-next tree and commit f9748ef13b6a ("gpio: Add missing device-managed documentation") from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc Documentation/driver-model/devres.txt index d483f2cf221b,8ff1167cfedf..000000000000 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt @@@ -310,7 -309,7 +310,12 @@@ SLAVE DMA ENGIN SPI devm_spi_register_master() +MDIO + devm_mdiobus_alloc() + devm_mdiobus_alloc_size() + devm_mdiobus_free() ++ + GPIO + devm_gpiod_get() + devm_gpiod_get_index() + devm_gpiod_put() [unhandled content-type:application/pgp-signature] | |