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

Commit e48fe8a1 authored by jianzhou's avatar jianzhou
Browse files

Merge android-4.9.217(d2adefff) into msm-4.9



* refs/heads/tmp-d2adefff:
  Linux 4.9.217
  ipv4: ensure rcu_read_lock() in cipso_v4_error()
  mm: slub: add missing TID bump in kmem_cache_alloc_bulk()
  ARM: 8958/1: rename missed uaccess .fixup section
  ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional()
  jbd2: fix data races at struct journal_head
  signal: avoid double atomic counter increments for user accounting
  mac80211: rx: avoid RCU list traversal under mutex
  net: ks8851-ml: Fix IRQ handling and locking
  cfg80211: check reg_rule for NULL in handle_channel_custom()
  HID: i2c-hid: add Trekstor Surfbook E11B to descriptor override
  HID: apple: Add support for recent firmware on Magic Keyboards
  ACPI: watchdog: Allow disabling WDAT at boot
  perf/amd/uncore: Replace manual sampling check with CAP_NO_INTERRUPT flag
  batman-adv: Use explicit tvlv padding for ELP packets
  batman-adv: Avoid probe ELP information leak
  batman-adv: update data pointers after skb_cow()
  batman-adv: Don't schedule OGM for disabled interface
  batman-adv: Avoid free/alloc race when handling OGM buffer
  batman-adv: Avoid free/alloc race when handling OGM2 buffer
  batman-adv: Fix duplicated OGMs on NETDEV_UP
  batman-adv: Prevent duplicated gateway_node entry
  batman-adv: Fix multicast TT issues with bogus ROAM flags
  batman-adv: Avoid storing non-TT-sync flags on singular entries too
  batman-adv: Fix debugfs path for renamed softif
  batman-adv: Fix debugfs path for renamed hardif
  batman-adv: prevent TT request storms by not sending inconsistent TT TLVLs
  batman-adv: Fix TT sync flags for intermediate TT responses
  batman-adv: Avoid race in TT TVLV allocator helper
  batman-adv: Fix internal interface indices types
  batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq
  batman-adv: Fix check of retrieved orig_gw in batadv_v_gw_is_eligible
  batman-adv: Always initialize fragment header priority
  batman-adv: Avoid spurious warnings from bat_v neigh_cmp implementation
  batman-adv: fix TT sync flag inconsistencies
  batman-adv: Accept only filled wifi station info
  batman-adv: Use default throughput value on cfg80211 error
  batman-adv: Fix rx packet/bytes stats on local ARP reply
  batman-adv: Initialize gw sel_class via batadv_algo
  batman-adv: Fix transmission of final, 16th fragment
  batman-adv: Fix double free during fragment merge error
  efi: Add a sanity check to efivar_store_raw()
  ipv6: restrict IPV6_ADDRFORM operation
  iommu/vt-d: Ignore devices with out-of-spec domain number
  iommu/vt-d: Fix the wrong printing in RHSA parsing
  mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame()
  netfilter: cthelper: add missing attribute validation for cthelper
  nl80211: add missing attribute validation for channel switch
  nl80211: add missing attribute validation for beacon report scanning
  nl80211: add missing attribute validation for critical protocol indication
  iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page
  iommu/vt-d: dmar: replace WARN_TAINT with pr_warn + add_taint
  efi: Fix a race and a buffer overflow while reading efivars via sysfs
  ARC: define __ALIGN_STR and __ALIGN symbols for ARC
  KVM: x86: clear stale x86_emulate_ctxt->intercept value
  gfs2_atomic_open(): fix O_EXCL|O_CREAT handling on cold dcache
  cifs_atomic_open(): fix double-put on late allocation failure
  drm/amd/display: remove duplicated assignment to grph_obj_type
  workqueue: don't use wq_select_unbound_cpu() for bound works
  iommu/vt-d: quirk_ioat_snb_local_iommu: replace WARN_TAINT with pr_warn + add_taint
  virtio-blk: fix hw_queue stopped on arbitrary error
  net: phy: fix MDIO bus PM PHY resuming
  cgroup: memcg: net: do not associate sock with unrelated cgroup
  bonding/alb: make sure arp header is pulled before accessing it
  slip: make slhc_compress() more robust against malicious packets
  net: fec: validate the new settings in fec_enet_set_coalesce()
  macvlan: add cond_resched() during multicast processing
  ipvlan: don't deref eth hdr before checking it's set
  ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast()
  ipvlan: egress mcast packets are not exceptional
  ipvlan: do not add hardware address of master to its unicast filter list
  ipvlan: add cond_resched_rcu() while processing muticast backlog
  nfc: add missing attribute validation for vendor subcommand
  nfc: add missing attribute validation for SE API
  team: add missing attribute validation for array index
  team: add missing attribute validation for port ifindex
  net: fq: add missing attribute validation for orphan mask
  macsec: add missing attribute validation for port
  nl802154: add missing attribute validation for dev_type
  nl802154: add missing attribute validation
  fib: add missing attribute validation for tun_id
  bnxt_en: reinitialize IRQs when MTU is modified
  r8152: check disconnect status after long sleep
  net: nfc: fix bounds checking bugs on "pipe"
  net: macsec: update SCI upon MAC address change.
  ipv6/addrconf: call ipv6_mc_up() for non-Ethernet interface
  gre: fix uninit-value in __iptunnel_pull_header
  cgroup, netclassid: periodically release file_lock on classid updating
  net: phy: Avoid multiple suspends
  phy: Revert toggling reset changes.
  NFS: Remove superfluous kmap in nfs_readdir_xdr_to_array

Change-Id: I93b723ff6e2b044471f51d70eb21935e51cfc572
Signed-off-by: default avatarjianzhou <jianzhou@codeaurora.org>
parents 4bdb0f40 d2adefff
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -596,3 +596,10 @@ in your dentry operations instead.
[mandatory]
	->rename() has an added flags argument.  Any flags not handled by the
        filesystem should result in EINVAL being returned.
--
[mandatory]

	[should've been added in 2016] stale comment in finish_open()
	nonwithstanding, failure exits in ->atomic_open() instances should
	*NOT* fput() the file, no matter what.  Everything is handled by the
	caller.
+4 −0
Original line number Diff line number Diff line
@@ -336,6 +336,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
			dynamic table installation which will install SSDT
			tables to /sys/firmware/acpi/tables/dynamic.

	acpi_no_watchdog	[HW,ACPI,WDT]
			Ignore the ACPI-based watchdog interface (WDAT) and let
			a native driver control the watchdog device instead.

	acpi_rsdp=	[ACPI,EFI,KEXEC]
			Pass the RSDP address to the kernel, mostly used
			on machines running EFI runtime service to boot the
+1 −1
Original line number Diff line number Diff line
VERSION = 4
PATCHLEVEL = 9
SUBLEVEL = 216
SUBLEVEL = 217
EXTRAVERSION =
NAME = Roaring Lionus

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@
#ifdef __ASSEMBLY__

#define ASM_NL		 `	/* use '`' to mark new line in macro */
#define __ALIGN		.align 4
#define __ALIGN_STR	__stringify(__ALIGN)

/* annotation for data we want in DCCM - if enabled in .config */
.macro ARCFP_DATA nm
+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ static bool __init cntvct_functional(void)
	 * this.
	 */
	np = of_find_compatible_node(NULL, NULL, "arm,armv7-timer");
	if (!np)
		np = of_find_compatible_node(NULL, NULL, "arm,armv8-timer");
	if (!np)
		goto out_put;

Loading