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

Commit 18118614 authored by Bruce Levy's avatar Bruce Levy
Browse files

Merge remote-tracking branch 'kdev_quic/tmp-9395452b' into Test4.8-rc6



* kdev_quic/tmp-9395452b:
  Linux 4.8-rc6
  nvme: make NVME_RDMA depend on BLOCK
  fscrypto: require write access to mount to set encryption policy
  fscrypto: only allow setting encryption policy on directories
  fscrypto: add authorization check for setting encryption policy
  libnvdimm: allow legacy (e820) pmem region to clear bad blocks
  nfit, mce: Fix SPA matching logic in MCE handler
  mm: fix cache mode of dax pmd mappings
  mm: fix show_smap() for zone_device-pmd ranges
  virtio_console: Stop doing DMA on the stack
  virtio: mark vring_dma_dev() static
  arm64: use preempt_disable_notrace in _percpu_read/write
  arm64: spinlocks: implement smp_mb__before_spinlock() as smp_mb()
  usb: chipidea: udc: fix NULL ptr dereference in isr_setup_status_phase
  cpufreq-stats: Minor documentation fix
  i2c: rk3x: Restore clock settings at resume time
  i2c: Spelling s/acknowedge/acknowledge/
  i2c: designware: save the preset value of DW_IC_SDA_HOLD
  Documentation: i2c: slave-interface: add note for driver development
  i2c: mux: demux-pinctrl: run properly with multiple instances
  ALSA: rawmidi: Fix possible deadlock with virmidi registration
  ALSA: timer: Fix zero-division by continue of uninitialized instance
  dmi-id: don't free dev structure after calling device_register
  xhci: fix null pointer dereference in stop command timeout function
  arm-cci: pmu: Fix typo in event name
  Revert "ARM: tegra: fix erroneous address in dts"
  powerpc/mm: Don't alias user region to other regions below PAGE_OFFSET
  powerpc/32: Fix again csum_partial_copy_generic()
  powerpc/powernv: Fix corrupted PE allocation bitmap on releasing PE
  gpio: sa1100: fix irq probing for ucb1x00
  gpio: mcp23s08: make driver depend on OF_GPIO
  Revert "gpio: include <linux/io-mapping.h> in gpiolib-of"
  usercopy: remove page-spanning test for now
  usercopy: force check_object_size() inline
  seccomp: Remove 2-phase API documentation
  um/ptrace: Fix the syscall number update after a ptrace
  um/ptrace: Fix the syscall_trace_leave call
  usb: dwc3: pci: fix build warning on !PM_SLEEP
  lkdtm: adjust usercopy tests to bypass const checks
  usercopy: fold builtin_const check into inline function
  x86/uaccess: force copy_*_user() to be inlined
  btrfs: introduce tickets_id to determine whether asynchronous metadata reclaim work makes progress
  Btrfs: remove root_log_ctx from ctx list before btrfs_sync_log returns
  thermal: rcar_thermal: Fix priv->zone error handling
  usb: gadget: prevent potenial null pointer dereference on skb->len
  powerpc/powernv: Fix crash on releasing compound PE
  powerpc/xics/opal: Fix processor numbers in OPAL ICP
  powerpc/pseries: Fix little endian build with CONFIG_KEXEC=n
  iio:core: fix IIO_VAL_FRACTIONAL sign handling
  iio: ensure ret is initialized to zero before entering do loop
  btrfs: do not decrease bytes_may_use when replaying extents
  PM / QoS: avoid calling cancel_delayed_work_sync() during early boot
  ceph: do not modify fi->frag in need_reset_readdir()
  ovl: fix workdir creation
  usb: renesas_usbhs: fix clearing the {BRDY,BEMP}STS condition
  usb: phy: phy-generic: Check clk_prepare_enable() error
  usb: gadget: udc: renesas-usb3: clear VBOUT bit in DRD_CON
  Revert "usb: dwc3: gadget: always decrement by 1"
  ARM: dts: imx6qdl: Fix SPDIF regression
  dax: fix mapping size check
  iio: accel: kxsd9: Fix scaling bug
  iio: accel: bmc150: reset chip at init time
  iio: fix pressure data output unit in hid-sensor-attributes
  spi: Prevent unexpected SPI time out due to arithmetic overflow
  IB/hfi1: Rework debugfs to use SRCU
  IB/hfi1: Make n_krcvqs be an unsigned long integer
  IB/hfi1: Add QSFP sanity pre-check
  IB/hfi1: Fix AHG KDETH Intr shift
  IB/hfi1: Fix SGE length for misaligned PIO copy
  IB/mlx5: Don't return errors from poll_cq
  IB/mlx5: Use TIR number based on selector
  IB/mlx5: Simplify code by removing return variable
  IB/mlx5: Return EINVAL when caller specifies too many SGEs
  IB/mlx4: Don't return errors from poll_cq
  Revert "IB/mlx4: Return EAGAIN for any error in mlx4_ib_poll_one"
  IB/ipoib: Fix memory corruption in ipoib cm mode connect flow
  IB/core: Fix use after free in send_leave function
  IB/cxgb4: Make _free_qp static to silence build warning
  IB/isert: Properly release resources on DEVICE_REMOVAL
  IB/hfi1: Fix the size parameter to find_first_bit
  IB/mlx5: Fix the size parameter to find_first_bit
  ALSA: timer: fix NULL pointer dereference in read()/ioctl() race
  crypto: caam - fix IV loading for authenc (giv)decryption
  crypto: cryptd - Use correct tfm object for AEAD tracking
  ALSA: fireworks: accessing to user space outside spinlock
  ALSA: firewire-tascam: accessing to user space outside spinlock
  ARM: imx6: add missing BM_CLPCR_BYPASS_PMIC_READY setting for imx6sx
  ALSA: hda - Enable subwoofer on Dell Inspiron 7559
  ALSA: hda - Add headset mic quirk for Dell Inspiron 5468
  tools:iio:iio_generic_buffer: fix trigger-less mode
  ALSA: usb-audio: Add sample rate inquiry quirk for B850V3 CP2114
  ARM: dts: imx7d-sdb: fix ti,x-plate-ohms property name
  fix:mailbox:bcm-pdc-mailbox:mark symbols static where possible
  mailbox: bcm-pdc: potential NULL dereference in pdc_shutdown()
  mailbox: Add HAS_DMA Kconfig dependency to BCM_PDC_MBOX
  ALSA: timer: fix NULL pointer dereference on memory allocation failure
  ALSA: timer: fix division by zero after SNDRV_TIMER_IOCTL_CONTINUE
  ARM: sa1100: clear reset status prior to reboot
  IB/hfi1: Clean up type used and casting
  i40iw: Receive notification events correctly
  i40iw: Update hw_iwarp_state
  ARM: dts: kirkwood: Fix PCIe label on OpenRD
  ARM: kirkwood: ib62x0: fix size of u-boot environment partition
  bus: arm-ccn: make event groups reliable
  bus: arm-ccn: fix hrtimer registration
  bus: arm-ccn: fix PMU interrupt flags
  ARM: tegra: Correct polarity for Tegra114 PMIC interrupt
  MAINTAINERS: add tree entry for ARM/UniPhier architecture
  i2c: bcm-kona: fix inconsistent indenting
  i2c: rcar: use proper device with dma_mapping_error
  i2c: sh_mobile: use proper device with dma_mapping_error
  i2c: mux: demux-pinctrl: invalidate properly when switching fails
  fuse: direct-io: don't dirty ITER_BVEC pages
  spi: pxa2xx-pci: fix ACPI-based enumeration of SPI devices
  pinctrl: sunxi: fix uart1 CTS/RTS pins at PG on A23/A33
  ARM: 8600/1: Enforce some NS-SVC initialisation
  ARM: 8599/1: mm: pull asm/memory.h explicitly
  ARM: sa1100: register clocks early
  ARM: sa1100: fix 3.6864MHz clock
  ARM: sun5i: Fix typo in trip point temperature
  pinctrl: cherryview: Do not mask all interrupts in probe
  pinctrl: pistachio: fix mfio pll_lock pinmux
  scsi: sas: remove is_sas_attached()
  scsi: ses: use scsi_is_sas_rphy instead of is_sas_attached
  scsi: sas: provide stub implementation for scsi_is_sas_rphy
  regmap: drop cache if the bus transfer error
  MAINTAINERS: add myself as Samsung SPI maintainer
  MAINTAINERS: Switch to kernel.org account for Krzysztof Kozlowski
  ARM: imx6ul: populates platform device at .init_machine
  regulator: Change Krzysztof Kozlowski's email to kernel.org
  bus: arm-ccn: Add missing event attribute exclusions for host/guest
  bus: arm-ccn: Correct required arguments for XP PMU events
  bus: arm-ccn: Fix XP watchpoint settings bitmask
  bus: arm-ccn: Do not attempt to configure XPs for cycle counter
  bus: arm-ccn: Fix PMU handling of MN
  builddeb: Skip gcc-plugins when not configured
  scsi: blacklist all RDAC devices for BLIST_NO_ULD_ATTACH
  scsi: fix upper bounds check of sense key in scsi_sense_key_string()
  ARM: dts: logicpd-somlv: Fix NAND device nodes
  ARM: dts: logicpd-torpedo-som: Provide NAND ready pin
  ARM: dts: overo: fix gpmc nand on boards with ethernet
  ARM: dts: overo: fix gpmc nand cs0 range
  ARM: dts: am335x: Update elm phandle binding
  ARM: imx6: add missing BM_CLPCR_BYP_MMDC_CH0_LPM_HS setting for imx6ul
  ARM: dts: exynos: Properly select eMMC HighSpeed mode on Odroid XU
  spi: Drop io_mutex in error paths
  ARM: dts: imx6sx-sabreauto: Fix misspelled property
  firmware: arm_scpi: add missing of_node_put after calling of_parse_phandle
  bus: vexpress-config: add missing of_node_put after calling of_parse_phandle
  ARM: dts: armada-388-clearfog: number LAN ports properly
  memory: omap-gpmc: allow probe of child nodes to fail
  regulator: qcom_smd: Fix voltage ranges for pma8084 ftsmps and pldo
  regulator: qcom_smd: Fix voltage ranges for pm8x41
  spi: sh-msiof: Avoid invalid clock generator parameters
  regmap: rbtree: Avoid overlapping nodes
  regmap: cache: Fix num_reg_defaults computation from reg_defaults_raw
  spi: img-spfi: Remove spi_master_put in img_spfi_remove()
  spi: mediatek: remove spi_master_put in mtk_spi_remove()
  spi: qup: Remove spi_master_put in spi_qup_remove()
  ARM: OMAP4+: CM: Remove redundant checks for clkctrl_offs of zero
  ARM: OMAP4+: Have _omap4_wait_target_* check for valid clkctrl_offs
  ARM: OMAP2+: AM33XX: Add HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET flag to rtc hwmod
  ARM: OMAP4+: hwmod: Add hwmod flag for HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET
  ARM: OMAP3: hwmod data: Add sysc information for DSI

CRs-Fixed: 1046658
Change-Id: I639c6c4d37dcb8bd47e96a9339b67e2186719cd2
Signed-off-by: default avatarKyle Yan <kyan@codeaurora.org>
Signed-off-by: default avatarBruce Levy <blevy@codeaurora.org>
parents 588f2091 9395452b
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ Kay Sievers <kay.sievers@vrfy.org>
Kenneth W Chen <kenneth.w.chen@intel.com>
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
Koushik <raghavendra.koushik@neterion.com>
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Leonid I Ananiev <leonid.i.ananiev@intel.com>
+10 −6
Original line number Diff line number Diff line
@@ -18,13 +18,17 @@ and config2 fields of the perf_event_attr structure. The "events"
directory provides configuration templates for all documented
events, that can be used with perf tool. For example "xp_valid_flit"
is an equivalent of "type=0x8,event=0x4". Other parameters must be
explicitly specified. For events originating from device, "node"
defines its index. All crosspoint events require "xp" (index),
"port" (device port number) and "vc" (virtual channel ID) and
"dir" (direction). Watchpoints (special "event" value 0xfe) also
require comparator values ("cmp_l" and "cmp_h") and "mask", being
index of the comparator mask.
explicitly specified.

For events originating from device, "node" defines its index.

Crosspoint PMU events require "xp" (index), "bus" (bus number)
and "vc" (virtual channel ID).

Crosspoint watchpoint-based events (special "event" value 0xfe)
require "xp" and "vc" as as above plus "port" (device port index),
"dir" (transmit/receive direction), comparator values ("cmp_l"
and "cmp_h") and "mask", being index of the comparator mask.
Masks are defined separately from the event description
(due to limited number of the config values) in the "cmp_mask"
directory, with first 8 configurable by user and additional
+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ Config Main Menu
	Power management options (ACPI, APM)  --->
		CPU Frequency scaling  --->
			[*] CPU Frequency scaling
			<*>   CPU frequency translation statistics 
			[*]   CPU frequency translation statistics
			[*]     CPU frequency translation statistics details


+5 −0
Original line number Diff line number Diff line
@@ -145,6 +145,11 @@ If you want to add slave support to the bus driver:

* Catch the slave interrupts and send appropriate i2c_slave_events to the backend.

Note that most hardware supports being master _and_ slave on the same bus. So,
if you extend a bus driver, please make sure that the driver supports that as
well. In almost all cases, slave support does not need to disable the master
functionality.

Check the i2c-rcar driver as an example.


+21 −7
Original line number Diff line number Diff line
@@ -1624,7 +1624,7 @@ N: rockchip

ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
M:	Kukjin Kim <kgene@kernel.org>
M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>
M:	Krzysztof Kozlowski <krzk@kernel.org>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
S:	Maintained
@@ -1644,7 +1644,6 @@ F: drivers/*/*s3c64xx*
F:	drivers/*/*s5pv210*
F:	drivers/memory/samsung/*
F:	drivers/soc/samsung/*
F:	drivers/spi/spi-s3c*
F:	Documentation/arm/Samsung/
F:	Documentation/devicetree/bindings/arm/samsung/
F:	Documentation/devicetree/bindings/sram/samsung-sram.txt
@@ -1832,6 +1831,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
ARM/UNIPHIER ARCHITECTURE
M:	Masahiro Yamada <yamada.masahiro@socionext.com>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
S:	Maintained
F:	arch/arm/boot/dts/uniphier*
F:	arch/arm/include/asm/hardware/cache-uniphier.h
@@ -7465,7 +7465,8 @@ F: Documentation/devicetree/bindings/sound/max9860.txt
F:	sound/soc/codecs/max9860.*

MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>
M:	Krzysztof Kozlowski <krzk@kernel.org>
M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
L:	linux-pm@vger.kernel.org
S:	Supported
F:	drivers/power/max14577_charger.c
@@ -7481,7 +7482,8 @@ F: include/dt-bindings/*/*max77802.h

MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
M:	Chanwoo Choi <cw00.choi@samsung.com>
M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>
M:	Krzysztof Kozlowski <krzk@kernel.org>
M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
L:	linux-kernel@vger.kernel.org
S:	Supported
F:	drivers/*/max14577*.c
@@ -9247,7 +9249,7 @@ F: drivers/pinctrl/sh-pfc/

PIN CONTROLLER - SAMSUNG
M:	Tomasz Figa <tomasz.figa@gmail.com>
M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>
M:	Krzysztof Kozlowski <krzk@kernel.org>
M:	Sylwester Nawrocki <s.nawrocki@samsung.com>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
@@ -10180,7 +10182,7 @@ S: Maintained
F:	drivers/platform/x86/samsung-laptop.c

SAMSUNG AUDIO (ASoC) DRIVERS
M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>
M:	Krzysztof Kozlowski <krzk@kernel.org>
M:	Sangbeom Kim <sbkim73@samsung.com>
M:	Sylwester Nawrocki <s.nawrocki@samsung.com>
L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -10195,7 +10197,8 @@ F: drivers/video/fbdev/s3c-fb.c

SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
M:	Sangbeom Kim <sbkim73@samsung.com>
M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>
M:	Krzysztof Kozlowski <krzk@kernel.org>
M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
L:	linux-kernel@vger.kernel.org
L:	linux-samsung-soc@vger.kernel.org
S:	Supported
@@ -10254,6 +10257,17 @@ S: Supported
L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
F:	drivers/clk/samsung/

SAMSUNG SPI DRIVERS
M:	Kukjin Kim <kgene@kernel.org>
M:	Krzysztof Kozlowski <krzk@kernel.org>
M:	Andi Shyti <andi.shyti@samsung.com>
L:	linux-spi@vger.kernel.org
L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/devicetree/bindings/spi/spi-samsung.txt
F:	drivers/spi/spi-s3c*
F:	include/linux/platform_data/spi-s3c64xx.h

SAMSUNG SXGBE DRIVERS
M:	Byungho An <bh74.an@samsung.com>
M:	Girish K S <ks.giri@samsung.com>
Loading