Message ID | 20240226165811.56f71171@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-80574-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1888997dyb; Sun, 25 Feb 2024 21:58:48 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXatwZcXEVN7cRh2HG5ojPfp28cnHphiPHs3AuFNg51ScWhbWHn6jxOZtfFZBWbR/ufmkk/JcHQ5vPNyvGGLF/DLz/EXA== X-Google-Smtp-Source: AGHT+IHDLYF4i5U8JD+pbhX+MQDsvlCVwCFaHEDuvnCX0ySUzPcbCBpztAPf2vMj2w4BDuVibqWM X-Received: by 2002:a25:870f:0:b0:dcc:5a73:1cad with SMTP id a15-20020a25870f000000b00dcc5a731cadmr3406765ybl.42.1708927128055; Sun, 25 Feb 2024 21:58:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708927128; cv=pass; d=google.com; s=arc-20160816; b=pdjbspO39Rs1s6XF1CqOvu36lrcgCeriauomULFKkfQaLQx/gg3rGHrbaxEtxvvPtC yViFHE5zkQw4Z3AGXmY8yRGY0c5/P5oDM9oUkB1xcOGqdy71iB8V3R4i8K5thS2srTdr 0Yg7fymqPZlSbPu3DYTV2ifCDLCaPht0A5McuckspThshaPdrPGae9FNR2CY4Vp8Ht/j 6Ftn8FMQpU1qYQXABcfdEJs/oub0/bY10ZG7OnAysQFDrXw+DvyvxkHGg/Bo+BngdyyH VrYZUT44m6hfsDyu/Z9TBzRqmW0v1+cCgGrdo1sd01WvEo+ZyN0FiInl3J1ZVsgTbJW6 Wy4A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=qeJ5Q6qXAm6WKVnxUei/51MURT3w78lyHKsNAH5SvCI=; fh=VScOfJDUi0KyWp3q3O7fIFbNqJnrG94tBdTBh5qUkX8=; b=y9bCBWYZ2MTuhKwwRtX/K7emV5hCz1jta1Dd+bgqhH16MsEdrxxhrhZ7pQiYifAUqD mSBkdoo47gsLtHjmZCKR8VmhVb7CZMyCjo6GUvyvFqbE7RvJAHSaqU1qDE74U32sm16q BVwWcKSitdSlf1eiaox9DxX8JrlnvsGp6i0Aom/HMOmYFcEv9uP0e7DaO/NOE1dx4Kkv mUr2h9bxbs5pvJUU7mufsjunkN3klHgLtQd4qv7XbLPlDqrbGW6vm11ClV8GKWKCeXvo 6UpJQ0RmTsExN7bcJPTReQniFFy68u8vPo3BdTPmRBCWJdgd0EMtxO7H10prMxcqnW+m AEqA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DZRlDEiZ; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-80574-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80574-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id h67-20020a636c46000000b005cdf801a27dsi3103605pgc.198.2024.02.25.21.58.47 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 21:58:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80574-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DZRlDEiZ; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-80574-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80574-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au 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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 5199DB21456 for <ouuuleilei@gmail.com>; Mon, 26 Feb 2024 05:58:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 096931BC4F; Mon, 26 Feb 2024 05:58:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="DZRlDEiZ" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 60A85171BB; Mon, 26 Feb 2024 05:58:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708927099; cv=none; b=YMpa96anYgcUps96/kD2EswkciSInYmiFbmn4tewcb5XkcshCvzXUVSUdYz0ClS6fJkEmXYXqIt4K31Ja3br5oMInk/yf/TCAgB3+4ob4PBMv8/0FpnutfHaOaTep1TGgOm3hTWqqq+rD3KZHNW0KQ4BZeFXFlttkdvMLqCKDuA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708927099; c=relaxed/simple; bh=r4fr2FR7mibX624BrzO1Er+KB+l3Wt2/WIOEarW0yBE=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=IgVqKXlXrWoYKuR9X/ttX0ng5dAD4HDBTRhFD1Cger1Zi6TsYP92tMlpB8hspUw/Uj4Qg4PgbLgDpZUmHfzQdD5UgBTSFrZK6jBy30D3g62DJso79NsM4y4YMZjT1OZcpvIY+DgW98WQ160Na4PbD4q82ZTer+Liw2l9yy7xBg4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=DZRlDEiZ; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1708927094; bh=qeJ5Q6qXAm6WKVnxUei/51MURT3w78lyHKsNAH5SvCI=; h=Date:From:To:Cc:Subject:From; b=DZRlDEiZ8VwfNSXBZjpzKPtp7q5pieIXCQVXNa+Ls3tvgUI+oh38wnifWvyEemlnr p6wjdM3hi70HGsifjN5mQ22WQF79SGcI/NA3UphYVs27cCrsECQE5e187xuxFlTB6c /TV3eD4TJrVAWKO/ScMfbh1AsUvbHBduvwXB83JpiyqVAZw7C7dDjqy0UuXCl5IcPe UhWHl8ZMyX547QAELLQREbm9LkR9am1v5zlfXKQ+pSzdJVD0ZdjwbMk32oJLpWmmJj 6/YS+P2uyi+JYxFtSy+vKeghnySbuwHRzt6CEvvu1K/lpT7ZQDn7xoAOb0HU8Ttd1n oGE9NH7jrJq5w== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4TjqfZ0nfPz4wcN; Mon, 26 Feb 2024 16:58:13 +1100 (AEDT) Date: Mon, 26 Feb 2024 16:58:11 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Kees Cook <keescook@chromium.org>, Masahiro Yamada <masahiroy@kernel.org> Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: manual merge of the kspp tree with the kbuild tree Message-ID: <20240226165811.56f71171@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Fh/hyUwCNLuBEw..bgQgHf5"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791939971828758845 X-GMAIL-MSGID: 1791939971828758845 |
Series |
linux-next: manual merge of the kspp tree with the kbuild tree
|
|
Commit Message
Stephen Rothwell
Feb. 26, 2024, 5:58 a.m. UTC
Hi all, Today's linux-next merge of the kspp tree got a conflict in: scripts/Makefile.lib between commit: bf48d9b756b9 ("kbuild: change tool coverage variables to take the path relative to $(obj)") from the kbuild tree and commits: 918327e9b7ff ("ubsan: Remove CONFIG_UBSAN_SANITIZE_ALL") 557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer") 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.
Comments
On Mon, Feb 26, 2024 at 04:58:11PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kspp tree got a conflict in: > > scripts/Makefile.lib > > between commit: > > bf48d9b756b9 ("kbuild: change tool coverage variables to take the path relative to $(obj)") > > from the kbuild tree and commits: > > 918327e9b7ff ("ubsan: Remove CONFIG_UBSAN_SANITIZE_ALL") > 557f8c582a9b ("ubsan: Reintroduce signed overflow sanitizer") > > 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. Thanks for this! Yes, this conflict resolution looks correct to me. -Kees > diff --cc scripts/Makefile.lib > index 298bd8c80d65,b4a248c20654..000000000000 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@@ -181,8 -175,11 +181,11 @@@ endi > > ifeq ($(CONFIG_UBSAN),y) > _c_flags += $(if $(patsubst n%,, \ > - $(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)$(CONFIG_UBSAN_SANITIZE_ALL)), \ > - $(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SANITIZE)y), \ > ++ $(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)y), \ > $(CFLAGS_UBSAN)) > + _c_flags += $(if $(patsubst n%,, \ > - $(UBSAN_SIGNED_WRAP_$(basetarget).o)$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \ > ++ $(UBSAN_SIGNED_WRAP_$(target-stem).o)$(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \ > + $(CFLAGS_UBSAN_SIGNED_WRAP)) > endif > > ifeq ($(CONFIG_KCOV),y)
diff --cc scripts/Makefile.lib index 298bd8c80d65,b4a248c20654..000000000000 --- a/scripts/Makefile.lib