From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7658B14831D for ; Wed, 3 Apr 2024 13:30:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712151033; cv=none; b=Xhr8lB/+xv8uNCV16qM5p2RRU3mkwJeM1i8TJgSbzjasJ3KvQv1rertgwCntAmszXFYBPNMbNKJHCUz7w4VaSf1tZK6MBkK6wULrhJOBEpHV22R81FIDeEzVldjRqtJcoto3CarXP3joXVmpCSfISApbjB7bk8CAdm6Q7UcD9SM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712151033; c=relaxed/simple; bh=bhTzMUc/tky1KdKOn6O2DzThVZpRWR68bl8DQ1qWalQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YL9N873GII+TM6c/PfYRFjUurInwBynH5jkTYKTFJDPABQ/YiuxfCZe7awQKUAveBjcdzxDcLJJrLXBqP42AXQ0rYAgEOqPSimpShIqwG0I783BBrBcK/y9KSAEgPf+21j2zMwSrP8OCLUyX0d36UP3TjZqqbx0KSH3f61lcipA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=iSLD6e82; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="iSLD6e82" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-6eaf2e7a7a4so763871b3a.0 for ; Wed, 03 Apr 2024 06:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712151032; x=1712755832; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=79QE4qLUqihK840Eis4twlw7XMMTo39qF0kCgSG1iyE=; b=iSLD6e82aZOWjmtk9GI640uE6FxCig3oPD12RmKRjNVRJ1K15H1OlVTHq0k6giiv21 Zqz/rG5MtedaeFproZ4jJXrCgGgxG7OnqqL1aK1mzbWF6HBLX1Bf81hRWnUdIuvFdGG3 7kc7yT6sLoMf0pMQWoG31Ofu1yiQhWgDzPzfrVWaRxDFL6S4gMLT0TUq6mMq4Bsjk777 Y+RZ5v7+AD/YZmj9W132ZjLGAZQV/d3OX3dyzy7SejxZvC1DzHzjVitSgLCgBWpeQ5P8 bktTfglh0QoYoeqPnWR0KL3o/JO0TliDzuDY2wjulf4RbYmw5mJ0gsLqckG7D5x49e80 9wUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712151032; x=1712755832; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=79QE4qLUqihK840Eis4twlw7XMMTo39qF0kCgSG1iyE=; b=EXyvx7Ydld0185ItLcSj7+4L19kwceoeE/s/TQ8zd2ij9AV7fWnMsycL5kErVcHhah CJByVOkjKJXnMu98HQrA+6z2C24gtzTnUSRc52/cJ+4/xB9yUBIgqog8hj2GqvA/f44/ TB62t2a0f47Lt4hEgAyA/5PPNdcJ+cT9xv7pHZ3iQ/QMTqGFlOKlovF//Otib/UO+mHS 1P/r/yh0yr/KzkyLBhY7vTHNk3v3gE8qmMUrk7Tixa6zei5drKCI/J4KrmBxQUWXXPzj K7QOKwahze6wgFdAHLoUBjV7JExydkmIZZIfo4ReEGJxazYdvSRuTGW/s46OvERhS6Ry iNfg== X-Forwarded-Encrypted: i=1; AJvYcCX/qO/zsHQuTEwj8SpaiDimFM2BEs+Pf9mvJsKrhcMV6Ihl4wFU1doIj62i3X8TNF/Ybku0AiYyF4mMHDTfpJvxV07N+r6PojgKaAk5 X-Gm-Message-State: AOJu0Yx3JSB5PneXCk8d6cBHM8SzKQ4VwqRkzL+W3TF2RLv70rc/cYCl qvyLA+6hoEdnlZzgmqVv/Qjh1W5D9nhvnBM8ovRn0sDmDvCeySbwzp9uCRZYknLaVJ6s61l6iZw lfQ== X-Google-Smtp-Source: AGHT+IFod3/kQyn5StbNtoSP41TxlbYNGNG8rECKzsaR5g0EHm09eDExYuEmIMuRYPn11TddB0ykA7cG4O8= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:2da8:b0:6eb:1d5:a3a with SMTP id fb40-20020a056a002da800b006eb01d50a3amr134207pfb.1.1712151031793; Wed, 03 Apr 2024 06:30:31 -0700 (PDT) Date: Wed, 3 Apr 2024 06:30:30 -0700 In-Reply-To: <20240403115353.59c7b4f4@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240403115353.59c7b4f4@canb.auug.org.au> Message-ID: Subject: Re: linux-next: manual merge of the kvm-x86 tree with the kvm-fixes tree From: Sean Christopherson To: Stephen Rothwell Cc: Paolo Bonzini , KVM , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="us-ascii" On Wed, Apr 03, 2024, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm-x86 tree got a conflict in: > > tools/testing/selftests/kvm/include/x86_64/processor.h > > between commit: > > 0d1756482e66 ("Merge tag 'kvm-x86-pvunhalt-6.9' of https://github.com/kvm-x86/linux into HEAD") > > from the kvm-fixes tree and commit: > > 964d0c614c7f ("Merge branch 'hyperv'") > > from the kvm-x86 tree. > > I fixed it up (I used the former version) Perfect, I'll drop my branch. Thanks!