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.
--
Intel Open Source Technology Centre
http://oss.intel.com/
Hi Stephen,
On Thu, Mar 14, 2013 at 01:02:01AM +0100, Samuel Ortiz wrote:
> 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.
--
Intel Open Source Technology Centre
http://oss.intel.com/
Hi Samuel,
On Fri, 15 Mar 2013 17:46:25 +0100 Samuel Ortiz <[email protected]> wrote:
>
> On Thu, Mar 14, 2013 at 01:02:01AM +0100, Samuel Ortiz wrote:
> >
> > 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?
> 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)?
--
Cheers,
Stephen Rothwell [email protected]
Hi Stephen,
On Sat, Mar 16, 2013 at 01:27:53PM +1100, Stephen Rothwell wrote:
> Hi Samuel,
>
> On Fri, 15 Mar 2013 17:46:25 +0100 Samuel Ortiz <[email protected]> wrote:
> >
> > On Thu, Mar 14, 2013 at 01:02:01AM +0100, Samuel Ortiz wrote:
> > >
> > > 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.
> 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'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.
> 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.
--
Intel Open Source Technology Centre
http://oss.intel.com/
Hi Samuel,
On Mon, 18 Mar 2013 00:39:07 +0100 Samuel Ortiz <[email protected]> wrote:
>
> > 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.
> > 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.
> > 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.
--
Cheers,
Stephen Rothwell [email protected]
On Mon, Mar 18, 2013 at 10:45:20AM +1100, Stephen Rothwell wrote:
> On Mon, 18 Mar 2013 00:39:07 +0100 Samuel Ortiz <[email protected]> wrote:
> >
> > > 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.
> > > 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.
--
Intel Open Source Technology Centre
http://oss.intel.com/
Hi Samuel,
On Mon, 18 Mar 2013 01:11:02 +0100 Samuel Ortiz <[email protected]> wrote:
>
> On Mon, Mar 18, 2013 at 10:45:20AM +1100, Stephen Rothwell wrote:
> > On Mon, 18 Mar 2013 00:39:07 +0100 Samuel Ortiz <[email protected]> wrote:
> > >
> > > > 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.
OK, I will fix this up for tomorrow.
--
Cheers,
Stephen Rothwell [email protected]