diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-09-23 20:19:49 +0200 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-09-23 20:19:49 +0200 |
commit | 2fcd14d0f78090f57aecd7f424e2b0373cd631a7 (patch) | |
tree | f8946c307a3b5d319c17ec988d8a38c0fe7a08de /arch/alpha/math-emu/math.c | |
parent | net: dsa: sja1105: stop using priv->vlan_aware (diff) | |
parent | Merge tag 'net-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
download | linux-2fcd14d0f78090f57aecd7f424e2b0373cd631a7.tar.xz linux-2fcd14d0f78090f57aecd7f424e2b0373cd631a7.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
net/mptcp/protocol.c
977d293e23b4 ("mptcp: ensure tx skbs always have the MPTCP ext")
efe686ffce01 ("mptcp: ensure tx skbs always have the MPTCP ext")
same patch merged in both trees, keep net-next.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/alpha/math-emu/math.c')
-rw-r--r-- | arch/alpha/math-emu/math.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/alpha/math-emu/math.c b/arch/alpha/math-emu/math.c index f7cef66af88d..4212258f3cfd 100644 --- a/arch/alpha/math-emu/math.c +++ b/arch/alpha/math-emu/math.c @@ -403,5 +403,3 @@ alpha_fp_emul_imprecise (struct pt_regs *regs, unsigned long write_mask) egress: return si_code; } - -EXPORT_SYMBOL(__udiv_qrnnd); |