mirror of
https://github.com/torvalds/linux.git
synced 2026-06-09 07:03:37 +02:00
640193f76b
* linux-linaro-lsk-v4.4-android: (733 commits)
LSK-ANDROID: memcg: Remove wrong ->attach callback
LSK-ANDROID: arm64: mm: Fix __create_pgd_mapping() call
ANDROID: sdcardfs: Move default_normal to superblock
blkdev: Refactoring block io latency histogram codes
FROMLIST: arm64: kpti: Fix the interaction between ASID switching and software PAN
FROMLIST: arm64: Move post_ttbr_update_workaround to C code
FROMLIST: arm64: mm: Rename post_ttbr0_update_workaround
sched: EAS: Initialize push_task as NULL to avoid direct reference on out_unlock path
fscrypt: updates on 4.15-rc4
ANDROID: uid_sys_stats: fix the comment
BACKPORT: tee: indicate privileged dev in gen_caps
BACKPORT: tee: optee: sync with new naming of interrupts
BACKPORT: tee: tee_shm: Constify dma_buf_ops structures.
BACKPORT: tee: optee: interruptible RPC sleep
BACKPORT: tee: optee: add const to tee_driver_ops and tee_desc structures
BACKPORT: tee.txt: standardize document format
BACKPORT: tee: add forward declaration for struct device
BACKPORT: tee: optee: fix uninitialized symbol 'parg'
BACKPORT: tee: add ARM_SMCCC dependency
BACKPORT: selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tables
...
Conflicts:
arch/arm64/kernel/vdso.c
drivers/usb/host/xhci-plat.c
include/drm/drmP.h
include/linux/kasan.h
kernel/time/timekeeping.c
mm/kasan/kasan.c
security/selinux/nlmsgtab.c
Also add this commit:
|
||
|---|---|---|
| .. | ||
| bridge | ||
| i2c | ||
| ttm | ||
| ati_pcigart.h | ||
| drm_agpsupport.h | ||
| drm_atomic_helper.h | ||
| drm_atomic.h | ||
| drm_cache.h | ||
| drm_core.h | ||
| drm_crtc_helper.h | ||
| drm_crtc.h | ||
| drm_displayid.h | ||
| drm_dp_helper.h | ||
| drm_dp_mst_helper.h | ||
| drm_edid.h | ||
| drm_encoder_slave.h | ||
| drm_fb_cma_helper.h | ||
| drm_fb_helper.h | ||
| drm_fixed.h | ||
| drm_flip_work.h | ||
| drm_gem_cma_helper.h | ||
| drm_gem.h | ||
| drm_global.h | ||
| drm_hashtab.h | ||
| drm_legacy.h | ||
| drm_mem_util.h | ||
| drm_mipi_dsi.h | ||
| drm_mm.h | ||
| drm_modes.h | ||
| drm_modeset_lock.h | ||
| drm_of.h | ||
| drm_os_linux.h | ||
| drm_panel.h | ||
| drm_pciids.h | ||
| drm_plane_helper.h | ||
| drm_rect.h | ||
| drm_scdc_helper.h | ||
| drm_sync_helper.h | ||
| drm_sysfs.h | ||
| drm_vma_manager.h | ||
| drmP.h | ||
| exynos_drm.h | ||
| gma_drm.h | ||
| i915_component.h | ||
| i915_drm.h | ||
| i915_pciids.h | ||
| intel-gtt.h | ||