diff options
| author |   Jason Gunthorpe <jgg@mellanox.com> | 2019-06-28 21:18:23 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-06-28 21:18:23 -0300 |
| commit | 371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4 (patch) | |
| tree | 9442ae9b22e3cf24fbe8dcefae8862a3e4e05629 /drivers/watchdog/asm9260_wdt.c | |
| parent | RDMA/hns: fix spelling mistake "attatch" -> "attach" (diff) | |
| parent | Linux 5.2-rc6 (diff) | |
| download | linux-dev-371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4.tar.xz linux-dev-371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4.zip | |
Merge tag 'v5.2-rc6' into rdma.git for-next
For dependencies in next patches.
Resolve conflicts:
- Use uverbs_get_cleared_udata() with new cq allocation flow
- Continue to delete nes despite SPDX conflict
- Resolve list appends in mlx5_command_str()
- Use u16 for vport_rule stuff
- Resolve list appends in struct ib_client
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/watchdog/asm9260_wdt.c')
| -rw-r--r-- | drivers/watchdog/asm9260_wdt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/asm9260_wdt.c b/drivers/watchdog/asm9260_wdt.c index c5b9aae544dd..45047e514b8e 100644 --- a/drivers/watchdog/asm9260_wdt.c +++ b/drivers/watchdog/asm9260_wdt.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Watchdog driver for Alphascale ASM9260. * * Copyright (c) 2014 Oleksij Rempel <linux@rempel-privat.de> - * - * Licensed under GPLv2 or later. */ #include <linux/bitops.h> |