Commit f77d26a9 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'x86/entry' into ras/core 

to fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific follow
up patches can be applied without creating a horrible merge conflict
afterwards.
parents b6bea24d f0178fc0

.clang-format

+15 −4
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ ForEachMacros: 
  - 'ax25_uid_for_each'

  - '__bio_for_each_bvec'

  - 'bio_for_each_bvec'

  - 'bio_for_each_bvec_all'

  - 'bio_for_each_integrity_vec'

  - '__bio_for_each_segment'

  - 'bio_for_each_segment'
@@ -142,10 +143,13 @@ ForEachMacros: 
  - 'for_each_card_auxs'

  - 'for_each_card_auxs_safe'

  - 'for_each_card_components'

  - 'for_each_card_dapms'

  - 'for_each_card_pre_auxs'

  - 'for_each_card_prelinks'

  - 'for_each_card_rtds'

  - 'for_each_card_rtds_safe'

  - 'for_each_card_widgets'

  - 'for_each_card_widgets_safe'

  - 'for_each_cgroup_storage_type'

  - 'for_each_child_of_node'

  - 'for_each_clear_bit'
@@ -160,6 +164,7 @@ ForEachMacros: 
  - 'for_each_cpu_and'

  - 'for_each_cpu_not'

  - 'for_each_cpu_wrap'

  - 'for_each_dapm_widgets'

  - 'for_each_dev_addr'

  - 'for_each_dev_scope'

  - 'for_each_displayid_db'
@@ -170,7 +175,6 @@ ForEachMacros: 
  - 'for_each_dpcm_fe'

  - 'for_each_drhd_unit'

  - 'for_each_dss_dev'

  - 'for_each_efi_handle'

  - 'for_each_efi_memory_desc'

  - 'for_each_efi_memory_desc_in_map'

  - 'for_each_element'
@@ -191,6 +195,7 @@ ForEachMacros: 
  - 'for_each_ip_tunnel_rcu'

  - 'for_each_irq_nr'

  - 'for_each_link_codecs'

  - 'for_each_link_cpus'

  - 'for_each_link_platforms'

  - 'for_each_lru'

  - 'for_each_matching_node'
@@ -250,6 +255,7 @@ ForEachMacros: 
  - 'for_each_pci_bridge'

  - 'for_each_pci_dev'

  - 'for_each_pci_msi_entry'

  - 'for_each_pcm_streams'

  - 'for_each_populated_zone'

  - 'for_each_possible_cpu'

  - 'for_each_present_cpu'
@@ -260,9 +266,12 @@ ForEachMacros: 
  - 'for_each_property_of_node'

  - 'for_each_registered_fb'

  - 'for_each_reserved_mem_region'

  - 'for_each_rtd_codec_dai'

  - 'for_each_rtd_codec_dai_rollback'

  - 'for_each_rtd_codec_dais'

  - 'for_each_rtd_codec_dais_rollback'

  - '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_from'

  - 'for_each_set_clump8'
@@ -334,6 +343,7 @@ ForEachMacros: 
  - 'klp_for_each_object'

  - 'klp_for_each_object_safe'

  - 'klp_for_each_object_static'

  - 'kunit_suite_for_each_test_case'

  - 'kvm_for_each_memslot'

  - 'kvm_for_each_vcpu'

  - 'list_for_each'
@@ -387,6 +397,7 @@ ForEachMacros: 
  - 'of_property_for_each_string'

  - 'of_property_for_each_u32'

  - 'pci_bus_for_each_resource'

  - 'pcm_for_each_format'

  - 'ping_portaddr_for_each_entry'

  - 'plist_for_each'

  - 'plist_for_each_continue'
@@ -482,7 +493,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false 
MacroBlockBegin: ''

MacroBlockEnd: ''

MaxEmptyLinesToKeep: 1

NamespaceIndentation: Inner

NamespaceIndentation: None

#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0

ObjCBlockIndentWidth: 8

ObjCSpaceAfterProperty: true

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ modules.order 
/linux

/vmlinux

/vmlinux.32

/vmlinux.symvers

/vmlinux-gdb.py

/vmlinuz

/System.map

.mailmap

+6 −1
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com> 
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leon Romanovsky <leon@kernel.org> <leon@leon.nu>

Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>

Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
@@ -234,7 +235,9 @@ Ralf Baechle <ralf@linux-mips.org> 
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>

Rémi Denis-Courmont <rdenis@simphalempin.com>

Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>

Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>

Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>

Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>

Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>

Rudolf Marek <R.Marek@sh.cvut.cz>

Rui Saraiva <rmps@joel.ist.utl.pt>
@@ -288,6 +291,8 @@ Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com> 
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.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>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

CREDITS

+4 −2
Original line number Diff line number Diff line
@@ -3104,14 +3104,16 @@ W: http://www.qsl.net/dl1bke/ 
D: Generic Z8530 driver, AX.25 DAMA slave implementation

D: Several AX.25 hacks



N: Ricardo Ribalda Delgado

E: ricardo.ribalda@gmail.com

N: Ricardo Ribalda

E: ribalda@kernel.org

W: http://ribalda.com

D: PLX USB338x driver

D: PCA9634 driver

D: Option GTM671WFS

D: Fintek F81216A

D: AD5761 iio driver

D: TI DAC7612 driver

D: Sony IMX214 driver

D: Various kernel hacks

S: Qtechnology A/S

S: Valby Langgade 142

Documentation/ABI/obsolete/sysfs-cpuidle

0 → 100644
+9 −0
Original line number Diff line number Diff line 
What:		/sys/devices/system/cpu/cpuidle/current_governor_ro

Date:		April, 2020

Contact:	linux-pm@vger.kernel.org

Description:

	current_governor_ro shows current using cpuidle governor, but read only.

	with the update that cpuidle governor can be changed at runtime in default,

	both current_governor and current_governor_ro co-exist under

	/sys/devices/system/cpu/cpuidle/ file, it's duplicate so make

	current_governor_ro obselete.