Messages in this thread | | | Date | Tue, 2 Oct 2012 15:13:27 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the spi-mb tree |
| |
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in drivers/spi/Kconfig between commit 536a53a300d0 ("spi: remove completely broken Tegra driver") from the spi-mb tree and commit 5bd276118189 ("spi: tegra: remove support of legacy DMA driver based access") from the arm-soc tree.
I fixed it up (by removing the SPI_TEGRA section) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |