Commit 0f464869 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'firewire-fixes-6.17-rc7' of... 

Merge tag 'firewire-fixes-6.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

Pull firewire fix from Takashi Sakamoto:
 "When new structures and events were added to UAPI in v6.5 kernel, the
  required update to the subsystem ABI version returned to userspace
  client was overlooked. The version is now updated"

* tag 'firewire-fixes-6.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: core: fix overlooked update of subsystem ABI version
parents 3b08f56f 853a57ba

drivers/firewire/core-cdev.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
/*

 * ABI version history is documented in linux/firewire-cdev.h.

 */

#define FW_CDEV_KERNEL_VERSION			5

#define FW_CDEV_KERNEL_VERSION			6

#define FW_CDEV_VERSION_EVENT_REQUEST2		4

#define FW_CDEV_VERSION_ALLOCATE_REGION_END	4

#define FW_CDEV_VERSION_AUTO_FLUSH_ISO_OVERFLOW	5