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 71E43C4CECD for ; Tue, 17 Sep 2019 15:17:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3C61421925 for ; Tue, 17 Sep 2019 15:17:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568733450; bh=sVZ6ge+yfDjOXzOx4fIF/VKvl5Za4ZNZw0rEy3EqVMI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=aMTyAjyM9PQABJE02gxK4Snmp3p4rollDLv+47sehsdFC7friiCDjftSebElk4KY7 cLJO3y2/ocgsZ9BwQ/d+sKTCeDkPDIR++QQVTjKYIzWETuYDGRrNznJaI3zRFZ6BDm a6+IpIO3+Oh1c5gFaMYHp6VHzlqcLBGJw6MGlY70= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729357AbfIQPR3 (ORCPT ); Tue, 17 Sep 2019 11:17:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:49008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727937AbfIQPR3 (ORCPT ); Tue, 17 Sep 2019 11:17:29 -0400 Received: from linux-8ccs (unknown [193.86.95.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8667721852; Tue, 17 Sep 2019 15:17:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568733448; bh=sVZ6ge+yfDjOXzOx4fIF/VKvl5Za4ZNZw0rEy3EqVMI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Uidq5re/aDTm1kY0VHPyJmXnqXLfjBxvObr6X32OsT0ANckL0KLeYr0j50KrxIkfN QbkxO0PlvkqF6/mwjes4EKl2v9jM5ihlg3kAkw8y8WHqEb598VQklOrEELSDadHy// 9DTjpLCMe99vlZ7BQ6xs7gzNzsB1Jj6bhpZ1wizI= Date: Tue, 17 Sep 2019 17:17:22 +0200 From: Jessica Yu To: Mark Brown Cc: Matthias Maennich , Masahiro Yamada , Arnd Bergmann , Martijn Coenen , Greg Kroah-Hartman , 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: <20190917151721.GB4116@linux-8ccs> References: <20190915222720.GL4352@sirena.co.uk> <20190916155927.GI4352@sirena.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20190916155927.GI4352@sirena.co.uk> X-OS: Linux linux-8ccs 4.12.14-lp150.12.28-default x86_64 User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org +++ Mark Brown [16/09/19 16:59 +0100]: >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. Hi Mark, Sorry for the trouble. We are currently working out a resolution (https://lore.kernel.org/lkml/20190917150902.GA4116@linux-8ccs/). Feel free to leave it at 3b5be16c7e90a69c until this gets resolved in the next day or two.. Thanks, Jessica