Received: by 2002:ab2:6a05:0:b0:1f8:1780:a4ed with SMTP id w5csp3050628lqo; Tue, 14 May 2024 19:38:14 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCX8WiIhHr3ARtb0D8Dpau7V4VNcoJ3ZytCbZ4ZJ7QmFcadbhabxifyRp3X6+r0mBean52U9n2dWp3KpqUXotz1tZjXHKs6dwmjrnyzqcA== X-Google-Smtp-Source: AGHT+IEuAGrl+fJRGIAERWj1SL2FHMjMIvYAXpvXysPpbaejNQIDvg5g3+9ORsX4I38r7qhaejfp X-Received: by 2002:a05:6a00:1a8e:b0:6f3:88c5:fed6 with SMTP id d2e1a72fcca58-6f4e02d341emr16096986b3a.19.1715740694423; Tue, 14 May 2024 19:38:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715740694; cv=pass; d=google.com; s=arc-20160816; b=xydM7+vH2Et8g65X9mJWdOJK+Pz5ba9ZfsI9MLa5/1AH2AdTPtP4iedLYB1ghjgJgt HpSSeg8zNxYQ1iGgxli763hlpex7EKhCq49oPwi780pH39rls0cOxSMMD8z53Vj8hVcc QdVF4ZBgnMcAkzItwa/h7VGGEaqRLwGDSNKX9ONNC1ky9YIrCszXIrQGamcncliV4w/P XtDcKlfk2KobJdYr19YYZ25wT0VaRl/4AuXsoU6eOsnDKGkl/4lqiDvAxSDI//iG63fq mMesfyKRycNCTOsIBiyUNgRM9EkuI7QuqrOugygG5ecQXpdRnq2DPVW9KiSqYHi6Prqm qUYw== 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=hCu80+x+uxfZ+hDUfZpGx8ICgUdnOeiPUZ1GH0+k3IY=; fh=bAd62JXC3zILug+m9wmjkPAuPAflTq2SgTFbr5sOsEo=; b=cpWO/yd1AJGKI0rZysJbUVlaPpZizil10v226OU/SjFOhchgVzkTyMrkWDZHYJxTv+ dijfXrUxuPmY1EejQQkXvie0r/FTBtohPqa1lDeJHA0k2OEAZ/GQpZv+H08pb2QVHa8I aZDyANk9MAnpLqklwko4e6P/1SC4vetE9a+Hz2hZq6hdtBunBFvbDIC4ImpnWPFXkmdD kVIyI5hGe/FVBCOqWRcz5vlNcZqoVhipVh6k7mQy/dDuqAuDPYhU8jGJBg/Qrg9cLcYA cuUNKwdmZ3v3oKrCJB8bA5WKlUqdJOZVte9fGpuFclpRj2zyu4YukLTYTyjVBWZxR8bg 5LXw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="CzZthND/"; 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-179350-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-179350-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 sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id d2e1a72fcca58-6f4d2aee63asi13242980b3a.218.2024.05.14.19.38.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 19:38:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-179350-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="CzZthND/"; 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-179350-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-179350-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 1B1B1282DE4 for ; Wed, 15 May 2024 02:38:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 930B6374D2; Wed, 15 May 2024 02:38:07 +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="CzZthND/" 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 94689364D2; Wed, 15 May 2024 02:38:02 +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=1715740686; cv=none; b=P5PqOT5fNNFE5C/xAC2uQUx9B+gSDbh9WVJzag5NMlM1xvd6o9DFew5nXRfX6aZX7rnrO+lPRHfQtr4LkXSWjndPXhS+4FmfD0z3EqPD8zEy/xJpy0f9RF9FyuUfvy1QshcuYfMflXrL0TGcQTVndHqtg7XEbz+f9tUf0660PF8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715740686; c=relaxed/simple; bh=fdnNK8EA+YS34XB3xhvOTBdinVxhF7TYHT979IK1Isk=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=q/DQWP0RSQBIseLqd1BAa1KVAyKzuatrdFMyAM6rzSHycUYCqqpuCzjQfvAGr6RKvcVx54LrvoM+hZSMVXj8Kg/F8Z81Z8DEwEWk4P5N9wCvoKWPy2KtQmrfz3oXmDRk6Udmd7d9sjC0Rc2wjuufEBT1EZJFTYbe4hLj0fBKpmc= 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=CzZthND/; 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=1715740680; bh=hCu80+x+uxfZ+hDUfZpGx8ICgUdnOeiPUZ1GH0+k3IY=; h=Date:From:To:Cc:Subject:From; b=CzZthND/ARQwmBwTVs6IWF7FmeXg5OOhQ2BTrbVXbE6mk3Wjuma6BxDnnassa/mWL JPG9kdFx47+on30LzVL3tHJtuFC17gD7TiHOvsRqhjE8U9zQb4DFDBdA4AWocCwcjs qFpZ9JVwxHr/0CRlzSRw5OBymStkr7SVjhpBhO50TZNqsKpYzPQGI95iscQfvtSEBZ SixiC9Vl/MWMMiunWqWuSKK93BE4/s1g5tCTFC0B7mXA5grxtMBMTj6PUGC2ftpcyS nKx6IR2nnMotG3tSf4sd+o8Mx/4BWAtu6mLkTL2K7aCWRTKjYBKT7sRfyU6BLLtFQ1 hYNOJ0OJZelZg== 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 4VfHT44Fsnz4wcR; Wed, 15 May 2024 12:38:00 +1000 (AEST) Date: Wed, 15 May 2024 12:37:58 +1000 From: Stephen Rothwell To: Steven Rostedt , Masami Hiramatsu , Andrew Morton Cc: Linux Kernel Mailing List , Linux Next Mailing List , Rasmus Villemoes Subject: linux-next: manual merge of the ftrace tree with the mm-nonmm-stable tree Message-ID: <20240515123758.30904383@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_/KSgvXggGgL+9b4U.DA5HJSD"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/KSgvXggGgL+9b4U.DA5HJSD Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the ftrace tree got a conflict in: init/main.c between commit: 212f863fa881 ("bootconfig: do not put quotes on cmdline items unless nece= ssary") from the mm-nonmm-stable tree and commit: efee03a50c28 ("bootconfig: do not put quotes on cmdline items unless nece= ssary") from the ftrace tree. I fixed it up (I just used the former - since it has an extra comment) 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_/KSgvXggGgL+9b4U.DA5HJSD Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZEIAYACgkQAVBC80lX 0GwcXwf/d2hNSVlcoG3A7tKQknNtUGBpMP7gm9ZLsUonK8/g6qoWRkDV2jgBar7Y w2QB6nvOYVYqjuRpxqSVYmQSFHdQA5WATxFFxSp+AXaqOpCfUnMZ7ed/ywdJnudR Sag1IuMv9niGhbDMwPB/uVZ+hwLBkCEeprGaF25kA17rcBKnOtzFva1Y/lq9AeeJ 8AfohaG7SfZCykc9j6gXfPGTpnOVyvMMCm6eYVzL2wYedTdYgMgab9IZd23T4DXk 2la3IazvLkCkaWnWSDm/U6HL7i8pvAraLXWJZOySgPyQ7zIi643VPCz0S8Evl2Ny 5w4BXa/yQs4CV89vDRBlIg0JEOy6Cw== =qJXg -----END PGP SIGNATURE----- --Sig_/KSgvXggGgL+9b4U.DA5HJSD--