Received: by 2002:a05:7412:798b:b0:fc:a2b0:25d7 with SMTP id fb11csp479544rdb; Thu, 22 Feb 2024 09:22:57 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU97eEV5pcbru9T94YQrbAoU3rDIYY4+EGYG//YybAgg+6DfOMKBQtcu+dwx0rFBDM1Bc7QRX/V+xa6Eyztx63zxxM927jnUxdxsknriQ== X-Google-Smtp-Source: AGHT+IGpNFCnUAs3wHhoiJGX/HSdLNLP5qlE0Ok8E4RIyjsxXG5eux1nNjzqoUXk+EKfcCk0b0L0 X-Received: by 2002:a17:906:ce53:b0:a3f:4926:a91c with SMTP id se19-20020a170906ce5300b00a3f4926a91cmr3295789ejb.35.1708622577268; Thu, 22 Feb 2024 09:22:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708622577; cv=pass; d=google.com; s=arc-20160816; b=JOpG5mlBxk4+92Ed8JdGvLLCIG3Zje4pP/4aSO64zGjh0K6KEbLcmfa3LD0qrsUZpz zpDqVcVT4PBMiAKE3eV1d0hnvJNFkIwBCtR9lSypEqSR89sgnGoXHLU/32+yihN5UjAa XrFwU4RKM1GJoiJze05RHDXA0k1Rj2YNn0cSeIBKfx8ByZ7hezmbuBaL3RdLk2Cus6yf 6f+7yQbc6i7AAud1Es3bKSb1TBte3stfPqS+WJC8iWYuvA921RGaVk+s/peiZ23QD6px 4lOsW8yKGPi/fCxsJqEELsFHO+OsanLt93MAxaYgysWrLq5dDkSVlH/f+oswy4W6+suw UQxw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :subject:cc:to:from:date:dkim-signature; bh=f9f1GJHzNb8f7GJh/CPDOO3136gk30DSA9xr4GvuYdg=; fh=KvfQAMF78gaNqYp8f6jwYy8OGXl+WdpY6cNWR5d2wnY=; b=EgDMYFDJAA85TxgwalOKWZAz1LmRx7TGOI410/BWbaGOy6HkyUqbSX7UL4kE1icV6k uZvQiUpvzkpYphM8tBEcR0DuSGZQaD25MXUw2Nri9TOqsyCxf9a1sQnyJqxWNv5e1GtX rMql+bbDWmJEQzlzTf2iT0Iaa46eh3d0vkZSkpnYh9Dj96XfQIh4PNWY3Yu89oRI3YzY 7hOrhWeMv86S633QQXOuUctuFLGsJMukT9Wtj2GUCStwwlFxeD3o2navKadCQvGFcOCL x0eK0PhtSUQLzaQA+3jjDtZJkqQIDP9bTuYUrlmNTDPeP7OWjXqFAjSKpx79rom+F3ji x1IA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=korg header.b=XajQmD34; arc=pass (i=1 dkim=pass dkdomain=linux-foundation.org); spf=pass (google.com: domain of linux-kernel+bounces-76931-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76931-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id ck23-20020a170906c45700b00a3f0f32058fsi2303934ejb.860.2024.02.22.09.22.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 09:22:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76931-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=korg header.b=XajQmD34; arc=pass (i=1 dkim=pass dkdomain=linux-foundation.org); spf=pass (google.com: domain of linux-kernel+bounces-76931-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76931-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 6514F1F280B8 for ; Thu, 22 Feb 2024 17:11:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2C5291552E8; Thu, 22 Feb 2024 17:11:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="XajQmD34" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B0CB14C5AB; Thu, 22 Feb 2024 17:11:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708621893; cv=none; b=eUtb/PRgyzyujKbh7LxHQssre3FiPnmHvIdYxRhVqsDMrR7J6j7B9AEsboESDeHggrtAEUQ7v/wpdZxqpMsXibf/t6SCmTrDdJWHFG/Z8/y4+D+XqOxbR32IsqXb7Kt5WeWbwtlHxchtHZqMilbpapYCbmIg/gtHiNyLdvICf1E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708621893; c=relaxed/simple; bh=K0i9HFk6CFL2zhmvdOVUHC2QYPmcZLijnnv2ogVxSGU=; h=Date:From:To:Cc:Subject:Message-Id:In-Reply-To:References: Mime-Version:Content-Type; b=g7K0/b3Tz54m/CA/k9aOLosnEDOsgpnwRRRkb4e1BYekWxVL+RvKll0qwlWMzV376mtvzZ3BdXgWlGemwSAXMx9SwAqeD/sjEJYtg9AtLP0pEacE5ikY+6rDlF7FQU+TNdYPHVQ/ts5steakxkc9oRj9EwG76V76tGelYWx1CTE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=XajQmD34; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55DE8C43390; Thu, 22 Feb 2024 17:11:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1708621892; bh=K0i9HFk6CFL2zhmvdOVUHC2QYPmcZLijnnv2ogVxSGU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=XajQmD34iYclajNLoZXOYbRQ47eSPFcGaq3DzCrTm75rom0tlAoIp/66pt7zsCKuo G0Jf9nSUOxIfMRbpp1wuBhTwWsGGuSIUVpKCPO+Oe/7LJ2CiXBoi2pF5vHa5uX/9QE Vqp+R439ZIEJO20xyE+dntgxNdBNx+l5EHayAcWg= Date: Thu, 22 Feb 2024 09:11:31 -0800 From: Andrew Morton To: Stephen Rothwell Cc: Kees Cook , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the kspp tree with the mm tree Message-Id: <20240222091131.5a85973927496f49af32123a@linux-foundation.org> In-Reply-To: <20240222164112.20c5646e@canb.auug.org.au> References: <20240222164112.20c5646e@canb.auug.org.au> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Thu, 22 Feb 2024 16:41:12 +1100 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kspp tree got conflicts in: > > scripts/Makefile.lib > scripts/Makefile.ubsan > > between commit: > > 1a75e5856b3b ("ubsan: reintroduce signed overflow sanitizer") > > from the mm-unstable branch of the mm tree and commit: > > 557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer") > > from the kspp tree. Thanks, I'll drop the mm.git copy.