Received: by 2002:a05:7412:a9a3:b0:f9:93eb:408e with SMTP id o35csp50452rdh; Wed, 20 Dec 2023 22:34:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IEjV7X145Xd6SWQuvPw8noj1yB8/QRIMyaR79GZpstm/7SOO+mKETsrHcmkEkz/5wAQh9jN X-Received: by 2002:a17:907:72cb:b0:a23:577f:41ba with SMTP id du11-20020a17090772cb00b00a23577f41bamr246969ejc.17.1703140466736; Wed, 20 Dec 2023 22:34:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703140466; cv=none; d=google.com; s=arc-20160816; b=OHnwALKQAWHQ5GC/ecNRbjisvTjli+voJowSVfBy1SIHTy6ly6iLs1++di0iiAavkn 8ymv3OVr0EONMeHZ01rY2ToTSVyz0QOSa3R3Vz5c9PZ/jqbS87Fz/yD6pNNtlwupB7eh ANCKXIHifRwTJVMBq743yZU7GYQEvgJK862Pj72fT6AnAGeGYX9PxUQd+65DuD/GfEv5 G5Ek52nCrFSdMK9Wtfv1DxQEnsuDTkY+nt2JOyszvb+TLfaeV7kjn+ZTHyXGLhlb6VPs BGNdndlVD9F5jfu9fzSQMflSmTBLIt/ECfpQr0DpA/nWU/9YzLbqSp+3A213lYu+fKn3 iuTA== ARC-Message-Signature: i=1; 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=nUhtLvTOheYdHlXefbwGGNCCpcBwQqatrUG1V2Cygo0=; fh=nL6MC+EJO41AKsaTGlExaJZuR/XUYf3qKCwABij+8ug=; b=hRorEP9AONi1CAZPAGARfiEGQZhKxXnE3IVMwN45IXQCLJN/WKQNb+/0n7BOei7+rC j3f2ag5nn535q0toXjelfRWBTc0V1+o4GZtyEXnfU1U2x4coPU4Gs8rmR/uagU5f7id9 4zJ/LwWRSvuWsXJ0KXbtVtH+c0G+cGPkxJR+p1p2NKJNd6ClmRVH59/ycJnphG9x8x0T bKOCKGj4AgmlW9uX3S5YbqWKPTnupV2zqvo+TKxH++2WqXsLIaFwJNDReWC2+TsLs86a iTCyh5ToCaJFNjqoofHOQIFqkAGldnJGkTP+R8msZYcjQ5QnMlAI9lnfUfAE5PbqmWlk lsKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=k3VZjW8L; spf=pass (google.com: domain of linux-kernel+bounces-7894-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7894-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 am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id v26-20020a50955a000000b00552c32f0f68si539110eda.577.2023.12.20.22.34.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 22:34:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7894-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=@canb.auug.org.au header.s=201702 header.b=k3VZjW8L; spf=pass (google.com: domain of linux-kernel+bounces-7894-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7894-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 7DA501F24128 for ; Thu, 21 Dec 2023 06:34:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B63F1156DA; Thu, 21 Dec 2023 06:34:18 +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="k3VZjW8L" X-Original-To: linux-kernel@vger.kernel.org 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 5871C156C5; Thu, 21 Dec 2023 06:34:14 +0000 (UTC) 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=1703140453; bh=nUhtLvTOheYdHlXefbwGGNCCpcBwQqatrUG1V2Cygo0=; h=Date:From:To:Cc:Subject:From; b=k3VZjW8LZBmHc7VpUF31JUXm1FXX1dgCm71nNN+GX+e0QmWFq5MorVTGgRcbpA1/Q LJyBz8pA1O4Ud8eXFJ8erECXpfdOBPm0ShmbT4mTCZWeeMPa7B91H9ATEy5NnwyPWK nVkPH7/82MXqcZXRqOxnSrUQ8YA088UC7C6OFP1kUpXQRM6rFurOUbradUvIftrsgP 61FvoNPiEP6ki5IrsqMg69lA7C8zZ+bBSuBP3tOKOkdp6iT9POXsAT4oStW0R9xzBg kyOGsV0Rw+2SDQjthKUDv1sDMbVEo8hfNzMfTJWHAPmCvglkmAtYe9N1JcoAemh4OK Bi2QEkf2OUp+Q== 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 4Swgd12Y1yz4wby; Thu, 21 Dec 2023 17:34:13 +1100 (AEDT) Date: Thu, 21 Dec 2023 17:34:12 +1100 From: Stephen Rothwell To: Vlastimil Babka , Andrew Morton Cc: Andrey Konovalov , Andrey Konovalov , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the slab tree with the mm tree Message-ID: <20231221173412.24b78407@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_/kVhN78tD/kc2/0MCeJe=e4q"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/kVhN78tD/kc2/0MCeJe=e4q 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: mm/slab.c between commit: 3ef36a834801 ("kasan: rename and document kasan_(un)poison_object_data") from the mm tree and commit: 16a1d968358a ("mm/slab: remove mm/slab.c and slab_def.h") from the slab tree. I fixed it up (I just removed the file) 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_/kVhN78tD/kc2/0MCeJe=e4q Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWD3GQACgkQAVBC80lX 0GxgOAf9HLr30SJjbsSUzVkyV8u+j9c4SL/bYT2oQoJ3yjVaE0vnxKpF0Mvx6uwa LhQ/DDiYEWgpgBImVLl1xM78ztvqNiOFptRRqnYIgDzygdPx6d6d7beG1k43nxpL HMLnGPLNO3SBLpCxUaTtDQVtwGFJF+DyKuOmxM3oV3QO8SrFkhBQrqr8y0NSOucT XRFXCu7GQFws3MQ/Kym88m7i6Vr1hY4Qb/fmUkrlG1eWxlj0yv8+xT9QZK3tNh/l pCpWtrDQievcM0Aq3jAHgOpEvXc4zS18xESfVQynjNTPMmoQEL0sklK7L0dl/HcR C02TZG5h1g52U4+LK26WO5hwmSDEhA== =UdHA -----END PGP SIGNATURE----- --Sig_/kVhN78tD/kc2/0MCeJe=e4q--