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=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 74778C43460 for ; Fri, 16 Apr 2021 08:07:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 580056113D for ; Fri, 16 Apr 2021 08:07:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238033AbhDPIHb (ORCPT ); Fri, 16 Apr 2021 04:07:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234829AbhDPIHa (ORCPT ); Fri, 16 Apr 2021 04:07:30 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C718DC061574; Fri, 16 Apr 2021 01:07:05 -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 4FM81w5Wkvz9s1l; Fri, 16 Apr 2021 18:07:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1618560422; bh=1Wnk0eZUlJJHZgw/9emJx2PZi827RZvoISUmtcGsT+g=; h=Date:From:To:Cc:Subject:From; b=em7UneyUJ4S3MFrN0oPCM7stuKGYF2AVilxBsGjGymRrD9zL6xfhAszXNulQ1iLu7 szHG2k85GoeKXbTEGRjs2tjmdFobUBYDQTbfecegSYOCH1aQ3LO7YCgkfneqJKtjHX 0HAA0cPBX+LDQ82qhLEqfXvVnkA7cokU8lVJriCTGb/pv5lzhE0+8kcbKZF4wh+/RA ALvx0JS3PR6NEgH17HTYn7lWhAS99FEplfVh1KRvHLIfOljGSmShjeOmDGKPubqCvU u3it1aSHnIclW7muuNWsx5/S6IMQEkqSk27TdoB5HVmgNMRHUN3By9IXdwXpQs+0qJ RaE7X18WDrT0Q== Date: Fri, 16 Apr 2021 18:07:00 +1000 From: Stephen Rothwell To: Miguel Ojeda , Petr Mladek Cc: Adam Bratschi-Kaye , Alex Gaynor , Finn Behrens , Geoffrey Thomas , John Ogness , Linux Kernel Mailing List , Linux Next Mailing List , Michael Ellerman , Miguel Ojeda , Wedson Almeida Filho Subject: linux-next: manual merge of the rust tree with the printk tree Message-ID: <20210416180700.6b693f7b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/GF2I8IbkuJnKG8ctnoA1y9V"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/GF2I8IbkuJnKG8ctnoA1y9V Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the rust tree got a conflict in: kernel/printk/printk.c between commit: cf5b0208fda4 ("printk: introduce CONSOLE_LOG_MAX") from the printk tree and commit: fd1e637b9b4b ("Rust: Kernel crate") from the rust 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 kernel/printk/printk.c index 421c35571797,d13be89530c4..000000000000 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@@ -394,11 -411,8 +394,12 @@@ static struct latched_seq clear_seq =3D=20 #define PREFIX_MAX 32 #endif =20 +/* the maximum size of a formatted record (i.e. with prefix added per lin= e) */ +#define CONSOLE_LOG_MAX 1024 + +/* the maximum size allowed to be reserved for a record */ + /* Keep in sync with rust/kernel/print.rs */ -#define LOG_LINE_MAX (1024 - PREFIX_MAX) +#define LOG_LINE_MAX (CONSOLE_LOG_MAX - PREFIX_MAX) =20 #define LOG_LEVEL(v) ((v) & 0x07) #define LOG_FACILITY(v) ((v) >> 3 & 0xff) --Sig_/GF2I8IbkuJnKG8ctnoA1y9V Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmB5RaQACgkQAVBC80lX 0GyS4AgAnbyJfaK8RnzxdFRl47e/InmnCJNk98m/BslB2sVhpq/2SPKyy2ubjzBf EtdCj/R9rzbfDipPBB58KdfwyDu1u7aUiE5CvvxQ+GsSkYBU1+gZbGTslRA+wc2m UKPlDQfiL+DwR2dKN/Yog4kS+ijQUqKtV/yZ3TN2kWpZO9t/JT7VRrCMjzyDLodg Omd4ADDUkKSN3AouqisCFGXTObW0mZSALrG7BW3lUzKZMorfyhHyAOoUqFU3+fV/ DroyDGNP6xY0SXF0F4QyAdfzE1Kv7XLR4o+goGarNkLPbK0OJgcW1ip8gzoDnrJs SXuqznzO/Cp4s0E8hZbjLpNKz6aqrg== =Y4ts -----END PGP SIGNATURE----- --Sig_/GF2I8IbkuJnKG8ctnoA1y9V--