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;
Date:   Tue, 17 Sep 2019 17:17:22 +0200
From:   Jessica Yu <jeyu@kernel.org>
To:     Mark Brown <broonie@kernel.org>
Cc:     Matthias Maennich <maennich@google.com>,
        Masahiro Yamada <yamada.masahiro@socionext.com>,
        Arnd Bergmann <arnd@arndb.de>,
        Martijn Coenen <maco@android.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        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 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>
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

+++ 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