From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1754250AbdGCSdF (ORCPT <rfc822;w@1wt.eu>);
        Mon, 3 Jul 2017 14:33:05 -0400
Received: from ozlabs.org ([103.22.144.67]:54535 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752113AbdGCSdE (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 3 Jul 2017 14:33:04 -0400
Date: Tue, 4 Jul 2017 04:33:00 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kamil Rytarowski <n54@gmx.com>
Cc: Jonathan Corbet <corbet@lwn.net>,
        Masahiro Yamada <yamada.masahiro@socionext.com>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the jc_docs tree with the kbuild
 tree
Message-ID: <20170704043247.52e889ba@canb.auug.org.au>
In-Reply-To: <054dc72a-39ce-ee8c-62d1-c17f487009de@gmx.com>
References: <20170626111331.5443587b@canb.auug.org.au>
        <20170703125859.0678914b@canb.auug.org.au>
        <054dc72a-39ce-ee8c-62d1-c17f487009de@gmx.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Kamil,

On Mon, 3 Jul 2017 18:43:32 +0200 Kamil Rytarowski <n54@gmx.com> wrote:
>
> Am I expected to do it myself and resend a new patch?

No, this conflict is not very hard to fix up, so Linus just needs to be
told it exists as a courtesy.

-- 
Cheers,
Stephen Rothwell