--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
11-01-2010, 04:26 PM
Leann Ogasawara
Lucid lts-backport-maverick Pull request
On Fri, 2010-10-29 at 14:42 -0600, Tim Gardner wrote:
> The following changes since commit e5bc81156355bc8203a2fb389447f99007ccf0f9:
> Brad Figg (1):
> UBUNTU: Ubuntu-2.6.35-23.36
>
> are available in the git repository at:
>
> git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lts-backport-maverick
Despite the Subject and above git repo indicating this should be applied
to the Lucid repo, it seems Lucid already has an lts-backport-maverick
branch. Looking at the actual patches in the pull request, it seems the
patches apply to Maverick? Is my understanding correct?
--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
11-01-2010, 04:58 PM
Tim Gardner
Lucid lts-backport-maverick Pull request
On 11/01/2010 01:26 PM, Leann Ogasawara wrote:
> On Fri, 2010-10-29 at 14:42 -0600, Tim Gardner wrote:
>> The following changes since commit e5bc81156355bc8203a2fb389447f99007ccf0f9:
>> Brad Figg (1):
>> UBUNTU: Ubuntu-2.6.35-23.36
>>
>> are available in the git repository at:
>>
>> git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lts-backport-maverick
>
> Despite the Subject and above git repo indicating this should be applied
> to the Lucid repo, it seems Lucid already has an lts-backport-maverick
> branch. Looking at the actual patches in the pull request, it seems the
> patches apply to Maverick? Is my understanding correct?
>
> Thanks,
> Leann
It's not really clear from the pull request I guess, but this really
does apply to the lts-backports-maverick branch in Lucid (unless I've
really messed something up).
rtg
--
Tim Gardner tim.gardner@canonical.com
--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
11-01-2010, 06:56 PM
Leann Ogasawara
Lucid lts-backport-maverick Pull request
On Mon, 2010-11-01 at 13:58 -0400, Tim Gardner wrote:
> On 11/01/2010 01:26 PM, Leann Ogasawara wrote:
> > On Fri, 2010-10-29 at 14:42 -0600, Tim Gardner wrote:
> >> The following changes since commit e5bc81156355bc8203a2fb389447f99007ccf0f9:
> >> Brad Figg (1):
> >> UBUNTU: Ubuntu-2.6.35-23.36
> >>
> >> are available in the git repository at:
> >>
> >> git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lts-backport-maverick
> >
> > Despite the Subject and above git repo indicating this should be applied
> > to the Lucid repo, it seems Lucid already has an lts-backport-maverick
> > branch. Looking at the actual patches in the pull request, it seems the
> > patches apply to Maverick? Is my understanding correct?
> >
> > Thanks,
> > Leann
>
> It's not really clear from the pull request I guess, but this really
> does apply to the lts-backports-maverick branch in Lucid (unless I've
> really messed something up).
Hrm, I can't seem to get this to apply cleanly to the current Lucid
lts-backport-maverick branch. The following two commits are already at
the tip of the current Lucid lts-backport-maverick branch:
d295edc9c59595a15affce38d93e8f5d4ac14249 UBUNTU: Ubuntu-lts-2.6.35-22.34
9afeecbc176baaa5fabce2f155f6a488c3cca1a6 UBUNTU: [Config] Created LTS backport branch
So it seems something isn't quite right with the pull request as it's
again trying to create the LTS backport branch which already exists. Or
are you expecting a hard reset to FETCH_HEAD instead?
Thanks,
Leann
--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
11-01-2010, 07:57 PM
Tim Gardner
Lucid lts-backport-maverick Pull request
On 11/01/2010 03:56 PM, Leann Ogasawara wrote:
> On Mon, 2010-11-01 at 13:58 -0400, Tim Gardner wrote:
>> On 11/01/2010 01:26 PM, Leann Ogasawara wrote:
>>> On Fri, 2010-10-29 at 14:42 -0600, Tim Gardner wrote:
>>>> The following changes since commit e5bc81156355bc8203a2fb389447f99007ccf0f9:
>>>> Brad Figg (1):
>>>> UBUNTU: Ubuntu-2.6.35-23.36
>>>>
>>>> are available in the git repository at:
>>>>
>>>> git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lts-backport-maverick
>>>
>>> Despite the Subject and above git repo indicating this should be applied
>>> to the Lucid repo, it seems Lucid already has an lts-backport-maverick
>>> branch. Looking at the actual patches in the pull request, it seems the
>>> patches apply to Maverick? Is my understanding correct?
>>>
>>> Thanks,
>>> Leann
>>
>> It's not really clear from the pull request I guess, but this really
>> does apply to the lts-backports-maverick branch in Lucid (unless I've
>> really messed something up).
>
> Hrm, I can't seem to get this to apply cleanly to the current Lucid
> lts-backport-maverick branch. The following two commits are already at
> the tip of the current Lucid lts-backport-maverick branch:
>
> d295edc9c59595a15affce38d93e8f5d4ac14249 UBUNTU: Ubuntu-lts-2.6.35-22.34
> 9afeecbc176baaa5fabce2f155f6a488c3cca1a6 UBUNTU: [Config] Created LTS backport branch
>
> So it seems something isn't quite right with the pull request as it's
> again trying to create the LTS backport branch which already exists. Or
> are you expecting a hard reset to FETCH_HEAD instead?
>
> Thanks,
> Leann
>
Oh, right. You've pointed out a couple of deficiencies (or unwitting
assumptions I've made). This really isn't a merge or pull request,
rather you'll need to reset hard to FETCH_HEAD since this branch is
always a total rebase.
rtg
--
Tim Gardner tim.gardner@canonical.com
--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
11-01-2010, 09:25 PM
Leann Ogasawara
Lucid lts-backport-maverick Pull request
On Mon, 2010-11-01 at 16:57 -0400, Tim Gardner wrote:
> On 11/01/2010 03:56 PM, Leann Ogasawara wrote:
> > On Mon, 2010-11-01 at 13:58 -0400, Tim Gardner wrote:
> >> On 11/01/2010 01:26 PM, Leann Ogasawara wrote:
> >>> On Fri, 2010-10-29 at 14:42 -0600, Tim Gardner wrote:
> >>>> The following changes since commit e5bc81156355bc8203a2fb389447f99007ccf0f9:
> >>>> Brad Figg (1):
> >>>> UBUNTU: Ubuntu-2.6.35-23.36
> >>>>
> >>>> are available in the git repository at:
> >>>>
> >>>> git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lts-backport-maverick
> >>>
> >>> Despite the Subject and above git repo indicating this should be applied
> >>> to the Lucid repo, it seems Lucid already has an lts-backport-maverick
> >>> branch. Looking at the actual patches in the pull request, it seems the
> >>> patches apply to Maverick? Is my understanding correct?
> >>>
> >>> Thanks,
> >>> Leann
> >>
> >> It's not really clear from the pull request I guess, but this really
> >> does apply to the lts-backports-maverick branch in Lucid (unless I've
> >> really messed something up).
> >
> > Hrm, I can't seem to get this to apply cleanly to the current Lucid
> > lts-backport-maverick branch. The following two commits are already at
> > the tip of the current Lucid lts-backport-maverick branch:
> >
> > d295edc9c59595a15affce38d93e8f5d4ac14249 UBUNTU: Ubuntu-lts-2.6.35-22.34
> > 9afeecbc176baaa5fabce2f155f6a488c3cca1a6 UBUNTU: [Config] Created LTS backport branch
> >
> > So it seems something isn't quite right with the pull request as it's
> > again trying to create the LTS backport branch which already exists. Or
> > are you expecting a hard reset to FETCH_HEAD instead?
> >
> > Thanks,
> > Leann
> >
>
> Oh, right. You've pointed out a couple of deficiencies (or unwitting
> assumptions I've made). This really isn't a merge or pull request,
> rather you'll need to reset hard to FETCH_HEAD since this branch is
> always a total rebase.
Lucid lts-backport-maverick Pull request
