Re: manual merge of the cix tree with the arm-soc tree

On 26-05-08 13:06:02, Arnd Bergmann wrote:
> 
> Hi Peter,
> 
> this is not a problem you caused, just something to be aware of
> when you send the pull request, and to check that Thierry made
> the right choice in resolving it.
> 
> > Arnd, I deleted this patch at CIX next-tree. Would you please help queue it
> > in your soc/defconfig:
> >
> > https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git/
> > branch: cix/defconfig
> 
> Please send it as a normal pull request or patch to [email protected]
> so your change gets mered using the patchwork process.
> 
> If you send it as a standalone patch, please make sure it applies
> on top of the soc/defconfig branch. A pull request is also fine,
> and that would normally be based on -rc1. Obviously this causes
> a merge conflict, which we will resolve during the merge.
> 

Hi Arnd,

Thanks for explaining it. So, for linux-next merge confliction patch,
how to handle it better?
Option 1:
Send pull-request to SoC maintainer once linux-next merge conflict happens, and
depends on SoC maintainer's tree at linux-next for testing
Option 2:
Rebase on SoC maintainer's tree, and still keep patches on SoC submaintainer's tree
at linux-next for testing
Other options?

-- 

Best regards,
Peter