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

Commit e682dcb1 authored by Kyle Yan's avatar Kyle Yan
Browse files

Merge remote-tracking branch '4.9/tmp-0455ac9d' into 4.9 



* 4.9/tmp-0455ac9d:
  Linux 4.9.12
  videodev2.h: go back to limited range Y'CbCr for SRGB and, ADOBERGB
  bcache: Make gc wakeup sane, remove set_task_state()
  ntb_transport: Pick an unused queue
  ntb: ntb_perf missing dmaengine_unmap_put
  NTB: ntb_transport: fix debugfs_remove_recursive
  timekeeping: Use deferred printk() in debug code
  printk: use rcuidle console tracepoint
  PCI/PME: Restore pcie_pme_driver.remove
  Revert "i2c: designware: detect when dynamic tar update is possible"
  ARM: 8658/1: uaccess: fix zeroing of 64-bit get_user()
  futex: Move futex_init() to core_initcall
  drm/dp/mst: fix kernel oops when turning off secondary monitor
  drm/radeon: Use mode h/vdisplay fields to hide out of bounds HW cursor
  Input: elan_i2c - add ELAN0605 to the ACPI table
  Fix missing sanity check in /dev/sg
  scsi: don't BUG_ON() empty DMA transfers
  powerpc/64: Disable use of radix under a hypervisor
  mmc: core: fix multi-bit bus width without high-speed mode
  fuse: fix uninitialized flags in pipe_buffer
  fuse: fix use after free issue in fuse_dev_do_read()
  siano: make it work again with CONFIG_VMAP_STACK
  vfs: fix uninitialized flags in splice_to_pipe()
  Linux 4.9.11
  x86/fpu/xstate: Fix xcomp_bv in XSAVES header
  tcp: don't annotate mark on control socket from tcp_v6_send_response()
  net/mlx5: Don't unlock fte while still using it
  tcp: fix mark propagation with fwmark_reflect enabled
  igmp, mld: Fix memory leak in igmpv3/mld_del_delrec()
  mld: do not remove mld souce list info when set link down
  l2tp: do not use udp_ioctl()
  net: dsa: Do not destroy invalid network devices
  ping: fix a null pointer dereference
  packet: round up linear to header len
  net: introduce device min_header_len
  sit: fix a double free on error path
  lwtunnel: valid encap attr check should return 0 when lwtunnel is disabled
  sctp: avoid BUG_ON on sctp_wait_for_sndbuf
  mlx4: Invoke softirqs after napi_reschedule
  catc: Use heap buffer for memory size test
  catc: Combine failure cleanup code in catc_probe()
  rtl8150: Use heap buffers for all register access
  pegasus: Use heap buffers for all register access
  macvtap: read vnet_hdr_size once
  tun: read vnet_hdr_sz once
  tcp: avoid infinite loop in tcp_splice_read()
  ipv6: tcp: add a missing tcp_v6_restore_cb()
  ip6_gre: fix ip6gre_err() invalid reads
  netlabel: out of bound access in cipso_v4_validate()
  ipv4: keep skb->dst around in presence of IP options
  net: use a work queue to defer net_disable_timestamp() work
  stmmac: Discard masked flags in interrupt status register
  tcp: fix 0 divide in __tcp_select_window()
  ipv6: pointer math error in ip6_tnl_parse_tlv_enc_lim()
  ipv6: fix ip6_tnl_parse_tlv_enc_lim()
  net/sched: matchall: Fix configuration race
  net/mlx5e: Fix update of hash function/key via ethtool
  can: Fix kernel panic at security_sock_rcv_skb
  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
  UPSTREAM: arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm macro
  UPSTREAM: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros
  UPSTREAM: cpufreq: schedutil: Add iowait boosting
  UPSTREAM: cpufreq / sched: ignore SMT when determining max cpu capacity
  BACKPORT: cpufreq / sched: Pass flags to cpufreq_update_util()
  UPSTREAM: cpufreq: schedutil: map raw required frequency to driver frequency
  UPSTREAM: cpufreq: governor: Create cpufreq_policy_apply_limits()
  BACKPORT: cpufreq: governor: Get rid of governor events
  UPSTREAM: cpufreq: schedutil: Improve prints messages with pr_fmt
  BACKPORT: cpufreq: Call cpufreq_disable_fast_switch() in sugov_exit()
  UPSTREAM: cpufreq: schedutil: Make default depend on CONFIG_SMP
  UPSTREAM: cpufreq: schedutil: Make it depend on CONFIG_SMP
  BACKPORT: cpufreq: schedutil: New governor based on scheduler utilization data
  Linux 4.9.10
  perf/core: Fix crash in perf_event_read()
  perf diff: Fix segfault on 'perf diff -o N' option
  perf diff: Fix -o/--order option behavior (again)
  stacktrace, lockdep: Fix address, newline ugliness
  IB/rxe: Fix mem_check_range integer overflow
  IB/rxe: Fix resid update
  x86/CPU/AMD: Fix Zen SMT topology
  x86/CPU/AMD: Bring back Compute Unit ID
  x86/mm/ptdump: Fix soft lockup in page table walker
  Revert "ALSA: line6: Only determine control port properties if needed"
  ALSA: seq: Don't handle loop timeout at snd_seq_pool_done()
  ALSA: seq: Fix race at creating a queue
  ALSA: hda - adding a new NV HDMI/DP codec ID in the driver
  xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend()
  powerpc/powernv: Fix CPU hotplug to handle waking on HVI
  powerpc/mm/radix: Update ERAT flushes when invalidating TLB
  btrfs: fix btrfs_compat_ioctl failures on non-compat ioctls
  scsi: qla2xxx: Avoid that issuing a LIP triggers a kernel crash
  scsi: mpt3sas: disable ASPM for MPI2 controllers
  scsi: aacraid: Fix INTx/MSI-x issue with older controllers
  scsi: zfcp: fix use-after-free by not tracing WKA port open/close on failed send
  Drivers: hv: vmbus: finally fix hv_need_to_signal_on_read()
  Drivers: hv: vmbus: On the read path cleanup the logic to interrupt the host
  Drivers: hv: vmbus: On write cleanup the logic to interrupt the host
  Drivers: hv: vmbus: Base host signaling strictly on the ring state
  net/mlx5e: Modify TIRs hash only when it's needed
  mac80211: Fix adding of mesh vendor IEs
  nl80211: Fix mesh HT operation check
  drm/i915: Always convert incoming exec offsets to non-canonical
  ARM: 8642/1: LPAE: catch pending imprecise abort on unmask
  ARM: dts: imx6dl: fix GPIO4 range
  target: Fix COMPARE_AND_WRITE ref leak for non GOOD status
  target: Fix multi-session dynamic se_node_acl double free OOPs
  target: Fix early transport_generic_handle_tmr abort scenario
  target: Use correct SCSI status during EXTENDED_COPY exception
  target: Don't BUG_ON during NodeACL dynamic -> explicit conversion
  drm/atomic: Fix double free in drm_atomic_state_default_clear
  drm/i915/bxt: Add MST support when do DPLL calculation
  drm/i915: fix use-after-free in page_flip_completed()
  ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write
  hns: avoid stack overflow with CONFIG_KASAN
  ibmvscsis: Add SGL limit
  mm/slub.c: fix random_seq offset destruction
  cpumask: use nr_cpumask_bits for parsing functions
  rtlwifi: rtl8192ce: Fix loading of incorrect firmware
  Revert "x86/ioapic: Restore IO-APIC irq_chip retrigger callback"
  selinux: fix off-by-one in setprocattr
  Input: uinput - fix crash when mixing old and new init style
  ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup
  crypto: ccp - Fix double add when creating new DMA command
  crypto: ccp - Fix DMA operations when IOMMU is enabled
  crypto: qat - zero esram only for DH85x devices
  crypto: qat - fix bar discovery for c62x
  crypto: chcr - Check device is allocated before use
  crypto: algif_aead - Fix kernel panic on list_del
  dm rq: cope with DM device destruction while in dm_old_request_fn()
  libnvdimm, pfn: fix memmap reservation size versus 4K alignment
  libnvdimm, namespace: do not delete namespace-id 0
  acpi, nfit: fix acpi_nfit_flush_probe() crash
  cpufreq: intel_pstate: Disable energy efficiency optimization
  ANDROID: ext4 crypto: Disables zeroing on truncation when there's no key
  ANDROID: Refactor fs readpage/write tracepoints.

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/include/asm/assembler.h
	arch/arm64/include/asm/mmu_context.h
	arch/arm64/include/asm/uaccess.h
	arch/arm64/kernel/entry.S
	arch/arm64/lib/clear_user.S
	arch/arm64/lib/copy_from_user.S
	arch/arm64/lib/copy_in_user.S
	arch/arm64/lib/copy_to_user.S
	arch/arm64/xen/hypercall.S
	drivers/cpufreq/Kconfig

Change-Id: Ibd6d488060e080e2abaa34b0f038b4a3a3cfa44d
Signed-off-by: default avatarKyle Yan <kyan@codeaurora.org>
parents 55a453a0 0455ac9d

Documentation/media/uapi/v4l/pixfmt-007.rst

+17 −6
Original line number Diff line number Diff line
@@ -211,7 +211,13 @@ Colorspace sRGB (V4L2_COLORSPACE_SRGB) 
The :ref:`srgb` standard defines the colorspace used by most webcams

and computer graphics. The default transfer function is

``V4L2_XFER_FUNC_SRGB``. The default Y'CbCr encoding is

``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is full range.

``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is limited range.



Note that the :ref:`sycc` standard specifies full range quantization,

however all current capture hardware supported by the kernel convert

R'G'B' to limited range Y'CbCr. So choosing full range as the default

would break how applications interpret the quantization range.



The chromaticities of the primary colors and the white reference are:
@@ -276,7 +282,7 @@ the following ``V4L2_YCBCR_ENC_601`` encoding as defined by :ref:`sycc`: 


Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range

[-0.5…0.5]. This transform is identical to one defined in SMPTE

170M/BT.601. The Y'CbCr quantization is full range.

170M/BT.601. The Y'CbCr quantization is limited range.





.. _col-adobergb:
@@ -288,10 +294,15 @@ The :ref:`adobergb` standard defines the colorspace used by computer 
graphics that use the AdobeRGB colorspace. This is also known as the

:ref:`oprgb` standard. The default transfer function is

``V4L2_XFER_FUNC_ADOBERGB``. The default Y'CbCr encoding is

``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is full

range. The chromaticities of the primary colors and the white reference

are:

``V4L2_YCBCR_ENC_601``. The default Y'CbCr quantization is limited

range.



Note that the :ref:`oprgb` standard specifies full range quantization,

however all current capture hardware supported by the kernel convert

R'G'B' to limited range Y'CbCr. So choosing full range as the default

would break how applications interpret the quantization range.



The chromaticities of the primary colors and the white reference are:





.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|
@@ -344,7 +355,7 @@ the following ``V4L2_YCBCR_ENC_601`` encoding: 


Y' is clamped to the range [0…1] and Cb and Cr are clamped to the range

[-0.5…0.5]. This transform is identical to one defined in SMPTE

170M/BT.601. The Y'CbCr quantization is full range.

170M/BT.601. The Y'CbCr quantization is limited range.





.. _col-bt2020:

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 9

SUBLEVEL = 12

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/kernel/unaligned.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs, 


	/* clear any remanants of delay slot */

	if (delay_mode(regs)) {

		regs->ret = regs->bta ~1U;

		regs->ret = regs->bta & ~1U;

		regs->status32 &= ~STATUS_DE_MASK;

	} else {

		regs->ret += state.instr_len;

arch/arm/boot/dts/imx6dl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 
&gpio4 {

	gpio-ranges = <&iomuxc  5 136 1>, <&iomuxc  6 145 1>, <&iomuxc  7 150 1>,

		      <&iomuxc  8 146 1>, <&iomuxc  9 151 1>, <&iomuxc 10 147 1>,

		      <&iomuxc 11 151 1>, <&iomuxc 12 148 1>, <&iomuxc 13 153 1>,

		      <&iomuxc 11 152 1>, <&iomuxc 12 148 1>, <&iomuxc 13 153 1>,

		      <&iomuxc 14 149 1>, <&iomuxc 15 154 1>, <&iomuxc 16  39 7>,

		      <&iomuxc 23  56 1>, <&iomuxc 24  61 7>, <&iomuxc 31  46 1>;

};

arch/arm/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static int gpr_set(struct task_struct *target, 
		   const void *kbuf, const void __user *ubuf)

{

	int ret;

	struct pt_regs newregs;

	struct pt_regs newregs = *task_pt_regs(target);



	ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,

				 &newregs,