public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-next <linux-next@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: missing merge fix for the access_once tree
Date: Sun, 28 Dec 2014 09:38:55 +0100	[thread overview]
Message-ID: <549FC19F.4050504@de.ibm.com> (raw)
In-Reply-To: <20141223173418.59e8556f@canb.auug.org.au>

Am 23.12.2014 um 07:34 schrieb Stephen Rothwell:
> Hi Linus,
> 
> On Mon, 22 Dec 2014 20:12:22 -0800 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>>
>> On Mon, Dec 22, 2014 at 6:17 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>
>>> I have been carrying this merge fix patch for some time.  It should
>>> have gone into the merge of the access_once tree.
>>
>> No, you had a different tree that got merged into linux-next, that
>> made it an error to do ACCESS_ONCE() on a structure.
>>
>> The thing I merged didn't actually have that final commit, exactly so
>> that things wouldn't break from missing conversions.
>>
>> So that patch isn't wrong, but it also isn't exactly a required fix
>> until the next merge window..
> 
> True, so "should" was a bit strong.
> 

I will re-add this up soon for my linux-next branch. 
There are some additional places which need to be changed, so give me some more days during the holidays

Christian


      reply	other threads:[~2014-12-28  8:39 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-23  2:17 linux-next: missing merge fix for the access_once tree Stephen Rothwell
2014-12-23  4:12 ` Linus Torvalds
2014-12-23  6:34   ` Stephen Rothwell
2014-12-28  8:38     ` Christian Borntraeger [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=549FC19F.4050504@de.ibm.com \
    --to=borntraeger@de.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=torvalds@linux-foundation.org \
    /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