2008-02-07 01:39:35

by Eric Van Hensbergen

[permalink] [raw]
Subject: [PULL] v9fs patches for merge window

The following changes since commit 3e6bdf473f489664dac4d7511d26c7ac3dfdc748:
Linus Torvalds (1):
Merge git://git.kernel.org/.../x86/linux-2.6-x86

are found in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git

Andrew Morton (1):
9p: fix p9_printfcall export

Anthony Liguori (2):
9p: add support for sticky bit
9p: Convert semaphore to spinlock for p9_idpool

Eric Van Hensbergen (7):
9p: create transport rpc cut-thru
9p: block-based virtio client
9p: fix bug in attach-per-user
9p: Fix soft lockup in virtio transport
9p: fix mmap to be read-only
9p: add remove function to trans_virtio
9p: transport API reorganization

Martin Stava (1):
9p: fix bug in p9_clone_stat

fs/9p/fid.c | 4 +-
fs/9p/v9fs.c | 51 +--
fs/9p/v9fs.h | 5 +-
fs/9p/vfs_file.c | 4 +-
fs/9p/vfs_inode.c | 5 +
include/net/9p/9p.h | 1 +
include/net/9p/client.h | 5 +-
include/net/9p/conn.h | 57 ---
include/net/9p/transport.h | 11 +-
net/9p/Makefile | 1 -
net/9p/client.c | 161 +++++--
net/9p/fcprint.c | 4 +-
net/9p/mod.c | 9 +-
net/9p/mux.c | 1060 ------------------------------------------
net/9p/trans_fd.c | 1103 +++++++++++++++++++++++++++++++++++++++++++-
net/9p/trans_virtio.c | 355 +++++++++------
net/9p/util.c | 20 +-
17 files changed, 1466 insertions(+), 1390 deletions(-)
delete mode 100644 include/net/9p/conn.h
delete mode 100644 net/9p/mux.c


2008-02-07 02:08:23

by Linus Torvalds

[permalink] [raw]
Subject: Re: [PULL] v9fs patches for merge window



On Wed, 6 Feb 2008, Eric Van Hensbergen wrote:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git

There seems to be a "for-linus" missing there.. With that I get the right
diffstat. But please don't make me have to search around and guess..

Linus

2008-02-07 02:43:58

by Andrew Morton

[permalink] [raw]
Subject: Re: [PULL] v9fs patches for merge window

On Wed, 6 Feb 2008 19:39:26 -0600 "Eric Van Hensbergen" <[email protected]> wrote:

Could you please cc me on pull requests? I need to pay more attention to
them. Thanks.

> Andrew Morton (1):
> 9p: fix p9_printfcall export

Really this should have been folded into the patch which it fixes. We get
a cleaner history that way, and it protects git-bisectability.

Yes, it can mean that people lose credit points. I make that up by adding
a little note in the signoffs in the form

[[email protected]: <whatever [s]he did>]


box:/usr/src/git26> git-log | grep ' \[akpm' | wc -l
707

That's 707 brownie points I lost, but we really didn't want all that stuff
in the permanent record.

2008-02-07 13:51:50

by Eric Van Hensbergen

[permalink] [raw]
Subject: Re: [PULL] v9fs patches for merge window

On Feb 6, 2008 8:43 PM, Andrew Morton <[email protected]> wrote:
> On Wed, 6 Feb 2008 19:39:26 -0600 "Eric Van Hensbergen" <[email protected]> wrote:
>
> Could you please cc me on pull requests? I need to pay more attention to
> them. Thanks.
>
> > Andrew Morton (1):
> > 9p: fix p9_printfcall export
>
> Really this should have been folded into the patch which it fixes. We get
> a cleaner history that way, and it protects git-bisectability.
>

I would have, but I didn't see the original offender in my upstream
branch, so I just applied it separately - looks to me like fcprint.c
hasn't been touched (until your patch) since its introduction:

ericvh@ericvh-desktop:~/src/linux/9p$ git log net/9p/fcprint.c
commit bd238fb431f31989898423c8b6496bc8c4204a86
Author: Latchesar Ionkov <[email protected]>
Date: Tue Jul 10 17:57:28 2007 -0500

9p: Reorganization of 9p file system code

This patchset moves non-filesystem interfaces of v9fs from fs/9p to net/9p.
It moves the transport, packet marshalling and connection layers to net/9p
leaving only the VFS related files in fs/9p. This work is being done in
preparation for in-kernel 9p servers as well as alternate 9p clients (other
than VFS).

Signed-off-by: Latchesar Ionkov <[email protected]>
Signed-off-by: Eric Van Hensbergen <[email protected]>

-eric