[GIT PULL] [Attempt #2] 9p changes fro merge window

[Eric Van Hensbergen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

The following changes since commit c3b92c8787367a8bb53d57d9789b558f1295cc96:

  Linux 3.1 (2011-10-24 09:10:05 +0200)

are available in the git repository at:
  git://github.com/ericvh/linux.git for-linus

Aneesh Kumar K.V (4):
      fs/9p: Update zero-copy implementation in 9p
      fs/9p: inode file operation is properly initialized init_special_inode
      fs/9p: Cleanup option parsing in 9p
      net/9p: Convert net/9p protocol dumps to tracepoints

Dan Carpenter (2):
      9p: move dereference after NULL check
      fs/9p: change an int to unsigned int

Nicolae Mogoreanu (1):
      9p: fix 9p.txt to advertise msize instead of maxdata

 Documentation/filesystems/9p.txt |    2 +-
 fs/9p/v9fs.c                     |   33 ++-
 fs/9p/vfs_dir.c                  |   14 +-
 fs/9p/vfs_inode.c                |    2 -
 include/net/9p/9p.h              |   14 +-
 include/net/9p/client.h          |    8 +-
 include/net/9p/transport.h       |   10 +-
 include/trace/events/9p.h        |  176 ++++++++++++++
 net/9p/client.c                  |  469 +++++++++++++++++++++++++++-----------
 net/9p/protocol.c                |   99 +-------
 net/9p/protocol.h                |    4 +-
 net/9p/trans_common.c            |   53 ++---
 net/9p/trans_common.h            |   21 +--
 net/9p/trans_virtio.c            |  319 +++++++++++++++-----------
 14 files changed, 772 insertions(+), 452 deletions(-)
 create mode 100644 include/trace/events/9p.h

The signed tag is: for-linus-3.2-merge-window in that branch

(sorry if I messed anything up in the signing process)

      -eric
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
Comment: GPGTools - http://gpgtools.org

iQIcBAEBAgAGBQJOpybdAAoJEGQ1yQUIRaTO0IkQAMax4r3FJBRvG+FpAs1sXgfq
AFiSBBLQ6Y5b/cr33o4l9Y6mL1j1A8QBFThSWEWHMxn6oz1h2lFbGHunWAJGVgOZ
Dvch7vK2ACQlwV/jFyN5CfbmDrFin15U/Olvhy78cTF2crKxCayMvrS/8h45++i1
DEcFcmHHzbPGJUiKrhiZEMw2di9JyNzmBz9jqg5FTmn8U8mESW/7B6uSIiu/CqFS
1hlQ7k8VoMguqXzdjQNPkZkP3iSBAwuv/rf3w6L9def4nPJ8SrV/ALGMXemNsLQF
MVuBOoPToXOEIl7M/fuBlcl21KxCF9Y74fKlKdMZQoSj/aTmULf4Z4Bl86WS717w
gdwIe6kxwLjONwDr546haklxf3pf+ovGgRGnrvaJ7nuYsfVOr7iIUG+WSiiT886G
SPsd07wKo+O1KmzzLKU5mLPiSBr2QFrYyRWxWmZ+GomAPMRbhGrNgk/GOR+GI0/Z
xE+/QNM41EMStvwRtXa6MJT63+9msNf8L2zDUgFSgfNedHHnCWZqCCWzeGwxgcK6
SHCnj7J6VWdqZBHFDYno0KDtwsRca72XZoei1kgUH+epSiWTvZdpgDNeSA0NCqTi
HnxI3vdbH95ptsM/lvljEA/vDo/nYg83LVvWcbFrLlUcUrmq03xftrItABCaQ4+D
mBTzEHrtFUvs7hw17n3N
=zUBe
-----END PGP SIGNATURE-----
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/