Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp64232pxu; Wed, 14 Oct 2020 20:26:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFVFpbPImJ91/tqk1u2juHSMYiol/gsR/QtWBhRPecz2fZR+nKkG7bkrqnLQwyki1KXltV X-Received: by 2002:a17:906:2301:: with SMTP id l1mr2206944eja.488.1602732368859; Wed, 14 Oct 2020 20:26:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602732368; cv=none; d=google.com; s=arc-20160816; b=TsDAK+OwlJTe0T2mi4WGcksAVHthacbe/eWYGv5nDjiuf0fwiH2jCAWdkZPJA2jOpL 1M+RgIeq0/4IcaOvF7iI6B5+X4+WAAsM1J6bgarCLKCuPB8P+Kj3NoUcDa17CFjGi81p MOibsdcQ1dfwytzTPVvyLxslJnksvXdQ+EjVE+FqXJxbgI8wvzAHJfWAs/1EcJF4BlYr 6sjXrfR6/l3YnTL9RFO/2ydWRMJTOqkpMFiGl0UR6UgupAoKrWYIgiAGdHNIxBXaWMvN E8K9hJYRv69zVDXXwLjz/pOQ536SRqYHLYX8iGb/4/tvFsrQgjXzQfpT/+ze9Jn6zZUb KqrQ== 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=pGnLyPwfJD6F7NHLJUFuLsiMpHAvy9rGjdaMIJnm6zQ=; b=ehpNU9tCKppEjwYVewIRIMa3bZ//+IEvT+v5wbngu0m5kUvLPGAjVxoWP2WzWMzAMT Z15r88QbMDWKMP15QmewauMknas/X7KPd0lZguatyI5I7xa28pNM4s6nvsz3UypTulqF dfiJeF0XhoHi1y+gQ6pUay9KRNA1/xb9htMONZjQB6CTtwfwoIdAe/W6VcvlEOIWHtzZ xgyoYKTyViM1NgBwBeTQwK9tM39OfHjsvctkTIPDdIFg1hNeOwEsY+PVnwVkjWitRbfF 2Ak3K71Z2QbFLedc9ukh+HSgacEjNMc8jsmU6p00IJNfAmwx49FiMxbBC5nbvP5WQ5oA V1qA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=ZAGOU5Mn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cf8si1196119ejb.203.2020.10.14.20.25.46; Wed, 14 Oct 2020 20:26:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=ZAGOU5Mn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732166AbgJOAfe (ORCPT + 99 others); Wed, 14 Oct 2020 20:35:34 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:33569 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727790AbgJOAfe (ORCPT ); Wed, 14 Oct 2020 20:35:34 -0400 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 4CBVgS1nSNz9sT6; Thu, 15 Oct 2020 11:35:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1602722132; bh=AEUzDcNpseI0zKOcofSjki/FWqNB2DYfmUv1ZA64ZT0=; h=Date:From:To:Cc:Subject:From; b=ZAGOU5MnMIDN+6LKnJTogH0NDfPeinbdSTa7Y18yG0Wyc+e/4RzG3DBHkq4mIo9Jc S6lgdXwIB6zFI1/Ff8RrULv6p+H8yaKi+LYr2f7mjPKe4S67rihGViE7Q3Hpis8PVK N/HTtqagwb/M66/oxbSedFAcA3GpzGQwMSEegjDBiydQFzZJqQ0wIKoWonUhZned36 TCBoH24zFMIV7NJrsZO37cWUBn+yLBkA9vB5ySWgYVfI3GwBqb9rR9Sx+7jtoO8Jo5 nXWfKJF0oeR7LbxvUN8jLrXayC6cWrrB1yUwGn4ZzQsIWlokcacTgLNy57iggydnTq 0PzOr2TdEw0gw== Date: Thu, 15 Oct 2020 11:35:30 +1100 From: Stephen Rothwell To: David Sterba Cc: Linux Kernel Mailing List , Linux Next Mailing List , Linus Torvalds Subject: linux-next: manual merge of the btrfs tree with Linus' tree Message-ID: <20201015113530.115e0361@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/voInhO8v9bi.ZAxF+1MUQqx"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/voInhO8v9bi.ZAxF+1MUQqx Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Please do *not* rebase/rewrite your linux-next included tree and then immediately send it to Linus. Or if you do, the please also update what you have in linux-next (so you can sneak it past me :-(). (mutter, mutter, unnecessary conflicts :-(). I have dropped the brtfs tree from linux-next today. --=20 Cheers, Stephen Rothwell --Sig_/voInhO8v9bi.ZAxF+1MUQqx Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+HmVMACgkQAVBC80lX 0GyiVwf+N2NmWlhEJR1ugr0XXH+JlSXRtJCu05zTfm4ODJFdPkS0ZmSnE0H0znZe IiN9aArnRWSJ5BUqCDWUMnQ3Tg/pKNn0ZlGiuXER23LsVhI45Jh1ktF9RWLg9Run 89olNZJZdqwHzJeCPfST/pBs7CF6rUeuWKCpF2+KvySD4esi87FnWEald1xhH7AP evdhMfn/WsfT4Ms6k1ud/f9HKE3a7GzMLDYxPlGScepVdWcueK8jWbeI2L5HkYp6 0O8ZgY1TeXj1Hcb1ngOZYjdZ3s5R1o0FkgKL9JJiGR9WpxpUS+Yrc3qqLGlbT2HV 0EiWPoRSFQInZBg/wFFNMsO/v87q7Q== =5OB4 -----END PGP SIGNATURE----- --Sig_/voInhO8v9bi.ZAxF+1MUQqx--