Return-Path: <linux-kernel-owner@kernel.org>
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
by smtp.lore.kernel.org (Postfix) with ESMTP id 4FC51C83012
for <linux-kernel@archiver.kernel.org>; Tue, 1 Dec 2020 09:19:14 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
by mail.kernel.org (Postfix) with ESMTP id E93C22065C
for <linux-kernel@archiver.kernel.org>; Tue, 1 Dec 2020 09:19:13 +0000 (UTC)
Authentication-Results: mail.kernel.org;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b="XSoRTh+E"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S2390192AbgLAJTA (ORCPT
<rfc822;linux-kernel@archiver.kernel.org>);
Tue, 1 Dec 2020 04:19:00 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53580 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S2390575AbgLAJSz (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 1 Dec 2020 04:18:55 -0500
Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE7B6C0613CF;
Tue, 1 Dec 2020 01:18:15 -0800 (PST)
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 4Clc2r05pcz9sVk;
Tue, 1 Dec 2020 20:18:11 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
s=201702; t=1606814293;
bh=5zJ9IuqI4gLBzisy31CtAwLvFcCEejz2ewdPwr5ZIXc=;
h=Date:From:To:Cc:Subject:From;
b=XSoRTh+EHwvFZY78Bf2irWcrLekZ2C+PGMrccxGEqnd85wF9DEVmI4kJG5cc9SQqD
s5ZfS+62iYm+R9Ney8uoxuEemKkMGPyjsV/JAD0ESElLAe7/Kt5nnQdOLvz2mt9BP+
AAYJFpkwb25isMoCDhkCNl6VzsXdOVzV181sX9JChIdnr53bI48oQYHcDvbAsehYKb
3tmNS2cRqTwhuYELoQpJw3+3tMIrqVwOuAEOznWh4q65iOU0FhL6jXsWVI+ws0J6bG
YuQiJrcEpu0SfIJHp5RiFGMw27Qjz8YrMB0QUqO5l107VlCKPBaJ0/sl3BqTHtoiYi
/yPpRKftEN26A==
Date: Tue, 1 Dec 2020 20:18:11 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Jonathan Corbet <corbet@lwn.net>
Cc: Andrew Klychkov <andrew.a.klychkov@gmail.com>,
Andrew Klychkov <andrew.a.klyckov@gmail.com>,
Andrey Konovalov <andreyknvl@google.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 akpm tree with the jc_docs tree
Message-ID: <20201201201811.72273de8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Ik6Kq09lnXxTrI8ZCP38H7.";
protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Series
linux-next: manual merge of the akpm tree with the jc_docs tree
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
Documentation/dev-tools/kasan.rst
between commit:
1a37e18bd4b9 ("Documentation: fix typos in dev-tools/kasan.rst")
from the jc_docs tree and commit:
bb26c2574ff9 ("kasan: update documentation")
from the akpm 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.
Hi all, Today's linux-next merge of the akpm tree got a conflict in: Documentation/dev-tools/kasan.rst between commit: 1a37e18bd4b9 ("Documentation: fix typos in dev-tools/kasan.rst") from the jc_docs tree and commit: bb26c2574ff9 ("kasan: update documentation") from the akpm 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.