Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 - net-next.git

path: root/fs/xfs/libxfs/xfs_dir2_block.c

diff options

author	Linus Torvalds <torvalds@linux-foundation.org>	2017-01-31 12:36:39 -0800
committer	Linus Torvalds <torvalds@linux-foundation.org>	2017-01-31 12:36:39 -0800
commit	415f9b71d17d294c2f2075b3fc7717d72e5e48f9 (patch)
tree	2baf33529d5de478b2501b7fa155d4cc95d35627 /fs/xfs/libxfs/xfs_dir2_block.c
parent	f9a42e0d58cf0fe3d902e63d4582f2ea4cd2bb8b (diff)
parent	81ddd8c0c5e1cb41184d66567140cb48c53eb3d1 (diff)

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fix from Steve French: "A small cifs fix for stable" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: cifs: initialize file_info_lock

Diffstat (limited to 'fs/xfs/libxfs/xfs_dir2_block.c')

0 files changed, 0 insertions, 0 deletions

into production usage. We've been running the top three in our nightly automated regression runs for the last two months, and the COMPARE_AND_WRITE fix Mr. Gary Guo has been manually verifying against a four node ESX cluster this past week. Note all of them have CC' stable tags. Summary: - Fix a bug with ESX EXTENDED_COPY + SAM_STAT_RESERVATION_CONFLICT status, where target_core_xcopy.c logic was incorrectly returning SAM_STAT_CHECK_CONDITION for all non SAM_STAT_GOOD cases (Nixon Vincent) - Fix a TMR LUN_RESET hung task bug while other in-flight TMRs are being aborted, before the new one had been dispatched into tmr_wq (Rob Millner) - Fix a long standing double free OOPs, where a dynamically generated 'demo-mode' NodeACL has multiple sessions associated with it, and the /sys/kernel/config/target/$FABRIC/$WWN/ subsequently disables demo-mode, but never converts the dynamic ACL into a explicit ACL (Rob Millner) - Fix a long standing reference leak with ESX VAAI COMPARE_AND_WRITE when the second phase WRITE COMMIT command fails, resulting in CHECK_CONDITION response never being sent and se_cmd->cmd_kref never reaching zero (Gary Guo) Beyond these items on v4.1.y we've reproduced, fixed, and run through our regression test suite using iscsi-target exports, there are two additional outstanding list items: - Remove a >= v4.2 RCU conversion BUG_ON that would trigger when dynamic node NodeACLs where being converted to explicit NodeACLs. The patch drops the BUG_ON to follow how pre RCU conversion worked for this special case (Benjamin Estrabaud) - Add ibmvscsis target_core_fabric_ops->max_data_sg_nent assignment to match what IBM's Virtual SCSI hypervisor is already enforcing at transport layer. (Bryant Ly + Steven Royer)" * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: ibmvscsis: Add SGL limit target: Fix COMPARE_AND_WRITE ref leak for non GOOD status target: Fix multi-session dynamic se_node_acl double free OOPs target: Fix early transport_generic_handle_tmr abort scenario target: Use correct SCSI status during EXTENDED_COPY exception target: Don't BUG_ON during NodeACL dynamic -> explicit conversion

Diffstat (limited to 'drivers/usb/host/ehci-ps3.c')


context:
space:
mode: