From: Joerg Roedel <jroedel@suse.de>
Date: Mon, 24 Jun 2019 08:23:16 +0000 (+0200)
Subject: Merge tag 'v5.2-rc6' into generic-dma-ops
X-Git-Tag: microblaze-v5.4-rc1~379^2^5
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5;p=linux-2.6-microblaze.git

Merge tag 'v5.2-rc6' into generic-dma-ops

Linux 5.2-rc6
---

ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5
diff --cc arch/arm64/mm/dma-mapping.c
index 1669618db08a,5992eb9a9a08..9c588a1d6ffd
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@@ -1,5 -1,7 +1,5 @@@
- // SPDX-License-Identifier: GPL-2.0
+ // SPDX-License-Identifier: GPL-2.0-only
  /*
 - * SWIOTLB-based DMA API implementation
 - *
   * Copyright (C) 2012 ARM Ltd.
   * Author: Catalin Marinas <catalin.marinas@arm.com>
   */