LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PULL] v9fs patches for merge window
@ 2008-02-07  1:39 Eric Van Hensbergen
  2008-02-07  2:08 ` Linus Torvalds
  2008-02-07  2:43 ` Andrew Morton
  0 siblings, 2 replies; 4+ messages in thread
From: Eric Van Hensbergen @ 2008-02-07  1:39 UTC (permalink / raw)
  To: torvalds; +Cc: V9FS Developers, Linux Kernel Mailing List

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PULL] v9fs patches for merge window
  2008-02-07  1:39 [PULL] v9fs patches for merge window Eric Van Hensbergen
@ 2008-02-07  2:08 ` Linus Torvalds
  2008-02-07  2:43 ` Andrew Morton
  1 sibling, 0 replies; 4+ messages in thread
From: Linus Torvalds @ 2008-02-07  2:08 UTC (permalink / raw)
  To: Eric Van Hensbergen; +Cc: V9FS Developers, Linux Kernel Mailing List



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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PULL] v9fs patches for merge window
  2008-02-07  1:39 [PULL] v9fs patches for merge window Eric Van Hensbergen
  2008-02-07  2:08 ` Linus Torvalds
@ 2008-02-07  2:43 ` Andrew Morton
  2008-02-07 13:51   ` Eric Van Hensbergen
  1 sibling, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2008-02-07  2:43 UTC (permalink / raw)
  To: Eric Van Hensbergen; +Cc: torvalds, V9FS Developers, Linux Kernel Mailing List

On Wed, 6 Feb 2008 19:39:26 -0600 "Eric Van Hensbergen" <ericvh@gmail.com> 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

[foo@bar.com: <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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PULL] v9fs patches for merge window
  2008-02-07  2:43 ` Andrew Morton
@ 2008-02-07 13:51   ` Eric Van Hensbergen
  0 siblings, 0 replies; 4+ messages in thread
From: Eric Van Hensbergen @ 2008-02-07 13:51 UTC (permalink / raw)
  To: Andrew Morton; +Cc: torvalds, V9FS Developers, Linux Kernel Mailing List

On Feb 6, 2008 8:43 PM, Andrew Morton <akpm@linux-foundation.org> wrote:
> On Wed, 6 Feb 2008 19:39:26 -0600 "Eric Van Hensbergen" <ericvh@gmail.com> 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 <lucho@ionkov.net>
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 <lucho@ionkov.net>
    Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

            -eric

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2008-02-07 13:51 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-07  1:39 [PULL] v9fs patches for merge window Eric Van Hensbergen
2008-02-07  2:08 ` Linus Torvalds
2008-02-07  2:43 ` Andrew Morton
2008-02-07 13:51   ` Eric Van Hensbergen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).