Message ID | 20240226111257.2784c310@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-80352-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1793226dyb; Sun, 25 Feb 2024 16:13:17 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWBAuIgvFea2kB7AZwaLAwys2+HAXNjwZ/SU3OPNiWuoKQH268xUMQQn8t8edhvkc7b3c6aTErnXd50z3kuFQf72RA5yQ== X-Google-Smtp-Source: AGHT+IE1JE/rvx0AxJn9kxTEdSX1Y3Ybch1emUQWOJSugKbf0Igw+wunWvRVEpf9Jdfngzm8ZftI X-Received: by 2002:a05:620a:228f:b0:787:bb01:9938 with SMTP id o15-20020a05620a228f00b00787bb019938mr6665470qkh.37.1708906397423; Sun, 25 Feb 2024 16:13:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708906397; cv=pass; d=google.com; s=arc-20160816; b=LA3dZbEal0nfiT86upeyjv14LIFgMU8yhioGZ2vuJSnajKY0uC0TEwx3313j049CX/ DyUBFlDpARvxb/uqJ6EuL9senwhiuFEPjswXriwaSsiIU7FNaVD0gAfw/GH5mXQ1H5p6 qZ4NTslP109ZLQC2J7Z8ybm01M/lmjpLbl3o5pKJY2ZsI08SeWazlvugAFsi3+bulZ4z P3g227FQgXX5Lh7Uowo6Hlk0wOPlCYEBa66JgWoo3WaBTckYxZGWiO+rZ5pAsbLE2cRZ ibkOS78yAZrtg/1OA3+2LCJCmjlwMUg43wUve576gYiJd6xY6gwe8aOHJaWjA0NmtlcH i9OA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=8FVLuN+HvufdQO1z5NwgyTOTi7uQpBZaAL6oAV1JjYw=; fh=SxnUIvA/M4p9jXxVw2QZqI7b7o4IJLgeskdQQ9TfYhI=; b=UcO5RQ5FOpmiBBt/zWnr5ubKcMEFR11YYITQlcrcIUJp85lLFqmYCXrlzw+YE4ntxX ReCBM5NS4D80evYoNz6cgFUsEqbLOcTu7MGtCxF+A+vmLg6O/lNFOCE9P0mKO+9LrtT0 FtbP588AJoeWBt5D1Z7YOb0HHyPQ0CC3W2+VDMs//7yi2oIyFKi/kU0c4LVC+ejLSed6 dw5Kkh0ZXegmwbGpDgie5eTenDtp965Ow864G54K2DeO+/U0aFzIDh2ZSvzr9/FOMMiN uDvIlqhlg3Ax50EmyKnHO2ubkSFKBMHoKs55pdEJFMaSn8auTnrfw4KGrqgLQgh8K+wu kqGQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=m36aK9SA; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-80352-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80352-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id j22-20020a05620a147600b00787c3210be1si3781473qkl.501.2024.02.25.16.13.17 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 16:13:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80352-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=m36aK9SA; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-80352-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80352-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 3A0241C20CDF for <ouuuleilei@gmail.com>; Mon, 26 Feb 2024 00:13:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ABC2B4C84; Mon, 26 Feb 2024 00:13:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="m36aK9SA" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BF9C173; Mon, 26 Feb 2024 00:13:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708906384; cv=none; b=Oy6BdbxvXoeR+Bao/5VgGPKt8hLzlYfU4lnjIBaOERWIeJ81veJADG2PWL6KpY7ZaxGp4jtM/HrdqoSnsvSE42gvKoScj7vN+8mdFpHqZHckBEri5D8+Baay6sWp4H8vMYE5WHYK0VbXxOcJj4fyiTX3g8V0DUPBTiM9KGP8jK0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708906384; c=relaxed/simple; bh=8G2GQFgqT5J6j9f2iJiXqAPWrET+M9EJYZquGHpRgbE=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=cnkAqFC+Ib18Bcp9aSqFmmIkqZsqcTJl+MEcnwybeszGKtgUeUh7JaHEkvVqC8wwVAh0eVpSM92Dz5+D4OKR3rYAS+WU6lFVkQ1/sRiJ1od6CxFlM0KYjt9+uj1krCabwybjLmaHnb5gcMffmNp8C/+M5cHZ5B1SoF2n04e6oqU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=m36aK9SA; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1708906379; bh=8FVLuN+HvufdQO1z5NwgyTOTi7uQpBZaAL6oAV1JjYw=; h=Date:From:To:Cc:Subject:From; b=m36aK9SAT6KL5sG7YjZF83CrODkAG1y3SH0eU/IyJwbk7dSqiVGRjJeLf070Aml7K aBDNA1yaytRaXIWSUHZ6c4sb6RhU5yVO9lJYeYD7YAXVw5U8P3HwihqzAsjpHWMySr s1f40z3eIfHPbwuN3Skuuq+EH0lyQFY2Vm9X2MYukbx0LV7kArecu1zF8zeT9KjDUm waDGyedRP8Q7NIMWCHEUSrOPT4pd2xJwTW7+Tr8GC1DS+anqwwDDMbBi4vQbmQP3Qg 4l7yI4TZra9mughbFcu7YhiTj2h87w/z/O2C6YTBuLrcwu1g8vCDqXbKAC0AyXeuc4 YnQ5BHz/9pNUw== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Tjh0C14TBz4wc8; Mon, 26 Feb 2024 11:12:59 +1100 (AEDT) Date: Mon, 26 Feb 2024 11:12:57 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Christian Brauner <brauner@kernel.org>, Kent Overstreet <kent.overstreet@linux.dev> Cc: 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 vfs-brauner tree with the bcachefs tree Message-ID: <20240226111257.2784c310@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/FvBqIVN51gPF3Kh4_DJXSW4"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791918234721055413 X-GMAIL-MSGID: 1791918234721055413 |
Series |
linux-next: manual merge of the vfs-brauner tree with the bcachefs tree
|
|
Commit Message
Stephen Rothwell
Feb. 26, 2024, 12:12 a.m. UTC
Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/bcachefs/super-io.c between commit: 2881c58d14b6 ("bcachefs: bch2_print_opts()") from the bcachefs tree and commit: 9f2f767f5ef8 ("bcachefs: port block device access to file") from the vfs-brauner 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/bcachefs/super-io.c index 38a5073202c5,bd64eb68e84a..000000000000 --- a/fs/bcachefs/super-io.c