diff mbox series

linux-next: manual merge of the drivers-x86 tree with Linus' tree

Message ID 20240208125744.300635a2@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the drivers-x86 tree with Linus' tree |

Commit Message

Stephen Rothwell Feb. 8, 2024, 1:57 a.m. UTC 
  Hi all,

Today's linux-next merge of the drivers-x86 tree got a conflict in:

  drivers/platform/x86/wmi.c

between commit:

  3ea7f59af8ff ("platform/x86: wmi: Decouple legacy WMI notify handlers from wmi_block_list")

from Linus' tree and commit:

  10fdfd13a359 ("platform: x86: wmi: make wmi_bus_type const")

from the drivers-x86 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff mbox series

Patch

diff --cc drivers/platform/x86/wmi.c
index 3c288e8f404b,5682c7de0394..000000000000
--- a/drivers/platform/x86/wmi.c