Files
Albert I c2fb12b615 Merge branch 'android-4.9.269-q-merge' into a11/upstream-aosp
* android-4.9.269-q-merge: (240 commits)
  Linux 4.9.269
  ipv6: remove extra dev_hold() for fallback tunnels
  xhci: Do not use GFP_KERNEL in (potentially) atomic context
  ip6_tunnel: sit: proper dev_{hold|put} in ndo_[un]init methods
  sit: proper dev_{hold|put} in ndo_[un]init methods
  lib: stackdepot: turn depot_lock spinlock to raw_spinlock
  ALSA: hda: generic: change the DAC ctl name for LO+SPK or LO+HP
  ceph: fix fscache invalidation
  um: Mark all kernel symbols as local
  Input: silead - add workaround for x86 BIOS-es which bring the chip up in a stuck state
  ACPI / hotplug / PCI: Fix reference count leak in enable_slot()
  isdn: capi: fix mismatched prototypes
  cxgb4: Fix the -Wmisleading-indentation warning
  usb: sl811-hcd: improve misleading indentation
  kgdb: fix gcc-11 warning on indentation
  extcon: adc-jack: Fix incompatible pointer type warning
  x86/msr: Fix wr/rdmsr_safe_regs_on_cpu() prototypes
  clk: exynos7: Mark aclk_fsys1_200 as critical
  netfilter: conntrack: Make global sysctls readonly in non-init netns
  kobject_uevent: remove warning in init_uevent_argv()
  ...

 Conflicts:
	drivers/mmc/core/core.c
	drivers/usb/core/hub.c

Signed-off-by: Albert I <kras@raphielgang.org>
2021-05-30 17:31:56 +08:00
..