From: "J. Bruce Fields" <bfields@fieldses•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, Mike Travis <travis@sgi•com>,
Jeff Layton <jlayton@redhat•com>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Subject: Re: linux-next: nfsd/cpus4096 merge conflict
Date: Wed, 11 Jun 2008 18:22:56 -0400 [thread overview]
Message-ID: <20080611222256.GB25194@fieldses.org> (raw)
In-Reply-To: <20080611144037.3382eaf7.sfr@canb.auug.org.au>
On Wed, Jun 11, 2008 at 02:40:37PM +1000, Stephen Rothwell wrote:
> Hi Bruce,
>
> Today's linux-next merge of the nfsd tree got a conflict in
> net/sunrpc/svc.c between commit 3f9b48a7584851997702cdc3f58e7811b5546397
> ("net: Pass reference to cpumask variable in net/sunrpc/svc.c") from the
> cpus4096 tree and commit 89a8922f36389cd4a284e5d7727cd792ef4544e0
> ("knfsd: convert knfsd to kthread API") from the nfsd tree.
>
> It appears that the cpus4096 patch may no longer be needed as it was just
> changing "set_cpus_allowed(current, oldmask)" to "set_cpus_allowed_ptr
> (current, &oldmask)" in __svc_create_thread() which has been removed and
> there doesn't appear to be any new calls to set_cpus_allowed added.
Yep, dropping 3f9b48a7584851997702cdc3f58e7811b5546397 looks like the
right thing to do. Thanks!
--b.
>
> I could be wrong, so it is probably worth checking.
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
> http://www.canb.auug.org.au/~sfr/
prev parent reply other threads:[~2008-06-11 22:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-11 4:40 linux-next: nfsd/cpus4096 merge conflict Stephen Rothwell
2008-06-11 13:43 ` Mike Travis
2008-06-11 22:22 ` J. Bruce Fields [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=20080611222256.GB25194@fieldses.org \
--to=bfields@fieldses$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=jlayton@redhat$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
--cc=travis@sgi$(echo .)com \
/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