diff options
| author | Conor Dooley <[email protected]> | 2023-04-05 22:20:55 +0100 |
|---|---|---|
| committer | Conor Dooley <[email protected]> | 2023-04-05 22:23:17 +0100 |
| commit | 4cd4beb98fe5ac2c4bcb995ba6e82322be174abb (patch) | |
| tree | 5f511ff3d23f2c188631bbc8cb7e585de424d944 /include/uapi/linux/netdev.h | |
| parent | e77da13b8e3626fc6d01287fba7c1eee4ebfe018 (diff) | |
| parent | 54baba33392d428a8be4942441a92a9b05cf537e (diff) | |
Merge branch 'riscv-jh7110_initial_dts' into riscv-dt-for-next
Merge Hal's series adding support for the new StarFive JH7110 SoC.
There's a few bindings here for core components that were not picked up
by the various maintainers for the subsystems (previously Palmer would
pick these up via the RISC-V tree) & the first two commits in the branch
are shared with the clk tree, since the dts depends on defines in the
dt-binding headers.
This is based on -rc2, as the board does not actually boot on -rc1
due to the bug Linus introduced.
Signed-off-by: Conor Dooley <[email protected]>
Diffstat (limited to 'include/uapi/linux/netdev.h')
| -rw-r--r-- | include/uapi/linux/netdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/netdev.h b/include/uapi/linux/netdev.h index 588391447bfb..8c4e3e536c04 100644 --- a/include/uapi/linux/netdev.h +++ b/include/uapi/linux/netdev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */ /* Do not edit directly, auto-generated from: */ /* Documentation/netlink/specs/netdev.yaml */ /* YNL-GEN uapi header */ |