mirror of
https://github.com/torvalds/linux.git
synced 2026-06-09 23:23:53 +02:00
c8f435d8fd
* linux-linaro-lsk-v4.4: (783 commits)
Linux 4.4.159
iw_cxgb4: only allow 1 flush on user qps
HID: sony: Support DS4 dongle
HID: sony: Update device ids
arm64: Add trace_hardirqs_off annotation in ret_to_user
ext4: don't mark mmp buffer head dirty
ext4: fix online resizing for bigalloc file systems with a 1k block size
ext4: fix online resize's handling of a too-small final block group
ext4: recalucate superblock checksum after updating free blocks/inodes
ext4: avoid divide by zero fault when deleting corrupted inline directories
tty: vt_ioctl: fix potential Spectre v1
drm/nouveau/drm/nouveau: Use pm_runtime_get_noresume() in connector_detect()
ocfs2: fix ocfs2 read block panic
scsi: target: iscsi: Use hex2bin instead of a re-implementation
neighbour: confirm neigh entries when ARP packet is received
net: hp100: fix always-true check for link up state
net/appletalk: fix minor pointer leak to userspace in SIOCFINDIPDDPRT
ipv6: fix possible use-after-free in ip6_xmit()
gso_segment: Reset skb->mac_len after modifying network header
mm: shmem.c: Correctly annotate new inodes for lockdep
...
Conflicts:
Makefile
fs/squashfs/block.c
include/uapi/linux/prctl.h
kernel/fork.c
kernel/sys.c
Trivial merge conflicts in above files. Resolved by rebasing
corresponding AOSP changes.
arch/arm64/mm/init.c
Pick the changes from upstream version of AOSP patch
"arm64: check for upper PAGE_SHIFT bits in pfn_valid" instead.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
|
||
|---|---|---|
| .. | ||
| adf_client.h | ||
| adf_fbdev.h | ||
| adf_format.h | ||
| adf_memblock.h | ||
| adf.h | ||
| atmel_lcdc.h | ||
| aty128.h | ||
| auo_k190xfb.h | ||
| broadsheetfb.h | ||
| cirrus.h | ||
| cvisionppc.h | ||
| da8xx-fb.h | ||
| display_timing.h | ||
| edid.h | ||
| exynos_mipi_dsim.h | ||
| exynos7_decon.h | ||
| exynos5433_decon.h | ||
| gbe.h | ||
| hecubafb.h | ||
| iga.h | ||
| ili9320.h | ||
| imx-ipu-v3.h | ||
| Kbuild | ||
| kyro.h | ||
| mach64.h | ||
| maxinefb.h | ||
| mbxfb.h | ||
| metronomefb.h | ||
| mipi_display.h | ||
| mmp_disp.h | ||
| neomagic.h | ||
| newport.h | ||
| of_display_timing.h | ||
| of_videomode.h | ||
| omap-panel-data.h | ||
| omapdss.h | ||
| omapvrfb.h | ||
| permedia2.h | ||
| platform_lcd.h | ||
| pm3fb.h | ||
| pmag-ba-fb.h | ||
| pmagb-b-fb.h | ||
| pxa168fb.h | ||
| radeon.h | ||
| s1d13xxxfb.h | ||
| sa1100fb.h | ||
| samsung_fimd.h | ||
| sh_mipi_dsi.h | ||
| sh_mobile_hdmi.h | ||
| sh_mobile_lcdc.h | ||
| sh_mobile_meram.h | ||
| sisfb.h | ||
| sstfb.h | ||
| tdfx.h | ||
| tgafb.h | ||
| trident.h | ||
| udlfb.h | ||
| uvesafb.h | ||
| vga.h | ||
| videomode.h | ||
| w100fb.h | ||