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=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 4CDF7C49ED7 for ; Mon, 16 Sep 2019 15:59:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1FC57214D9 for ; Mon, 16 Sep 2019 15:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568649575; bh=q1MAUAUwls4xAVihZxg3h4OqfsOFaoaGc7iMOdVX6Mo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=zb+RsyWqKspIYsKwF60lVjOfwNHoJoJ8lR+deWaqhxlbGKSKhtAHBlqQCumNt35Lr 2cM03GvpkBN+aA9uvDUCKqfj5egdmNoMbCSFiOSoZCn0SJIms2MepCyl8OJ5zeK92V tF61EsQ1u3xyqoYwvMF2LQ+liBrGwHFqnaCDQjOM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731858AbfIPP7e (ORCPT ); Mon, 16 Sep 2019 11:59:34 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:58424 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731829AbfIPP7e (ORCPT ); Mon, 16 Sep 2019 11:59:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=6Goen0A9OE9gqgWT3hJoh0DRnNeOa0bFJwwrQWV3ht0=; b=Tese8/pjYYvpN4Rvt4v74p0rS v0oCFt9sV1YjjEBOwI0sxhs/P/Wu3NivcqKEseyp8nCoLDq1kSdUAxwzthdhcW2IKj41BaRm7jYvn xoGOt5ZegH2xPAnHi4wdFdGnzOkkrHsMtsM3yBI1MCWm1Qj079mG82xaIFJgcYdHGiJQ0=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i9tPV-00052S-EG; Mon, 16 Sep 2019 15:59:29 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 1F6D22741A0D; Mon, 16 Sep 2019 16:59:28 +0100 (BST) Date: Mon, 16 Sep 2019 16:59:28 +0100 From: Mark Brown To: Jessica Yu , Matthias Maennich , Masahiro Yamada , Arnd Bergmann , Martijn Coenen , Greg Kroah-Hartman Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the modules tree with the compiler-attributes tree Message-ID: <20190916155927.GI4352@sirena.co.uk> References: <20190915222720.GL4352@sirena.co.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="H7G8UhBuWJ9AoGD+" Content-Disposition: inline In-Reply-To: <20190915222720.GL4352@sirena.co.uk> X-Cookie: Man and wife make one fool. User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --H7G8UhBuWJ9AoGD+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sun, Sep 15, 2019 at 11:27:20PM +0100, Mark Brown wrote: > Since this conflcit is non-trivial, it's late and there's a good chance > I'm not going to actually finish building -next today I've just used the > commit from the last time -next was built, 3b5be16c7e90a69c, for the > modules tree - sorry. I'll have another go tomorrow. This means none > of the changes in modules-next are in -next as they were all committed > in the past week. I had another look but I'm still not comfortable doing this merge in a sensible timeframe so I punted again, sorry. I'll probably carry on doing this. --H7G8UhBuWJ9AoGD+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl1/sV8ACgkQJNaLcl1U h9A8mAf+Jh44K8rTp+/29L9D52GuEB4fkLuhXGIaRQ8S5505+bIHGNQUqLEDjJRp svlafU4r7sjJt0YlnvI3qmC7u1xKb9FAFEbpTw7skFeQrtUs+j1UEZdc3x8FRmsH 3nknSx2rma+UqsH9AIaCiutTQnphoNozTnhmznl2PS9X/yvrGafKn/DtZwvxLQJk zOajME2MEf7pikJWmm99A3JkeMWCs90bTd8W3WmfCigXToqbmNNAlNnjot8xmUr7 tBFNmj5nGV1zs/PQ5QHXeaDtCmPcXgNJdTzbDgFrCmA4u7+iij59cw3tg/+PeT2c lWg2ZM43GQVmFrnwHLhxLiQoTbXzDg== =+igc -----END PGP SIGNATURE----- --H7G8UhBuWJ9AoGD+--