Skip to contentSkip to conversation

New MFD tree for linux-next

DISCUSSION Samuel Ortiz 2 participants 7 messages Mar 14, 2013 – Mar 18, 2013

lore
Share & tools
lore
#0 lore raw

Hi Stephen,

I am moving the MFD development from mfd-2.6.git/for-next to a new mfd-next tree:

git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git

Could you please point linux-next at it ? Many thanks in advance.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
#1 lore raw

Hi Stephen,

Quoted 8 lines · Samuel Ortiz

Hi Stephen,

I am moving the MFD development from mfd-2.6.git/for-next to a new mfd-next tree:

git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git

Could you please point linux-next at it ? Many thanks in advance.

I'm also carrying MFD fixes through the mfd-fixes tree:

git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git

Could you please also add it to linux-next ?

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
#2 lore raw

Hi Samuel,

Quoted 9 lines · On Fri, 15 Mar 2013 17:46:25 +0100 Samuel Ortiz <[email protected]> wrote:
Quoted 7 lines · Samuel Ortiz

I am moving the MFD development from mfd-2.6.git/for-next to a new mfd-next tree:

git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git

Could you please point linux-next at it ? Many thanks in advance.

Done. I assume that you are still using the for-next branch?

Quoted 5 lines

I'm also carrying MFD fixes through the mfd-fixes tree:

git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git

Could you please also add it to linux-next ?

What branch should I use of that?

BTW, those two trees look very similar (in fact "diff -u <(git ls-remote mfd) <(git ls-remote mfd-fixes)" only shows a couple of differences in all the refs). You do realise that I can use 2 different branches of one tree, right (as can others)?

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]
#3 lore raw

Hi Stephen,

Quoted 6 lines · Stephen Rothwell

Hi Samuel,

Quoted 3 lines · On Fri, 15 Mar 2013 17:46:25 +0100 Samuel Ortiz <[email protected]> wrote:
Quoted 1 line · Samuel Ortiz
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines

I am moving the MFD development from mfd-2.6.git/for-next to a new mfd-next tree:

git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git

Could you please point linux-next at it ? Many thanks in advance.

Done.

Thanks.

Quoted 1 line

I assume that you are still using the for-next branch?

I will update for-next branch to be in sync with mfd-next until the 3.10 merge window closes. After that I'll probably delete the mfd-2.6.git tree.

Quoted 7 lines
Quoted 5 lines

I'm also carrying MFD fixes through the mfd-fixes tree:

git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git

Could you please also add it to linux-next ?

What branch should I use of that?

Ah, I didn't see that the remote tree still carries the mfd-2.6 branches, I'll remove them.
Please use master.

Quoted 4 lines

BTW, those two trees look very similar (in fact "diff -u <(git ls-remote mfd) <(git ls-remote mfd-fixes)" only shows a couple of differences in all the refs). You do realise that I can use 2 different branches of one tree, right (as can others)?

I understand that :) But using 2 trees rather than 2 separate branches is more convenient to my personal workflow.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
#4 lore raw

Hi Samuel,

Quoted 4 lines · On Mon, 18 Mar 2013 00:39:07 +0100 Samuel Ortiz <[email protected]> wrote:
Quoted 2 lines

I assume that you are still using the for-next branch?

I will update for-next branch to be in sync with mfd-next until the 3.10 merge window closes. After that I'll probably delete the mfd-2.6.git tree.

I meant "I assume that I should still fetch the for-next branch of ...sameo/mfd-next.git". If that has changed, please let me know.

Quoted 4 lines
Quoted 1 line

What branch should I use of that?

Ah, I didn't see that the remote tree still carries the mfd-2.6 branches, I'll remove them.
Please use master.

OK. I will do that from tomorrow.

Quoted 6 lines
Quoted 4 lines

BTW, those two trees look very similar (in fact "diff -u <(git ls-remote mfd) <(git ls-remote mfd-fixes)" only shows a couple of differences in all the refs). You do realise that I can use 2 different branches of one tree, right (as can others)?

I understand that :) But using 2 trees rather than 2 separate branches is more convenient to my personal workflow.

No worries.

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]
#5 lore raw
Quoted 8 lines · Stephen Rothwell
Quoted 4 lines · On Mon, 18 Mar 2013 00:39:07 +0100 Samuel Ortiz <[email protected]> wrote:
Quoted 2 lines

I assume that you are still using the for-next branch?

I will update for-next branch to be in sync with mfd-next until the 3.10 merge window closes. After that I'll probably delete the mfd-2.6.git tree.

I meant "I assume that I should still fetch the for-next branch of ...sameo/mfd-next.git". If that has changed, please let me know.

Sorry for the misunderstanding, I was not clear enough: mfd-next master is replacing mfd-2.6 for-next and mfd-fixes master is replacing mfd-2.6 for-linus. So no need to pull mfd-next for-next.

I deleted all branches but master from both mfd-next and mfd-fixes, so things should be clearer now.

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

What branch should I use of that?

Ah, I didn't see that the remote tree still carries the mfd-2.6 branches, I'll remove them.
Please use master.

OK. I will do that from tomorrow.

Thanks a lot.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
#6 lore raw

Hi Samuel,

Quoted 8 lines · On Mon, 18 Mar 2013 01:11:02 +0100 Samuel Ortiz <[email protected]> wrote:
Quoted 6 lines · Stephen Rothwell
Quoted 4 lines · On Mon, 18 Mar 2013 00:39:07 +0100 Samuel Ortiz <[email protected]> wrote:
Quoted 2 lines

I assume that you are still using the for-next branch?

I will update for-next branch to be in sync with mfd-next until the 3.10 merge window closes. After that I'll probably delete the mfd-2.6.git tree.

Quoted 8 lines
Quoted 2 lines

I meant "I assume that I should still fetch the for-next branch of ...sameo/mfd-next.git". If that has changed, please let me know.

Sorry for the misunderstanding, I was not clear enough: mfd-next master is replacing mfd-2.6 for-next and mfd-fixes master is replacing mfd-2.6 for-linus. So no need to pull mfd-next for-next.

I deleted all branches but master from both mfd-next and mfd-fixes, so things should be clearer now.

OK, I will fix this up for tomorrow.

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]