Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01f5de3f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.48 into android-4.19 



Changes in 4.19.48
	bonding/802.3ad: fix slave link initialization transition states
	cxgb4: offload VLAN flows regardless of VLAN ethtype
	inet: switch IP ID generator to siphash
	ipv4/igmp: fix another memory leak in igmpv3_del_delrec()
	ipv4/igmp: fix build error if !CONFIG_IP_MULTICAST
	ipv6: Consider sk_bound_dev_if when binding a raw socket to an address
	ipv6: Fix redirect with VRF
	llc: fix skb leak in llc_build_and_send_ui_pkt()
	net: dsa: mv88e6xxx: fix handling of upper half of STATS_TYPE_PORT
	net: fec: fix the clk mismatch in failed_reset path
	net-gro: fix use-after-free read in napi_gro_frags()
	net: mvneta: Fix err code path of probe
	net: mvpp2: fix bad MVPP2_TXQ_SCHED_TOKEN_CNTR_REG queue value
	net: phy: marvell10g: report if the PHY fails to boot firmware
	net: sched: don't use tc_action->order during action dump
	net: stmmac: fix reset gpio free missing
	usbnet: fix kernel crash after disconnect
	net/mlx5: Avoid double free in fs init error unwinding path
	tipc: Avoid copying bytes beyond the supplied data
	net/mlx5: Allocate root ns memory using kzalloc to match kfree
	net/mlx5e: Disable rxhash when CQE compress is enabled
	net: stmmac: dma channel control register need to be init first
	bnxt_en: Fix aggregation buffer leak under OOM condition.
	net/tls: fix state removal with feature flags off
	net/tls: don't ignore netdev notifications if no TLS features
	crypto: vmx - ghash: do nosimd fallback manually
	include/linux/compiler*.h: define asm_volatile_goto
	compiler.h: give up __compiletime_assert_fallback()
	jump_label: move 'asm goto' support test to Kconfig
	xen/pciback: Don't disable PCI_COMMAND on PCI device reset.
	Revert "tipc: fix modprobe tipc failed after switch order of device registration"
	tipc: fix modprobe tipc failed after switch order of device registration
	Linux 4.19.48

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents cab4399e e109a984

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 47

SUBLEVEL = 48

EXTRAVERSION =

NAME = "People's Front"

arch/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ config KPROBES 
config JUMP_LABEL

       bool "Optimize very unlikely/likely branches"

       depends on HAVE_ARCH_JUMP_LABEL

       depends on CC_HAS_ASM_GOTO

       help

         This option enables a transparent branch optimization that

	 makes certain almost-always-true or almost-always-false branch

arch/arm/kernel/jump_label.c

+0 −4
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
#include <asm/patch.h>

#include <asm/insn.h>



#ifdef HAVE_JUMP_LABEL



static void __arch_jump_label_transform(struct jump_entry *entry,

					enum jump_label_type type,

					bool is_static)
@@ -35,5 +33,3 @@ void arch_jump_label_transform_static(struct jump_entry *entry, 
{

	__arch_jump_label_transform(entry, type, true);

}
 


#endif

arch/arm64/kernel/jump_label.c

+0 −4
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include <linux/jump_label.h>

#include <asm/insn.h>



#ifdef HAVE_JUMP_LABEL



void arch_jump_label_transform(struct jump_entry *entry,

			       enum jump_label_type type)

{
@@ -49,5 +47,3 @@ void arch_jump_label_transform_static(struct jump_entry *entry, 
	 * NOP needs to be replaced by a branch.

	 */

}
 


#endif	/* HAVE_JUMP_LABEL */

arch/mips/kernel/jump_label.c

+0 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#include <asm/cacheflush.h>

#include <asm/inst.h>



#ifdef HAVE_JUMP_LABEL



/*

 * Define parameters for the standard MIPS and the microMIPS jump

 * instruction encoding respectively:
@@ -70,5 +68,3 @@ void arch_jump_label_transform(struct jump_entry *e, 


	mutex_unlock(&text_mutex);

}
 


#endif /* HAVE_JUMP_LABEL */