Skip to content

Commit ec57e2f

Browse files
author
Ingo Molnar
committed
Merge branch 'x86/build' into locking/core, to pick up dependent patches and unify jump-label work
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 4766ab5 + 72a9c67 commit ec57e2f

File tree

813 files changed

+8080
-4630
lines changed

Some content is hidden

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

813 files changed

+8080
-4630
lines changed

‎Documentation/ABI/stable/sysfs-devices-system-xen_memory

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,12 @@ Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
7575
Description:
7676
Amount (in KiB) of low (or normal) memory in the
7777
balloon.
78+
79+
What: /sys/devices/system/xen_memory/xen_memory0/scrub_pages
80+
Date: September 2018
81+
KernelVersion: 4.20
82+
Contact: xen-devel@lists.xenproject.org
83+
Description:
84+
Control scrubbing pages before returning them to Xen for others domains
85+
use. Can be set with xen_scrub_pages cmdline
86+
parameter. Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5000,6 +5000,12 @@
50005000
Disables the PV optimizations forcing the HVM guest to
50015001
run as generic HVM guest with no PV drivers.
50025002

5003+
xen_scrub_pages= [XEN]
5004+
Boolean option to control scrubbing pages before giving them back
5005+
to Xen, for use by other domains. Can be also changed at runtime
5006+
with /sys/devices/system/xen_memory/xen_memory0/scrub_pages.
5007+
Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.
5008+
50035009
xirc2ps_cs= [NET,PCMCIA]
50045010
Format:
50055011
<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

‎Documentation/device-mapper/dm-raid.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,3 +348,7 @@ Version History
348348
1.13.1 Fix deadlock caused by early md_stop_writes(). Also fix size an
349349
state races.
350350
1.13.2 Fix raid redundancy validation and avoid keeping raid set frozen
351+
1.14.0 Fix reshape race on small devices. Fix stripe adding reshape
352+
deadlock/potential data corruption. Update superblock when
353+
specific devices are requested via rebuild. Fix RAID leg
354+
rebuild errors.

‎Documentation/devicetree/bindings/input/gpio-keys.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Device-Tree bindings for input/gpio_keys.c keyboard driver
1+
Device-Tree bindings for input/keyboard/gpio_keys.c keyboard driver
22

33
Required properties:
44
- compatible = "gpio-keys";

‎Documentation/devicetree/bindings/net/macb.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Required properties:
1010
Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
1111
the Cadence GEM, or the generic form: "cdns,gem".
1212
Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.
13+
Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.
1314
Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
1415
Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
1516
Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

‎Documentation/fb/uvesafb.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ than x86. Check the v86d documentation for a list of currently supported
1515
arches.
1616

1717
v86d source code can be downloaded from the following website:
18-
http://dev.gentoo.org/~spock/projects/uvesafb
18+
19+
https://github.com/mjanusz/v86d
1920

2021
Please refer to the v86d documentation for detailed configuration and
2122
installation instructions.
@@ -177,7 +178,7 @@ from the Video BIOS if you set pixclock to 0 in fb_var_screeninfo.
177178

178179
--
179180
Michal Januszewski <spock@gentoo.org>
180-
Last updated: 2009-03-30
181+
Last updated: 2017-10-10
181182

182183
Documentation of the uvesafb options is loosely based on vesafb.txt.
183184

‎Documentation/filesystems/vfs.txt

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ struct file_operations
848848
----------------------
849849

850850
This describes how the VFS can manipulate an open file. As of kernel
851-
4.1, the following members are defined:
851+
4.18, the following members are defined:
852852

853853
struct file_operations {
854854
struct module *owner;
@@ -858,11 +858,11 @@ struct file_operations {
858858
ssize_t (*read_iter) (struct kiocb *, struct iov_iter *);
859859
ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
860860
int (*iterate) (struct file *, struct dir_context *);
861+
int (*iterate_shared) (struct file *, struct dir_context *);
861862
__poll_t (*poll) (struct file *, struct poll_table_struct *);
862863
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
863864
long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
864865
int (*mmap) (struct file *, struct vm_area_struct *);
865-
int (*mremap)(struct file *, struct vm_area_struct *);
866866
int (*open) (struct inode *, struct file *);
867867
int (*flush) (struct file *, fl_owner_t id);
868868
int (*release) (struct inode *, struct file *);
@@ -882,6 +882,10 @@ struct file_operations {
882882
#ifndef CONFIG_MMU
883883
unsigned (*mmap_capabilities)(struct file *);
884884
#endif
885+
ssize_t (*copy_file_range)(struct file *, loff_t, struct file *, loff_t, size_t, unsigned int);
886+
int (*clone_file_range)(struct file *, loff_t, struct file *, loff_t, u64);
887+
int (*dedupe_file_range)(struct file *, loff_t, struct file *, loff_t, u64);
888+
int (*fadvise)(struct file *, loff_t, loff_t, int);
885889
};
886890

887891
Again, all methods are called without any locks being held, unless
@@ -899,6 +903,9 @@ otherwise noted.
899903

900904
iterate: called when the VFS needs to read the directory contents
901905

906+
iterate_shared: called when the VFS needs to read the directory contents
907+
when filesystem supports concurrent dir iterators
908+
902909
poll: called by the VFS when a process wants to check if there is
903910
activity on this file and (optionally) go to sleep until there
904911
is activity. Called by the select(2) and poll(2) system calls
@@ -951,6 +958,16 @@ otherwise noted.
951958

952959
fallocate: called by the VFS to preallocate blocks or punch a hole.
953960

961+
copy_file_range: called by the copy_file_range(2) system call.
962+
963+
clone_file_range: called by the ioctl(2) system call for FICLONERANGE and
964+
FICLONE commands.
965+
966+
dedupe_file_range: called by the ioctl(2) system call for FIDEDUPERANGE
967+
command.
968+
969+
fadvise: possibly called by the fadvise64() system call.
970+
954971
Note that the file operations are implemented by the specific
955972
filesystem in which the inode resides. When opening a device node
956973
(character or block special) most filesystems will call special

‎Documentation/media/uapi/dvb/video_function_calls.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,3 @@ Video Function Calls
3333
video-clear-buffer
3434
video-set-streamtype
3535
video-set-format
36-
video-set-attributes

‎Documentation/process/code-of-conduct.rst

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
Contributor Covenant Code of Conduct
2+
++++++++++++++++++++++++++++++++++++
3+
4+
Our Pledge
5+
==========
6+
7+
In the interest of fostering an open and welcoming environment, we as
8+
contributors and maintainers pledge to making participation in our project and
9+
our community a harassment-free experience for everyone, regardless of age, body
10+
size, disability, ethnicity, sex characteristics, gender identity and
11+
expression, level of experience, education, socio-economic status, nationality,
12+
personal appearance, race, religion, or sexual identity and orientation.
13+
14+
Our Standards
15+
=============
16+
17+
Examples of behavior that contributes to creating a positive environment
18+
include:
19+
20+
* Using welcoming and inclusive language
21+
* Being respectful of differing viewpoints and experiences
22+
* Gracefully accepting constructive criticism
23+
* Focusing on what is best for the community
24+
* Showing empathy towards other community members
25+
26+
27+
Examples of unacceptable behavior by participants include:
28+
29+
* The use of sexualized language or imagery and unwelcome sexual attention or
30+
advances
31+
* Trolling, insulting/derogatory comments, and personal or political attacks
32+
* Public or private harassment
33+
* Publishing others’ private information, such as a physical or electronic
34+
address, without explicit permission
35+
* Other conduct which could reasonably be considered inappropriate in a
36+
professional setting
37+
38+
39+
Our Responsibilities
40+
====================
41+
42+
Maintainers are responsible for clarifying the standards of acceptable behavior
43+
and are expected to take appropriate and fair corrective action in response to
44+
any instances of unacceptable behavior.
45+
46+
Maintainers have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, or to ban temporarily or permanently any
49+
contributor for other behaviors that they deem inappropriate, threatening,
50+
offensive, or harmful.
51+
52+
Scope
53+
=====
54+
55+
This Code of Conduct applies both within project spaces and in public spaces
56+
when an individual is representing the project or its community. Examples of
57+
representing a project or community include using an official project e-mail
58+
address, posting via an official social media account, or acting as an appointed
59+
representative at an online or offline event. Representation of a project may be
60+
further defined and clarified by project maintainers.
61+
62+
Enforcement
63+
===========
64+
65+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
66+
reported by contacting the Technical Advisory Board (TAB) at
67+
<tab@lists.linux-foundation.org>. All complaints will be reviewed and
68+
investigated and will result in a response that is deemed necessary and
69+
appropriate to the circumstances. The TAB is obligated to maintain
70+
confidentiality with regard to the reporter of an incident. Further details of
71+
specific enforcement policies may be posted separately.
72+
73+
Maintainers who do not follow or enforce the Code of Conduct in good faith may
74+
face temporary or permanent repercussions as determined by other members of the
75+
project’s leadership.
76+
77+
Attribution
78+
===========
79+
80+
This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
81+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

‎Documentation/process/code-of-conflict.rst

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎Documentation/process/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Below are the essential guides that every developer should read.
2020
:maxdepth: 1
2121

2222
howto
23-
code-of-conflict
23+
code-of-conduct
2424
development-process
2525
submitting-patches
2626
coding-style

‎Documentation/virtual/kvm/api.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4510,7 +4510,8 @@ Do not enable KVM_FEATURE_PV_UNHALT if you disable HLT exits.
45104510
Architectures: s390
45114511
Parameters: none
45124512
Returns: 0 on success, -EINVAL if hpage module parameter was not set
4513-
or cmma is enabled
4513+
or cmma is enabled, or the VM has the KVM_VM_S390_UCONTROL
4514+
flag set
45144515

45154516
With this capability the KVM support for memory backing with 1m pages
45164517
through hugetlbfs can be enabled for a VM. After the capability is
@@ -4521,6 +4522,15 @@ hpage module parameter is not set to 1, -EINVAL is returned.
45214522
While it is generally possible to create a huge page backed VM without
45224523
this capability, the VM will not be able to run.
45234524

4525+
7.14 KVM_CAP_MSR_PLATFORM_INFO
4526+
4527+
Architectures: x86
4528+
Parameters: args[0] whether feature should be enabled or not
4529+
4530+
With this capability, a guest may read the MSR_PLATFORM_INFO MSR. Otherwise,
4531+
a #GP would be raised when the guest tries to access. Currently, this
4532+
capability does not enable write permissions of this MSR for the guest.
4533+
45244534
8. Other capabilities.
45254535
----------------------
45264536

‎Documentation/x86/earlyprintk.txt

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,25 @@ and two USB cables, connected like this:
3535
( If your system does not list a debug port capability then you probably
3636
won't be able to use the USB debug key. )
3737

38-
b.) You also need a Netchip USB debug cable/key:
38+
b.) You also need a NetChip USB debug cable/key:
3939

4040
http://www.plxtech.com/products/NET2000/NET20DC/default.asp
4141

42-
This is a small blue plastic connector with two USB connections,
42+
This is a small blue plastic connector with two USB connections;
4343
it draws power from its USB connections.
4444

4545
c.) You need a second client/console system with a high speed USB 2.0
4646
port.
4747

48-
d.) The Netchip device must be plugged directly into the physical
48+
d.) The NetChip device must be plugged directly into the physical
4949
debug port on the "host/target" system. You cannot use a USB hub in
5050
between the physical debug port and the "host/target" system.
5151

5252
The EHCI debug controller is bound to a specific physical USB
53-
port and the Netchip device will only work as an early printk
53+
port and the NetChip device will only work as an early printk
5454
device in this port. The EHCI host controllers are electrically
5555
wired such that the EHCI debug controller is hooked up to the
56-
first physical and there is no way to change this via software.
56+
first physical port and there is no way to change this via software.
5757
You can find the physical port through experimentation by trying
5858
each physical port on the system and rebooting. Or you can try
5959
and use lsusb or look at the kernel info messages emitted by the
@@ -65,9 +65,9 @@ and two USB cables, connected like this:
6565
to the hardware vendor, because there is no reason not to wire
6666
this port into one of the physically accessible ports.
6767

68-
e.) It is also important to note, that many versions of the Netchip
68+
e.) It is also important to note, that many versions of the NetChip
6969
device require the "client/console" system to be plugged into the
70-
right and side of the device (with the product logo facing up and
70+
right hand side of the device (with the product logo facing up and
7171
readable left to right). The reason being is that the 5 volt
7272
power supply is taken from only one side of the device and it
7373
must be the side that does not get rebooted.
@@ -81,13 +81,18 @@ and two USB cables, connected like this:
8181
CONFIG_EARLY_PRINTK_DBGP=y
8282

8383
And you need to add the boot command line: "earlyprintk=dbgp".
84+
8485
(If you are using Grub, append it to the 'kernel' line in
85-
/etc/grub.conf)
86+
/etc/grub.conf. If you are using Grub2 on a BIOS firmware system,
87+
append it to the 'linux' line in /boot/grub2/grub.cfg. If you are
88+
using Grub2 on an EFI firmware system, append it to the 'linux'
89+
or 'linuxefi' line in /boot/grub2/grub.cfg or
90+
/boot/efi/EFI/<distro>/grub.cfg.)
8691

8792
On systems with more than one EHCI debug controller you must
8893
specify the correct EHCI debug controller number. The ordering
8994
comes from the PCI bus enumeration of the EHCI controllers. The
90-
default with no number argument is "0" the first EHCI debug
95+
default with no number argument is "0" or the first EHCI debug
9196
controller. To use the second EHCI debug controller, you would
9297
use the command line: "earlyprintk=dbgp1"
9398

@@ -111,7 +116,7 @@ and two USB cables, connected like this:
111116
see the raw output.
112117

113118
c.) On Nvidia Southbridge based systems: the kernel will try to probe
114-
and find out which port has debug device connected.
119+
and find out which port has a debug device connected.
115120

116121
3. Testing that it works fine:
117122

0 commit comments

Comments
 (0)