Skip to content

Commit 266d17a

Browse files
committed
Merge tag 'driver-core-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg KH: "Here is the set of driver core changes for 5.18-rc1. Not much here, primarily it was a bunch of cleanups and small updates: - kobj_type cleanups for default_groups - documentation updates - firmware loader minor changes - component common helper added and take advantage of it in many drivers (the largest part of this pull request). All of these have been in linux-next for a while with no reported problems" * tag 'driver-core-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (54 commits) Documentation: update stable review cycle documentation drivers/base/dd.c : Remove the initial value of the global variable Documentation: update stable tree link Documentation: add link to stable release candidate tree devres: fix typos in comments Documentation: add note block surrounding security patch note samples/kobject: Use sysfs_emit instead of sprintf base: soc: Make soc_device_match() simpler and easier to read driver core: dd: fix return value of __setup handler driver core: Refactor sysfs and drv/bus remove hooks driver core: Refactor multiple copies of device cleanup scripts: get_abi.pl: Fix typo in help message kernfs: fix typos in comments kernfs: remove unneeded #if 0 guard ALSA: hda/realtek: Make use of the helper component_compare_dev_name video: omapfb: dss: Make use of the helper component_compare_dev power: supply: ab8500: Make use of the helper component_compare_dev ASoC: codecs: wcd938x: Make use of the helper component_compare/release_of iommu/mediatek: Make use of the helper component_compare/release_of drm: of: Make use of the helper component_release_of ...
2 parents 02e2af2 + 88d99e8 commit 266d17a

File tree

51 files changed

+372
-430
lines changed

Some content is hidden

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

51 files changed

+372
-430
lines changed

Documentation/process/stable-kernel-rules.rst

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ Rules on what kind of patches are accepted, and which ones are not, into the
3535
Procedure for submitting patches to the -stable tree
3636
----------------------------------------------------
3737

38-
- Security patches should not be handled (solely) by the -stable review
38+
.. note::
39+
40+
Security patches should not be handled (solely) by the -stable review
3941
process but should follow the procedures in
4042
:ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`.
4143

@@ -81,8 +83,8 @@ it to be applied to.
8183
:ref:`option_2` and :ref:`option_3` are more useful if the patch isn't deemed
8284
worthy at the time it is applied to a public git tree (for instance, because
8385
it deserves more regression testing first). :ref:`option_3` is especially
84-
useful if the patch needs some special handling to apply to an older kernel
85-
(e.g., if API's have changed in the meantime).
86+
useful if the original upstream patch needs to be backported (for example
87+
the backport needs some special handling due to e.g. API changes).
8688

8789
Note that for :ref:`option_3`, if the patch deviates from the original
8890
upstream patch (for example because it had to be backported) this must be very
@@ -151,8 +153,17 @@ Review cycle
151153
- If the patch is rejected by a member of the committee, or linux-kernel
152154
members object to the patch, bringing up issues that the maintainers and
153155
members did not realize, the patch will be dropped from the queue.
154-
- At the end of the review cycle, the ACKed patches will be added to the
155-
latest -stable release, and a new -stable release will happen.
156+
- The ACKed patches will be posted again as part of release candidate (-rc)
157+
to be tested by developers and testers.
158+
- Usually only one -rc release is made, however if there are any outstanding
159+
issues, some patches may be modified or dropped or additional patches may
160+
be queued. Additional -rc releases are then released and tested until no
161+
issues are found.
162+
- Responding to the -rc releases can be done on the mailing list by sending
163+
a "Tested-by:" email with any testing information desired. The "Tested-by:"
164+
tags will be collected and added to the release commit.
165+
- At the end of the review cycle, the new -stable release will be released
166+
containing all the queued and tested patches.
156167
- Security patches will be accepted into the -stable tree directly from the
157168
security kernel team, and not go through the normal review cycle.
158169
Contact the kernel security team for more details on this procedure.
@@ -168,7 +179,16 @@ Trees
168179
- The finalized and tagged releases of all stable kernels can be found
169180
in separate branches per version at:
170181

171-
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
182+
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
183+
184+
- The release candidate of all stable kernel versions can be found at:
185+
186+
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/
187+
188+
.. warning::
189+
The -stable-rc tree is a snapshot in time of the stable-queue tree and
190+
will change frequently, hence will be rebased often. It should only be
191+
used for testing purposes (e.g. to be consumed by CI systems).
172192

173193

174194
Review committee

arch/x86/kernel/cpu/resctrl/rdtgroup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3221,13 +3221,13 @@ static int __init rdtgroup_setup_root(void)
32213221

32223222
list_add(&rdtgroup_default.rdtgroup_list, &rdt_all_groups);
32233223

3224-
ret = rdtgroup_add_files(rdt_root->kn, RF_CTRL_BASE);
3224+
ret = rdtgroup_add_files(kernfs_root_to_node(rdt_root), RF_CTRL_BASE);
32253225
if (ret) {
32263226
kernfs_destroy_root(rdt_root);
32273227
goto out;
32283228
}
32293229

3230-
rdtgroup_default.kn = rdt_root->kn;
3230+
rdtgroup_default.kn = kernfs_root_to_node(rdt_root);
32313231
kernfs_activate(rdtgroup_default.kn);
32323232

32333233
out:

0 commit comments

Comments
 (0)