From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Corbet <corbet@lwn•net>
Cc: linux-next@vger•kernel.org, Andi Kleen <andi@firstfloor•org>,
Chuck Lever <chuck.lever@oracle•com>,
Trond Myklebust <trond.myklebust@fys•uio.no>
Subject: linux-next: manual merge of the bkl-removal tree
Date: Mon, 30 Jun 2008 18:21:22 +1000 [thread overview]
Message-ID: <20080630182122.99ea9f2e.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
Hi Jonathan,
Today's linux-next merge of the bkl-removal tree got a trivial conflict
in fs/nfs/file.c between commit 69cc426fc4b7664ec69642cd9b30eabe2ec8ad4a
("NFS: Make nfs_llseek methods consistent") from the nfs tree and commit
a9f88f0c4fed5d1ed6fb4a0389891d327a147130 ("Remove BKL from remote_llseek
v2") from the bkl-removal tree.
I fixed it up and can carry it. Or maybe you should liaise with Trond to
put ths nfs part of the BKL removal in his tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-06-30 8:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-30 8:21 Stephen Rothwell [this message]
2008-06-30 22:51 ` linux-next: manual merge of the bkl-removal tree Jonathan Corbet
2008-07-01 16:05 ` Chuck Lever
-- strict thread matches above, loose matches on Subject: below --
2008-07-01 9:45 Stephen Rothwell
2008-07-02 21:10 ` Jonathan Corbet
2008-07-03 5:39 ` Stephen Rothwell
2008-06-16 6:50 Stephen Rothwell
2008-06-19 20:51 ` Jonathan Corbet
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=20080630182122.99ea9f2e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andi@firstfloor$(echo .)org \
--cc=chuck.lever@oracle$(echo .)com \
--cc=corbet@lwn$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=trond.myklebust@fys$(echo .)uio.no \
/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