mbox

[GIT,PULL] KVM/ARM Fixes for 3.12-rc2

Message ID 1380052160-20755-1-git-send-email-christoffer.dall@linaro.org
State New
Headers show

Pull-request

git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2

Message

Christoffer Dall Sept. 24, 2013, 7:49 p.m. UTC
The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:

  Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)

are available in the git repository at:


  git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2

for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:

  ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)

----------------------------------------------------------------
KVM/ARM Fixes for 3.12-rc2

Fixes compilation error with KVM/ARM enabled.

----------------------------------------------------------------
Olof Johansson (1):
      ARM: kvm: rename cpu_reset to avoid name clash

 arch/arm/kvm/reset.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Paolo Bonzini Sept. 25, 2013, 9:49 a.m. UTC | #1
Il 24/09/2013 21:49, Christoffer Dall ha scritto:
> The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:
> 
>   Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)
> 
> are available in the git repository at:
> 
> 
>   git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2
> 
> for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:
> 
>   ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)
> 
> ----------------------------------------------------------------
> KVM/ARM Fixes for 3.12-rc2
> 
> Fixes compilation error with KVM/ARM enabled.
> 
> ----------------------------------------------------------------
> Olof Johansson (1):
>       ARM: kvm: rename cpu_reset to avoid name clash
> 
>  arch/arm/kvm/reset.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 

Pulled, thanks.

Paolo
Olof Johansson Oct. 2, 2013, 8:14 p.m. UTC | #2
Paolo,

On Wed, Sep 25, 2013 at 2:49 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 24/09/2013 21:49, Christoffer Dall ha scritto:
>> The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:
>>
>>   Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)
>>
>> are available in the git repository at:
>>
>>
>>   git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2
>>
>> for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:
>>
>>   ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)
>>
>> ----------------------------------------------------------------
>> KVM/ARM Fixes for 3.12-rc2
>>
>> Fixes compilation error with KVM/ARM enabled.
>>
>> ----------------------------------------------------------------
>> Olof Johansson (1):
>>       ARM: kvm: rename cpu_reset to avoid name clash
>>
>>  arch/arm/kvm/reset.c |    6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>
> Pulled, thanks.

When do you expect to send your branch to Linus? I haven't seen it
land there yet, nor in linux-next. This is keeping us from even
building KVM-enabled kernels on ARM.



-Olof
Gleb Natapov Oct. 3, 2013, 4:04 a.m. UTC | #3
On Wed, Oct 02, 2013 at 01:14:57PM -0700, Olof Johansson wrote:
> Paolo,
> 
> On Wed, Sep 25, 2013 at 2:49 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> > Il 24/09/2013 21:49, Christoffer Dall ha scritto:
> >> The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:
> >>
> >>   Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)
> >>
> >> are available in the git repository at:
> >>
> >>
> >>   git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2
> >>
> >> for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:
> >>
> >>   ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)
> >>
> >> ----------------------------------------------------------------
> >> KVM/ARM Fixes for 3.12-rc2
> >>
> >> Fixes compilation error with KVM/ARM enabled.
> >>
> >> ----------------------------------------------------------------
> >> Olof Johansson (1):
> >>       ARM: kvm: rename cpu_reset to avoid name clash
> >>
> >>  arch/arm/kvm/reset.c |    6 +++---
> >>  1 file changed, 3 insertions(+), 3 deletions(-)
> >>
> >
> > Pulled, thanks.
> 
> When do you expect to send your branch to Linus? I haven't seen it
> land there yet, nor in linux-next. This is keeping us from even
> building KVM-enabled kernels on ARM.
> 
It is in Linus tree for a couple of days now.

--
			Gleb.
Olof Johansson Oct. 3, 2013, 4:07 a.m. UTC | #4
On Wed, Oct 2, 2013 at 9:04 PM, Gleb Natapov <gleb@redhat.com> wrote:
> On Wed, Oct 02, 2013 at 01:14:57PM -0700, Olof Johansson wrote:
>> Paolo,
>>
>> On Wed, Sep 25, 2013 at 2:49 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> > Il 24/09/2013 21:49, Christoffer Dall ha scritto:
>> >> The following changes since commit 62d228b8c676232eca579f91cc0782b060a59097:
>> >>
>> >>   Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2013-09-17 22:20:30 -0400)
>> >>
>> >> are available in the git repository at:
>> >>
>> >>
>> >>   git://git.linaro.org/people/cdall/linux-kvm-arm.git tags/kvm-arm-fixes-3.12-rc2
>> >>
>> >> for you to fetch changes up to ac570e0493815e0b41681c89cb50d66421429d27:
>> >>
>> >>   ARM: kvm: rename cpu_reset to avoid name clash (2013-09-24 11:15:05 -0700)
>> >>
>> >> ----------------------------------------------------------------
>> >> KVM/ARM Fixes for 3.12-rc2
>> >>
>> >> Fixes compilation error with KVM/ARM enabled.
>> >>
>> >> ----------------------------------------------------------------
>> >> Olof Johansson (1):
>> >>       ARM: kvm: rename cpu_reset to avoid name clash
>> >>
>> >>  arch/arm/kvm/reset.c |    6 +++---
>> >>  1 file changed, 3 insertions(+), 3 deletions(-)
>> >>
>> >
>> > Pulled, thanks.
>>
>> When do you expect to send your branch to Linus? I haven't seen it
>> land there yet, nor in linux-next. This is keeping us from even
>> building KVM-enabled kernels on ARM.
>>
> It is in Linus tree for a couple of days now.

Weird, I looked at both mainline and -next this morning, or so I
thought. Thanks, and apologies for the noise.


-Olof