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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C52F4C433EF for ; Tue, 14 Dec 2021 16:39:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236122AbhLNQj2 (ORCPT ); Tue, 14 Dec 2021 11:39:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234227AbhLNQj1 (ORCPT ); Tue, 14 Dec 2021 11:39:27 -0500 Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C99DC06173E for ; Tue, 14 Dec 2021 08:39:27 -0800 (PST) Received: by mail-ot1-x332.google.com with SMTP id h19-20020a9d3e53000000b0056547b797b2so21435183otg.4 for ; Tue, 14 Dec 2021 08:39:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=A1RKIABzLXozSTYS++5X2nHFwuaAyVJUV7kAQnW/Xd0=; b=D91xl2OmQ74oHpYWWwhABoBP4k1YJA4auMst9K+kAAgId5wpMHVlK/k7aGk0rsNgTZ G6W5k9ZEGoWTTtfM4DNODVuEsJzADZCnPixQ/2Y6abECGOgIg80eHVlue2LxysmfPSah GP/w4RvwT9XFOVgYwQgsdXpU+LyjLu7jV4efo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=A1RKIABzLXozSTYS++5X2nHFwuaAyVJUV7kAQnW/Xd0=; b=inPRoRO5bwLfWOMh5Ju+nuTZa2uHJALRst8aQXuVjhYQI0Vo88/wiL/HUdDNC+Ft6P txh/m6TlmDnKYADqLUEjQABTokeULsg9J737OEyG0kq5tv5PYhASj47gMnmtQC8/iRwP qD5ByvvFzpzvekRNiV7XLV3L2+QjynFFtO0DUiq7FVANpEhnEo1rXKkSA+J3OJETAh+E rScHvs/s+5C+A2AIHQr14t/ewjxi6wcgij2HpQHvBfx+FLFAwKvD92fKIkYzzw2fSeg7 QfPqNWsKy2q2XE9G7F0Fq4TWx/0yFgyvjxJwVbaweo0nm1nzU+oIZsRcgsw6xisZl5Fz M7ng== X-Gm-Message-State: AOAM533gg2ADBr83M1nBKYI9qjrf3zGOT79nlXSzbLuckhVmIoFQEbfa M/JYJrvl22ehR3e78z+UOgjvBA== X-Google-Smtp-Source: ABdhPJz1b/E9tBP/pB4bUKn2ekqxvbKXfIAzaBvJQMlh60PGDAN1MGP18Ag/jAVnbMNq0n1H/1vbpA== X-Received: by 2002:a9d:7459:: with SMTP id p25mr5038261otk.247.1639499966418; Tue, 14 Dec 2021 08:39:26 -0800 (PST) Received: from [192.168.1.112] (c-24-9-64-241.hsd1.co.comcast.net. [24.9.64.241]) by smtp.gmail.com with ESMTPSA id j5sm64501oou.23.2021.12.14.08.39.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Dec 2021 08:39:26 -0800 (PST) Subject: Re: linux-next: manual merge of the xarray tree with the kselftest tree To: broonie@kernel.org, Matthew Wilcox Cc: Linux Kernel Mailing List , Linux Next Mailing List , linux-kselftest@vger.kernel.org, Shuah Khan References: <20211213222443.474487-1-broonie@kernel.org> From: Shuah Khan Message-ID: <1dcd2d43-cf39-3b4c-49b5-138d94f34433@linuxfoundation.org> Date: Tue, 14 Dec 2021 09:39:25 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20211213222443.474487-1-broonie@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org On 12/13/21 3:24 PM, broonie@kernel.org wrote: > Hi all, > > Today's linux-next merge of the xarray tree got a conflict in: > > tools/include/linux/kernel.h > > between commits: > > d6e6a27d960f9 ("tools: Fix math.h breakage") > 066b34aa5461f ("tools: fix ARRAY_SIZE defines in tools and selftests hdrs") > > from the kselftest and origin trees and commit: > > f2aa11fd51440 ("tools: Fix math.h breakage") > > from the xarray 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. > > diff --cc tools/include/linux/kernel.h > index 9701e8307db02,3e8df500cfbd4..0000000000000 > --- a/tools/include/linux/kernel.h > +++ b/tools/include/linux/kernel.h > Thank you. I will keep track of this when I send pull request. thanks, -- Shuah