On Sun, 1 Nov 2015 17:45:54 -0800
Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
> On Sun, Nov 1, 2015 at 5:41 PM, Jeff Layton <jlayton@xxxxxxxxxxxxxxx> wrote:
> >
> > Yes, indeed -- facepalm.
> >
> > Would you like me to push a new tag and send a new pull req?
>
> It's fine as-is, I just wanted to verify the (fairly obvious) issue,
> that this wasn't something you had actually expected to make 4.3.
>
> I won't pull it until tomorrow anyway (I want to leave 4.3 alone for a
> day to let people at least get a *chance* of testing it before I start
> acting on the merge window), so if you want to update your tag names
> etc you have time, but it doesn't really matter.
>
> Linus
Ok, thanks. I went ahead and fixed the tag. Here's a revised pull req:
The following changes since commit 1f93e4a96c9109378204c147b3eec0d0e8100fde:
Linux 4.3-rc2 (2015-09-20 14:32:34 -0700)
are available in the git repository at:
git://git.samba.org/jlayton/linux.git tags/locks-v4.4-1
for you to fetch changes up to 616fb38fa7a9599293e05ae1fa9acfaf73922434:
locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait (2015-10-22 14:57:42 -0400)
----------------------------------------------------------------
File locking related changes for v4.4 (pile #1)
The largest series of changes is from Ben who offered up a set to add a
new helper function for setting locks based on the type set in fl_flags.
Dmitry also send in a fix for a potential race that he found with KTSAN.
----------------------------------------------------------------
Benjamin Coddington (4):
locks: Use more file_inode and fix a comment
locks: introduce locks_lock_inode_wait()
Move locks API users to locks_lock_inode_wait()
locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait
Dmitry Vyukov (1):
fs: fix data races on inode->i_flctx
Jeff Layton (1):
locks: change tracepoint for generic_add_lease
drivers/staging/lustre/lustre/llite/file.c | 8 +--
fs/9p/vfs_file.c | 4 +-
fs/ceph/locks.c | 4 +-
fs/cifs/file.c | 2 +-
fs/dlm/plock.c | 4 +-
fs/fuse/file.c | 2 +-
fs/gfs2/file.c | 8 +--
fs/lockd/clntproc.c | 13 +---
fs/locks.c | 106 ++++++++++++++++++-----------
fs/nfs/file.c | 13 +---
fs/nfs/nfs4proc.c | 13 +---
fs/ocfs2/locks.c | 8 +--
include/linux/fs.h | 21 ++----
include/trace/events/filelock.h | 38 ++++++++++-
14 files changed, 127 insertions(+), 117 deletions(-)
--
Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
Attachment:
pgpgo4mZWcU41.pgp
Description: OpenPGP digital signature
