Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp486695ybi; Thu, 11 Jul 2019 23:23:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqztU5v/lp3NFVpY4jTkyc8IDCpYDCRGYVMc1o7OexnE2/Leiog7opQIdp/0SGt0j23MLFZD X-Received: by 2002:a17:902:8b88:: with SMTP id ay8mr9086355plb.139.1562912627972; Thu, 11 Jul 2019 23:23:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562912627; cv=none; d=google.com; s=arc-20160816; b=yllEaKNQx1g9R+hLSc4nj3ZgkjOBS0jqNT8r+QwDFgiS32tX/ivJJzsm6/gP3uM30n 68Oz4e2j7L9JDiqxtXloRFuxDrrVFSEvXJAF/Luq4chj2NU+uAQ11o9fiSyADgIJizVd YTQc9fXRoW+LLTzBgJmGA5Q9LbxUK443tR2LvT05rROFvAZ1zmgeOfUoLR4stTAjQW6O znUPsis2qwYsVgmYowWqquYd7A0bGNAJCyZ1EEAdgqnaLkphGjHChFNFzHofSLCM+oZf FeFDlnWj+9VRxARkvI72k7YeU92GfbEcXzQtryZAmgIrmh2C/2ymetuGBPMT8hqGACJO 58EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=jh4yud1uh5MHKbfXMC20Ub1u0Ft7ZfL9wBBPxAOC0mk=; b=CH/38iz/CDUJcI6Lv2lDPZXJ4RB4SXqMxBF2CBzhR6oyY6VoTdKz5W7zqpomguk0EA ckIctbOMGhq9AayKUWhjgh62kGfl7C0gAj+/K7Vc67FFsoW0wufkI1JH9bkf8EJxO9G0 4mqBKI4V73/yNIV6snXDFoDwce+3PDzufEgAcvnMaG//2bbAUIwTjtnzev840zwJBymG NaOKke4Z0aHb5gjmw7FtVwVj5baFBHilTOpqeNP6AXMBnwO216VYJyd0wab4phIB5y1j q8fsQ5gL37bwDtzrWphBSVlOtLq2bhTvXlHgAJQj0PZZAFZs1Hg6qPHdBdGDRiWnO+zj Wvnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=MjniTqyx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h65si7367763pfb.18.2019.07.11.23.23.31; Thu, 11 Jul 2019 23:23:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=MjniTqyx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726078AbfGLGXL (ORCPT + 99 others); Fri, 12 Jul 2019 02:23:11 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:55229 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725840AbfGLGXL (ORCPT ); Fri, 12 Jul 2019 02:23:11 -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 45lNCH5r3pz9s4Y; Fri, 12 Jul 2019 16:23:07 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1562912588; bh=jh4yud1uh5MHKbfXMC20Ub1u0Ft7ZfL9wBBPxAOC0mk=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=MjniTqyxB281FEgODDvI9asxlGGnn4kx0DS/8roF3a/FE5Fnie9lR9N44wd21alte kyvVewrQ9Hh6ypfiuIKt+KBewclioUPMu9cP8OJiWR7YPJUwCqhs+LfBjL4Bd1nDaK Bv4mFJ6Lg3lfr5EFdTMIy9MlkeUtIh/ca5ANyVvPg4+rcGf2cRJfN2cEID0xesUGhy ekxnALUincd0qtXlKpF7wWgykDiSMHYQ3YBHsMlIf5zHz7sSJhgzyPdFsq2tAKzSOO hpP7ZgIJ9LWzk7lceEnRyACD9RCu18kj8YPui/4jyYgRo3qEDRg16m2fBaj8FY6dWt 87iM9ikaR7d0A== Date: Fri, 12 Jul 2019 16:23:07 +1000 From: Stephen Rothwell To: Yoshinori Sato Cc: David Miller , Networking , Linux Next Mailing List , Linux Kernel Mailing List , Krzysztof Kozlowski , Jiri Pirko Subject: Re: linux-next: manual merge of the net-next tree with the sh tree Message-ID: <20190712162307.4d63a16a@canb.auug.org.au> In-Reply-To: <87y313950z.wl-ysato@users.sourceforge.jp> References: <20190617114011.4159295e@canb.auug.org.au> <20190712105928.2846f8d0@canb.auug.org.au> <87y313950z.wl-ysato@users.sourceforge.jp> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/UZ8nh1ToNs3warKxgFKUtF6"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/UZ8nh1ToNs3warKxgFKUtF6 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Yoshinori, On Fri, 12 Jul 2019 14:49:00 +0900 Yoshinori Sato wrote: > > I can not update sh-next now, so I will fix it tomorrow. You don't need to (and should not) update your tree, just mention the conflicts to Linus when you send your pull request. --=20 Cheers, Stephen Rothwell --Sig_/UZ8nh1ToNs3warKxgFKUtF6 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0oJ0sACgkQAVBC80lX 0GzUBAf+KfXxUOmFzD8cKQI3teZDWaDKNCiU0gCTBmfa1zV9RYliEXiKGo7M5MGA MQRPA8W44jqPgvgZWXtTuiZdgZySQ33JfnjJ6qd0pEHF+HfSOnxjvcciO6sBqOy9 MzZJLhF42zSkTz5g9SFz8y7maJKyjYRxJ32oFytvu5npI1tpWT8s4SX1F1XkhSMO 8GnFjZtAViMNu4oYd9roqzg0fty3BxOGK+8yasiZj13kb/aZfmEhvqkSTUjLEL53 MshiPYzNP/8HVt3IWmJ+J0AWKhcCxEsXrDptlESevqFEGNCeEqZ43IbU8UZzrOOz pxE9rCUG+/z7fW89e1yK5NXgktgCTA== =/vsf -----END PGP SIGNATURE----- --Sig_/UZ8nh1ToNs3warKxgFKUtF6--