Commit f9aa9dc7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



All conflicts were simple overlapping changes except perhaps
for the Thunder driver.

That driver has a change_mtu method explicitly for sending
a message to the hardware.  If that fails it returns an
error.

Normally a driver doesn't need an ndo_change_mtu method becuase those
are usually just range changes, which are now handled generically.
But since this extra operation is needed in the Thunder driver, it has
to stay.

However, if the message send fails we have to restore the original
MTU before the change because the entire call chain expects that if
an error is thrown by ndo_change_mtu then the MTU did not change.
Therefore code is added to nicvf_change_mtu to remember the original
MTU, and to restore it upon nicvf_update_hw_max_frs() failue.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 06b37b65 3b404a51

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/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

+1 −0
Original line number Diff line number Diff line
@@ -7086,6 +7086,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

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Psychotic Stoned Sheep



# *DOCUMENTATION*
@@ -399,11 +399,12 @@ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ 
		   -fno-strict-aliasing -fno-common \

		   -Werror-implicit-function-declaration \

		   -Wno-format-security \

		   -std=gnu89

		   -std=gnu89 $(call cc-option,-fno-PIE)





KBUILD_AFLAGS_KERNEL :=

KBUILD_CFLAGS_KERNEL :=

KBUILD_AFLAGS   := -D__ASSEMBLY__

KBUILD_AFLAGS   := -D__ASSEMBLY__ $(call cc-option,-fno-PIE)

KBUILD_AFLAGS_MODULE  := -DMODULE

KBUILD_CFLAGS_MODULE  := -DMODULE

KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds

CRA Git | Maintained and supported by SUSTech CRA and CCSE