From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACE32C33CB3 for ; Tue, 28 Jan 2020 10:06:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B1512467B for ; Tue, 28 Jan 2020 10:06:38 +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="oKQEN7YR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725926AbgA1KGi (ORCPT ); Tue, 28 Jan 2020 05:06:38 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:38019 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725922AbgA1KGh (ORCPT ); Tue, 28 Jan 2020 05:06:37 -0500 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 486Mhq4nfcz9sNx; Tue, 28 Jan 2020 21:06:35 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1580205995; bh=l/ocmuSwqhgFJhi93Wf9ycxzSqcALOQnU2DzUcJuyvA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=oKQEN7YR6d2BvLVRjXFRmmnwqNSZ6BtAVkzio0Qrzngq4J/1oiwoAbHVkCnAlMtMs KUcNmbkVdK54xQy63hQiB949YTZMHIkGiQaZLBgTtntRxQnC6Latfd6SLfAQeTQa97 2pZrrh9iNo99bxv/LlLCCVck/q6wUOmBaftKScOEmjdd0n7NPJu5UfvA20j20hNASL WKSk3ztj8AziAp5Ng1VXfxOeW+xeEWLyAQxZ99LzevEiLsx58ZxUAJ8mfb7QRXm76i xOefaSxKSbprg5/yIXKQlAi2HczzUFjBgS62JxwKsqMwAbc5HJsbosiefCncY3Cnh4 GtQ2iUHLCb7sQ== Date: Tue, 28 Jan 2020 21:06:15 +1100 From: Stephen Rothwell To: Andy Shevchenko Cc: Darren Hart , Christoph Hellwig , Linux Next Mailing List , Linux Kernel Mailing List , Mika Westerberg Subject: Re: linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree Message-ID: <20200128210615.4347a362@canb.auug.org.au> In-Reply-To: References: <20200124161558.7cbb88c9@canb.auug.org.au> <20200128100311.3ca81231@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/HET=K3uTDM3=NSfpCKooC/p"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/HET=K3uTDM3=NSfpCKooC/p Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Andy, On Tue, 28 Jan 2020 11:11:32 +0200 Andy Shevchenko wrote: > > I can't reproduce this. Linus already pulled PR for PDx86, >=20 > $ git checkout -b test-xxx origin/master > Branch 'test-xxx' set up to track remote branch 'master' from 'origin'. > Switched to a new branch 'test-xxx' > $ git merge for-next > Already up to date. Thanks for letting me know. Sorry about the noise. --=20 Cheers, Stephen Rothwell --Sig_/HET=K3uTDM3=NSfpCKooC/p Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl4wB5cACgkQAVBC80lX 0GxKcgf+OcXzZTagjmWdoc22VxMX1g1xQ7bVFyt39+TFqI14zUuvwPUJ2Usmqhok DuMAd3fZbYu3mOymlbi56YqkfR/8pJt3o+fgFY2d8blzg93EWeOzBjzUCbxnME9H aYdxMSJ+JlNVgNbElIWd6bmcAlxMAros5a1IpxaHaont/XGXawGijqnR/1zzcam3 TXrmvVBi75bg8PTRkVmdXDDojRZ3sb6w/HcfudURA8bh8JNc2C6E0rb25YHjXTE+ T7jhlicIffomQvQD8j5IJjdXtPyHVm8m4h/C6GlwKy97kCZgq7aT9W+rEUnCfO0J k5/ozsCR/Dr7Eaq5rgUdwaiyJb8aHg== =i1+i -----END PGP SIGNATURE----- --Sig_/HET=K3uTDM3=NSfpCKooC/p--