diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-27 14:23:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-27 14:23:31 -0700 |
| commit | 68aaf4459556b1f9370c259fd486aecad2257552 (patch) | |
| tree | 99d92536a3263634969be6b70a96facea85a0df1 /arch/mips | |
| parent | d00ee466a07eb9182ad3caf6140c7ebb527b4c64 (diff) | |
| parent | 9e8312f5e160ade069e131d54ab8652cf0e86e1a (diff) | |
| download | linux-68aaf4459556b1f9370c259fd486aecad2257552.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/include/asm/octeon/cvmx-sli-defs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/octeon/cvmx-sli-defs.h b/arch/mips/include/asm/octeon/cvmx-sli-defs.h index 52cf96ea43e5..cbc7cdae1c6a 100644 --- a/arch/mips/include/asm/octeon/cvmx-sli-defs.h +++ b/arch/mips/include/asm/octeon/cvmx-sli-defs.h @@ -46,6 +46,7 @@ static inline uint64_t CVMX_SLI_PCIE_MSI_RCV_FUNC(void) case OCTEON_CN78XX & OCTEON_FAMILY_MASK: if (OCTEON_IS_MODEL(OCTEON_CN78XX_PASS1_X)) return 0x0000000000003CB0ull; + /* Else, fall through */ default: return 0x0000000000023CB0ull; } |