Skip to contentSkip to conversation

Pull request question for Mark (ASoC)

DISCUSSION Lee Jones 3 participants 4 messages Sep 20, 2012 1 message not in the archive

lore
Share & tools
lore

Lee Jones

author
#0 lore raw

Hi Mark,

I have a pull request for you, but at least one of the patches touches the MOP500 driver as well as ux500 platform code. If I split them up into for-asoc-next and for-arm-soc-next branches there I it will cause conflicts in arch/arm/mach-ux500/*.

Is it okay to send the 6 patches I have for ASoC, all of which are encapsulated in sound/soc/ux500/ through the arm-soc tree with the rest of my patches please?

Kind regards,
Lee

Signature · 4 lines
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#1 lore raw
Quoted 8 lines · Lee Jones

I have a pull request for you, but at least one of the patches touches the MOP500 driver as well as ux500 platform code. If I split them up into for-asoc-next and for-arm-soc-next branches there I it will cause conflicts in arch/arm/mach-ux500/*.

Is it okay to send the 6 patches I have for ASoC, all of which are encapsulated in sound/soc/ux500/ through the arm-soc tree with the rest of my patches please?

I have no problem with that but please post whatever code you're thinking of sending as well as the pull requests, don't just post the pull requests.

A message that is not in the archive (sent off-list or not yet received): CABVG=qc6-DVzMhogCopaS+rdHm5ZRM2q_1L_k9xXGWRrxzrfBw@mail.gmail.com

#3 lore raw
Quoted 5 lines
Quoted 4 lines

I have a pull request for you, but at least one of the patches touches the MOP500 driver as well as ux500 platform code. If I split them up into for-asoc-next and for-arm-soc-next branches there I it will cause conflicts in arch/arm/mach-ux500/*.

Quoted 7 lines
Quoted 3 lines

Is it okay to send the 6 patches I have for ASoC, all of which are encapsulated in sound/soc/ux500/ through the arm-soc tree with the rest of my patches please?

I have no problem with that but please post whatever code you're thinking of sending as well as the pull requests, don't just post the pull requests.

How would you like me to do that? As a patch-set with git send-mail?

Signature · 4 lines
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#4 lore raw
Quoted 5 lines · Lee Jones
Quoted 3 lines

I have no problem with that but please post whatever code you're thinking of sending as well as the pull requests, don't just post the pull requests.

How would you like me to do that? As a patch-set with git send-mail?

Yes, please.