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=-3.9 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 446CCC43457 for ; Thu, 15 Oct 2020 03:21:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D1DAA2225C for ; Thu, 15 Oct 2020 03:21:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="JzWfvXIz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728586AbgJODVj (ORCPT ); Wed, 14 Oct 2020 23:21:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725919AbgJODVj (ORCPT ); Wed, 14 Oct 2020 23:21:39 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20004C061755; Wed, 14 Oct 2020 20:21:39 -0700 (PDT) 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 4CBZM02HP7z9sT6; Thu, 15 Oct 2020 14:21:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1602732096; bh=/OMQe24iAQN//EyN6R9KvD5E0PFWKFXZ9VWhvWYr+MI=; h=Date:From:To:Cc:Subject:From; b=JzWfvXIzrtBw2v+YhPI6lD6wRL0C+PxzxEyTMhM+ms6dqyKrsSxBl7/QITmPeHUB4 L10fEuBMzJ3QR6toIacG17aLDuxLf1jtzd2K8Ss/sh6E+8pWJ4cAKseCfEY16HYdPV b701c0YWrDBPIMLaNHzxfaNaN+qwBuaDyROub+3K2fbQWIzMcK/jE2NdHi6hD0RQeo VCiIsl04LYX5steyZDG045EO1ERBruXRlKCXe9APDEoeqcIBEdQoM3b2xNoDmeDhW2 ajPtFEc7j4NMuSvU7+J4L8iN0zXzYLCToZz682MAuKgRt0zoyxoQ5C/04fklgsro2T QGrHwt3vaK5Jg== Date: Thu, 15 Oct 2020 14:21:30 +1100 From: Stephen Rothwell To: Rob Herring Cc: Borislav Petkov , Kyung Min Park , Linux Kernel Mailing List , Linux Next Mailing List , Ricardo Neri , Rob Herring Subject: linux-next: manual merge of the devicetree tree with Linus' tree Message-ID: <20201015142130.20634f21@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Qx7D5BZw4X3OyzfQsqXmZpv"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/Qx7D5BZw4X3OyzfQsqXmZpv Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/x86/index.rst between commit: ea4e3bef4c94 ("Documentation/x86: Add documentation for /proc/cpuinfo fea= ture flags") from Linus' tree and commit: 441848282c59 ("dt: Remove booting-without-of.rst") from the devicetree 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. --=20 Cheers, Stephen Rothwell diff --cc Documentation/x86/index.rst index 740ee7f87898,1faf44f551bd..000000000000 --- a/Documentation/x86/index.rst +++ b/Documentation/x86/index.rst @@@ -9,7 -9,7 +9,8 @@@ x86-specific Documentatio :numbered: =20 boot + booting-dt + cpuinfo topology exception-tables kernel-stacks --Sig_/Qx7D5BZw4X3OyzfQsqXmZpv Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+HwDoACgkQAVBC80lX 0Gzn0wf+KShSjUabi1T9awpFGTJRVYJQktPEFhgzLgiU5+dHA3y9TcBDQft8Ll6M ggWccY74zmdCpvzsDfMW7DZuN8GGqf2Kw2PnyyymdH3Z87jD2Y5IIKRonNV1oSKb xHV+uWyFVKlggLWroPyutYvBs7mzlMgVzX6e4q8CMTDLGb8saHL40qBJmv64a9oJ b+5nYCrW7fluQSfBg30vGLlYl3H/Dc17fmjiB9UMimutcR8z8WQKSrK72twS8Ig4 QvWxxxqhmacawfcqTKtOb6RVkJ8NwWQJZMqyQ9U9aAeA1KXpeSdeOUbQotCrhK0k Xf0hTvRq/mqhpl6Q+ojt8Ne0Jwzrpg== =TuZZ -----END PGP SIGNATURE----- --Sig_/Qx7D5BZw4X3OyzfQsqXmZpv--