diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-05-31 10:49:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-31 10:49:43 -0700 |
| commit | b4b12b0d2f02613101a7a667ef7b7cc8d388e597 (patch) | |
| tree | ae2d52198929797821961fd0b5923b5ea1a89fe1 /arch/powerpc/xmon/ppc-dis.c | |
| parent | netfilter: nf_conntrack_bridge: fix CONFIG_IPV6=y (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-b4b12b0d2f02613101a7a667ef7b7cc8d388e597.tar.xz linux-dev-b4b12b0d2f02613101a7a667ef7b7cc8d388e597.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The phylink conflict was between a bug fix by Russell King
to make sure we have a consistent PHY interface mode, and
a change in net-next to pull some code in phylink_resolve()
into the helper functions phylink_mac_link_{up,down}()
On the dp83867 side it's mostly overlapping changes, with
the 'net' side removing a condition that was supposed to
trigger for RGMII but because of how it was coded never
actually could trigger.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/powerpc/xmon/ppc-dis.c')
| -rw-r--r-- | arch/powerpc/xmon/ppc-dis.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/powerpc/xmon/ppc-dis.c b/arch/powerpc/xmon/ppc-dis.c index 27f1e6415036..75fa98221d48 100644 --- a/arch/powerpc/xmon/ppc-dis.c +++ b/arch/powerpc/xmon/ppc-dis.c @@ -1,22 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* ppc-dis.c -- Disassemble PowerPC instructions Copyright (C) 1994-2016 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support This file is part of GDB, GAS, and the GNU binutils. -GDB, GAS, and the GNU binutils are free software; you can redistribute -them and/or modify them under the terms of the GNU General Public -License as published by the Free Software Foundation; either version -2, or (at your option) any later version. - -GDB, GAS, and the GNU binutils are distributed in the hope that they -will be useful, but WITHOUT ANY WARRANTY; without even the implied -warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this file; see the file COPYING. If not, write to the Free -Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ + */ #include <asm/cputable.h> #include <asm/cpu_has_feature.h> |