Skip to content

Commit 649e441

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into core/urgent, to pick up dependent commits
We want to fix an objtool build warning that got introduced in the latest upstream kernel. Signed-off-by: Ingo Molnar <[email protected]>
2 parents 42f930d + 5cb0512 commit 649e441

File tree

12,646 files changed

+12975
-274
lines changed

Some content is hidden

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

12,646 files changed

+12975
-274
lines changed

‎Documentation/ABI/testing/sysfs-devices-power‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,7 @@ Description:
211211
device, after it has been suspended at run time, from a resume
212212
request to the moment the device will be ready to process I/O,
213213
in microseconds. If it is equal to 0, however, this means that
214-
the PM QoS resume latency may be arbitrary and the special value
215-
"n/a" means that user space cannot accept any resume latency at
216-
all for the given device.
214+
the PM QoS resume latency may be arbitrary.
217215

218216
Not all drivers support this attribute. If it isn't supported,
219217
it is not present.

‎Kbuild‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
#
23
# Kbuild for top-level directory of the kernel
34
# This file takes care of the following:

‎Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
#
23
# For a description of the syntax of this configuration file,
34
# see Documentation/kbuild/kconfig-language.txt.

‎MAINTAINERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6671,7 +6671,7 @@ F: include/net/ieee802154_netdev.h
66716671
F: Documentation/networking/ieee802154.txt
66726672

66736673
IFE PROTOCOL
6674-
M: Yotam Gigi <yotamg@mellanox.com>
6674+
M: Yotam Gigi <yotam.gi@gmail.com>
66756675
M: Jamal Hadi Salim <[email protected]>
66766676
F: net/ife
66776677
F: include/net/ife.h
@@ -8743,7 +8743,7 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/
87438743
F: drivers/net/ethernet/mellanox/mlxsw/
87448744

87458745
MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
8746-
M: Yotam Gigi <yotamg@mellanox.com>
8746+
M: mlxsw@mellanox.com
87478747
L: [email protected]
87488748
S: Supported
87498749
W: http://www.mellanox.com
@@ -10890,7 +10890,7 @@ S: Maintained
1089010890
F: drivers/block/ps3vram.c
1089110891

1089210892
PSAMPLE PACKET SAMPLING SUPPORT:
10893-
M: Yotam Gigi <yotamg@mellanox.com>
10893+
M: Yotam Gigi <yotam.gi@gmail.com>
1089410894
S: Maintained
1089510895
F: net/psample
1089610896
F: include/net/psample.h

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
VERSION = 4
23
PATCHLEVEL = 14
34
SUBLEVEL = 0

‎arch/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
#
23
# General architecture dependent options
34
#

‎arch/alpha/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
config ALPHA
23
bool
34
default y

‎arch/alpha/Kconfig.debug‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
menu "Kernel hacking"
23

34
source "lib/Kconfig.debug"

‎arch/alpha/boot/bootloader.lds‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
OUTPUT_FORMAT("elf64-alpha")
23
ENTRY(__start)
34
printk = srm_printk;

‎arch/alpha/boot/bootp.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* arch/alpha/boot/bootp.c
34
*

0 commit comments

Comments
 (0)