Commit 266d17a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-5.18-rc1' of... 

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
  ...
parents 02e2af20 88d99e87

Documentation/process/stable-kernel-rules.rst

+26 −6
Original line number Diff line number Diff line
@@ -35,7 +35,9 @@ Rules on what kind of patches are accepted, and which ones are not, into the 
Procedure for submitting patches to the -stable tree

----------------------------------------------------



 - Security patches should not be handled (solely) by the -stable review

.. note::



   Security patches should not be handled (solely) by the -stable review

   process but should follow the procedures in

   :ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`.
@@ -81,8 +83,8 @@ it to be applied to. 
:ref:`option_2` and :ref:`option_3` are more useful if the patch isn't deemed

worthy at the time it is applied to a public git tree (for instance, because

it deserves more regression testing first).  :ref:`option_3` is especially

useful if the patch needs some special handling to apply to an older kernel

(e.g., if API's have changed in the meantime).

useful if the original upstream patch needs to be backported (for example

the backport needs some special handling due to e.g. API changes).



Note that for :ref:`option_3`, if the patch deviates from the original

upstream patch (for example because it had to be backported) this must be very
@@ -151,8 +153,17 @@ Review cycle 
 - If the patch is rejected by a member of the committee, or linux-kernel

   members object to the patch, bringing up issues that the maintainers and

   members did not realize, the patch will be dropped from the queue.

 - At the end of the review cycle, the ACKed patches will be added to the

   latest -stable release, and a new -stable release will happen.

 - The ACKed patches will be posted again as part of release candidate (-rc)

   to be tested by developers and testers.

 - Usually only one -rc release is made, however if there are any outstanding

   issues, some patches may be modified or dropped or additional patches may

   be queued. Additional -rc releases are then released and tested until no

   issues are found.

 - Responding to the -rc releases can be done on the mailing list by sending

   a "Tested-by:" email with any testing information desired. The "Tested-by:"

   tags will be collected and added to the release commit.

 - At the end of the review cycle, the new -stable release will be released

   containing all the queued and tested patches.

 - Security patches will be accepted into the -stable tree directly from the

   security kernel team, and not go through the normal review cycle.

   Contact the kernel security team for more details on this procedure.
@@ -168,7 +179,16 @@ Trees 
 - The finalized and tagged releases of all stable kernels can be found

   in separate branches per version at:



	https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git

	https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git



 - The release candidate of all stable kernel versions can be found at:



        https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/



   .. warning::

      The -stable-rc tree is a snapshot in time of the stable-queue tree and

      will change frequently, hence will be rebased often. It should only be

      used for testing purposes (e.g. to be consumed by CI systems).





Review committee

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

+2 −2
Original line number Diff line number Diff line
@@ -3221,13 +3221,13 @@ static int __init rdtgroup_setup_root(void) 


	list_add(&rdtgroup_default.rdtgroup_list, &rdt_all_groups);



	ret = rdtgroup_add_files(rdt_root->kn, RF_CTRL_BASE);

	ret = rdtgroup_add_files(kernfs_root_to_node(rdt_root), RF_CTRL_BASE);

	if (ret) {

		kernfs_destroy_root(rdt_root);

		goto out;

	}



	rdtgroup_default.kn = rdt_root->kn;

	rdtgroup_default.kn = kernfs_root_to_node(rdt_root);

	kernfs_activate(rdtgroup_default.kn);



out:

drivers/base/component.c

+177 −123

File changed.

Preview size limit exceeded, changes collapsed.

drivers/base/dd.c

+34 −54

File changed.

Preview size limit exceeded, changes collapsed.

drivers/base/devres.c

+2 −2
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ EXPORT_SYMBOL_GPL(devres_release_group); 


/*

 * Custom devres actions allow inserting a simple function call

 * into the teadown sequence.

 * into the teardown sequence.

 */



struct action_devres {
@@ -916,7 +916,7 @@ void *devm_krealloc(struct device *dev, void *ptr, size_t new_size, gfp_t gfp) 


	/*

	 * We can copy the memory contents after releasing the lock as we're

	 * no longer modyfing the list links.

	 * no longer modifying the list links.

	 */

	memcpy(new_dr->data, old_dr->data,

	       total_old_size - offsetof(struct devres, data));