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

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

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



Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	net/ipv4/tcp_metrics.c

Overlapping changes between the "don't create two tcp metrics objects
with the same key" race fix in net and the addition of the destination
address in the lookup key in net-next.

Minor overlapping changes in bnx2x driver.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7b1e46c5 7d0d46da

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -9230,6 +9230,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
@@ -9239,6 +9240,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/
@@ -9251,6 +9253,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 = -rc7

EXTRAVERSION = -rc8

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)