| Message ID | 20231005100932.53c35f2c@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id
hf10csp457971vqb;
Wed, 4 Oct 2023 16:10:48 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IF8V91UpfMVvwCfD21M+qETFAq8iM38ncK3md9i8IEsk3KxQu5clQ5WnwwCCgM7itGGK7A3
X-Received: by 2002:a05:6a21:33a1:b0:169:3769:2739 with SMTP id
yy33-20020a056a2133a100b0016937692739mr1777194pzb.14.1696461048167;
Wed, 04 Oct 2023 16:10:48 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1696461048; cv=none;
d=google.com; s=arc-20160816;
b=V9wogOFc1ZT2/BDxQG96YGj7oF2UsGvLYV/17nJu4STc+TyvnTMF5WTHngLUGzKIl3
vBUkqlyHCNzvlYt9nQ24fGnWDXIGaDyBKZgTpGKqdoUht7I2IzzZ0zPgBW+opXxEgiCS
8kAtboNzFTntgSlH6VFIwBhXj/S8wjyu9M2iXihoGOLrbH6dHBrNnTTZAsQyyytISjqZ
LcEKIJVSAyVBZM/UzuJc3jd61K3cRHDiAJFAoxTXXVCO5yv1F+d1FDYGKB6xoOx62gi6
ZQ3Q7BbIyIYrITorACiCH9zA/M9BR+NcUgz/VtAK0MQ5UvQmsHO6gE3PeAPj6NWMIJQ+
jbiA==
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=mCF3g0jquxEL+pwxpJMLbfQmMd435GQolk4LT94nhT8=;
fh=MB0dYUiFRhFV8vBcj7vBYvZSHuGC98fcfmkhoPq37KI=;
b=Gurytw1rb1tndT8duG10Z6q8usF8SXTaGcVpM6/zs+Xj54VFCd7d9xqOEmQi11LuKx
1KydRMUDmsCH4rRvNSNhkS2TWcAzbshFu0eAvU4gMVpAPfBOWZ6LHYFN5jHyEEA1iiTI
jFHrWQXvkgxnORPilc/KiEXVB+Q3wHqGbakgaQwbexyBR3VBcWzTJ10TWSdghVt1MuFr
g1l/iXfoIAnA3CxcD3q6bXzuytE44JjWSHUGAZl9XBRVZSAnjJx5TeYLu18fqLPdPVDv
2GAuSo8KKZSOV49muPRd0SA8HpV8TxaMAkMQlVmAhBj0Mh3H4dkImEclfWSxb4FcyQkG
mbZQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=nQn2tPl+;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35])
by mx.google.com with ESMTPS id
bs188-20020a6328c5000000b0056952b496efsi152852pgb.366.2023.10.04.16.10.47
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 04 Oct 2023 16:10:48 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=nQn2tPl+;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.35 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 (depot.vger.email [IPv6:2620:137:e000::3:0])
by groat.vger.email (Postfix) with ESMTP id 503ED830F567;
Wed, 4 Oct 2023 16:10:19 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S240321AbjJDXJ5 (ORCPT <rfc822;ezelljr.billy@gmail.com>
+ 19 others); Wed, 4 Oct 2023 19:09:57 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55930 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S236558AbjJDXJz (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 4 Oct 2023 19:09:55 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99261C0;
Wed, 4 Oct 2023 16:09:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1696460986;
bh=mCF3g0jquxEL+pwxpJMLbfQmMd435GQolk4LT94nhT8=;
h=Date:From:To:Cc:Subject:From;
b=nQn2tPl+5GuHnR89ZLjroihIy1eSaqjG1tSqI1FfAnH+wiYPjl8/kma2GYtsCaMUN
F1liNxo9BXYcr+MD3tPnzaR33yd8shuCWkzpc8zhBRa7SzhU0UwGjZkEYfXdtAfF8m
tDrKCohOP7HJReYR2jod54jek/yvRzVqbfJ6nVuPHU8tcm+Ayy6xCPXpj71ERxqK5j
SPz5o6Yww8KNetwpFhKLM8vwpFg77HRjdDnjxtzSgU+5godHB+PqsaoPqp7Ff5Mm/h
6iqzYQqlFSUyYP5lIB/ezlpCgki1IlDRUd1xN7Rk+A67uAxXPWzaGMt3kYiwQweEvj
ajgS/uzzUe4Pg==
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 (prime256v1) server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4S19Pk09rWz4xLy;
Thu, 5 Oct 2023 10:09:45 +1100 (AEDT)
Date: Thu, 5 Oct 2023 10:09:32 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Sterba <dsterba@suse.cz>
Cc: David Sterba <dsterba@suse.com>, Filipe Manana <fdmanana@suse.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the btrfs tree with the btrfs-fixes
tree
Message-ID: <20231005100932.53c35f2c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/H93Sqh0F6fw6Oc5b84TQeVD";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]);
Wed, 04 Oct 2023 16:10:19 -0700 (PDT)
X-Spam-Level: **
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1778868340080017950
X-GMAIL-MSGID: 1778868340080017950
|
| Series |
linux-next: manual merge of the btrfs tree with the btrfs-fixes tree
|
|
Commit Message
Stephen Rothwell
Oct. 4, 2023, 11:09 p.m. UTC
Hi all,
Today's linux-next merge of the btrfs tree got a conflict in:
fs/btrfs/transaction.h
between commit:
f8d1b011ca8c ("btrfs: always print transaction aborted messages with an error level")
from the btrfs-fixes tree and commit:
5483af73c851 ("btrfs: rename errno identifiers to error")
from the btrfs 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 fs/btrfs/transaction.h index 93869cda6af9,de58776de307..000000000000 --- a/fs/btrfs/transaction.h