Messages in this thread | | | Date | Sun, 02 Mar 2014 22:21:02 -0700 | From | Stephen Warren <> | Subject | Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree |
| |
On 03/02/2014 06:02 PM, Stephen Rothwell wrote: > Hi Stephen, > > Today's linux-next merge of the bcm2835 tree got a conflict in > arch/arm/mach-bcm2835/Kconfig between commits ddb902cc3459 ("ARM: > centralize common multi-platform kconfig options") and > 0676b21fffd1 ("ARM: bcm2835: enable V6K instead of plain V6") from > the arm-soc tree and commit d30fe6272183 ("ARM: bcm2835: Move to > mach-bcm directory") from the bcm2835 tree.
Olof, Arnd, Kevin,
Do you want me to rebase the patch that moves arch/arm/mach-bcm2835/Kconfig into arch/arm/mach-bcm/Kconfig, or even drop it and take it through arm-soc directly? Or, will you just handle this when you merge the pull request?
| |