From: Thomas Gleixner <tglx@linutronix•de>
To: Darren Hart <dvhltc@us•ibm.com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Ingo Molnar <mingo@elte•hu>, "H. Peter Anvin" <hpa@zytor•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the tip-core tree with Linus' tree
Date: Thu, 21 May 2009 11:30:45 +0200 (CEST) [thread overview]
Message-ID: <alpine.LFD.2.00.0905211129480.3570@localhost.localdomain> (raw)
In-Reply-To: <4A14D0FF.60202@us.ibm.com>
On Wed, 20 May 2009, Darren Hart wrote:
> Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the tip-core tree got a conflict in
> > kernel/futex.c between commit 64d1304a64477629cb16b75491a77bafe6f86963
> > ("futex: setup writeable mapping for futex ops which modify user space
> > data") from Linus' tree and a couple of commits from the tip-core tree.
> >
> > I fixed it up (see below - but please check in particular, I have no idea
> > if the call to get_futex_key() in futex_wait_requeue_pi() should take
> > VERIFY_READ or VERIFY_WRITE).
> >
> > I can carry this fixup as necessary.
>
> I suspect Thomas will be catching that up in the next day or so in tip
> (or I can). If you need something now, the uaddr is VERIFY_READ and
> uaddr2 is VERIFY_WRITE. See below...
Fix is in -tip and queued for -next
Thanks,
tglx
next prev parent reply other threads:[~2009-05-21 9:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-21 1:39 linux-next: manual merge of the tip-core tree with Linus' tree Stephen Rothwell
2009-05-21 3:56 ` Darren Hart
2009-05-21 9:30 ` Thomas Gleixner [this message]
2009-05-21 9:38 ` Stephen Rothwell
2009-05-22 0:19 ` Stephen Rothwell
2009-05-22 5:50 ` Stephen Rothwell
2009-05-22 18:18 ` Darren Hart
-- strict thread matches above, loose matches on Subject: below --
2009-04-06 0:36 Stephen Rothwell
2009-02-09 0:38 Stephen Rothwell
2009-02-09 0:46 ` Chris Mason
2009-02-09 8:51 ` Ingo Molnar
2009-02-06 2:26 Stephen Rothwell
2009-02-06 13:53 ` Ingo Molnar
2009-02-02 0:46 Stephen Rothwell
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=alpine.LFD.2.00.0905211129480.3570@localhost.localdomain \
--to=tglx@linutronix$(echo .)de \
--cc=dvhltc@us$(echo .)ibm.com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
/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