From: Mark Brown <broonie@kernel.org>
To: Jessica Yu <jeyu@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
Date: Tue, 17 Sep 2019 16:25:41 +0100 [thread overview]
Message-ID: <20190917152541.GE3524@sirena.co.uk> (raw)
In-Reply-To: <20190917151721.GB4116@linux-8ccs>
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
On Tue, Sep 17, 2019 at 05:17:22PM +0200, Jessica Yu wrote:
> +++ Mark Brown [16/09/19 16:59 +0100]:
> > 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.
> 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..
OK, that's easier for me so I'll do that!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2019-09-17 15:25 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
2019-09-17 15:17 ` Jessica Yu
2019-09-17 15:25 ` Mark Brown [this message]
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=20190917152541.GE3524@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;
as well as URLs for NNTP newsgroup(s).