forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
S390 bpf_jit.S is removed in net-next and had changes in 'net', since that code isn't used any more take the removal. TLS data structures split the TX and RX components in 'net-next', put the new struct members from the bug fix in 'net' into the RX part. The 'net-next' tree had some reworking of how the ERSPAN code works in the GRE tunneling code, overlapping with a one-line headroom calculation fix in 'net'. Overlapping changes in __sock_map_ctx_update_elem(), keep the bits that read the prog members via READ_ONCE() into local variables before using them. Signed-off-by: David S. Miller <[email protected]>
- Loading branch information
Showing
340 changed files
with
4,334 additions
and
1,831 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -244,3 +244,11 @@ Description: read only | |
Returns 1 if the psl timebase register is synchronized | ||
with the core timebase register, 0 otherwise. | ||
Users: https://github.com/ibm-capi/libcxl | ||
|
||
What: /sys/class/cxl/<card>/tunneled_ops_supported | ||
Date: May 2018 | ||
Contact: [email protected] | ||
Description: read only | ||
Returns 1 if tunneled operations are supported in capi mode, | ||
0 otherwise. | ||
Users: https://github.com/ibm-capi/libcxl |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3690,7 +3690,6 @@ F: drivers/cpufreq/arm_big_little_dt.c | |
|
||
CPU POWER MONITORING SUBSYSTEM | ||
M: Thomas Renninger <[email protected]> | ||
M: Shuah Khan <[email protected]> | ||
M: Shuah Khan <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
|
@@ -4309,7 +4308,7 @@ F: Documentation/driver-api/dma-buf.rst | |
T: git git://anongit.freedesktop.org/drm/drm-misc | ||
|
||
DMA GENERIC OFFLOAD ENGINE SUBSYSTEM | ||
M: Vinod Koul <[email protected]> | ||
M: Vinod Koul <[email protected]> | ||
L: [email protected] | ||
Q: https://patchwork.kernel.org/project/linux-dmaengine/list/ | ||
S: Maintained | ||
|
@@ -7694,10 +7693,10 @@ F: include/linux/sunrpc/ | |
F: include/uapi/linux/sunrpc/ | ||
|
||
KERNEL SELFTEST FRAMEWORK | ||
M: Shuah Khan <[email protected]> | ||
M: Shuah Khan <[email protected]> | ||
L: [email protected] | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git | ||
Q: https://patchwork.kernel.org/project/linux-kselftest/list/ | ||
S: Maintained | ||
F: tools/testing/selftests/ | ||
F: Documentation/dev-tools/kselftest* | ||
|
@@ -12218,7 +12217,7 @@ F: Documentation/s390/vfio-ccw.txt | |
F: include/uapi/linux/vfio_ccw.h | ||
|
||
S390 ZCRYPT DRIVER | ||
M: Harald Freudenberger <freude@de.ibm.com> | ||
M: Harald Freudenberger <freude@linux.ibm.com> | ||
L: [email protected] | ||
W: http://www.ibm.com/developerworks/linux/linux390/ | ||
S: Supported | ||
|
@@ -13262,6 +13261,12 @@ M: Jan-Benedict Glaw <[email protected]> | |
S: Maintained | ||
F: arch/alpha/kernel/srm_env.c | ||
|
||
ST STM32 I2C/SMBUS DRIVER | ||
M: Pierre-Yves MORDRET <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/i2c/busses/i2c-stm32* | ||
|
||
STABLE BRANCH | ||
M: Greg Kroah-Hartman <[email protected]> | ||
L: [email protected] | ||
|
@@ -14649,7 +14654,6 @@ F: drivers/usb/common/usb-otg-fsm.c | |
|
||
USB OVER IP DRIVER | ||
M: Valentina Manea <[email protected]> | ||
M: Shuah Khan <[email protected]> | ||
M: Shuah Khan <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.