From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB26DC43331 for ; Thu, 26 Mar 2020 07:55:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B68B20719 for ; Thu, 26 Mar 2020 07:55:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="a2kO2qeo"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="l+U+4Vnm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727666AbgCZHzs (ORCPT ); Thu, 26 Mar 2020 03:55:48 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:56203 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726298AbgCZHzs (ORCPT ); Thu, 26 Mar 2020 03:55:48 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id E25875C0129; Thu, 26 Mar 2020 03:55:46 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Thu, 26 Mar 2020 03:55:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=WRFxXaVJ1R121EkTxmQTkclCA83 EcIRd38Qmy1TbxiM=; b=a2kO2qeo6aqJTnKjeRPY5g8BHfJJLLx0MmFUp8qYFdc Z67AzO0dOEKGBUwv9JJ8ow7FRqYykkHLM7m4+3MgH2dI9JlDuyE5nUA2U3ybi8tz zbvo6LlXEhGiZRSQCcOzgMGRENRb4vOaGZ/shbmr/GaYjokbIlZAgSy3+3J57tdV yDBLbQ8C2J+uokabOBBT9mnTnGPKMhFsFpg2xGkZhRlLwqW/3q5AV12ycmh1JOVL vpJrZw8gS914n8O5NwjQEMI8O6V+n3by80Mzy5a4ahsu4th1w1jthDFZHHfiGVe4 VBrsgz4LCYM3BkqzkRw/JqZDZTjcHjaCus6CglBLjAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=WRFxXa VJ1R121EkTxmQTkclCA83EcIRd38Qmy1TbxiM=; b=l+U+4VnmRElxuwl8PnYQ6f K2dXKyI7afx9+K9d2ikllHJC/RDmasOtp6FVFqGxW2s9ix5F7+KufXmQCiINpKqq xZVxS0FwDR7ehzBlyuCQh7NEogvWi5n5Oe0+MTHMFxADjOxvZmWbJiICMjy3NXm+ z9fgqVG0ieneeppoTawmEawAwololJdUx50sUYh3vMV51HsuD8E/g8nt2p/vUZMg U1jx0wEgHi2MgOECDVTFSZLZqAnbewzzmUTYcefQF5GPbnrmWD3oOn55AK1YBau0 WpRLrG1bDEu53pJIL/aH/aVczxSVNFtfYNafwmdtdg/lC4nLsDElGRQMcvghZ7Gw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrudehhedguddtlecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecukfhppeekfedrkeeirdekledrud dtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehg rhgvgheskhhrohgrhhdrtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id E0AA33069150; Thu, 26 Mar 2020 03:55:45 -0400 (EDT) Date: Thu, 26 Mar 2020 08:55:41 +0100 From: Greg KH To: Stephen Rothwell Cc: Paolo Bonzini , KVM , Linux Next Mailing List , Linux Kernel Mailing List , Masahiro Yamada , Andrew Jones Subject: Re: linux-next: manual merge of the kvm tree with the spdx tree Message-ID: <20200326075541.GA957772@kroah.com> References: <20200326142727.6991104f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200326142727.6991104f@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 26, 2020 at 02:27:27PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > > tools/testing/selftests/kvm/.gitignore > > between commit: > > d198b34f3855 (".gitignore: add SPDX License Identifier") > > from the spdx tree and commit: > > 1914f624f5e3 ("selftests: KVM: SVM: Add vmcall test to gitignore") > > from the kvm tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Looks good, thanks!