joy/android_kernel_sony_sdm845
Watch
1
Fork
You've already forked android_kernel_sony_sdm845
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch '4.9/tmp-77d3588' into 4.9

Browse source 
* 4.9/tmp-77d3588:
  Linux 4.9.31
  xfs: Fix off-by-in in loop termination in xfs_find_get_desired_pgoff()
  xfs: fix unaligned access in xfs_btree_visit_blocks
  xfs: avoid mount-time deadlock in CoW extent recovery
  xfs: xfs_trans_alloc_empty
  xfs: bad assertion for delalloc an extent that start at i_size
  xfs: BMAPX shouldn't barf on inline-format directories
  xfs: fix indlen accounting error on partial delalloc conversion
  xfs: fix use-after-free in xfs_finish_page_writeback
  xfs: reserve enough blocks to handle btree splits when remapping
  xfs: wait on new inodes during quotaoff dquot release
  xfs: update ag iterator to support wait on new inodes
  xfs: support ability to wait on new inodes
  xfs: fix up quotacheck buffer list error handling
  xfs: prevent multi-fsb dir readahead from reading random blocks
  xfs: handle array index overrun in xfs_dir2_leaf_readbuf()
  xfs: fix integer truncation in xfs_bmap_remap_alloc
  xfs: drop iolock from reclaim context to appease lockdep
  xfs: actually report xattr extents via iomap
  xfs: fix over-copying of getbmap parameters from userspace
  xfs: use dedicated log worker wq to avoid deadlock with cil wq
  xfs: fix kernel memory exposure problems
  xfs: rework the inline directory verifiers
  xfs: verify inline directory data forks
  xfs: fix off-by-one on max nr_pages in xfs_find_get_desired_pgoff()
  xfs: use ->b_state to fix buffer I/O accounting release race
  xfs: Fix missed holes in SEEK_HOLE implementation
  drm/gma500/psb: Actually use VBT mode when it is found
  mm/slub.c: trace free objects at KERN_INFO
  slub/memcg: cure the brainless abuse of sysfs attributes
  ksm: prevent crash after write_protect_page fails
  x86/boot: Use CROSS_COMPILE prefix for readelf
  RDMA/qib,hfi1: Fix MR reference count leak on write with immediate
  mm: consider memblock reservations for deferred memory initialization sizing
  mlock: fix mlock count can not decrease in race condition
  mm/migrate: fix refcount handling when !hugepage_migration_supported()
  ALSA: hda - apply STAC_9200_DELL_M22 quirk for Dell Latitude D430
  pcmcia: remove left-over %Z format
  drm/radeon: Fix vram_size/visible values in DRM_RADEON_GEM_INFO ioctl
  drm/radeon: Unbreak HPD handling for r600+
  drm/radeon/ci: disable mclk switching for high refresh rates (v2)
  scsi: mpt3sas: Force request partial completion alignment
  nvme: avoid to use blk_mq_abort_requeue_list()
  nvme: use blk_mq_start_hw_queues() in nvme_kill_queues()
  nvme-rdma: support devices with queue size < 32
  HID: wacom: Have wacom_tpc_irq guard against possible NULL dereference
  ibmvscsis: Fix the incorrect req_lim_delta
  ibmvscsis: Clear left-over abort_cmd pointers
  iscsi-target: Always wait for kthread_should_stop() before kthread exit
  mmc: sdhci-iproc: suppress spurious interrupt with Multiblock read
  Revert "ACPI / button: Change default behavior to lid_init_state=open"
  acpi, nfit: Fix the memory error check in nfit_handle_mce()
  x86/MCE: Export memory_error()
  crypto: skcipher - Add missing API setkey checks
  i2c: i2c-tiny-usb: fix buffer not being DMA capable
  drivers/tty: 8250: only call fintek_8250_probe when doing port I/O
  powerpc/spufs: Fix hash faults for kernel regions
  fs/ufs: Set UFS default maximum bytes per file
  sparc/ftrace: Fix ftrace graph time measurement
  sparc: Fix -Wstringop-overflow warning
  bpf: add bpf_clone_redirect to bpf_helper_changes_pkt_data
  ipv4: add reference counting to metrics
  sctp: fix ICMP processing if skb is non-linear
  tcp: avoid fastopen API to be used on AF_UNSPEC
  virtio-net: enable TSO/checksum offloads for Q-in-Q vlans
  be2net: Fix offload features for Q-in-Q packets
  vlan: Fix tcp checksum offloads in Q-in-Q vlans
  net: phy: marvell: Limit errata to 88m1101
  net/mlx5: Avoid using pending command interface slots
  bonding: fix accounting of active ports in 3ad
  ipv6: fix out of bound writes in __ip6_append_data()
  bridge: start hello_timer when enabling KERNEL_STP in br_stp_start
  qmi_wwan: add another Lenovo EM74xx device ID
  bridge: netlink: check vlan_default_pvid range
  ipv6: Check ip6_find_1stfragopt() return value properly.
  ipv6: Prevent overrun when parsing v6 header options
  net: Improve handling of failures on link and route dumps
  tcp: eliminate negative reordering in tcp_clean_rtx_queue
  net/mlx5e: Fix ethtool pause support and advertise reporting
  net/mlx5e: Use the correct pause values for ethtool advertising
  net/packet: fix missing net_device reference release
  sctp: do not inherit ipv6_{mc|ac|fl}_list from parent
  sctp: fix src address selection if using secondary addresses for ipv6
  tcp: avoid fragmenting peculiar skbs in SACK
  net: fix compile error in skb_orphan_partial()
  netem: fix skb_orphan_partial()
  bpf, arm64: fix faulty emission of map access in tail calls
  s390/qeth: add missing hash table initializations
  s390/qeth: avoid null pointer dereference on OSN
  s390/qeth: unbreak OSM and OSN support
  s390/qeth: handle sysfs error during initialization
  ipv6/dccp: do not inherit ipv6_mc_list from parent
  driver: vrf: Fix one possible use-after-free issue
  dccp/tcp: do not inherit mc_list from parent
  android: base-cfg: disable CONFIG_NFSD and CONFIG_NFS_FS
  UPSTREAM: drm/ttm: fix ttm_bo_wait
  FROMLIST: [net-next,v2,2/2] bpf: Remove the capability check for cgroup skb eBPF program
  FROMLIST: [net-next,v2,1/2] bpf: Allow CGROUP_SKB eBPF program to access sk_buff
  ANDROID: Update init/do_mounts_dm.c to the latest ChromiumOS version.
  FROMLIST: f2fs: sanity check size of nat and sit cache
  FROMLIST: f2fs: sanity check checkpoint segno and blkoff
  ANDROID: Kconfig: add depends for UID_SYS_STATS
  ANDROID: hid: uhid: implement refcount for open and close
  ANDROID: cpufreq: system panic when switch interactive governor frequently
  ANDROID: sched/walt: kill {min,max}_capacity
  ANDROID: fixup! sched/fair: jump to max OPP when crossing UP threshold
  BACKPORT [FROMLIST] New getsockopt option to get socket cookie
  UPSTREAM: bpf: cgroup: fix documentation of __cgroup_bpf_update()
  BACKPORT: bpf: introduce BPF_F_ALLOW_OVERRIDE flag
  UPSTREAM: bpf: restore skb->sk before pskb_trim() call
  UPSTREAM: cgroup: move CONFIG_SOCK_CGROUP_DATA to init/Kconfig
  UPSTREAM: cgroup, bpf: remove unnecessary #include
  ANDROID: mnt: Fix next_descendent

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
	init/do_mounts_dm.c
	kernel/sched/core.c
	kernel/sched/walt.c

Change-Id: I7a987967400f81c9d2ec2dc2283a881de9fd386f
Signed-off-by: Kyle Yan <kyan@codeaurora.org>
This commit is contained in:
Kyle Yan 2017-06-09 10:47:05 -07:00
commit 303cde8076
151 changed files with 1296 additions and 493 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 9
SUBLEVEL = 30
SUBLEVEL = 31
EXTRAVERSION =
NAME = Roaring Lionus

2
arch/alpha/include/uapi/asm/socket.h
View file

@ -97,4 +97,6 @@
#define SO_CNX_ADVICE 53
#define SO_COOKIE 57
#endif /* _UAPI_ASM_SOCKET_H */

5
arch/arm64/net/bpf_jit_comp.c
View file

@ -252,8 +252,9 @@ static int emit_bpf_tail_call(struct jit_ctx *ctx)
*/
off = offsetof(struct bpf_array, ptrs);
emit_a64_mov_i64(tmp, off, ctx);
emit(A64_LDR64(tmp, r2, tmp), ctx);
emit(A64_LDR64(prg, tmp, r3), ctx);
emit(A64_ADD(1, tmp, r2, tmp), ctx);
emit(A64_LSL(1, prg, r3, 3), ctx);
emit(A64_LDR64(prg, tmp, prg), ctx);
emit(A64_CBZ(1, prg, jmp_offset), ctx);
/* goto *(prog->bpf_func + prologue_size); */

2
arch/avr32/include/uapi/asm/socket.h
View file

@ -90,4 +90,6 @@
#define SO_CNX_ADVICE 53
#define SO_COOKIE 57
#endif /* _UAPI__ASM_AVR32_SOCKET_H */

2
arch/frv/include/uapi/asm/socket.h
View file

@ -90,5 +90,7 @@
#define SO_CNX_ADVICE 53
#define SO_COOKIE 57
#endif /* _ASM_SOCKET_H */

2
arch/ia64/include/uapi/asm/socket.h
View file

@ -99,4 +99,6 @@
#define SO_CNX_ADVICE 53
#define SO_COOKIE 57
#endif /* _ASM_IA64_SOCKET_H */

2
arch/m32r/include/uapi/asm/socket.h
View file

@ -90,4 +90,6 @@
#define SO_CNX_ADVICE 53
#define SO_COOKIE 57
#endif /* _ASM_M32R_SOCKET_H */

2
arch/mips/include/uapi/asm/socket.h
View file

@ -108,4 +108,6 @@
#define SO_CNX_ADVICE 53
#define SO_COOKIE 57
#endif /* _UAPI_ASM_SOCKET_H */

2
arch/mn10300/include/uapi/asm/socket.h
View file

@ -90,4 +90,6 @@
#define SO_CNX_ADVICE 53
#define SO_COOKIE 57
#endif /* _ASM_SOCKET_H */

2
arch/parisc/include/uapi/asm/socket.h
View file

@ -89,4 +89,6 @@
#define SO_CNX_ADVICE 0x402E
#define SO_COOKIE 0x4032
#endif /* _UAPI_ASM_SOCKET_H */

2
arch/powerpc/include/uapi/asm/socket.h
View file

@ -97,4 +97,6 @@
#define SO_CNX_ADVICE 53
#define SO_COOKIE 57
#endif /* _ASM_POWERPC_SOCKET_H */

4
arch/powerpc/platforms/cell/spu_base.c
View file

@ -197,7 +197,9 @@ static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
(REGION_ID(ea) != USER_REGION_ID)) {
spin_unlock(&spu->register_lock);
ret = hash_page(ea, _PAGE_PRESENT | _PAGE_READ, 0x300, dsisr);
ret = hash_page(ea,
_PAGE_PRESENT | _PAGE_READ | _PAGE_PRIVILEGED,
0x300, dsisr);
spin_lock(&spu->register_lock);
if (!ret) {

2
arch/s390/include/uapi/asm/socket.h
View file

@ -96,4 +96,6 @@
#define SO_CNX_ADVICE 53
#define SO_COOKIE 57
#endif /* _ASM_SOCKET_H */

4
arch/sparc/include/asm/pgtable_32.h
View file

@ -91,9 +91,9 @@ extern unsigned long pfn_base;
* ZERO_PAGE is a global shared page that is always zero: used
* for zero-mapped memory areas etc..
*/
extern unsigned long empty_zero_page;
extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
#define ZERO_PAGE(vaddr) (virt_to_page(&empty_zero_page))
#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
/*
* In general all page table modifications should use the V8 atomic

2
arch/sparc/include/asm/setup.h
View file

@ -16,7 +16,7 @@ extern char reboot_command[];
*/
extern unsigned char boot_cpu_id;
extern unsigned long empty_zero_page;
extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
extern int serial_console;
static inline int con_is_present(void)

2
arch/sparc/include/uapi/asm/socket.h
View file

@ -86,6 +86,8 @@
#define SO_CNX_ADVICE 0x0037
#define SO_COOKIE 0x003b
/* Security levels - as per NRL IPv6 - don't actually do anything */
#define SO_SECURITY_AUTHENTICATION 0x5001
#define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002

15
arch/sparc/kernel/ftrace.c
View file

@ -130,18 +130,17 @@ unsigned long prepare_ftrace_return(unsigned long parent,
if (unlikely(atomic_read(&current->tracing_graph_pause)))
return parent + 8UL;
trace.func = self_addr;
trace.depth = current->curr_ret_stack + 1;
/* Only trace if the calling function expects to */
if (!ftrace_graph_entry(&trace))
return parent + 8UL;
if (ftrace_push_return_trace(parent, self_addr, &trace.depth,
frame_pointer, NULL) == -EBUSY)
return parent + 8UL;
trace.func = self_addr;
/* Only trace if the calling function expects to */
if (!ftrace_graph_entry(&trace)) {
current->curr_ret_stack--;
return parent + 8UL;
}
return return_hooker;
}
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

2
arch/sparc/mm/init_32.c
View file

@ -301,7 +301,7 @@ void __init mem_init(void)
/* Saves us work later. */
memset((void *)&empty_zero_page, 0, PAGE_SIZE);
memset((void *)empty_zero_page, 0, PAGE_SIZE);
i = last_valid_pfn >> ((20 - PAGE_SHIFT) + 5);
i += 1;

2
arch/x86/boot/compressed/Makefile
View file

@ -94,7 +94,7 @@ vmlinux-objs-$(CONFIG_EFI_MIXED) += $(obj)/efi_thunk_$(BITS).o
quiet_cmd_check_data_rel = DATAREL $@
define cmd_check_data_rel
for obj in $(filter %.o,$^); do \
readelf -S $$obj | grep -qF .rel.local && { \
${CROSS_COMPILE}readelf -S $$obj | grep -qF .rel.local && { \
echo "error: $$obj has data relocations!" >&2; \
exit 1; \
} || true; \

1
arch/x86/include/asm/mce.h
View file

@ -257,6 +257,7 @@ static inline void mce_amd_feature_init(struct cpuinfo_x86 *c) { }
#endif
int mce_available(struct cpuinfo_x86 *c);
bool mce_is_memory_error(struct mce *m);
DECLARE_PER_CPU(unsigned, mce_exception_count);
DECLARE_PER_CPU(unsigned, mce_poll_count);

Some files were not shown because too many files have changed in this diff Show more