public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* linux-next: duplicate patch in the mlx5-next tree
@ 2024-07-01  5:36 Stephen Rothwell
  2024-07-01  7:08 ` Leon Romanovsky
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2024-07-01  5:36 UTC (permalink / raw)
  To: Leon Romanovsky, Doug Ledford, Jason Gunthorpe
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

Hi all,

The following commit is also in the rdma tree as a different commit
(but the same patch):

  78a6cbd5145c ("RDMA/mlx5: Use sq timestamp as QP timestamp when RoCE is disabled")

This is commit

  0c5275bf75ec ("RDMA/mlx5: Use sq timestamp as QP timestamp when RoCE is disabled")

in the rdma tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: duplicate patch in the mlx5-next tree
  2024-07-01  5:36 linux-next: duplicate patch in the mlx5-next tree Stephen Rothwell
@ 2024-07-01  7:08 ` Leon Romanovsky
  0 siblings, 0 replies; 2+ messages in thread
From: Leon Romanovsky @ 2024-07-01  7:08 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Doug Ledford, Jason Gunthorpe, Linux Kernel Mailing List,
	Linux Next Mailing List

On Mon, Jul 01, 2024 at 03:36:01PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the rdma tree as a different commit
> (but the same patch):
> 
>   78a6cbd5145c ("RDMA/mlx5: Use sq timestamp as QP timestamp when RoCE is disabled")
> 
> This is commit
> 
>   0c5275bf75ec ("RDMA/mlx5: Use sq timestamp as QP timestamp when RoCE is disabled")
> 
> in the rdma tree.

It is safe to drop the commit from mlx5-next, I dropped it now.

Thanks

> 
> -- 
> Cheers,
> Stephen Rothwell



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-07-01  7:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-01  5:36 linux-next: duplicate patch in the mlx5-next tree Stephen Rothwell
2024-07-01  7:08 ` Leon Romanovsky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox