Received: by 2002:ab2:7903:0:b0:1fb:b500:807b with SMTP id a3csp708782lqj; Sun, 2 Jun 2024 19:33:29 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUKCX38gEERCPQvgl8aGWJtBa+ywQ1s2QEyIrfoIl/UPT+FJtIfp4pD7KYCdcn6K33KYLSemT2+AscO7Fk266FKjUHHP+iSq/TE9OBovQ== X-Google-Smtp-Source: AGHT+IFoKRaN5McxGj0+sNvf/7ef5P8QPUheOzFyoz8C8BahbYSc5WjYNiNzXCohqeFGt9ZqD2Rd X-Received: by 2002:a17:90a:cc14:b0:2bd:47fe:6dec with SMTP id 98e67ed59e1d1-2c1acb2f3abmr15594238a91.5.1717382009564; Sun, 02 Jun 2024 19:33:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717382009; cv=pass; d=google.com; s=arc-20160816; b=lfyqC00rkMvfBpgVN7qHXUqudLtTBc9ot6CM5jimuu2tWoa1uhY22eOkf80WWkV9Vw YH7/P6d6nM3idNL6ijl/mCghZ0BbG8refxuG9Cut9mexS3LOg4PhmTE7B7tlsIMYmVhf m+66pZkEVv7Gc4jMTaivtJ0xIn0Ut7+3udTWjk0cpwVKkb+KHy9G7Dv2tahBlvNWjfhT YIHbRsYViBtr2jx/3bmHxqGgtR0VlnLDlQtVxzHPBZo2bdR5qZNy9iGISTk4JSHwoKYF G60jGZcVHQ7Z8D1Wy3LWecu5E6adnka+HpOGk52qIS3HrAvJ4A27La+cAHXmkAg39h+P peFg== 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=wBScdLHriUy6y8ctymJvvAmc+IVF07l0O0hi4eSNeuw=; fh=QU+NAYrTzSgkDPtCs5zeDMpDk1yc9gPVY8clLsthBxM=; b=nlG1jTjRX6oaLJeKxd4M/snUUhKvXfFUJ+seTbP0aKihBM+xmoMLoYG0jXUvh/y77+ JRLctFRSZPm0DSJRQjx5UMlr2oJGfIFcU/X05bMHmC+40MMn24aIIp00u2Eaoo9HO5Cd jWqBNeEebaORMOd0IEoiKYnLCaPupKPg5NQDRmv6xJHJOvix1BH56m6tGyX3Zw7hMMl5 jhJilAHTC4mf5nPhaHNo2elFT689rHAY5VtQkBs/IuUIVJNDw+2rbDKUFPy3SjoWDVzX /BLdeCirMy+iNdMZ/WxfM+6J02MH4X1kT+oq9hzBus5dtzmSyEw9htLyywDWd5MXhwKr HBEw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=WGhM550C; 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-198546-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-198546-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id 41be03b00d2f7-6c35b40bf08si4948056a12.526.2024.06.02.19.33.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jun 2024 19:33:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-198546-linux.lists.archive=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=WGhM550C; 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-198546-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-198546-linux.lists.archive=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 6E119B20B27 for ; Mon, 3 Jun 2024 02:33:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6161363D5; Mon, 3 Jun 2024 02:33:16 +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="WGhM550C" Received: from mail.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 9CF3D15D1; Mon, 3 Jun 2024 02:33:12 +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=1717381995; cv=none; b=K6qJm8ltN9aOi8QfgGMOFZMn3Vn+G5E3aKW6khawecZIoxrfR72ohklP7ym8t2qXottfDx3va8BPAgBcp+jOY+uU8sPmKKL1zifqsFkfoOuMqA17aW2BF6opxp/kvWp9BdfhzNAotnZnu6IsphTZfMt4xPem04U5aQGgDjLhIcM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717381995; c=relaxed/simple; bh=LyzyMXf+Pvw4ht2lY9vW7hoDtyqzIxH774qV/hRs4Dk=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=MlGW5blwZ3vah/Qm5ZWnSLg8q81VsUWTzfmk5B3pJhTwIUmpuLSWU54YI5GRdr01OiGfM862rXkHr4b9hPLXHnwZLqc9wa0Ev4n2LINnaDYL1jHJTtvlBvyMOrD9FuP+twugoCIJ0iwF4HzUngwrYoT2Aq0dhKf24SgDHTKW3Fk= 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=WGhM550C; 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=1717381990; bh=wBScdLHriUy6y8ctymJvvAmc+IVF07l0O0hi4eSNeuw=; h=Date:From:To:Cc:Subject:From; b=WGhM550CxcZAYmd21uhYcZaaJWJvYzhvcSkqEMavC5qfTughluAYsjIHwCkSbfnVM VSOqJyj0KovgM2V9j+Xpjc1Lwe8DrEdc6XAT9iZu7EaoY0XeP1GTMSo22OVvoUPy2x m8tfpQjvRomlF5NQtVf/ZWwVCDOX/MNVBpjT1XPDyt3NRTzvu7ybIe5gjooFP/IPZU 76HUmEIoJ+ayEtkqi94C6TbbjOgYYc18xRQ+0BF9Nw+TPTW/ICpDowcu8IzuHoB0kk L/hyJIUX74cav+xG8OtKs/FP9wlITmLnJ2fpjSzCgJqU1odkYPP4yeIEbOI8hhC+wP mM3K2AphhkRng== 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 4VsySk11szz4wc8; Mon, 3 Jun 2024 12:33:09 +1000 (AEST) Date: Mon, 3 Jun 2024 12:33:09 +1000 From: Stephen Rothwell To: Vlastimil Babka Cc: Kees Cook , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the slab tree with Linus' tree Message-ID: <20240603123251.473fca71@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/yR+s=W1xhAq8HmRDnLUyb8w"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/yR+s=W1xhAq8HmRDnLUyb8w Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the slab tree got a conflict in: lib/fortify_kunit.c between commit: 99a6087dfdc6 ("kunit/fortify: Remove __kmalloc_node() test") from Linus' tree and commit: a0a44d9175b3 ("mm, slab: don't wrap internal functions with alloc_hooks()= ") from the slab tree. I fixed it up (the latter includes the former, so I just used the latter) 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. --=20 Cheers, Stephen Rothwell --Sig_/yR+s=W1xhAq8HmRDnLUyb8w Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZdK2UACgkQAVBC80lX 0GxQIgf/cA2Td5l6sK8ULLrNlBjkQjTUmGPXAHfe114/6ZCwQB1Qf0MjjyEVY+1Q k8HoUxbB7t6mqwcDDN1oyPxNakKn6K17br4cz/Jvw/l2Kr3pTSeu5DoGobIuZF5G bJDUKk5loVIUNISWCmKLI6y75vWG7RuzA3DqfDbhhxMBquHCGJyXW7wLeh+4sIay 8G4mvKJ+4zBLtXJeM86IJW3fBpglq95IDwL6jVcrYUM7B6LZbVdLIUMNx4oCQf5s JAG7XKmJaUGAr5LW/pjOJ/6VSNvECEElPKj7GdGJCsYI79msKA1pJ8SjQwEid2wA ueOQtD3n8WAZaSZtauAhzkIrwblQPQ== =c6O1 -----END PGP SIGNATURE----- --Sig_/yR+s=W1xhAq8HmRDnLUyb8w--