Commit a5bd4f8a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next 

Just one-liner which corrects a select statement for DRM_KMS_FB_HELPER
which looks like it was missed in the initial merge.  Based on 3.13.

* 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox: (55 commits)
  DRM: armada: fix missing DRM_KMS_FB_HELPER select
parents dee13f12 bed86f15

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;

arch/arm/kernel/traps.c

+3 −2
Original line number Diff line number Diff line
@@ -431,9 +431,10 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) 
			instr2 = __mem_to_opcode_thumb16(instr2);

			instr = __opcode_thumb32_compose(instr, instr2);

		}

	} else if (get_user(instr, (u32 __user *)pc)) {

		instr = __mem_to_opcode_arm(instr);

	} else {

		if (get_user(instr, (u32 __user *)pc))

			goto die_sig;

		instr = __mem_to_opcode_arm(instr);

	}



	if (call_undef_hook(regs, instr) == 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE