From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDAD6C433C1 for ; Mon, 22 Mar 2021 03:45:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8627161967 for ; Mon, 22 Mar 2021 03:45:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229731AbhCVDpV (ORCPT ); Sun, 21 Mar 2021 23:45:21 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:44881 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229614AbhCVDpH (ORCPT ); Sun, 21 Mar 2021 23:45:07 -0400 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4F3gPD342Bz9sW4; Mon, 22 Mar 2021 14:45:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1616384705; bh=y5zl+b8knrXFb5tRNYcr64U2woI+Jjhequ0OvtRkpfU=; h=Date:From:To:Cc:Subject:From; b=cM6HvbOoK6iMG76jTu864lMolzeFWsMmNX+LwDpYRw9zx2vxVx9tgXnZPXQ8POzsw 41z2rcOVXFhvE8VutjddLp2mMn2YS2GGA6ujZXSY4o1V/HFCZe/rX7wPQ1KgcIlFM4 VMBU/p8CdTRelMAJaQsuwWxifCC27QjCOGpiDA/QQy5kPXDREdtZUWRmqiaqolXdCL 9PQ4qkFrbxp3eAR6SYOfKfaXpf17N4zcwapCHTIT9oTBdXSlWBg0zI0zHGfXHVRa67 vGL5NgA7rKoZzRebrymtgqrsIJu/g/J07ddb+dePvVL9U+aIvzgAa60LXG1LfhS4W1 quJWg2TwCKS0g== Date: Mon, 22 Mar 2021 14:45:03 +1100 From: Stephen Rothwell To: Steven Rostedt , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Colin Ian King , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the ftrace tree with the tip tree Message-ID: <20210322144503.26e2b6ca@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/RfTJIQQUr_9FkywWzfjddYi"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/RfTJIQQUr_9FkywWzfjddYi 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: arch/x86/kernel/kprobes/ftrace.c between commit: d9f6e12fb0b7 ("x86: Fix various typos in comments") from the tip tree and commit: e0196ae73234 ("ftrace: Fix spelling mistake "disabed" -> "disabled"") from the ftrace tree. I fixed it up (I used the former - it fixed a second typo in the same 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_/RfTJIQQUr_9FkywWzfjddYi Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmBYEr8ACgkQAVBC80lX 0GwOEgf+Jr/UkBFDiY1w+66zXjvBD21avD1ugtkmvEjMayiIVNRTVjK8zr/1rRNB dz+I8BTDakp46UvviviRF2mV3HEUHMBVDfscGQSxRXzwlr+O8KH7ewGjCT8bAFZ+ 0TCsbgehHPu/eOVsQ6NLxYEo0F2nHuTMJonv5qJPtJVFNj7U7FXOlEbj3LkFVt5P yYnTlEj/qitbwfEB4tULpBj3Woqi/BiMSEfL851PuYTtMKzaLVGX9ekfCtr8lin7 FxviRuw9jCWuL18Njo28xTfv6kQ7oKNenwFvGYsh75D2Di+4NkxJaKAXlKJ4u4IF Q9g+aGXZyK9HlFFjGClECULlpRkgSQ== =cUes -----END PGP SIGNATURE----- --Sig_/RfTJIQQUr_9FkywWzfjddYi--