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

Commit 820b1a93 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v4.9-rc6' into patchwork 

Linux 4.9-rc6

* tag 'v4.9-rc6': (305 commits)
  Linux 4.9-rc6
  ext4: sanity check the block and cluster size at mount time
  fscrypto: don't use on-stack buffer for key derivation
  fscrypto: don't use on-stack buffer for filename encryption
  i2c: i2c-mux-pca954x: fix deselect enabling for device-tree
  kvm: x86: merge kvm_arch_set_irq and kvm_arch_set_irq_inatomic
  KVM: x86: fix missed SRCU usage in kvm_lapic_set_vapic_addr
  KVM: async_pf: avoid recursive flushing of work items
  kvm: kvmclock: let KVM_GET_CLOCK return whether the master clock is in use
  KVM: Disable irq while unregistering user notifier
  KVM: x86: do not go through vcpu in __get_kvmclock_ns
  MAINTAINERS: Add LED subsystem co-maintainer
  crypto: algif_hash - Fix NULL hash crash with shash
  powerpc/mm: Fix missing update of HID register on secondary CPUs
  KVM: arm64: Fix the issues when guest PMCCFILTR is configured
  arm64: KVM: pmu: Fix AArch32 cycle counter access
  powerpc/mm/radix: Invalidate ERAT on tlbiel for POWER9 DD1
  i2c: digicolor: use clk_disable_unprepare instead of clk_unprepare
  ipmi/bt-bmc: change compatible node to 'aspeed, ast2400-ibt-bmc'
  Revert "drm/mediatek: set vblank_disable_allowed to true"
  ...
parents 8c1d254f 9c763584

Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt→Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ perform in-band IPMI communication with their host. 


Required properties:



- compatible : should be "aspeed,ast2400-bt-bmc"

- compatible : should be "aspeed,ast2400-ibt-bmc"

- reg: physical address and size of the registers



Optional properties:
@@ -17,7 +17,7 @@ Optional properties: 
Example:



	ibt@1e789140 {

		compatible = "aspeed,ast2400-bt-bmc";

		compatible = "aspeed,ast2400-ibt-bmc";

		reg = <0x1e789140 0x18>;

		interrupts = <8>;

	};

Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Required properties: 


Optional properties:

- ti,dmic: phandle for the OMAP dmic node if the machine have it connected

- ti,jack_detection: Need to be present if the board capable to detect jack

- ti,jack-detection: Need to be present if the board capable to detect jack

  insertion, removal.



Available audio endpoints for the audio-routing table:

Documentation/networking/dsa/dsa.txt

+2 −1
Original line number Diff line number Diff line
@@ -67,13 +67,14 @@ Note that DSA does not currently create network interfaces for the "cpu" and 
Switch tagging protocols

------------------------



DSA currently supports 4 different tagging protocols, and a tag-less mode as

DSA currently supports 5 different tagging protocols, and a tag-less mode as

well. The different protocols are implemented in:



net/dsa/tag_trailer.c: Marvell's 4 trailer tag mode (legacy)

net/dsa/tag_dsa.c: Marvell's original DSA tag

net/dsa/tag_edsa.c: Marvell's enhanced DSA tag

net/dsa/tag_brcm.c: Broadcom's 4 bytes tag

net/dsa/tag_qca.c: Qualcomm's 2 bytes tag



The exact format of the tag protocol is vendor specific, but in general, they

all contain something which:

Documentation/virtual/kvm/api.txt

+11 −0
Original line number Diff line number Diff line
@@ -777,6 +777,17 @@ Gets the current timestamp of kvmclock as seen by the current guest. In 
conjunction with KVM_SET_CLOCK, it is used to ensure monotonicity on scenarios

such as migration.



When KVM_CAP_ADJUST_CLOCK is passed to KVM_CHECK_EXTENSION, it returns the

set of bits that KVM can return in struct kvm_clock_data's flag member.



The only flag defined now is KVM_CLOCK_TSC_STABLE.  If set, the returned

value is the exact kvmclock value seen by all VCPUs at the instant

when KVM_GET_CLOCK was called.  If clear, the returned value is simply

CLOCK_MONOTONIC plus a constant offset; the offset can be modified

with KVM_SET_CLOCK.  KVM will try to make all VCPUs follow this clock,

but the exact value read by each VCPU could differ, because the host

TSC is not stable.



struct kvm_clock_data {

	__u64 clock;  /* kvmclock current value */

	__u32 flags;

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -7084,6 +7084,7 @@ F: drivers/scsi/53c700* 
LED SUBSYSTEM

M:	Richard Purdie <rpurdie@rpsys.net>

M:	Jacek Anaszewski <j.anaszewski@samsung.com>

M:	Pavel Machek <pavel@ucw.cz>

L:	linux-leds@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git

S:	Maintained
@@ -8084,6 +8085,7 @@ F: drivers/infiniband/hw/mlx4/ 
F:	include/linux/mlx4/



MELLANOX MLX5 core VPI driver

M:	Saeed Mahameed <saeedm@mellanox.com>

M:	Matan Barak <matanb@mellanox.com>

M:	Leon Romanovsky <leonro@mellanox.com>

L:	netdev@vger.kernel.org