From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) (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 BFBC0204096 for ; Wed, 8 Jan 2025 23:40:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736379614; cv=none; b=HigUeGnE1tvu7jlUISqBG6Q2JI5Fjkmsqr4erXDZ8O0Auo1IP+2XQ3IqBrxDzJy9KHhKXcpyHe7EC+5ly71BlU+3mXWDK6tYiqaAodNi5Vr2JlzAhtbn8LsMBeae2/Sd1U6Og0SRSJRd5jDzw9XlFl6I/w0EwLiyMVU9XEPkzSo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736379614; c=relaxed/simple; bh=6MdkO+ANHM9A60tsmkecbfdrjtmSsD6weQX4DUCJNuQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=H/kytDHkfBu2P/LRnGgh3/3Y165pQikDtCLyWykcGzk6+bX4d9Wgbu5KtgD3naHSbzob8/iWbFxdY3vdrfiN8o2GbRRtq1pAisHpFPArim9btw7V63l4AHDb+8uaY+P+azosR7XL2owDpwpno9cIQCbFTkkX1BmLfULeqZaIIaY= 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=F0oTw53F; arc=none smtp.client-ip=209.85.166.178 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="F0oTw53F" Received: by mail-il1-f178.google.com with SMTP id e9e14a558f8ab-3a777958043so1019685ab.2 for ; Wed, 08 Jan 2025 15:40:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1736379612; x=1736984412; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=6Ri8mtVirUvyyZ6nmOnC/LZjhObjSlPKVdDOjjMdr2c=; b=F0oTw53Fn6BhcYe32Cl26yv7NTB+xwr/Tn6Wlw+dXXw4Yu1XtShmOVs5v5YnD1KQPU /Zw5xKnTC8jpEEbG2OItlLvTVeRICjHKktPXPsNkS4sDAHJ33DpYeGwEl0epNYEk/u01 N1sJ55oLZg9Xshm+OZN5JgGfVfP940fBQWcXQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736379612; x=1736984412; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6Ri8mtVirUvyyZ6nmOnC/LZjhObjSlPKVdDOjjMdr2c=; b=bzPqOJwccB2z3uDESd0YSpp0kuf3S0QQlHNM5sVZ2Bp/2Ti0cQytYW1/4I27DNmN1u VK0+y55cT9/d71oE7Znuix/Jv+EprCmDK20HEN6G6Ksj4eBzRjMdKCkHq2ObcfpL9DU9 cPPcqqTcaxTHZqOJVyGSvxhhxjAI+2GT76NonAmUato0R+jS8ViZ/rYQxCrLjbii1nLi TT+PDjf82KTfrVJLhCd7pR8u4+cVLJka9+af3Vwt4RPvZrHTXqdrfvKwcawHCLAhN0bw N37oeKzbO/IKpm2CT1GQrWuM3XDRSYRRnZ4Cg1Lm9Bw7LhSBwDBf5uDipa9yULR7vOIP nTjw== X-Forwarded-Encrypted: i=1; AJvYcCX8tGbZ+119Vtl/EIUX0lnngH3rp2Th9VHub4uVnVpCrl1DAidm5BeSA8yCn57RH+ZNYbW/YwWfRI6NIsk=@vger.kernel.org X-Gm-Message-State: AOJu0Yxa/dijjioizw+K/N7OPMkdxgteuDCqnUZ0oKJRX21tRKcExyOQ +rn7+QlewqzdhbPJC8Nkh+wE+4YsJIsDUPiC+JIdXdeZ+bfx/go+MjpfxiOA82A= X-Gm-Gg: ASbGnctdlvnBlolOl4c7kkQ8Zu15SvYy3plFMXP1MgMnMJmC+BEhzpHb+3wkRPw3Eo4 UqFGnC5xkZIIQIWbuFngkF8ldTgOViR5hMVodnLYMXVFq0S3wRusPu5tcBSZW7k1/YQx+PFK61S fGHNHAR+lPJAgCxZznEmaU2Ea0jj6ESBX6eBUIKAP5jpSEPK0Xw/OnqcEarkMsBvGgyM7yQERnV ipp7NdX4sWVaC/FBngKg4d+TZgqn3nv33N2m7am/0QhnSE3OVqvycvtWg4kRFZ65UAc X-Google-Smtp-Source: AGHT+IF6eYSuISgD+RCYfI+Ara0n1whGJDeBklXH6p//wxMXgzwItnvsMB1eg/4jHGvsuHgbZqdB3A== X-Received: by 2002:a05:6e02:152d:b0:3a7:fe8c:b014 with SMTP id e9e14a558f8ab-3ce3aa763a6mr36286005ab.21.1736379611869; Wed, 08 Jan 2025 15:40:11 -0800 (PST) Received: from [192.168.1.128] ([38.175.170.29]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3ce4af56167sm398725ab.58.2025.01.08.15.40.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Jan 2025 15:40:11 -0800 (PST) Message-ID: <057fdf09-ef2b-42fa-9300-dd7bf348362c@linuxfoundation.org> Date: Wed, 8 Jan 2025 16:40:10 -0700 Precedence: bulk X-Mailing-List: linux-kernel@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 tree with the net-next tree To: Stephen Rothwell , Shuah Khan , David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Laura Nao , Linux Kernel Mailing List , Linux Next Mailing List , Willem de Bruijn , Shuah Khan References: <20250108144003.67532649@canb.auug.org.au> Content-Language: en-US From: Shuah Khan In-Reply-To: <20250108144003.67532649@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/7/25 20:40, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kselftest tree got a conflict in: > > tools/testing/selftests/kselftest/ktap_helpers.sh > > between commit: > > 912d6f669725 ("selftests/net: packetdrill: report benign debug flakes as xfail") > > from the net-next tree and commit: > > 279e9403c5bd ("selftests: Warn about skipped tests in result summary") > > from the kselftest 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. > Thank you for finding this. I will mention this when I send pr to Linus. thanks, -- Shuah