diff options
author | David S. Miller | 2019-06-28 06:06:39 +0200 |
---|---|---|
committer | David S. Miller | 2019-06-28 06:06:39 +0200 |
commit | d96ff269a04be286989ead13bf8b4be55bdee8ee (patch) | |
tree | 46b6d010a9a4dfe96dc86339d1cbded8874c6b8f /arch/arm/boot/dts/gemini-dlink-dns-313.dts | |
parent | Merge branch 'nfp-extend-flower-capabilities-for-GRE-tunnel-offload' (diff) | |
parent | Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
download | kernel-qcow2-linux-d96ff269a04be286989ead13bf8b4be55bdee8ee.tar.gz kernel-qcow2-linux-d96ff269a04be286989ead13bf8b4be55bdee8ee.tar.xz kernel-qcow2-linux-d96ff269a04be286989ead13bf8b4be55bdee8ee.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The new route handling in ip_mc_finish_output() from 'net' overlapped
with the new support for returning congestion notifications from BPF
programs.
In order to handle this I had to take the dev_loopback_xmit() calls
out of the switch statement.
The aquantia driver conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/gemini-dlink-dns-313.dts')
-rw-r--r-- | arch/arm/boot/dts/gemini-dlink-dns-313.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts index b12504e10f0b..360642a02a48 100644 --- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts +++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts @@ -11,7 +11,7 @@ / { model = "D-Link DNS-313 1-Bay Network Storage Enclosure"; - compatible = "dlink,dir-313", "cortina,gemini"; + compatible = "dlink,dns-313", "cortina,gemini"; #address-cells = <1>; #size-cells = <1>; |