lkml.org 
[lkml]   [2013]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: linux-next: manual merge of the kvm-arm tree
    From
    On 16 October 2013 12:04, Thierry Reding <thierry.reding@gmail.com> wrote:
    > On Wed, Oct 16, 2013 at 12:02:08PM -0700, Christoffer Dall wrote:
    >> On 16 October 2013 11:58, Marc Zyngier <marc.zyngier@arm.com> wrote:
    >> > On 16/10/13 19:51, Thierry Reding wrote:
    >> >> Today's linux-next merge of the kvm-arm tree got conflicts in
    >> >>
    >> >> arch/arm/kvm/reset.c
    >> >>
    >> >> caused by commits e8c2d99 (KVM: ARM: Add support for Cortex-A7) and ac570e0
    >> >> (ARM: kvm: rename cpu_reset to avoid name clash).
    >> >>
    >> >> I've fixed them up (see below). Please verify that the resolution looks
    >> >> good.
    >> >
    >> > Looks good to me (I have the same resolution in my own tree).
    >> >
    >> Yes, fix is good.
    >>
    >> This will stay a conflict until kvm/next and kvm/fixes merge, which
    >> doesn't happen before after the merge window, usually. If that's
    >> going to cause too many headaches, maybe we need to talk to the KVM
    >> guys (cc'ed) about a solution until then.
    >
    > It shouldn't be a problem. Mark and I share the rerere cache, so unless
    > the conflict changes somehow it'll get resolved automatically in future
    > merges.
    >
    Cool, I had no idea how you dealt with these merges, but I figured a
    daily manual operation was probably not how it works:)


    \
     
     \ /
      Last update: 2013-10-16 21:21    [W:4.210 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site