Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754306AbbDRSvX (ORCPT ); Sat, 18 Apr 2015 14:51:23 -0400 Received: from mail-ob0-f181.google.com ([209.85.214.181]:34244 "EHLO mail-ob0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753887AbbDRSvW (ORCPT ); Sat, 18 Apr 2015 14:51:22 -0400 MIME-Version: 1.0 From: Eric Van Hensbergen Date: Sat, 18 Apr 2015 13:51:01 -0500 Message-ID: Subject: [GIT PULL] 9p: patches for the 4.1 merge window To: Linus Torvalds , V9FS Developers , linux-kernel Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2219 Lines: 59 The following changes since commit b314acaccd7e0d55314d96be4a33b5f50d0b3344: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (2015-03-19 16:43:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git tags/for-linus-4.1-merge-window for you to fetch changes up to f569d3ef8254d4b3b8daa4f131f9397d48bf296c: net/9p: add a privport option for RDMA transport. (2015-03-21 19:32:33 -0700) ---------------------------------------------------------------- 9p: patches for 4.1 merge window Some accumulated cleanup patches for kerneldoc and unused variables as well as some lock bug fixes and adding privateport option for RDMA. A quick check shows some merge-conflicts versus current-tip on 9p: use unsigned integers for nwqid/count If you would prefer I can rebase, remerge and fix the patch but didn't want to do that and look the for-next references. Signed-off-by: Eric Van Hensbergen ---------------------------------------------------------------- Andrey Ryabinin (1): net/9p: use memcpy() instead of snprintf() in p9_mount_tag_show() Dominique Martinet (3): net/9p: Initialize opts->privport as it should be. fs/9p: Initialize status in v9fs_file_do_lock. net/9p: add a privport option for RDMA transport. Fabian Frederick (2): 9p: kerneldoc warning fixes 9p: remove unused variable in p9_fd_create() Kirill A. Shutemov (3): 9p: fix error handling in v9fs_file_do_lock 9p: do not crash on unknown lock status code 9p: use unsigned integers for nwqid/count fs/9p/v9fs.h | 1 - fs/9p/vfs_addr.c | 2 -- fs/9p/vfs_file.c | 10 ++++++---- net/9p/protocol.c | 6 +++--- net/9p/trans_fd.c | 3 +-- net/9p/trans_rdma.c | 52 +++++++++++++++++++++++++++++++++++++++++-------- net/9p/trans_virtio.c | 5 ++++- 7 files changed, 58 insertions(+), 21 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/