LKML Archive on
help / color / mirror / Atom feed
From: Kalle Valo <>
To: Stephen Rothwell <>
Cc: Wireless <>,
	Petr Mladek <>, Chris Down <>,
	Linux Kernel Mailing List <>,
	Linux Next Mailing List <>,
	Lukas Bulwahn <>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the printk tree
Date: Tue, 17 Aug 2021 20:01:16 +0300	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <> (Stephen Rothwell's message of "Mon, 9 Aug 2021 13:18:13 +1000")

Stephen Rothwell <> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
> between commit:
>   337015573718 ("printk: Userspace format indexing support")
> from the printk tree and commit:
>   d249ff28b1d8 ("intersil: remove obsolete prism54 wireless driver")
> from the wireless-drivers-next 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.

Thanks, the conflict is trivial enough so Linus should handle it without


  reply	other threads:[~2021-08-17 17:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-09  3:18 Stephen Rothwell
2021-08-17 17:01 ` Kalle Valo [this message]
2021-08-24  2:07 ` Stephen Rothwell
2021-08-24  2:09   ` 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:

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

  git send-email \ \ \ \ \ \ \ \ \ \
    --subject='Re: linux-next: manual merge of the wireless-drivers-next tree with the printk tree' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).