From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Borntraeger <borntraeger@de•ibm.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: build failure after merge of the access_once tree
Date: Mon, 8 Dec 2014 10:55:17 +1100 [thread overview]
Message-ID: <20141208105517.0e9ac555@canb.auug.org.au> (raw)
In-Reply-To: <5484C3B9.2030909@de.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 628 bytes --]
Hi Christian,
On Sun, 07 Dec 2014 22:16:41 +0100 Christian Borntraeger <borntraeger@de•ibm.com> wrote:
>
> I also did an additional check and merged this tree with linux-next/master. This introduced a new problem.
> The fix is simple, see patch. But I am not sure how to add that to next (via my tree), since this change is only in next.
OK, thanks for that. I will apply that patch as a merge fix to my tree
when I merge your tree. You (or the owner of the conflicting tree)
will need to let Linus know when the merge happens in his tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-12-07 23:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-05 10:32 linux-next: build failure after merge of the access_once tree Stephen Rothwell
2014-12-07 20:57 ` Christian Borntraeger
2014-12-07 21:16 ` Christian Borntraeger
2014-12-07 23:55 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-12-08 11:26 Stephen Rothwell
2014-12-08 11:35 ` Christian Borntraeger
2014-12-09 19:54 ` Christian Borntraeger
2014-12-10 8:20 Stephen Rothwell
2014-12-10 11:20 ` Christian Borntraeger
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=20141208105517.0e9ac555@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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