From patchwork Sat Aug 19 19:35:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Ojeda X-Patchwork-Id: 136329 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp2814727vqi; Sun, 20 Aug 2023 23:21:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGU8yAhT7VlDAjlHTnh+vwLx6qVPjE3cUWS1rPzhXaSEAflqgCHgciQQQnypxbu3+Pp/ox2 X-Received: by 2002:aa7:850b:0:b0:668:8ad5:778f with SMTP id v11-20020aa7850b000000b006688ad5778fmr6950417pfn.17.1692598897752; Sun, 20 Aug 2023 23:21:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692598897; cv=none; d=google.com; s=arc-20160816; b=085xftHfJGrZ0Fdpj7a7r3ifOviUXnOmdwtAxFkAPa08KFxOM4v+Aj0q9jTlpp/pqm RQOLqwtBF11wYYOHzVS8yzWdHVie4ViXtrnVBx4D6PuRtj3wnbtxfLDyrb4+HGhNGFcA NsdRhSneeAnzKIuOe2u36ndd24DYuzafVHiRAeoPqc0l9HSv5sA/zvH0CoN5I24mwKPl +JOGnr7PLy5EUKRUX7RsF7d6yCKUXJJ9nGHtrWacS3DelZCpf2JEaqLWLtAGO7PwirbN S8kGLkhIGgwcjyJ35gTsswXmkbjyhEoe7pAxUVxhMH4PPazlHJP+hlA4k0IdLkG+8k47 tWfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=bLrgX7EE9B7HJDkmydSHIiZYS189H/DzOK9UD89gGUg=; fh=gw6XfzHWI/kIjpu/pysKP8wzr44c8PGMkcxLf0JOBfg=; b=piUmQdErhUHBLFpm8deDonKb0IQmGERLIMxGMk65Wd8NZj85xnR85kygsyRWl0bExg 3zjDb4342gPt61BRrtpaQyn7VdgC51KDcHSAILfDpSP5kQlhl5PxXUxUEXV7Ogj2gPdm Uu1LlcGfx7Vj3/h/9S4DWgdXgCl0pI63nw4Z6O7SabmIaMcX9wvDfx5kzreXXmTJOax1 yTUOgW7X+wOAyYoThGlvZ4U0CmT1ipbKg8hltTUER/C1lutxUy83vcHAPCPMFVvBo0gX Llguu5G5mX8r6ycJikjgvFtfLE6SkhytKvp/1Up+QClotOfAjK1lrbPEf7b2O6TiACtO mceA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kC4JjgfI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id eg6-20020a056a00800600b0068708f54862si6497761pfb.48.2023.08.20.23.21.24; Sun, 20 Aug 2023 23:21:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kC4JjgfI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230471AbjHTUm4 (ORCPT + 99 others); Sun, 20 Aug 2023 16:42:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230388AbjHTUmx (ORCPT ); Sun, 20 Aug 2023 16:42:53 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FB2D46E170 for ; Sat, 19 Aug 2023 12:36:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 250F960B5B for ; Sat, 19 Aug 2023 19:36:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2BDCC433C8; Sat, 19 Aug 2023 19:36:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692473817; bh=5TyeQjTLWSpiPjfMhus5haTkjykIBpujJRFZlCRb9xk=; h=From:To:Cc:Subject:Date:From; b=kC4JjgfI7hLYcOsAefmfrYG9ovyd1iuKPjzEEfi+jFdhOYGtUBptjOYx47rAtw+Gi Fi5lPfcaX0e6QJn6em9bM6on09NueyMLrGuoyvE+wHsb72o0gjRQYWUChT7Mwf+0Za FiOs7BpcqU1MiHuPeY93h+Ygyq/mGi8ycCo9bdhC8clPipGLgOvKmMLFNFO4r7NQd4 LLpIJ5c/MEOzmg1QoTeZGm2gLif/L8e9oh6SInrR/1x/krrQ63t0fFI/8YbxCXm65z R7Yqua8k0jCshLGdP+JGrh9RQu/hp73AWa/JKI1OdCdnVRWnO5G01msI4i3Ca+EuH0 KM3DA+HnWI/ug== From: Miguel Ojeda To: Linus Torvalds Cc: Miguel Ojeda , Wedson Almeida Filho , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] Rust fixes for 6.5-rc7 Date: Sat, 19 Aug 2023 21:35:41 +0200 Message-ID: <20230819193541.290947-1-ojeda@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774743611258741606 X-GMAIL-MSGID: 1774818581803254689 Hi Linus, Please pull this fix for Rust. It has been in linux-next for 4 rounds (i.e. since the restart on Tuesday). No conflicts expected. No changes to the C side. Cheers, Miguel The following changes since commit 52a93d39b17dc7eb98b6aa3edb93943248e03b2f: Linux 6.5-rc5 (2023-08-06 15:07:51 -0700) are available in the Git repository at: https://github.com/Rust-for-Linux/linux.git tags/rust-fixes-6.5-rc7 for you to fetch changes up to 3fa7187eceee11998f756481e45ce8c4f9d9dc48: rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`) (2023-08-09 21:15:07 +0200) ---------------------------------------------------------------- Rust fixes for 6.5-rc7 - Macros: fix 'HAS_*' redefinition by the '#[vtable]' macro under conditional compilation. ---------------------------------------------------------------- Qingsong Chen (1): rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`) rust/macros/vtable.rs | 1 + 1 file changed, 1 insertion(+)