From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Sep 2021 16:47:33 +0000 (-0700)
Subject: Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... 
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=52926229be069258440c39de063fcd4a5fd75d62;p=kernel.git

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

Pull firewire updates from Stefan Richter:

 - Migrate the bus snooper driver 'nosy' from PCI to DMA API

 - Small janitorial cleanup in the IPv4/v6-over-1394 driver

[ The 'nosy' change already come in as a different commit through Greg
  KH in the misc tree back in the previous merge window, so only the
  cleanup ends up being new to 5.15   - Linus ]

* tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: nosy: switch from 'pci_' to 'dma_' API
  firewire: net: remove unused variable 'guid'
---

52926229be069258440c39de063fcd4a5fd75d62