From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) (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 EB2C714A82 for ; Mon, 29 Jan 2024 19:01:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706554917; cv=none; b=ulMO8LxaTIdLxtTmjmOzS2a1duFdyXqsPMqBxt0KHZzf1d8IK3ltq0AMyacui+cMiclK2DCCzfpPPNrLZzrbnpbwEdmQ0f86vXKXbKekUtIAMxdluSUwhxiOgHb1XtiQ0jTlQgC0yppNcWaNlMIVryWsG4hmUM/YAa62CE9X420= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706554917; c=relaxed/simple; bh=rXwL8ZgyJFSpC9k+Ab0i+1OiFs1s/8BDF4WGUL9Hg6k=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=N1KxrgDxPBwPwmO37JoF9a/brIAMrIr36qdtLw+uN5IbO6u2xFbnwthhL71kpzAjplpFABfMoKgCJ57kA2jt76LPqMs0od4JbZ5pKpu84q+A7vn4xTl+LTa1oM0GJIiDfTQvxtTBQAA8i7dLUXHLfEahkK+qWoUJT4R1IKGcUYM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org; spf=pass smtp.mailfrom=linuxfoundation.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eurxFM7V; arc=none smtp.client-ip=209.85.166.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="eurxFM7V" Received: by mail-io1-f47.google.com with SMTP id ca18e2360f4ac-7c00a2cbcf6so1399939f.1 for ; Mon, 29 Jan 2024 11:01:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1706554915; x=1707159715; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=jSJF+OOAXf610xBVp3jRjdPIYKqNvKf0pGO5qcf0N64=; b=eurxFM7VnQTBJ8zpsfhmcGS/aQtMga5QJZ8+lTwOelHJVP8klRaNvcY7IOSFAcauw1 w+d0rbXi2qIFker9Eurtzh/9PnG79zH+T02ytq5AQLlJ4GYIxK54g1WuE1Zog2amVhQG nBTnPVPxCxTMYThDPWevHrGdTKC4ykFnkX2dk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706554915; x=1707159715; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jSJF+OOAXf610xBVp3jRjdPIYKqNvKf0pGO5qcf0N64=; b=VhcKnYeyUjeNoqOJLXCtFjPhSq/HGyrY6MLcYiRtWSFshefkmIiFt6/RI/V6DaNdv7 muynrmjgYNwMlQ/4n3H8dfXPUMlPz3joxed3ghJWiI4N6sruuuIz4Gll23ZAc67E4wpd /73H5GYMojXX1F8Xq32nMOjy1Vg4mMnUuLUVqTOjq7jy4K1bXzLlFP8eQVK13crVlhlG J5SOoaK4FcA3Pd8Xm035T+r2PL+R6q5ll5Rxnfe/DRKx0665r8NVjeNCX000HBDmQCW2 dtVU90dGnU83NgQ62ByeZmgRDTGpsBSoHkUb3aYbc0/EC2SQRNu0IMSNtC7ycZ5eBBMq 2/lQ== X-Gm-Message-State: AOJu0Yz050bj+Jww/KcMChQPxYpTjBARzcGn4xtQs0c1TQEf79KdKT/D HkUhk4erO/LaQdkkxOqxHxuWYOT8oHo87qsUZGJ3bQ5i/wg8IIj9jajgEMOFGvo= X-Google-Smtp-Source: AGHT+IHO4inrLZ+LmjpobsSd6xvDcDGhMatpnyJ1hPtxg7GuwS+LDjEPtsGiqtzMaR6hLvhp4a7WQA== X-Received: by 2002:a5e:8e0b:0:b0:7bf:dba0:7f78 with SMTP id a11-20020a5e8e0b000000b007bfdba07f78mr6571295ion.0.1706554914874; Mon, 29 Jan 2024 11:01:54 -0800 (PST) Received: from [192.168.1.128] ([38.175.170.29]) by smtp.gmail.com with ESMTPSA id f35-20020a0284a6000000b0046f1caefc72sm1949458jai.114.2024.01.29.11.01.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 29 Jan 2024 11:01:54 -0800 (PST) Message-ID: Date: Mon, 29 Jan 2024 12:01:53 -0700 Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: manual merge of the kselftest-fixes tree with the mm-hotfixes tree Content-Language: en-US To: Stephen Rothwell , Shuah Khan , Andrew Morton Cc: "Hu.Yadi" , Linux Kernel Mailing List , Linux Next Mailing List , Muhammad Usama Anjum , Shuah Khan References: <20240129085301.5458880a@canb.auug.org.au> From: Shuah Khan In-Reply-To: <20240129085301.5458880a@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/28/24 14:53, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kselftest-fixes tree got a conflict in: > > tools/testing/selftests/core/close_range_test.c > > between commit: > > 27a593e3f13a ("selftests: core: include linux/close_range.h for CLOSE_RANGE_* macros") > > from the mm-hotfixes-unstable branch of the mm-hotfixes tree and commit: > > b5a8a6de69bc ("selftests/core: Fix build issue with CLOSE_RANGE_UNSHARE") > > from the kselftest-fixes tree. > > I fixed it up (basically the same patch, I used the former which kept > the blank line) 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. > Thank you Stephen. Andrew, would you like me to drop this commit? I was planning to send pull request with this in later on today, but if you prefer, I can drop this commit and the send the PR. thanks, -- Shuah