Commit f89c326d authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge branch 'i2c/for-current-fixed' into i2c/for-5.8

parents 6fe12cdb efa7fb4c
Loading
Loading
Loading
Loading
+14 −4
Original line number Original line Diff line number Diff line
@@ -142,10 +142,13 @@ ForEachMacros:
  - 'for_each_card_auxs'
  - 'for_each_card_auxs'
  - 'for_each_card_auxs_safe'
  - 'for_each_card_auxs_safe'
  - 'for_each_card_components'
  - 'for_each_card_components'
  - 'for_each_card_dapms'
  - 'for_each_card_pre_auxs'
  - 'for_each_card_pre_auxs'
  - 'for_each_card_prelinks'
  - 'for_each_card_prelinks'
  - 'for_each_card_rtds'
  - 'for_each_card_rtds'
  - 'for_each_card_rtds_safe'
  - 'for_each_card_rtds_safe'
  - 'for_each_card_widgets'
  - 'for_each_card_widgets_safe'
  - 'for_each_cgroup_storage_type'
  - 'for_each_cgroup_storage_type'
  - 'for_each_child_of_node'
  - 'for_each_child_of_node'
  - 'for_each_clear_bit'
  - 'for_each_clear_bit'
@@ -160,6 +163,7 @@ ForEachMacros:
  - 'for_each_cpu_and'
  - 'for_each_cpu_and'
  - 'for_each_cpu_not'
  - 'for_each_cpu_not'
  - 'for_each_cpu_wrap'
  - 'for_each_cpu_wrap'
  - 'for_each_dapm_widgets'
  - 'for_each_dev_addr'
  - 'for_each_dev_addr'
  - 'for_each_dev_scope'
  - 'for_each_dev_scope'
  - 'for_each_displayid_db'
  - 'for_each_displayid_db'
@@ -170,7 +174,6 @@ ForEachMacros:
  - 'for_each_dpcm_fe'
  - 'for_each_dpcm_fe'
  - 'for_each_drhd_unit'
  - 'for_each_drhd_unit'
  - 'for_each_dss_dev'
  - 'for_each_dss_dev'
  - 'for_each_efi_handle'
  - 'for_each_efi_memory_desc'
  - 'for_each_efi_memory_desc'
  - 'for_each_efi_memory_desc_in_map'
  - 'for_each_efi_memory_desc_in_map'
  - 'for_each_element'
  - 'for_each_element'
@@ -191,6 +194,7 @@ ForEachMacros:
  - 'for_each_ip_tunnel_rcu'
  - 'for_each_ip_tunnel_rcu'
  - 'for_each_irq_nr'
  - 'for_each_irq_nr'
  - 'for_each_link_codecs'
  - 'for_each_link_codecs'
  - 'for_each_link_cpus'
  - 'for_each_link_platforms'
  - 'for_each_link_platforms'
  - 'for_each_lru'
  - 'for_each_lru'
  - 'for_each_matching_node'
  - 'for_each_matching_node'
@@ -250,6 +254,7 @@ ForEachMacros:
  - 'for_each_pci_bridge'
  - 'for_each_pci_bridge'
  - 'for_each_pci_dev'
  - 'for_each_pci_dev'
  - 'for_each_pci_msi_entry'
  - 'for_each_pci_msi_entry'
  - 'for_each_pcm_streams'
  - 'for_each_populated_zone'
  - 'for_each_populated_zone'
  - 'for_each_possible_cpu'
  - 'for_each_possible_cpu'
  - 'for_each_present_cpu'
  - 'for_each_present_cpu'
@@ -260,9 +265,12 @@ ForEachMacros:
  - 'for_each_property_of_node'
  - 'for_each_property_of_node'
  - 'for_each_registered_fb'
  - 'for_each_registered_fb'
  - 'for_each_reserved_mem_region'
  - 'for_each_reserved_mem_region'
  - 'for_each_rtd_codec_dai'
  - 'for_each_rtd_codec_dais'
  - 'for_each_rtd_codec_dai_rollback'
  - 'for_each_rtd_codec_dais_rollback'
  - 'for_each_rtd_components'
  - 'for_each_rtd_components'
  - 'for_each_rtd_cpu_dais'
  - 'for_each_rtd_cpu_dais_rollback'
  - 'for_each_rtd_dais'
  - 'for_each_set_bit'
  - 'for_each_set_bit'
  - 'for_each_set_bit_from'
  - 'for_each_set_bit_from'
  - 'for_each_set_clump8'
  - 'for_each_set_clump8'
@@ -334,6 +342,7 @@ ForEachMacros:
  - 'klp_for_each_object'
  - 'klp_for_each_object'
  - 'klp_for_each_object_safe'
  - 'klp_for_each_object_safe'
  - 'klp_for_each_object_static'
  - 'klp_for_each_object_static'
  - 'kunit_suite_for_each_test_case'
  - 'kvm_for_each_memslot'
  - 'kvm_for_each_memslot'
  - 'kvm_for_each_vcpu'
  - 'kvm_for_each_vcpu'
  - 'list_for_each'
  - 'list_for_each'
@@ -387,6 +396,7 @@ ForEachMacros:
  - 'of_property_for_each_string'
  - 'of_property_for_each_string'
  - 'of_property_for_each_u32'
  - 'of_property_for_each_u32'
  - 'pci_bus_for_each_resource'
  - 'pci_bus_for_each_resource'
  - 'pcm_for_each_format'
  - 'ping_portaddr_for_each_entry'
  - 'ping_portaddr_for_each_entry'
  - 'plist_for_each'
  - 'plist_for_each'
  - 'plist_for_each_continue'
  - 'plist_for_each_continue'
@@ -482,7 +492,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockBegin: ''
MacroBlockEnd: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
MaxEmptyLinesToKeep: 1
NamespaceIndentation: Inner
NamespaceIndentation: None
#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
ObjCBlockIndentWidth: 8
ObjCBlockIndentWidth: 8
ObjCSpaceAfterProperty: true
ObjCSpaceAfterProperty: true
+2 −0
Original line number Original line Diff line number Diff line
@@ -288,6 +288,8 @@ Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
Will Deacon <will@kernel.org> <will.deacon@arm.com>
Will Deacon <will@kernel.org> <will.deacon@arm.com>
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
Yusuke Goda <goda.yusuke@renesas.com>
Yusuke Goda <goda.yusuke@renesas.com>
Gustavo Padovan <gustavo@las.ic.unicamp.br>
Gustavo Padovan <gustavo@las.ic.unicamp.br>
+9 −6
Original line number Original line Diff line number Diff line
@@ -182,12 +182,15 @@ fix_padding
	space-efficient. If this option is not present, large padding is
	space-efficient. If this option is not present, large padding is
	used - that is for compatibility with older kernels.
	used - that is for compatibility with older kernels.



allow_discards
The journal mode (D/J), buffer_sectors, journal_watermark, commit_time can
	Allow block discard requests (a.k.a. TRIM) for the integrity device.
be changed when reloading the target (load an inactive table and swap the
	Discards are only allowed to devices using internal hash.
tables with suspend and resume). The other arguments should not be changed

when reloading the target because the layout of disk data depend on them
The journal mode (D/J), buffer_sectors, journal_watermark, commit_time and
and the reloaded target would be non-functional.
allow_discards can be changed when reloading the target (load an inactive
table and swap the tables with suspend and resume). The other arguments
should not be changed when reloading the target because the layout of disk
data depend on them and the reloaded target would be non-functional.




The layout of the formatted block device:
The layout of the formatted block device:
+1 −2
Original line number Original line Diff line number Diff line
@@ -5187,8 +5187,7 @@


	usbcore.old_scheme_first=
	usbcore.old_scheme_first=
			[USB] Start with the old device initialization
			[USB] Start with the old device initialization
			scheme,  applies only to low and full-speed devices
			scheme (default 0 = off).
			 (default 0 = off).


	usbcore.usbfs_memory_mb=
	usbcore.usbfs_memory_mb=
			[USB] Memory limit (in MB) for buffers allocated by
			[USB] Memory limit (in MB) for buffers allocated by
+19 −28
Original line number Original line Diff line number Diff line
@@ -390,9 +390,17 @@ When ``kptr_restrict`` is set to 2, kernel pointers printed using
modprobe
modprobe
========
========


This gives the full path of the modprobe command which the kernel will
The full path to the usermode helper for autoloading kernel modules,
use to load modules. This can be used to debug module loading
by default "/sbin/modprobe".  This binary is executed when the kernel
requests::
requests a module.  For example, if userspace passes an unknown
filesystem type to mount(), then the kernel will automatically request
the corresponding filesystem module by executing this usermode helper.
This usermode helper should insert the needed module into the kernel.

This sysctl only affects module autoloading.  It has no effect on the
ability to explicitly insert modules.

This sysctl can be used to debug module loading requests::


    echo '#! /bin/sh' > /tmp/modprobe
    echo '#! /bin/sh' > /tmp/modprobe
    echo 'echo "$@" >> /tmp/modprobe.log' >> /tmp/modprobe
    echo 'echo "$@" >> /tmp/modprobe.log' >> /tmp/modprobe
@@ -400,10 +408,15 @@ requests::
    chmod a+x /tmp/modprobe
    chmod a+x /tmp/modprobe
    echo /tmp/modprobe > /proc/sys/kernel/modprobe
    echo /tmp/modprobe > /proc/sys/kernel/modprobe


This only applies when the *kernel* is requesting that the module be
Alternatively, if this sysctl is set to the empty string, then module
loaded; it won't have any effect if the module is being loaded
autoloading is completely disabled.  The kernel will not try to
explicitly using ``modprobe`` from userspace.
execute a usermode helper at all, nor will it call the
kernel_module_request LSM hook.


If CONFIG_STATIC_USERMODEHELPER=y is set in the kernel configuration,
then the configured static usermode helper overrides this sysctl,
except that the empty string is still accepted to completely disable
module autoloading as described above.


modules_disabled
modules_disabled
================
================
@@ -446,28 +459,6 @@ Notes:
     successful IPC object allocation. If an IPC object allocation syscall
     successful IPC object allocation. If an IPC object allocation syscall
     fails, it is undefined if the value remains unmodified or is reset to -1.
     fails, it is undefined if the value remains unmodified or is reset to -1.


modprobe:
=========

The path to the usermode helper for autoloading kernel modules, by
default "/sbin/modprobe".  This binary is executed when the kernel
requests a module.  For example, if userspace passes an unknown
filesystem type to mount(), then the kernel will automatically request
the corresponding filesystem module by executing this usermode helper.
This usermode helper should insert the needed module into the kernel.

This sysctl only affects module autoloading.  It has no effect on the
ability to explicitly insert modules.

If this sysctl is set to the empty string, then module autoloading is
completely disabled.  The kernel will not try to execute a usermode
helper at all, nor will it call the kernel_module_request LSM hook.

If CONFIG_STATIC_USERMODEHELPER=y is set in the kernel configuration,
then the configured static usermode helper overrides this sysctl,
except that the empty string is still accepted to completely disable
module autoloading as described above.

nmi_watchdog
nmi_watchdog
============
============


Loading