Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Browse files Browse the repository at this point in the history 
Minor SPDX change conflict.

Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@davem330
davem330 committed Jun 22, 2019
2 parents e0effb5 + c356dc4 commit 92ad632
Show file tree
Hide file tree
Showing 5,301 changed files with 7,190 additions and 26,605 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .mailmap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ Greg Kroah-Hartman <greg@echidna.(none)>
Greg Kroah-Hartman <[email protected]>
Greg Kroah-Hartman <[email protected]>
Gregory CLEMENT <[email protected]> <[email protected]>
Hanjun Guo <[email protected]> <[email protected]>
Henk Vergonet <[email protected]>
Henrik Kretzschmar <[email protected]>
Henrik Rydberg <[email protected]>
Expand Down Expand Up @@ -238,6 +239,7 @@ Vlad Dogaru <[email protected]> <[email protected]>
Vladimir Davydov <[email protected]> <[email protected]>
Vladimir Davydov <[email protected]> <[email protected]>
Takashi YOSHII <[email protected]>
Will Deacon <[email protected]> <[email protected]>
Yakir Yang <[email protected]> <[email protected]>
Yusuke Goda <[email protected]>
Gustavo Padovan <[email protected]>
Expand Down
22 changes: 11 additions & 11 deletions Documentation/ABI/testing/sysfs-bus-siox
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
What: /sys/bus/siox/devices/siox-X/active
KernelVersion: 4.16
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
Description:
On reading represents the current state of the bus. If it
contains a "0" the bus is stopped and connected devices are
Expand All @@ -12,7 +12,7 @@ Description:

What: /sys/bus/siox/devices/siox-X/device_add
KernelVersion: 4.16
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
Description:
Write-only file. Write

Expand All @@ -27,61 +27,61 @@ Description:

What: /sys/bus/siox/devices/siox-X/device_remove
KernelVersion: 4.16
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
Description:
Write-only file. A single write removes the last device in the siox chain.

What: /sys/bus/siox/devices/siox-X/poll_interval_ns
KernelVersion: 4.16
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
Description:
Defines the interval between two poll cycles in nano seconds.
Note this is rounded to jiffies on writing. On reading the current value
is returned.

What: /sys/bus/siox/devices/siox-X-Y/connected
KernelVersion: 4.16
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
Description:
Read-only value. "0" means the Yth device on siox bus X isn't "connected" i.e.
communication with it is not ensured. "1" signals a working connection.

What: /sys/bus/siox/devices/siox-X-Y/inbytes
KernelVersion: 4.16
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
Description:
Read-only value reporting the inbytes value provided to siox-X/device_add

What: /sys/bus/siox/devices/siox-X-Y/status_errors
KernelVersion: 4.16
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
Description:
Counts the number of time intervals when the read status byte doesn't yield the
expected value.

What: /sys/bus/siox/devices/siox-X-Y/type
KernelVersion: 4.16
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
Description:
Read-only value reporting the type value provided to siox-X/device_add.

What: /sys/bus/siox/devices/siox-X-Y/watchdog
KernelVersion: 4.16
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
Description:
Read-only value reporting if the watchdog of the siox device is
active. "0" means the watchdog is not active and the device is expected to
be operational. "1" means the watchdog keeps the device in reset.

What: /sys/bus/siox/devices/siox-X-Y/watchdog_errors
KernelVersion: 4.16
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
Description:
Read-only value reporting the number to time intervals when the
watchdog was active.

What: /sys/bus/siox/devices/siox-X-Y/outbytes
KernelVersion: 4.16
Contact: Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <[email protected]>
Contact: Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <[email protected]>
Description:
Read-only value reporting the outbytes value provided to siox-X/device_add.
4 changes: 2 additions & 2 deletions Documentation/driver-api/uio-howto.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@ fields of ``struct uio_mem``:
- ``int memtype``: Required if the mapping is used. Set this to
``UIO_MEM_PHYS`` if you you have physical memory on your card to be
mapped. Use ``UIO_MEM_LOGICAL`` for logical memory (e.g. allocated
with :c:func:`kmalloc()`). There's also ``UIO_MEM_VIRTUAL`` for
virtual memory.
with :c:func:`__get_free_pages()` but not kmalloc()). There's also
``UIO_MEM_VIRTUAL`` for virtual memory.

- ``phys_addr_t addr``: Required if the mapping is used. Fill in the
address of your memory block. This address is the one that appears in
Expand Down
2 changes: 1 addition & 1 deletion Documentation/fb/fbcon.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ C. Boot options

Select the initial font to use. The value 'name' can be any of the
compiled-in fonts: 10x18, 6x10, 7x14, Acorn8x8, MINI4x6,
PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, VGA8x16, VGA8x8.
PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, TER16x32, VGA8x16, VGA8x8.

Note, not all drivers can handle font with widths not divisible by 8,
such as vga16fb.
Expand Down
48 changes: 32 additions & 16 deletions Documentation/virtual/kvm/api.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@ yet and must be cleared on entry.

4.35 KVM_SET_USER_MEMORY_REGION

Capability: KVM_CAP_USER_MEM
Capability: KVM_CAP_USER_MEMORY
Architectures: all
Type: vm ioctl
Parameters: struct kvm_userspace_memory_region (in)
Expand Down Expand Up @@ -3857,43 +3857,59 @@ Type: vcpu ioctl
Parameters: struct kvm_nested_state (in/out)
Returns: 0 on success, -1 on error
Errors:
E2BIG: the total state size (including the fixed-size part of struct
kvm_nested_state) exceeds the value of 'size' specified by
E2BIG: the total state size exceeds the value of 'size' specified by
the user; the size required will be written into size.

struct kvm_nested_state {
__u16 flags;
__u16 format;
__u32 size;

union {
struct kvm_vmx_nested_state vmx;
struct kvm_svm_nested_state svm;
struct kvm_vmx_nested_state_hdr vmx;
struct kvm_svm_nested_state_hdr svm;

/* Pad the header to 128 bytes. */
__u8 pad[120];
};
__u8 data[0];
} hdr;

union {
struct kvm_vmx_nested_state_data vmx[0];
struct kvm_svm_nested_state_data svm[0];
} data;
};

#define KVM_STATE_NESTED_GUEST_MODE 0x00000001
#define KVM_STATE_NESTED_RUN_PENDING 0x00000002
#define KVM_STATE_NESTED_EVMCS 0x00000004

#define KVM_STATE_NESTED_SMM_GUEST_MODE 0x00000001
#define KVM_STATE_NESTED_SMM_VMXON 0x00000002
#define KVM_STATE_NESTED_FORMAT_VMX 0
#define KVM_STATE_NESTED_FORMAT_SVM 1

struct kvm_vmx_nested_state {
#define KVM_STATE_NESTED_VMX_VMCS_SIZE 0x1000

#define KVM_STATE_NESTED_VMX_SMM_GUEST_MODE 0x00000001
#define KVM_STATE_NESTED_VMX_SMM_VMXON 0x00000002

struct kvm_vmx_nested_state_hdr {
__u64 vmxon_pa;
__u64 vmcs_pa;
__u64 vmcs12_pa;

struct {
__u16 flags;
} smm;
};

struct kvm_vmx_nested_state_data {
__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];
__u8 shadow_vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];
};

This ioctl copies the vcpu's nested virtualization state from the kernel to
userspace.

The maximum size of the state, including the fixed-size part of struct
kvm_nested_state, can be retrieved by passing KVM_CAP_NESTED_STATE to
the KVM_CHECK_EXTENSION ioctl().
The maximum size of the state can be retrieved by passing KVM_CAP_NESTED_STATE
to the KVM_CHECK_EXTENSION ioctl().

4.115 KVM_SET_NESTED_STATE

Expand All @@ -3903,8 +3919,8 @@ Type: vcpu ioctl
Parameters: struct kvm_nested_state (in)
Returns: 0 on success, -1 on error

This copies the vcpu's kvm_nested_state struct from userspace to the kernel. For
the definition of struct kvm_nested_state, see KVM_GET_NESTED_STATE.
This copies the vcpu's kvm_nested_state struct from userspace to the kernel.
For the definition of struct kvm_nested_state, see KVM_GET_NESTED_STATE.

4.116 KVM_(UN)REGISTER_COALESCED_MMIO

Expand Down
27 changes: 13 additions & 14 deletions MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ F: drivers/acpi/fan.c

ACPI FOR ARM64 (ACPI/arm64)
M: Lorenzo Pieralisi <[email protected]>
M: Hanjun Guo <[email protected]>
M: Hanjun Guo <[email protected]>
M: Sudeep Holla <[email protected]>
L: [email protected]
L: [email protected] (moderated for non-subscribers)
Expand Down Expand Up @@ -1235,7 +1235,7 @@ F: arch/arm/lib/floppydma.S
F: arch/arm/include/asm/floppy.h

ARM PMU PROFILING AND DEBUGGING
M: Will Deacon <will[email protected]>
M: Will Deacon <will@kernel.org>
M: Mark Rutland <[email protected]>
S: Maintained
L: [email protected] (moderated for non-subscribers)
Expand Down Expand Up @@ -1307,7 +1307,7 @@ F: Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
F: drivers/irqchip/irq-vic.c

ARM SMMU DRIVERS
M: Will Deacon <will[email protected]>
M: Will Deacon <will@kernel.org>
R: Robin Murphy <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Maintained
Expand Down Expand Up @@ -2085,7 +2085,7 @@ F: drivers/tty/serial/msm_serial.c
F: drivers/usb/dwc3/dwc3-qcom.c
F: include/dt-bindings/*/qcom*
F: include/linux/*/qcom*
T: git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git

ARM/RADISYS ENP2611 MACHINE SUPPORT
M: Lennert Buytenhek <[email protected]>
Expand Down Expand Up @@ -2550,7 +2550,7 @@ F: drivers/i2c/busses/i2c-xiic.c

ARM64 PORT (AARCH64 ARCHITECTURE)
M: Catalin Marinas <[email protected]>
M: Will Deacon <will[email protected]>
M: Will Deacon <will@kernel.org>
L: [email protected] (moderated for non-subscribers)
T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
S: Maintained
Expand Down Expand Up @@ -2734,7 +2734,7 @@ S: Maintained
F: drivers/net/wireless/atmel/atmel*

ATOMIC INFRASTRUCTURE
M: Will Deacon <will[email protected]>
M: Will Deacon <will@kernel.org>
M: Peter Zijlstra <[email protected]>
R: Boqun Feng <[email protected]>
L: [email protected]
Expand Down Expand Up @@ -3121,7 +3121,7 @@ F: arch/arm/mach-bcm/

BROADCOM BCM2835 ARM ARCHITECTURE
M: Eric Anholt <[email protected]>
M: Stefan Wahren <[email protected]>
M: Stefan Wahren <[email protected]>
L: [email protected] (moderated for non-subscribers)
L: [email protected] (moderated for non-subscribers)
T: git git://github.com/anholt/linux
Expand Down Expand Up @@ -6227,7 +6227,6 @@ F: include/linux/ipmi-fru.h
K: fmc_d.*register

FPGA MANAGER FRAMEWORK
M: Alan Tull <[email protected]>
M: Moritz Fischer <[email protected]>
L: [email protected]
S: Maintained
Expand Down Expand Up @@ -8567,7 +8566,7 @@ S: Odd Fixes

KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
M: "J. Bruce Fields" <[email protected]>
M: Jeff Layton <[email protected]>
M: Chuck Lever <[email protected]>
L: [email protected]
W: http://nfs.sourceforge.net/
T: git git://linux-nfs.org/~bfields/linux.git
Expand Down Expand Up @@ -9122,7 +9121,7 @@ F: drivers/misc/lkdtm/*
LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
M: Alan Stern <[email protected]>
M: Andrea Parri <[email protected]>
M: Will Deacon <will[email protected]>
M: Will Deacon <will@kernel.org>
M: Peter Zijlstra <[email protected]>
M: Boqun Feng <[email protected]>
M: Nicholas Piggin <[email protected]>
Expand Down Expand Up @@ -9230,7 +9229,7 @@ F: Documentation/admin-guide/LSM/LoadPin.rst
LOCKING PRIMITIVES
M: Peter Zijlstra <[email protected]>
M: Ingo Molnar <[email protected]>
M: Will Deacon <will[email protected]>
M: Will Deacon <will@kernel.org>
L: [email protected]
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
S: Maintained
Expand Down Expand Up @@ -10552,7 +10551,7 @@ F: arch/arm/boot/dts/mmp*
F: arch/arm/mach-mmp/

MMU GATHER AND TLB INVALIDATION
M: Will Deacon <will[email protected]>
M: Will Deacon <will@kernel.org>
M: "Aneesh Kumar K.V" <[email protected]>
M: Andrew Morton <[email protected]>
M: Nick Piggin <[email protected]>
Expand Down Expand Up @@ -12050,7 +12049,7 @@ S: Maintained
F: drivers/pci/controller/dwc/*layerscape*

PCI DRIVER FOR GENERIC OF HOSTS
M: Will Deacon <will[email protected]>
M: Will Deacon <will@kernel.org>
L: [email protected]
L: [email protected] (moderated for non-subscribers)
S: Maintained
Expand Down Expand Up @@ -14415,7 +14414,7 @@ F: lib/test_siphash.c
F: include/linux/siphash.h

SIOX
M: Gavin Schenk <g.schenk@eckelmann.de>
M: Thorsten Scherer <t.scherer@eckelmann.de>
M: Uwe Kleine-König <[email protected]>
R: Pengutronix Kernel Team <[email protected]>
S: Supported
Expand Down
5 changes: 1 addition & 4 deletions arch/arc/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#

config ARC
def_bool y
Expand Down
5 changes: 1 addition & 4 deletions arch/arc/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#

KBUILD_DEFCONFIG := nsim_hs_defconfig

Expand Down
5 changes: 1 addition & 4 deletions arch/arc/boot/dts/axc001.dtsi
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (C) 2013-15 Synopsys, Inc. (www.synopsys.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

/*
Expand Down
5 changes: 1 addition & 4 deletions arch/arc/boot/dts/axc003.dtsi
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (C) 2014-15 Synopsys, Inc. (www.synopsys.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

/*
Expand Down
5 changes: 1 addition & 4 deletions arch/arc/boot/dts/axc003_idu.dtsi
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (C) 2014, 2015 Synopsys, Inc. (www.synopsys.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

/*
Expand Down
Loading

0 comments on commit 92ad632

Please sign in to comment.