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

Skip to content
Commit d7864ac2 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19.48 (01f5de3f) into msm-4.19



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

Conflicts:
	include/linux/compiler.h

Change-Id: I43dd2908aa00a247ac985c36d210e83370361315
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 29939375 01f5de3f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment