Fix Makefile mismerge and IPS manifest of OS-5585 and OS-5591
OS-5591 Double flock(3C) causes undue block
OS-5585 fcntl(F_OFD_GETLK) should return EINVAL on bad parameters
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>

*** 11,18 ****
  
  #
  # Copyright (c) 2012 by Delphix. All rights reserved.
  #
  
! SUBDIRS = poll sigqueue spoof-ras
  
  include $(SRC)/test/Makefile.com
--- 11,18 ----
  
  #
  # Copyright (c) 2012 by Delphix. All rights reserved.
  #
  
! SUBDIRS = poll sigqueue spoof-ras file-locking
  
  include $(SRC)/test/Makefile.com