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

Commit a3188666 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.14-rc1' of... 

Merge tag 'asoc-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.14

A few fixes, all in drivers.  Nothing stands out particularly, the
biggest set of fixes is some build coverage issues from Sachin.
parents e7729a41 e65523ca

Documentation/devicetree/bindings/sound/simple-card.txt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Example: 
sound {

	compatible = "simple-audio-card";

	simple-audio-card,format = "left_j";

	simple-audio-routing =

	simple-audio-card,routing =

		"MIC_IN", "Mic Jack",

		"Headphone Jack", "HP_OUT",

		"Ext Spk", "LINE_OUT";

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -9231,6 +9231,7 @@ F: include/media/videobuf2-* 


VIRTIO CONSOLE DRIVER

M:	Amit Shah <amit.shah@redhat.com>

L:	virtio-dev@lists.oasis-open.org

L:	virtualization@lists.linux-foundation.org

S:	Maintained

F:	drivers/char/virtio_console.c
@@ -9240,6 +9241,7 @@ F: include/uapi/linux/virtio_console.h 
VIRTIO CORE, NET AND BLOCK DRIVERS

M:	Rusty Russell <rusty@rustcorp.com.au>

M:	"Michael S. Tsirkin" <mst@redhat.com>

L:	virtio-dev@lists.oasis-open.org

L:	virtualization@lists.linux-foundation.org

S:	Maintained

F:	drivers/virtio/
@@ -9252,6 +9254,7 @@ F: include/uapi/linux/virtio_*.h 
VIRTIO HOST (VHOST)

M:	"Michael S. Tsirkin" <mst@redhat.com>

L:	kvm@vger.kernel.org

L:	virtio-dev@lists.oasis-open.org

L:	virtualization@lists.linux-foundation.org

L:	netdev@vger.kernel.org

S:	Maintained

Makefile

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

PATCHLEVEL = 13

SUBLEVEL = 0

EXTRAVERSION = -rc8

EXTRAVERSION =

NAME = One Giant Leap for Frogkind



# *DOCUMENTATION*

arch/arm/kernel/devtree.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ void __init arm_dt_init_cpu_maps(void) 


bool arch_match_cpu_phys_id(int cpu, u64 phys_id)

{

	return (phys_id & MPIDR_HWID_BITMASK) == cpu_logical_map(cpu);

	return phys_id == cpu_logical_map(cpu);

}



static const void * __init arch_get_next_mach(const char *const **match)

arch/arm/kernel/perf_event_cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static int probe_current_pmu(struct arm_pmu *pmu) 
static int cpu_pmu_device_probe(struct platform_device *pdev)

{

	const struct of_device_id *of_id;

	int (*init_fn)(struct arm_pmu *);

	const int (*init_fn)(struct arm_pmu *);

	struct device_node *node = pdev->dev.of_node;

	struct arm_pmu *pmu;

	int ret = -ENODEV;