From: Mark Brown <broonie@kernel.org>
To: Jessica Yu <jeyu@kernel.org>,
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>
Cc: 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
Date: Mon, 16 Sep 2019 16:59:28 +0100 [thread overview]
Message-ID: <20190916155927.GI4352@sirena.co.uk> (raw)
In-Reply-To: <20190915222720.GL4352@sirena.co.uk>
[-- Attachment #1: Type: text/plain, Size: 600 bytes --]
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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-09-16 15:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-15 22:27 linux-next: manual merge of the modules tree with the compiler-attributes tree Mark Brown
2019-09-16 15:59 ` Mark Brown [this message]
2019-09-17 15:17 ` Jessica Yu
2019-09-17 15:25 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190916155927.GI4352@sirena.co.uk \
--to=broonie@kernel.org \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maco@android.com \
--cc=maennich@google.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox