Skip to content

Commit 523aa35

Browse files
gregkhgregkh
committed
Merge 4.11-rc6 into driver-core-next
We want the fixes in here as well for testing. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents fd0f50d + 39da7c5 commit 523aa35

File tree

477 files changed

+6928
-2826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

477 files changed

+6928
-2826
lines changed

‎.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ Vlad Dogaru <[email protected]> <[email protected]>
171171
Vladimir Davydov <[email protected]> <[email protected]>
172172
Vladimir Davydov <[email protected]> <[email protected]>
173173
Takashi YOSHII <[email protected]>
174+
Yakir Yang <[email protected]> <[email protected]>
174175
Yusuke Goda <[email protected]>
175176
Gustavo Padovan <[email protected]>
176177
Gustavo Padovan <[email protected]>

‎Documentation/admin-guide/kernel-parameters.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1725,6 +1725,12 @@
17251725
kernel and module base offset ASLR (Address Space
17261726
Layout Randomization).
17271727

1728+
kasan_multi_shot
1729+
[KNL] Enforce KASAN (Kernel Address Sanitizer) to print
1730+
report on every invalid memory access. Without this
1731+
parameter KASAN will print report only for the first
1732+
invalid access.
1733+
17281734
keepinitrd [HW,ARM]
17291735

17301736
kernelcore= [KNL,X86,IA-64,PPC]

‎Documentation/devicetree/bindings/rng/omap_rng.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ Required properties:
1212
- reg : Offset and length of the register set for the module
1313
- interrupts : the interrupt number for the RNG module.
1414
Used for "ti,omap4-rng" and "inside-secure,safexcel-eip76"
15-
- clocks: the trng clock source
15+
- clocks: the trng clock source. Only mandatory for the
16+
"inside-secure,safexcel-eip76" compatible.
1617

1718
Example:
1819
/* AM335x */

‎Documentation/filesystems/Locking

+1-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ prototypes:
5858
int (*permission) (struct inode *, int, unsigned int);
5959
int (*get_acl)(struct inode *, int);
6060
int (*setattr) (struct dentry *, struct iattr *);
61-
int (*getattr) (const struct path *, struct dentry *, struct kstat *,
62-
u32, unsigned int);
61+
int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);
6362
ssize_t (*listxattr) (struct dentry *, char *, size_t);
6463
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);
6564
void (*update_time)(struct inode *, struct timespec *, int);

‎Documentation/filesystems/porting

+6
Original file line numberDiff line numberDiff line change
@@ -600,3 +600,9 @@ in your dentry operations instead.
600600
[recommended]
601601
->readlink is optional for symlinks. Don't set, unless filesystem needs
602602
to fake something for readlink(2).
603+
--
604+
[mandatory]
605+
->getattr() is now passed a struct path rather than a vfsmount and
606+
dentry separately, and it now has request_mask and query_flags arguments
607+
to specify the fields and sync type requested by statx. Filesystems not
608+
supporting any statx-specific features may ignore the new arguments.

‎Documentation/filesystems/vfs.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,7 @@ struct inode_operations {
382382
int (*permission) (struct inode *, int);
383383
int (*get_acl)(struct inode *, int);
384384
int (*setattr) (struct dentry *, struct iattr *);
385-
int (*getattr) (const struct path *, struct dentry *, struct kstat *,
386-
u32, unsigned int);
385+
int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);
387386
ssize_t (*listxattr) (struct dentry *, char *, size_t);
388387
void (*update_time)(struct inode *, struct timespec *, int);
389388
int (*atomic_open)(struct inode *, struct dentry *, struct file *,

‎Documentation/pinctrl.txt

+7-1
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,15 @@ static struct pinctrl_desc foo_desc = {
7777

7878
int __init foo_probe(void)
7979
{
80+
int error;
81+
8082
struct pinctrl_dev *pctl;
8183

82-
return pinctrl_register_and_init(&foo_desc, <PARENT>, NULL, &pctl);
84+
error = pinctrl_register_and_init(&foo_desc, <PARENT>, NULL, &pctl);
85+
if (error)
86+
return error;
87+
88+
return pinctrl_enable(pctl);
8389
}
8490

8591
To enable the pinctrl subsystem and the subgroups for PINMUX and PINCONF and

‎Documentation/process/stable-kernel-rules.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ specified in the following format in the sign-off area:
124124

125125
.. code-block:: none
126126
127-
Cc: <[email protected]> # 3.3.x-
127+
Cc: <[email protected]> # 3.3.x
128128
129129
The tag has the meaning of:
130130

‎Documentation/virtual/kvm/api.txt

+63
Original file line numberDiff line numberDiff line change
@@ -3377,6 +3377,69 @@ struct kvm_ppc_resize_hpt {
33773377
__u32 pad;
33783378
};
33793379

3380+
4.104 KVM_X86_GET_MCE_CAP_SUPPORTED
3381+
3382+
Capability: KVM_CAP_MCE
3383+
Architectures: x86
3384+
Type: system ioctl
3385+
Parameters: u64 mce_cap (out)
3386+
Returns: 0 on success, -1 on error
3387+
3388+
Returns supported MCE capabilities. The u64 mce_cap parameter
3389+
has the same format as the MSR_IA32_MCG_CAP register. Supported
3390+
capabilities will have the corresponding bits set.
3391+
3392+
4.105 KVM_X86_SETUP_MCE
3393+
3394+
Capability: KVM_CAP_MCE
3395+
Architectures: x86
3396+
Type: vcpu ioctl
3397+
Parameters: u64 mcg_cap (in)
3398+
Returns: 0 on success,
3399+
-EFAULT if u64 mcg_cap cannot be read,
3400+
-EINVAL if the requested number of banks is invalid,
3401+
-EINVAL if requested MCE capability is not supported.
3402+
3403+
Initializes MCE support for use. The u64 mcg_cap parameter
3404+
has the same format as the MSR_IA32_MCG_CAP register and
3405+
specifies which capabilities should be enabled. The maximum
3406+
supported number of error-reporting banks can be retrieved when
3407+
checking for KVM_CAP_MCE. The supported capabilities can be
3408+
retrieved with KVM_X86_GET_MCE_CAP_SUPPORTED.
3409+
3410+
4.106 KVM_X86_SET_MCE
3411+
3412+
Capability: KVM_CAP_MCE
3413+
Architectures: x86
3414+
Type: vcpu ioctl
3415+
Parameters: struct kvm_x86_mce (in)
3416+
Returns: 0 on success,
3417+
-EFAULT if struct kvm_x86_mce cannot be read,
3418+
-EINVAL if the bank number is invalid,
3419+
-EINVAL if VAL bit is not set in status field.
3420+
3421+
Inject a machine check error (MCE) into the guest. The input
3422+
parameter is:
3423+
3424+
struct kvm_x86_mce {
3425+
__u64 status;
3426+
__u64 addr;
3427+
__u64 misc;
3428+
__u64 mcg_status;
3429+
__u8 bank;
3430+
__u8 pad1[7];
3431+
__u64 pad2[3];
3432+
};
3433+
3434+
If the MCE being reported is an uncorrected error, KVM will
3435+
inject it as an MCE exception into the guest. If the guest
3436+
MCG_STATUS register reports that an MCE is in progress, KVM
3437+
causes an KVM_EXIT_SHUTDOWN vmexit.
3438+
3439+
Otherwise, if the MCE is a corrected error, KVM will just
3440+
store it in the corresponding bank (provided this bank is
3441+
not holding a previously reported uncorrected error).
3442+
33803443
5. The kvm_run structure
33813444
------------------------
33823445

‎Documentation/virtual/kvm/devices/arm-vgic.txt

+6
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ Groups:
8383

8484
Bits for undefined preemption levels are RAZ/WI.
8585

86+
For historical reasons and to provide ABI compatibility with userspace we
87+
export the GICC_PMR register in the format of the GICH_VMCR.VMPriMask
88+
field in the lower 5 bits of a word, meaning that userspace must always
89+
use the lower 5 bits to communicate with the KVM device and must shift the
90+
value left by 3 places to obtain the actual priority mask level.
91+
8692
Limitations:
8793
- Priorities are not implemented, and registers are RAZ/WI
8894
- Currently only implemented for KVM_DEV_TYPE_ARM_VGIC_V2.

‎MAINTAINERS

+20-4
Original file line numberDiff line numberDiff line change
@@ -4117,14 +4117,13 @@ F: drivers/block/drbd/
41174117
F: lib/lru_cache.c
41184118
F: Documentation/blockdev/drbd/
41194119

4120-
DRIVER CORE, KOBJECTS, DEBUGFS, KERNFS AND SYSFS
4120+
DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
41214121
M: Greg Kroah-Hartman <[email protected]>
41224122
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
41234123
S: Supported
41244124
F: Documentation/kobject.txt
41254125
F: drivers/base/
41264126
F: fs/debugfs/
4127-
F: fs/kernfs/
41284127
F: fs/sysfs/
41294128
F: include/linux/debugfs.h
41304129
F: include/linux/kobj*
@@ -4775,6 +4774,12 @@ L: [email protected]
47754774
S: Maintained
47764775
F: drivers/edac/mpc85xx_edac.[ch]
47774776

4777+
EDAC-PND2
4778+
M: Tony Luck <[email protected]>
4779+
L: [email protected]
4780+
S: Maintained
4781+
F: drivers/edac/pnd2_edac.[ch]
4782+
47784783
EDAC-PASEMI
47794784
M: Egor Martovetsky <[email protected]>
47804785
L: [email protected]
@@ -4922,6 +4927,7 @@ F: include/linux/netfilter_bridge/
49224927
F: net/bridge/
49234928

49244929
ETHERNET PHY LIBRARY
4930+
M: Andrew Lunn <[email protected]>
49254931
M: Florian Fainelli <[email protected]>
49264932
L: [email protected]
49274933
S: Maintained
@@ -7083,9 +7089,9 @@ S: Maintained
70837089
F: fs/autofs4/
70847090

70857091
KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
7092+
M: Masahiro Yamada <[email protected]>
70867093
M: Michal Marek <[email protected]>
7087-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git for-next
7088-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git rc-fixes
7094+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
70897095
L: [email protected]
70907096
S: Maintained
70917097
F: Documentation/kbuild/
@@ -7202,6 +7208,14 @@ F: arch/mips/include/uapi/asm/kvm*
72027208
F: arch/mips/include/asm/kvm*
72037209
F: arch/mips/kvm/
72047210

7211+
KERNFS
7212+
M: Greg Kroah-Hartman <[email protected]>
7213+
M: Tejun Heo <[email protected]>
7214+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
7215+
S: Supported
7216+
F: include/linux/kernfs.h
7217+
F: fs/kernfs/
7218+
72057219
KEXEC
72067220
M: Eric Biederman <[email protected]>
72077221
W: http://kernel.org/pub/linux/utils/kernel/kexec/
@@ -10808,6 +10822,7 @@ F: drivers/s390/block/dasd*
1080810822
F: block/partitions/ibm.c
1080910823

1081010824
S390 NETWORK DRIVERS
10825+
M: Julian Wiedmann <[email protected]>
1081110826
M: Ursula Braun <[email protected]>
1081210827
L: [email protected]
1081310828
W: http://www.ibm.com/developerworks/linux/linux390/
@@ -10838,6 +10853,7 @@ S: Supported
1083810853
F: drivers/s390/scsi/zfcp_*
1083910854

1084010855
S390 IUCV NETWORK LAYER
10856+
M: Julian Wiedmann <[email protected]>
1084110857
M: Ursula Braun <[email protected]>
1084210858
L: [email protected]
1084310859
W: http://www.ibm.com/developerworks/linux/linux390/

‎Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 4
22
PATCHLEVEL = 11
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc4
4+
EXTRAVERSION = -rc6
55
NAME = Fearless Coyote
66

77
# *DOCUMENTATION*
@@ -372,7 +372,7 @@ LDFLAGS_MODULE =
372372
CFLAGS_KERNEL =
373373
AFLAGS_KERNEL =
374374
LDFLAGS_vmlinux =
375-
CFLAGS_GCOV = -fprofile-arcs -ftest-coverage -fno-tree-loop-im -Wno-maybe-uninitialized
375+
CFLAGS_GCOV := -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,)
376376
CFLAGS_KCOV := $(call cc-option,-fsanitize-coverage=trace-pc,)
377377

378378

@@ -653,6 +653,12 @@ KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \
653653
# Tell gcc to never replace conditional load with a non-conditional one
654654
KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
655655

656+
# check for 'asm goto'
657+
ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
658+
KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
659+
KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
660+
endif
661+
656662
include scripts/Makefile.gcc-plugins
657663

658664
ifdef CONFIG_READABLE_ASM
@@ -798,12 +804,6 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types)
798804
# use the deterministic mode of AR if available
799805
KBUILD_ARFLAGS := $(call ar-option,D)
800806

801-
# check for 'asm goto'
802-
ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
803-
KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
804-
KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
805-
endif
806-
807807
include scripts/Makefile.kasan
808808
include scripts/Makefile.extrawarn
809809
include scripts/Makefile.ubsan

‎arch/alpha/kernel/osf_sys.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,7 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
12901290
/* copy relevant bits of struct timex. */
12911291
if (copy_from_user(&txc, txc_p, offsetof(struct timex32, time)) ||
12921292
copy_from_user(&txc.tick, &txc_p->tick, sizeof(struct timex32) -
1293-
offsetof(struct timex32, time)))
1293+
offsetof(struct timex32, tick)))
12941294
return -EFAULT;
12951295

12961296
ret = do_adjtimex(&txc);

‎arch/arc/boot/dts/skeleton.dtsi

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
device_type = "cpu";
2727
compatible = "snps,arc770d";
2828
reg = <0>;
29+
clocks = <&core_clk>;
2930
};
3031
};
3132

‎arch/arc/boot/dts/skeleton_hs.dtsi

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
device_type = "cpu";
2222
compatible = "snps,archs38";
2323
reg = <0>;
24+
clocks = <&core_clk>;
2425
};
2526
};
2627

‎arch/arc/boot/dts/skeleton_hs_idu.dtsi

+20-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,27 @@
1919

2020
cpu@0 {
2121
device_type = "cpu";
22-
compatible = "snps,archs38xN";
22+
compatible = "snps,archs38";
2323
reg = <0>;
24+
clocks = <&core_clk>;
25+
};
26+
cpu@1 {
27+
device_type = "cpu";
28+
compatible = "snps,archs38";
29+
reg = <1>;
30+
clocks = <&core_clk>;
31+
};
32+
cpu@2 {
33+
device_type = "cpu";
34+
compatible = "snps,archs38";
35+
reg = <2>;
36+
clocks = <&core_clk>;
37+
};
38+
cpu@3 {
39+
device_type = "cpu";
40+
compatible = "snps,archs38";
41+
reg = <3>;
42+
clocks = <&core_clk>;
2443
};
2544
};
2645

‎arch/arc/boot/dts/vdk_axs10x_mb.dtsi

+13-7
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,19 @@
112112
interrupts = <7>;
113113
bus-width = <4>;
114114
};
115+
};
115116

116-
/* Embedded Vision subsystem UIO mappings; only relevant for EV VDK */
117-
uio_ev: uio@0xD0000000 {
118-
compatible = "generic-uio";
119-
reg = <0xD0000000 0x2000 0xD1000000 0x2000 0x90000000 0x10000000 0xC0000000 0x10000000>;
120-
reg-names = "ev_gsa", "ev_ctrl", "ev_shared_mem", "ev_code_mem";
121-
interrupts = <23>;
122-
};
117+
/*
118+
* Embedded Vision subsystem UIO mappings; only relevant for EV VDK
119+
*
120+
* This node is intentionally put outside of MB above becase
121+
* it maps areas outside of MB's 0xEz-0xFz.
122+
*/
123+
uio_ev: uio@0xD0000000 {
124+
compatible = "generic-uio";
125+
reg = <0xD0000000 0x2000 0xD1000000 0x2000 0x90000000 0x10000000 0xC0000000 0x10000000>;
126+
reg-names = "ev_gsa", "ev_ctrl", "ev_shared_mem", "ev_code_mem";
127+
interrupt-parent = <&mb_intc>;
128+
interrupts = <23>;
123129
};
124130
};

‎arch/arc/include/asm/kprobes.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ int kprobe_fault_handler(struct pt_regs *regs, unsigned long cause);
5454
void kretprobe_trampoline(void);
5555
void trap_is_kprobe(unsigned long address, struct pt_regs *regs);
5656
#else
57-
static void trap_is_kprobe(unsigned long address, struct pt_regs *regs)
58-
{
59-
}
57+
#define trap_is_kprobe(address, regs)
6058
#endif /* CONFIG_KPROBES */
6159

6260
#endif /* _ARC_KPROBES_H */

0 commit comments

Comments
 (0)