mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Armin Wolf <W_Armin@gmx.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
	Hans de Goede <hdegoede@redhat.com>,
	Mark Gross <markgross@kernel.org>
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
	"Jai Luthra" <jai.luthra@ideasonboard.com>,
	"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
	"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the staging tree with the drivers-x86 tree
Date: Fri, 21 Nov 2025 05:49:51 +0100	[thread overview]
Message-ID: <6465e1ba-54e2-4823-b8e7-d3f12b11fd10@gmx.de> (raw)
In-Reply-To: <20251121142512.371a77fe@canb.auug.org.au>

Am 21.11.25 um 04:25 schrieb Stephen Rothwell:

> Hi all,
>
> Today's linux-next merge of the staging tree got conflicts in:
>
>    drivers/platform/Kconfig
>    drivers/platform/Makefile
>
> between commit:
>
>    e2c1b56f3dfa ("platform/x86: wmi: Move WMI core code into a separate directory")
>
> from the drivers-x86 tree and commit:
>
>    aa125180c673 ("platform/raspberrypi: Destage VCHIQ interface")
>
> from the staging 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.

The fixup seems fine to me as far as the WMI driver core is concerned, but
the entries for the Raspberry Pi seem to contain some leading whitespaces.

Thanks,
Armin Wolf


  reply	other threads:[~2025-11-21  4:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-21  3:25 Stephen Rothwell
2025-11-21  4:49 ` Armin Wolf [this message]
2025-12-08  0:39 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6465e1ba-54e2-4823-b8e7-d3f12b11fd10@gmx.de \
    --to=w_armin@gmx.de \
    --cc=greg@kroah.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hdegoede@redhat.com \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=jai.luthra@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=markgross@kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®