Merge branch 'for-linus' into for-next

This back-merge is necessary for adjusting the latest FireWire fix
with the recent refactoring in 5.3 development branch.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --cc sound/firewire/amdtp-am824.c
index 7019a2143581869cd7da5870650558ef72c8ec0d,d09da9dbf235fef572be31beeb772ded6675129f..623d014c0e7ebb6c4aa36d9d137e22742b9a87fc
--- 1/sound/firewire/amdtp-am824.c
--- 2/sound/firewire/amdtp-am824.c
+++ b/sound/firewire/amdtp-am824.c
@@@ -321,7 -321,7 +321,7 @@@ static void read_midi_messages(struct a
        u8 *b;
  
        for (f = 0; f < frames; f++) {
-               port = (s->data_block_counter + f) % 8;
 -              port = (8 - s->tx_first_dbc + s->data_block_counter + f) % 8;
++              port = (8 - s->ctx_data.tx.first_dbc + s->data_block_counter + f) % 8;
                b = (u8 *)&buffer[p->midi_position];
  
                len = b[0] - 0x80;

diff --cc sound/firewire/fireface/ff-protocol-latter.c
Simple merge

diff --cc sound/firewire/motu/motu-stream.c
Simple merge

diff --cc sound/firewire/oxfw/oxfw.c
Simple merge

diff --cc sound/pci/hda/hda_codec.c
Simple merge

diff --cc sound/soc/sof/intel/hda.c
Simple merge