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=-2.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 CC43FC5DF62 for ; Wed, 6 Nov 2019 07:28:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 89E8F2173B for ; Wed, 6 Nov 2019 07:28:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="f2xpuM4b" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731280AbfKFH2h (ORCPT ); Wed, 6 Nov 2019 02:28:37 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:43340 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729695AbfKFH2h (ORCPT ); Wed, 6 Nov 2019 02:28:37 -0500 Received: by mail-lj1-f195.google.com with SMTP id y23so13939699ljh.10; Tue, 05 Nov 2019 23:28:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=tL7GGhFlW5adac2tYoxQS+JgkXCcxkJj9jtno9t3BBU=; b=f2xpuM4bvsGPnXJ9o/Ja6C1QUuH8QyWDCU0F9wwcy819GFZu6Ms/cQLD5f+PD8Y6vm 92hMxXUNBoq+QPgS35WGy/49yDzEO74YWLKUauvrrmEdaidWzid6KjTsQCDfUtewh+qd tkcgAUGMmmwvfL2wsA/rm5mjdnA3pNgRkzMXgc5+DRI24BbvrgEaVTwRlzui0DhWHKWf D9Ne0LcxuAA/UEMAo1Y46KbBq/aKuL10z6NhMaFseuhoKaRG+XC5g2Tg74VmVoPRiU3E EwSt+Ro4I2bcUWgazmeyHIJkMYeJIfpq+cPMNk21yhOFUNi1yRZjFcRWs1TEhukrcWUV 092A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=tL7GGhFlW5adac2tYoxQS+JgkXCcxkJj9jtno9t3BBU=; b=mR4aiv0oNjO2CzYH4AWB4LBZipkVdtsmgIVtMNYekEz4RvreHKF383gB8r1KXBQ98Q eIENu/LeN0wkpO4set2I656l4uhP9MrCc6NMALx7cESc+yrBZeXwUvXkBaYcNrk70gms 2TKwgRz3sDZIoLNpydKoKTf+C/j1tpC3dALVoxCdECq9TnrlpcxetFjYx6lFy0TVvd0W olDb4rcHFBuqzwnq7Mw/sDBJTyeenOg9RjvSG23BsGDw/uGIeodfSeV42MAOWe5gMKYD 4pDw34Oy1PcaTWBiM3euzwuwQdhqwuO0hUDJvyPDvkW55vYdQA1je37km6RUYPBo3yVT 8t0w== X-Gm-Message-State: APjAAAWun2RvvsIaMkFcWD/D0KtOtFpw8Rho9IaQ4dSepeVewDSDwugH z7quKUm2P3Bm8I81uqKtoQU= X-Google-Smtp-Source: APXvYqz+tpZFUNF/7rn+2RUfKd3T7lYwDMCYKra/BDGVwKOBvZr394OswIiHuhQNw9nekIFFYsYBCw== X-Received: by 2002:a2e:91c7:: with SMTP id u7mr678244ljg.249.1573025314830; Tue, 05 Nov 2019 23:28:34 -0800 (PST) Received: from uranus.localdomain ([5.18.102.224]) by smtp.gmail.com with ESMTPSA id w21sm1148384ljg.91.2019.11.05.23.28.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2019 23:28:33 -0800 (PST) Received: by uranus.localdomain (Postfix, from userid 1000) id 4BF074612CA; Wed, 6 Nov 2019 10:28:33 +0300 (MSK) Date: Wed, 6 Nov 2019 10:28:33 +0300 From: Cyrill Gorcunov To: Stephen Rothwell Cc: Kees Cook , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux Next Mailing List , Linux Kernel Mailing List , Pankaj Bharadiya Subject: Re: linux-next: manual merge of the kspp tree with the tip tree Message-ID: <20191106072833.GC2560@uranus.lan> References: <20191106160331.016b2521@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191106160331.016b2521@canb.auug.org.au> User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 06, 2019 at 04:03:31PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kspp tree got a conflict in: > > arch/x86/kernel/fpu/xstate.c > > between commit: > > 446e693ca30b ("x86/fpu: Use XFEATURE_FP/SSE enum values instead of hardcoded numbers") > > from the tip tree and commit: > > ec2f877856e0 ("treewide: Use sizeof_member() macro") > > from the kspp 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. Since these macros are just the same the fix is fine. Thank you!