By a popular demand quilt tree was replaced by a git one.
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
---
MAINTAINERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: b/MAINTAINERS
===================================================================
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2743,7 +2743,7 @@ IDE SUBSYSTEM
P: Bartlomiej Zolnierkiewicz
M: [email protected]
L: [email protected]
-T: quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git
S: Maintained
F: Documentation/ide/
F: drivers/ide/
Hello.
Bartlomiej Zolnierkiewicz wrote:
> By a popular demand quilt tree was replaced by a git one.
>
> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
> ---
> MAINTAINERS | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: b/MAINTAINERS
> ===================================================================
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2743,7 +2743,7 @@ IDE SUBSYSTEM
> P: Bartlomiej Zolnierkiewicz
> M: [email protected]
> L: [email protected]
> -T: quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
> +T: git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git
>
Does that mean that the patches that have been already accepeted into
the git tree, can't be updated afterwards (i.e. I have a habit of
sometimes sending several takes of the same patch)?
WBR, Sergei
On Friday 24 April 2009 10:08:48 Sergei Shtylyov wrote:
> Hello.
>
> Bartlomiej Zolnierkiewicz wrote:
>
> > By a popular demand quilt tree was replaced by a git one.
> >
> > Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
> > ---
> > MAINTAINERS | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > Index: b/MAINTAINERS
> > ===================================================================
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -2743,7 +2743,7 @@ IDE SUBSYSTEM
> > P: Bartlomiej Zolnierkiewicz
> > M: [email protected]
> > L: [email protected]
> > -T: quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
> > +T: git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git
> >
>
> Does that mean that the patches that have been already accepeted into
> the git tree, can't be updated afterwards (i.e. I have a habit of
> sometimes sending several takes of the same patch)?
Yes, please just send incremental updates once the patch has been merged.
Thanks,
Bart
Hi,
On Fri, Apr 24, 2009 at 11:54 AM, Bartlomiej Zolnierkiewicz
<[email protected]> wrote:
> On Friday 24 April 2009 10:08:48 Sergei Shtylyov wrote:
>> Hello.
>>
>> Bartlomiej Zolnierkiewicz wrote:
>>
>> > By a popular demand quilt tree was replaced by a git one.
>> >
>> > Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
>> > ---
>> > ?MAINTAINERS | ? ?2 +-
>> > ?1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > Index: b/MAINTAINERS
>> > ===================================================================
>> > --- a/MAINTAINERS
>> > +++ b/MAINTAINERS
>> > @@ -2743,7 +2743,7 @@ IDE SUBSYSTEM
>> > ?P: Bartlomiej Zolnierkiewicz
>> > ?M: [email protected]
>> > ?L: [email protected]
>> > -T: quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
>> > +T: git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git
>> >
>>
>> ? Does that mean that the patches that have been already accepeted into
>> the git tree, can't be updated afterwards (i.e. I have a habit of
>> sometimes sending several takes of the same patch)?
>
> Yes, please just send incremental updates once the patch has been merged.
Or, you can interactively rebase the tree to the commit right before the patch
to be replaced and then add the updated patch in place of the old one. There's a
very hands-on example in the manpage in section "INTERACTIVE MODE."
A problem with that might be that others who've pulled from your branch will see
the rewritten history with a new SHA1 commit, but that would be still ok since
we'll be pulling from the linux-next branch and the for-linus branch is the one
that is cast in stone once Linus pulls from you.
--
Regards/Gruss,
Boris
On Friday 24 April 2009 18:41:42 Borislav Petkov wrote:
> Hi,
>
> On Fri, Apr 24, 2009 at 11:54 AM, Bartlomiej Zolnierkiewicz
> <[email protected]> wrote:
> > On Friday 24 April 2009 10:08:48 Sergei Shtylyov wrote:
> >> Hello.
> >>
> >> Bartlomiej Zolnierkiewicz wrote:
> >>
> >> > By a popular demand quilt tree was replaced by a git one.
> >> >
> >> > Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
> >> > ---
> >> > MAINTAINERS | 2 +-
> >> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >> >
> >> > Index: b/MAINTAINERS
> >> > ===================================================================
> >> > --- a/MAINTAINERS
> >> > +++ b/MAINTAINERS
> >> > @@ -2743,7 +2743,7 @@ IDE SUBSYSTEM
> >> > P: Bartlomiej Zolnierkiewicz
> >> > M: [email protected]
> >> > L: [email protected]
> >> > -T: quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
> >> > +T: git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git
> >> >
> >>
> >> Does that mean that the patches that have been already accepeted into
> >> the git tree, can't be updated afterwards (i.e. I have a habit of
> >> sometimes sending several takes of the same patch)?
> >
> > Yes, please just send incremental updates once the patch has been merged.
>
> Or, you can interactively rebase the tree to the commit right before the patch
> to be replaced and then add the updated patch in place of the old one. There's a
> very hands-on example in the manpage in section "INTERACTIVE MODE."
>
> A problem with that might be that others who've pulled from your branch will see
> the rewritten history with a new SHA1 commit, but that would be still ok since
> we'll be pulling from the linux-next branch and the for-linus branch is the one
> that is cast in stone once Linus pulls from you.
I don't think that it will be ok to people who have already based their
work on a earlier version of the tree. Also sometimes people may need
to pull ide tree into their tree (block tree comes to mind) so rebasing
should be avoided as much as possible.
Moreover, I would prefer getting patches which don't need updating. ;-)
Thanks,
Bart
On Fri, Apr 24, 2009 at 09:21:16PM +0200, Bartlomiej Zolnierkiewicz wrote:
> Moreover, I would prefer getting patches which don't need updating. ;-)
Sounds like a good idea, let's do that! :0)
--
Regards/Gruss,
Boris.
Borislav Petkov wrote:
> On Fri, Apr 24, 2009 at 09:21:16PM +0200, Bartlomiej Zolnierkiewicz wrote:
>> Moreover, I would prefer getting patches which don't need updating. ;-)
>
> Sounds like a good idea, let's do that! :0)
>
Great. :-)
To rebase or not seems to be an issue people have different opinions
about. Some trees get rebased regularly while others seldomly or
never. Not being a maintainer, I prefer trees which don't get rebased
but being able to provide cross-tree sync points is one of the biggest
benefits and as long as they can be established when necessary, I
guess to-each-his/her-own.
Thanks.
--
tejun