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

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

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

parents 8ade06c6 89307bab

Documentation/virtual/kvm/api.txt

+16 −0
Original line number Diff line number Diff line
@@ -1100,6 +1100,15 @@ emulate them efficiently. The fields in each entry are defined as follows: 
   eax, ebx, ecx, edx: the values returned by the cpuid instruction for

         this function/index combination



The TSC deadline timer feature (CPUID leaf 1, ecx[24]) is always returned

as false, since the feature depends on KVM_CREATE_IRQCHIP for local APIC

support.  Instead it is reported via



  ioctl(KVM_CHECK_EXTENSION, KVM_CAP_TSC_DEADLINE_TIMER)



if that returns true and you use KVM_CREATE_IRQCHIP, or if you emulate the

feature in userspace, then you can enable the feature for KVM_SET_CPUID2.



4.47 KVM_PPC_GET_PVINFO



Capability: KVM_CAP_PPC_GET_PVINFO
@@ -1151,6 +1160,13 @@ following flags are specified: 
/* Depends on KVM_CAP_IOMMU */

#define KVM_DEV_ASSIGN_ENABLE_IOMMU	(1 << 0)



The KVM_DEV_ASSIGN_ENABLE_IOMMU flag is a mandatory option to ensure

isolation of the device.  Usages not specifying this flag are deprecated.



Only PCI header type 0 devices with PCI BAR resources are supported by

device assignment.  The user requesting this ioctl must have read/write

access to the PCI sysfs resource files associated with the device.



4.49 KVM_DEASSIGN_PCI_DEVICE



Capability: KVM_CAP_DEVICE_DEASSIGNMENT

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2700,7 +2700,7 @@ FIREWIRE SUBSYSTEM 
M:	Stefan Richter <stefanr@s5r6.in-berlin.de>

L:	linux1394-devel@lists.sourceforge.net

W:	http://ieee1394.wiki.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git

S:	Maintained

F:	drivers/firewire/

F:	include/linux/firewire*.h

Makefile

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

PATCHLEVEL = 2

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/oprofile/common.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) 
	return oprofile_perf_init(ops);

}



void __exit oprofile_arch_exit(void)

void oprofile_arch_exit(void)

{

	oprofile_perf_exit();

}

arch/ia64/include/asm/cputime.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ typedef u64 cputime64_t; 
 */

#define cputime_to_usecs(__ct)		((__ct) / NSEC_PER_USEC)

#define usecs_to_cputime(__usecs)	((__usecs) * NSEC_PER_USEC)

#define usecs_to_cputime64(__usecs)	usecs_to_cputime(__usecs)



/*

 * Convert cputime <-> seconds