| Message ID | 20230622131108.19059f3c@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4797896vqr;
Wed, 21 Jun 2023 20:28:16 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ71j7uqSTab92S7qbtWuOa1nIrITUiJiuu9IC+FfG92yPzk2HtGuNRI/Zzrw6bbrbStAofl
X-Received: by 2002:a05:6a20:2590:b0:10c:38d3:437c with SMTP id
k16-20020a056a20259000b0010c38d3437cmr16950447pzd.58.1687404496157;
Wed, 21 Jun 2023 20:28:16 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1687404496; cv=none;
d=google.com; s=arc-20160816;
b=QtEouhrT1BO1faJEe5XyjiBcvpVeDFH0UQZeCVkjqmUsy9uE8bUEYLcd8XKEERR86s
g8IrDuB4setwrFtG2McX8FAzSEI0Gqsh6a1uqA+k82FFC9LvBsL0WoikO2qp61+rRa/d
BK1x5cEAciyA/VhmS5ENlPPWEuWrvJhZ3sQF/kGRl7jZghqtW8kMl2UaC/vzatcZGn7z
wcq/2FFDRWd0IS9P5JyNjApZuhkrw5Y9JUXH9p2BSTOeWzZlHUqzYcqcIAEkFok/jWjG
xfMTTPhs4RGtS2DuXmubIif2D25+LkoznYhp6UkH5RLvW9bI35wSi41o5w3Z8a28FjPZ
flRQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=7Qm8l7c2nuE9U4jZ8AyN30XctT4g7MtPQ1Sf7C9ve9Y=;
b=aqd4UDYitN1tX02QDVJx1CJ+c//+wyHjqu/iBv2H6NxYt6VfALG7Wmn3ed8hivLu0j
26hSu5D49USoVjzKG5jROxFCXK3c9zeHuJzlD2cy3Ltbu377psanfTxo6eXrWqSQIDtM
FteU3z9hBfnYdtb2BTaa2E+LSCEdWtsQOq5xRHa9p/dz9PejRSK/ijWVby45hchK1HY4
ukCf91pu+Q8tUXTgxcPm6quPViKrDXyn9W7VM9Sg6zwI6rCklPTHR5SnR3vJIDq+Ogj/
1rdIwaLz4i3vWGxFpl6/roB0tqvk064Hp5E1WNkOfktxAAI+zXKVbfNyHgdhaZrS/H5G
h/VA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=D9gPMYmn;
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=canb.auug.org.au
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
lh15-20020a170903290f00b001a29280c544si5235762plb.263.2023.06.21.20.28.01;
Wed, 21 Jun 2023 20:28:16 -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=@canb.auug.org.au header.s=201702 header.b=D9gPMYmn;
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=canb.auug.org.au
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230059AbjFVDLa (ORCPT <rfc822;n2h9z4@gmail.com> + 99 others);
Wed, 21 Jun 2023 23:11:30 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48078 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229960AbjFVDLY (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 21 Jun 2023 23:11:24 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
[IPv6:2404:9400:2221:ea00::3])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 403B11BDC;
Wed, 21 Jun 2023 20:11:21 -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 4Qmlkm2pTDz4x0L;
Thu, 22 Jun 2023 13:11:12 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1687403476;
bh=7Qm8l7c2nuE9U4jZ8AyN30XctT4g7MtPQ1Sf7C9ve9Y=;
h=Date:From:To:Cc:Subject:From;
b=D9gPMYmnssPsDCwCYe8tHi2mwCRsU9uFAiz7kH5AFIUgCmE8uRQ3nh9AQQXlgE5FT
RNZuEPNxQ7/e9kfudGQEjPrgq0QXtgcEbLUge+vX9x+m6PhNVTyKZ8DUyQEvuqA52l
witBkMDaXINPriAGT0GlHlPdLLVowl+1apDnTUbM4cXv2UKEM7E8VMXwl8x1N4vTjA
+cn8jzQM+QiicXgR86JFScai59P2h3IYvZ2DDMoYaVdNEGRo+LuGxCRgvp5mexzGnx
8+D9f1suLf2OYlBlyIK4dJqRt0OfgDn0cdLBlgzEEwalP+mYNdXYYnB+r33ca/7+dc
E57GRqdws0+yQ==
Date: Thu, 22 Jun 2023 13:11:08 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Christian Brauner <brauner@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rick Edgecombe <rick.p.edgecombe@intel.com>
Subject: linux-next: manual merge of the tip tree with the vfs-brauner tree
Message-ID: <20230622131108.19059f3c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/G3lxhFHOTDr_0Ur8G.CHSPo";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS,
T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1769371856910458753?=
X-GMAIL-MSGID: =?utf-8?q?1769371856910458753?=
|
| Series |
linux-next: manual merge of the tip tree with the vfs-brauner tree
|
|
Commit Message
Stephen Rothwell
June 22, 2023, 3:11 a.m. UTC
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
include/linux/proc_fs.h
between commit:
ef104443bffa ("procfs: consolidate arch_report_meminfo declaration")
from the vfs-brauner tree and commit:
eec387cbf905 ("x86: Expose thread features in /proc/$PID/status")
from the tip 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.
diff --cc include/linux/proc_fs.h index 253f2676d93a,80ff8e533cbd..000000000000 --- a/include/linux/proc_fs.h