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

Commit 99d31966 authored by Imran Khan's avatar Imran Khan
Browse files

Merge tag 'lsk-v3.18-17.03-android' into 'msm-3.18'



LSK Android 17.03 v3.18

    * origin/tmp-1203868f:
      Linux 3.18.48
      Fix "qla2xxx: terminate exchange when command is aborted by LIO"
      Fix "tunnels: Don't apply GRO to multiple layers of encapsulation."
      Fix "crypto: algif_hash - Require setkey before accept(2)"
      Documentation: Remove ZBOOT MMC/SDHI utility and docs
      drm/i915: cleanup some indenting
      net:Add sysctl_max_skb_frags
      blk: rq_data_dir() should not return a boolean
      spi: dw-mid: refactor to use helpers
      x86/boot: Add CONFIG_PARAVIRT_SPINLOCKS quirk to arch/x86/boot/compressed/misc.h
      staging: rtl8723au: core: rtw_wlan_util: fix misleading indentation
      Staging: lustre: missing curly braces in ll_setattr_raw()
      xilinx usb2 gadget: get rid of incredibly annoying compile warning
      Staging: iio: adc: fix indent on break statement
      bfa: Fix indentation
      i40e: Reduce stack in i40e_dbg_dump_desc
      be2iscsi: Fix bogus WARN_ON length check
      iwlegacy: avoid warning about missing braces
      drivers/net/ethernet/dec/tulip/uli526x.c: fix misleading indentation in uli526x_timer
      media: remove unused variable that causes a warning
      mtd: blkdevs: fix switch-bool compilation warning
      netfilter; Add some missing default cases to switch statements in nft_reject.
      s3c-camif: fix compiler warnings
      x86/xen: fix upper bound of pmd loop in xen_cleanhighmap()
      ALSA: oxygen: Fix logical-not-parentheses warning
      HID: hid-input: Add parentheses to quell gcc warning
      ata: hpt366: fix constant cast warning
      Bluetooth: make hci_test_bit's addr const
      netfilter: Fix switch statement warnings with recent gcc.
      Disable "frame-address" warning
      net: caif: fix misleading indentation
      paride: fix the "verbose" module param
      atm: iphase: fix misleading indention
      MODULE_DEVICE_TABLE: fix some callsites
      module: fix types of device tables aliases
      ANDROID: security: export security_path_chown()
      ANDROID: sdcardfs: Switch strcasecmp for internal call
      ANDROID: sdcardfs: switch to full_name_hash and qstr
      ANDROID: sdcardfs: Add GID Derivation to sdcardfs
      ANDROID: sdcardfs: Remove redundant operation
      ANDROID: sdcardfs: add support for user permission isolation
      ANDROID: sdcardfs: Refactor configfs interface
      ANDROID: sdcardfs: Allow non-owners to touch
      UPSTREAM: FROMLIST: 9p: fix a potential acl leak
      BACKPORT: posix_acl: Clear SGID bit when setting file permissions
      BACKPORT: Input: xpad - fix oops when attaching an unknown Xbox One gamepad
      [PATCH] arm64: entry: fix BACKPORT "use ldp/stp instead of push/pop.."
      android: base-cfg: remove CONFIG_IP[6]_NF_TARGET_REJECT_SKERR
      android: base-cfg: enable CONFIG_INET_DIAG_DESTROY
      Linux 3.18.47
      UPSTREAM: l2tp: fix racy SOCK_ZAPPED flag check in l2tp_ip{,6}_bind()
      UPSTREAM: net: avoid signed overflows for SO_{SND|RCV}BUFFORCE
      net: socket: don't set sk_uid to garbage value in ->setattr()
      ANDROID: mnt: remount should propagate to slaves of slaves
      ANDROID: configs: CONFIG_ARM64_SW_TTBR0_PAN=y
      UPSTREAM: arm64: Disable PAN on uaccess_enable()
      UPSTREAM: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN
      UPSTREAM: arm64: xen: Enable user access before a privcmd hvc call
      UPSTREAM: arm64: Handle faults caused by inadvertent user access with PAN enabled
      BACKPORT: arm64: Disable TTBR0_EL1 during normal kernel execution
      BACKPORT: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1
      BACKPORT: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros
      UPSTREAM: arm64: alternative: add auto-nop infrastructure
      BACKPORT: arm64: barriers: introduce nops and __nops macros for NOP sequences
      Revert "FROMLIST: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros"
      Revert "FROMLIST: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1"
      Revert "FROMLIST: arm64: Disable TTBR0_EL1 during normal kernel execution"
      Revert "FROMLIST: arm64: Handle faults caused by inadvertent user access with PAN enabled"
      Revert "FROMLIST: arm64: xen: Enable user access before a privcmd hvc call"
      Revert "FROMLIST: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN"
      gro: Allow tunnel stacking in the case of FOU/GUE
      tunnels: Don't apply GRO to multiple layers of encapsulation.
      net: Use more bit fields in napi_gro_cb
      net: ipv4: Convert IP network timestamps to be y2038 safe
      ipip: Properly mark ipip GRO packets as encapsulated.
      sg_write()/bsg_write() is not fit to be called under KERNEL_DS
      fs: exec: apply CLOEXEC before changing dumpable task flags
      IB/cma: Fix a race condition in iboe_addr_get_sgid()
      Revert "ALSA: usb-audio: Fix race at stopping the stream"
      drivers/gpu/drm/ast: Fix infinite loop if read fails
      target/user: Fix use-after-free of tcmu_cmds if they are expired
      scsi: avoid a permanent stop of the scsi device's request queue
      IPoIB: Avoid reading an uninitialized member variable
      block_dev: don't test bdev->bd_contains when it is not stable
      Input: drv260x - fix input device's parent assignment
      libceph: verify authorize reply on connect
      ALSA: hiface: Fix M2Tech hiFace driver sampling rate change
      s390/vmlogrdr: fix IUCV buffer allocation
      kconfig/nconf: Fix hang when editing symbol with a long prompt
      SUNRPC: fix refcounting problems with auth_gss messages.
      ext4: return -ENOMEM instead of success
      nfs_write_end(): fix handling of short copies
      fgraph: Handle a case where a tracer ignores set_graph_notrace
      ALSA: usb-audio: Add QuickCam Communicate Deluxe/S7500 to volume_control_quirks
      dm space map metadata: fix 'struct sm_metadata' leak on failed create
      arm/xen: Use alloc_percpu rather than __alloc_percpu
      drm/radeon: add additional pci revision to dpm workaround
      CIFS: Fix a possible memory corruption during reconnect
      CIFS: Fix a possible memory corruption in push locks
      CIFS: Fix missing nls unload in smb2_reconnect()
      mmc: sdhci: Fix recovery from tuning timeout
      ALSA: usb-audio: Fix race at stopping the stream
      xfs: set AGI buffer type in xlog_recover_clear_agi_bucket
      block: protect iterate_bdevs() against concurrent close
      Btrfs: fix tree search logic when replaying directory entry deletes
      powerpc/ps3: Fix system hang with GCC 5 builds
      thermal: hwmon: Properly report critical temperature in sysfs
      md/raid5: limit request size according to implementation limits
      f2fs: set ->owner for debugfs status file's file_operations
      ALSA: hda - fix headset-mic problem on a Dell laptop
      dm crypt: mark key as invalid until properly loaded
      KVM: PPC: Book3S HV: Save/restore XER in checkpointed register state
      ext4: add sanity checking to count_overhead()
      ext4: use more strict checks for inodes_per_block on mount
      ext4: sanity check the block and cluster size at mount time
      ssb: Fix error routine when fallback SPROM fails
      staging: comedi: ni_mio_common: fix M Series ni_ai_insn_read() data mask
      ext4: fix stack memory corruption with 64k block size
      ext4: fix mballoc breakage with 64k block size
      crypto: caam - fix AEAD givenc descriptors
      regulator: stw481x-vmmc: fix ages old enable error
      PCI: Check for PME in targeted sleep state
      scsi: megaraid_sas: For SRIOV enabled firmware, ensure VF driver waits for 30secs before reset
      drm/gma500: Add compat ioctl
      arm64: respect mem= for EFI
      ANDROID: sdcardfs: Fix locking issue with permision fix up
      ANDROID: trace: net: use %pK for kernel pointers
      ANDROID: android-base: Enable QUOTA related configs
      net: ipv4: Don't crash if passing a null sk to ip_rt_update_pmtu.
      net: inet: Support UID-based routing in IP protocols.
      Revert "net: ipv6: fix virtual tunneling build"
      net: core: add UID to flows, rules, and routes
      net: core: Add a UID field to struct sock.
      Revert "net: core: Support UID-based routing."
      Revert "Handle 'sk' being NULL in UID-based routing."
      Revert "net: core: fix UID-based routing build"
      Revert "ANDROID: net: fib: remove duplicate assignment"
      ANDROID: dm verity: add minimum prefetch size
      UPSTREAM: arm64: vdso: Mark vDSO code as read-only
      Linux 3.18.46
      packet: fix race condition in packet_set_ring
      Bluetooth: Fix potential NULL dereference in RFCOMM bind callback
      scsi: arcmsr: Buffer overflow in arcmsr_iop_message_xfer()
      nfsd: Disable NFSv2 timestamp workaround for NFSv3+
      fuse: Propagate dentry down to inode_change_ok()
      tcp: fix use after free in tcp_xmit_retransmit_queue()
      x86/kexec: add -fno-PIE
      scripts/has-stack-protector: add -fno-PIE
      x86/init: Fix cr4_init_shadow() on CR4-less machines
      ARM: 8617/1: dma: fix dma_max_pfn()
      mm,ksm: fix endless looping in allocating memory when ksm enable
      can: dev: fix deadlock reported after bus-off
      cpuset: handle race between CPU hotplug and cpuset_hotplug_work
      mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl
      drm/msm: fix use of copy_from_user() while holding spinlock
      bus: arm-ccn: Fix PMU handling of MN
      bus: arm-ccn: Provide required event arguments
      LSK: record a known bug on x86 with KASAN
      LSK: add a file to record known bugs
      x86/arm64/kasan, mm: Fix kasan build
      UPSTREAM: x86/kasan: Fix KASAN shadow region page tables
      UPSTREAM: include/linux/kmemleak.h: needs slab.h
      ANDROID: skip building drivers as modules
      ANDROID: fix dm-verity and dm-android-verity modules build
      ANDROID: fix sdcardfs module build
      ANDROID: mm: Export do_munmap
      ANDROID: fs: Export d_absolute_path
      ANDROID: video: adf: Set ADF_MEMBLOCK to boolean
      ANDROID: video: adf: Fix modular build
      UPSTREAM: PCI: xilinx: Fix typo in function name
      ANDROID: fix bogomips reporting in /proc/cpuinfo
      FROMLIST: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN
      FROMLIST: arm64: xen: Enable user access before a privcmd hvc call
      FROMLIST: arm64: Handle faults caused by inadvertent user access with PAN enabled
      FROMLIST: arm64: Disable TTBR0_EL1 during normal kernel execution
      BACKPORT: arm64: mm: place empty_zero_page in bss
      UPSTREAM: arm64: head.S: use memset to clear BSS
      FROMLIST: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1
      FROMLIST: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros
      UPSTREAM: arm64: use non-global mappings for UEFI runtime regions
      UPSTREAM: arm64: Store struct thread_info in sp_el0
      BACKPORT: arm64: Handle el1 synchronous instruction aborts cleanly
      BACKPORT: arm64: kernel: Save and restore UAO and addr_limit on exception entry
      UPSTREAM: Revert "arm64: alternatives: add enable parameter to conditional asm macros"
      UPSTREAM: arm64: kill ESR_LNX_EXEC
      UPSTREAM: arm64: add macro to extract ESR_ELx.EC
      UPSTREAM: arm64: mm: mark fault_info table const
      BACKPORT: arm64: Fold proc-macros.S into assembler.h
      UPSTREAM: arm64/kernel: fix incorrect EL0 check in inv_entry macro
      UPSTREAM: arm64: Add macros to read/write system registers
      UPSTREAM: arm64: mm: remove dsb from update_mmu_cache
      UPSTREAM: arm64: tlb: remove redundant barrier from __flush_tlb_pgtable
      UPSTREAM: arm64: mm: kill mm_cpumask usage
      UPSTREAM: arm64: switch_mm: simplify mm and CPU checks
      UPSTREAM: arm64: tlbflush: avoid flushing when fullmm == 1
      UPSTREAM: arm64: tlbflush: remove redundant ASID casts to (unsigned long)
      BACKPORT: arm64: mm: rewrite ASID allocator and MM context-switching code
      UPSTREAM: arm64/efi: move virtmap init to early initcall
      UPSTREAM: arm64/efi: handle potential failure to remap memory map
      UPSTREAM: arm64: flush: use local TLB and I-cache invalidation
      UPSTREAM: arm64: efi: don't restore TTBR0 if active_mm points at init_mm
      UPSTREAM: arm64: proc: de-scope TLBI operation during cold boot
      UPSTREAM: arm64: Move swapper pagetable definitions
      UPSTREAM: arm64: mm: remove unused cpu_set_idmap_tcr_t0sz function
      UPSTREAM: arm64: remove dead code
      UPSTREAM: arm64: kill flush_cache_all()
      UPSTREAM: arm/arm64: KVM: Use set/way op trapping to track the state of the caches
      UPSTREAM: arm64: head.S: ensure idmap_t0sz is visible
      UPSTREAM: arm64: head.S: ensure visibility of page tables
      UPSTREAM: arm64: mm: increase VA range of identity map
      UPSTREAM: arm64: enforce x1|x2|x3 == 0 upon kernel entry as per boot protocol
      UPSTREAM: arm64: remove __calc_phys_offset
      UPSTREAM: arm64: merge __enable_mmu and __turn_mmu_on
      BACKPORT: arm64: use PC-relative reference for secondary_holding_pen_release
      UPSTREAM: arm64: remove __switch_data object from head.S
      UPSTREAM: arm64: Add contiguous page flag shifts and constants
      UPSTREAM: arm64: entry: always restore x0 from the stack on syscall return
      BACKPORT: arm64: entry: use ldp/stp instead of push/pop when saving/restoring regs
      UPSTREAM: arm64: mdscr_el1: avoid exposing DCC to userspace
      UPSTREAM: locking/atomics: Add _{acquire|release|relaxed}() variants of some atomic operations
      UPSTREAM: arm64: mm: ensure patched kernel text is fetched from PoU
      UPSTREAM: arm64: Use last level TLBI for user pte changes
      UPSTREAM: arm64: Clean up __flush_tlb(_kernel)_range functions
      BACKPORT: arm64: force CONFIG_SMP=y and remove redundant #ifdefs
      UPSTREAM: arm64: move update_mmu_cache() into asm/pgtable.h
      UPSTREAM: arm64: fix missing syscall trace exit
      UPSTREAM: arm64: Fix section mismatch on alloc_init_p[mu]d()
      UPSTREAM: arm64: mm: remove reference to tlb.S from comment block
      BACKPORT: arm64: expose number of page table levels on Kconfig level
      UPSTREAM: arm64: mm: remove unused functions and variable protoypes
      UPSTREAM: arm64: drop unnecessary cache+tlb maintenance
      UPSTREAM: arm64:mm: free the useless initial page table
      UPSTREAM: arm64: remove broken cachepolicy code
      BACKPORT: mm: avoid setting up anonymous pages into file mapping
      UPSTREAM: arm64: fix dump_instr when PAN and UAO are in use
      UPSTREAM: arm64: Remove the get_thread_info() function
      BACKPORT: arm64: kernel: Don't toggle PAN on systems with UAO
      UPSTREAM: arm64: cpufeature: Test 'matches' pointer to find the end of the list
      BACKPORT: arm64: kernel: Add support for User Access Override
      UPSTREAM: arm64: add ARMv8.2 id_aa64mmfr2 boiler plate
      BACKPORT: arm64: cpufeature: Change read_cpuid() to use sysreg's mrs_s macro
      UPSTREAM: arm64/kvm: Make use of the system wide safe values
      BACKPORT: arm64/debug: Make use of the system wide safe value
      BACKPORT: arm64: add __init/__initdata section marker to some functions/variables
      UPSTREAM: arm64: cpufeature: Track unsigned fields
      UPSTREAM: arm64: cpufeature: Add helpers for extracting unsigned values
      UPSTREAM: arm64: mark cpus_have_hwcap as __maybe_unused
      UPSTREAM: arm64: cpufeature: declare enable_cpu_capabilities as static
      UPSTREAM: arm64: Move FP/ASIMD hwcap handling to common code
      UPSTREAM: arm64: flush FP/SIMD state correctly after execve()
      UPSTREAM: arm64: fix bug for reloading FPSIMD state after CPU hotplug.
      UPSTREAM: arm64: kernel thread don't need to save fpsimd context.
      UPSTREAM: arm64/HWCAP: Use system wide safe values
      BACKPORT: arm64/capabilities: Make use of system wide safe value
      UPSTREAM: arm64: Delay cpu feature capability checks
      UPSTREAM: arm64: Refactor check_cpu_capabilities
      UPSTREAM: arm64: Cleanup mixed endian support detection
      UPSTREAM: arm64: Read system wide CPUID value
      UPSTREAM: arm64: Consolidate CPU Sanity check to CPU Feature infrastructure
      BACKPORT: arm64: Keep track of CPU feature registers
      UPSTREAM: arm64: sanity checks: add missing AArch32 registers
      UPSTREAM: arm64: Handle width of a cpuid feature
      BACKPORT: arm64: Move /proc/cpuinfo handling code
      BACKPORT: arm64: Move mixed endian support detection
      BACKPORT: arm64: Move cpu feature detection code
      BACKPORT: arm64: Delay cpuinfo_store_boot_cpu
      UPSTREAM: arm64: Delay ELF HWCAP initialisation until all CPUs are up
      UPSTREAM: arm64: Make the CPU information more clear
      BACKPORT: arm64: copy_to-from-in_user optimization using copy template
      UPSTREAM: arm64: remove processor_id
      UPSTREAM: arm64: alternative: put secondary CPUs into polling loop during patch
      UPSTREAM: arm64: alternatives: add enable parameter to conditional asm macros
      BACKPORT: arm64: elf: use cpuid_feature_extract_field for hwcap detection
      UPSTREAM: arm64: Get rid of struct cpu_table
      BACKPORT: arm64: lse: use generic cpufeature detection for LSE atomics
      BACKPORT: arm64: kconfig: group the v8.1 features together
      UPSTREAM: arm64: cpufeature.h: add missing #include of kernel.h
      cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions
      CHROMIUM: cgroups: relax permissions on moving tasks between cgroups
      Revert "cgroup: refactor allow_attach function into common code"
      Revert "memcg: add permission check"
      Revert "cgroup: Add generic cgroup subsystem permission checks"
      Revert "cgroup: memcg: pass correct argument to subsys_cgroup_allow_attach"
      Revert "cgroup: Fix issues in allow_attach callback"
      Revert "Fix generic cgroup subsystem permission checks"
      Revert "include: linux: cgroup: Fix compiler warning"
      Revert "cpuset: Add allow_attach hook for cpusets on android."
      Revert "cpuset: Fix allow_attach hook for cpusets on android."
      BACKPORT: arm64: kernel: Adopt new alternative assembler macros
      UPSTREAM: arm64: mm: Adopt new alternative assembler macros
      UPSTREAM: arm64: decode ESR_ELx.EC when reporting exceptions
      UPSTREAM: arm64: move to ESR_ELx macros
      UPSTREAM: arm64: introduce common ESR_ELx_* definitions
      UPSTREAM: arm64: alternative: Allow immediate branch as alternative instruction
      UPSTREAM: arm64: add module support for alternatives fixups
      UPSTREAM: arm64: insn: Add aarch64_{get,set}_branch_offset
      UPSTREAM: arm64: insn: Add aarch64_insn_decode_immediate
      UPSTREAM: arm64: insn: fix compare-and-branch encodings
      UPSTREAM: arm64: sanity checks: add ID_AA64DFR{0,1}_EL1
      UPSTREAM: arm64: sanity checks: add missing newline to print
      UPSTREAM: arm64: sanity checks: ignore ID_MMFR0.AuxReg
      sdcardfs: Change magic value
      sdcardfs: Use per mount permissions
      sdcardfs: Add gid and mask to private mount data
      sdcardfs: User new permission2 functions
      vfs: Add setattr2 for filesystems with per mount permissions
      vfs: Add permission2 for filesystems with per mount permissions
      vfs: Allow filesystems to access their private mount data
      mnt: Add filesystem private data to mount points
      sdcardfs: Move directory unlock before touch
      sdcardfs: fix external storage exporting incorrect uid
      sdcardfs: Added top to sdcardfs_inode_info
      sdcardfs: Switch package list to RCU
      sdcardfs: Fix locking for permission fix up
      sdcardfs: Check for other cases on path lookup
      sdcardfs: override umask on mkdir and create
      ANDROID: video: adf: Avoid directly referencing user pointers
      ANDROID: mmc: Move tracepoint creation and export symbols
      android: binder: support for file-descriptor arrays.
      android: binder: support for scatter-gather.
      android: binder: add extra size to allocator.
      android: binder: refactor binder_transact()
      android: binder: support multiple /dev instances.
      android: binder: deal with contexts in debugfs.
      android: binder: support multiple context managers.
      android: binder: split flat_binder_object.
      scsi: megaraid_sas: fix macro MEGASAS_IS_LOGICAL to avoid regression
      Linux 3.18.45
      kbuild: add -fno-PIE
      firewire: net: fix fragmented datagram_size off-by-one
      firewire: net: guard against rx buffer overflows
      parisc: Ensure consistent state when switching to kernel stack at syscall entry
      ovl: fsync after copy-up
      virtio: console: Unlock vqs while freeing buffers
      md: be careful not lot leak internal curr_resync value into metadata. -- (all)
      md: sync sync_completed has correct value as recovery finishes.
      scsi: arcmsr: Send SYNCHRONIZE_CACHE command to firmware
      scsi: scsi_debug: Fix memory leak if LBP enabled and module is unloaded
      drm/radeon/si_dpm: workaround for SI kickers
      KVM: MIPS: Make ERET handle ERL before EXL
      drm/radeon: drop register readback in cayman_cp_int_cntl_setup
      scsi: megaraid_sas: Fix data integrity failure for JBOD (passthrough) devices
      powerpc: Convert cmp to cmpd in idle enter sequence
      drm/radeon/si_dpm: Limit clocks on HD86xx part
      drm/radeon/si/dpm: add workaround for for Jet parts
      Input: i8042 - add XMG C504 to keyboard reset table
      mac80211: discard multicast and 4-addr A-MSDUs
      GenWQE: Fix bad page access during abort of resource allocation
      btrfs: fix races on root_log_ctx lists
      vt: clear selection before resizing
      tty: limit terminal size to 4M chars
      ALSA: usb-audio: Add quirk for Syntek STK1160
      KEYS: Fix short sprintf buffer in /proc/keys show function
      hv: do not lose pending heartbeat vmbus packets
      mei: txe: don't clean an unprocessed interrupt cause.
      dm table: fix missing dm_put_target_type() in dm_table_add_target()
      libxfs: clean up _calc_dquots_per_chunk
      target: Don't override EXTENDED_COPY xcopy_pt_cmd SCSI status code
      ubifs: Fix xattr_names length in exit paths
      powerpc/mm: Prevent unlikely crash in copro_calculate_slb()
      isofs: Do not return EACCES for unknown filesystems
      memstick: rtsx_usb_ms: Manage runtime PM when accessing the device
      memstick: rtsx_usb_ms: Runtime resume the device when polling for cards
      mmc: rtsx_usb_sdmmc: Handle runtime PM while changing the led
      mmc: rtsx_usb_sdmmc: Avoid keeping the device runtime resumed when unused
      mmc: sdhci: cast unsigned int to unsigned long long to avoid unexpeted error
      irqchip/gicv3: Handle loop timeout proper
      drm/radeon: change vblank_time's calculation method to reduce computational error.
      jbd2: fix incorrect unlock on j_list_lock
      scsi: Fix use-after-free
      mmc: core: Annotate cmd_hdr as __le32
      udp: properly support MSG_PEEK with truncated buffers

    Conflicts:
    	android/configs/android-recommended.cfg
    	arch/arm64/Kconfig
    	arch/arm64/include/asm/cacheflush.h
    	arch/arm64/include/asm/cpufeature.h
    	arch/arm64/include/asm/cputype.h
    	arch/arm64/include/asm/page.h
    	arch/arm64/include/asm/percpu.h
    	arch/arm64/include/asm/thread_info.h
    	arch/arm64/include/asm/tlbflush.h
    	arch/arm64/kernel/alternative.c
    	arch/arm64/kernel/cpu_ops.c
    	arch/arm64/kernel/cpuinfo.c
    	arch/arm64/kernel/entry.S
    	arch/arm64/kernel/fpsimd.c
    	arch/arm64/kernel/setup.c
    	arch/arm64/kernel/smp.c
    	arch/arm64/mm/cache.S
    	arch/arm64/mm/fault.c
    	arch/arm64/mm/mmu.c
    	drivers/mmc/host/sdhci.c
    	drivers/staging/android/binder.c
    	drivers/usb/gadget/legacy/gmidi.c
    	drivers/usb/serial/option.c
    	include/linux/cgroup.h
    	include/linux/sched/sysctl.h
    	include/net/ip.h
    	kernel/cgroup.c
    	kernel/sched/fair.c
    	mm/memory.c

    Scheduler and USB related changes were completely ignored, as
    suggested by respective teams.

Change-Id: Ib5da28d822ed2685ee02120e5602139d9af78e3e
Signed-off-by: default avatarImran Khan <kimran@codeaurora.org>
parents b806e9b3 1203868f
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