linux-next: manual merge of the ieee1394 tree with the origin tree

[Mark Brown]

Hi all,

Today's linux-next merge of the ieee1394 tree got a conflict in:

  drivers/firewire/core-transaction.c

between commit:

  7f9f2d6abc40f ("firewire: core: fix race condition in split transaction handling")

from the origin tree and commit:

  0f7228de31f1c ("firewire: core: expand close_transaction() into its callers and remove it")

from the ieee1394 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/firewire/core-transaction.c
index 016070560c742,a0379fc3e60e5..0000000000000
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@@ -89,53 -94,28 +94,32 @@@ void fw_cancel_pending_transactions(str
  			break;						\
  		}							\
  	}								\
- 	if (t) {							\
- 		if (try_cancel_split_timeout(t))			\
- 			remove_transaction_entry(card, t);		\
 -	if (__t && try_cancel_split_timeout(__t))			\
 -		remove_transaction_entry(card, __t);			\
++	if (__t) {							\
++		if (try_cancel_split_timeout(__t))			\
++			remove_transaction_entry(card, __t);		\
 +		else							\
- 			t = NULL;					\
++			__t = NULL;					\
 +	}								\
- 	t;								\
+ 	__t;								\
  })
  
- static int close_transaction(struct fw_transaction *transaction, struct fw_card *card, int rcode,
- 			     u32 response_tstamp)
- {
- 	struct fw_transaction *t;
- 
- 	// NOTE: This can be without irqsave when we can guarantee that __fw_send_request() for
- 	// local destination never runs in any type of IRQ context.
- 	scoped_guard(spinlock_irqsave, &card->transactions.lock) {
- 		t = find_and_pop_transaction_entry(card, iter == transaction);
- 		if (!t)
- 			return -ENOENT;
- 	}
- 
- 	if (!t->with_tstamp) {
- 		t->callback.without_tstamp(card, rcode, NULL, 0, t->callback_data);
- 	} else {
- 		t->callback.with_tstamp(card, rcode, t->packet.timestamp, response_tstamp, NULL, 0,
- 					t->callback_data);
- 	}
- 
- 	return 0;
- }
- 
- /*
-  * Only valid for transactions that are potentially pending (ie have
-  * been sent).
+ /**
+  * fw_cancel_transaction: cancel transaction.
+  * @card:		interface where the transaction has been requested
+  * @transaction:	transaction instance to be cancelled
+  *
+  * Terminate the transaction by either canceling the request subaction or the response subaction
+  * of the split transaction, then schedule the transaction callback to notify the cancellation.
+  * The transaction instance should be kept until the callback will be invoked.
+  *
+  * Context: Process context.
+  * Returns: 0 on success, -ENOENT if the transaction instance is not found in the queue for the
+  * pending transaction.
   */
- int fw_cancel_transaction(struct fw_card *card,
- 			  struct fw_transaction *transaction)
+ int fw_cancel_transaction(struct fw_card *card, struct fw_transaction *transaction)
  {
- 	u32 tstamp;
- 
- 	/*
- 	 * Cancel the packet transmission if it's still queued.  That
- 	 * will call the packet transmission callback which cancels
- 	 * the transaction.
- 	 */
- 
+ 	// Cancel the packet transmission if it's still queued. That will schedule the packet
+ 	// transmission callback which cancels the transaction.
  	if (card->driver->cancel_packet(card, &transaction->packet) == 0)
  		return 0;

Attachment: signature.asc
Description: PGP signature