LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@codeaurora.org>,
	Wireless <linux-wireless@vger.kernel.org>,
	Petr Mladek <pmladek@suse.com>
Cc: Chris Down <chris@chrisdown.name>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Lukas Bulwahn <lukas.bulwahn@gmail.com>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the printk tree
Date: Tue, 24 Aug 2021 12:07:14 +1000	[thread overview]
Message-ID: <20210824120714.421e734d@canb.auug.org.au> (raw)
In-Reply-To: <20210809131813.3989f9e8@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 1680 bytes --]

Hi all,

On Mon, 9 Aug 2021 13:18:13 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
> 
>   MAINTAINERS
> 
> 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc MAINTAINERS
> index 5cf181197a50,492bc169c3bd..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -14974,18 -14927,6 +14974,11 @@@ S:	Maintaine
>   F:	include/linux/printk.h
>   F:	kernel/printk/
>   
>  +PRINTK INDEXING
>  +R:	Chris Down <chris@chrisdown.name>
>  +S:	Maintained
>  +F:	kernel/printk/index.c
>  +
> - PRISM54 WIRELESS DRIVER
> - M:	Luis Chamberlain <mcgrof@kernel.org>
> - L:	linux-wireless@vger.kernel.org
> - S:	Obsolete
> - W:	https://wireless.wiki.kernel.org/en/users/Drivers/p54
> - F:	drivers/net/wireless/intersil/prism54/
> - 
>   PROC FILESYSTEM
>   L:	linux-kernel@vger.kernel.org
>   L:	linux-fsdevel@vger.kernel.org

This is now a conflict between the net-next tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  parent reply	other threads:[~2021-08-24  2:07 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
2021-08-24  2:07 ` Stephen Rothwell [this message]
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:
  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=20210824120714.421e734d@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=chris@chrisdown.name \
    --cc=kvalo@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=lukas.bulwahn@gmail.com \
    --cc=pmladek@suse.com \
    --subject='Re: linux-next: manual merge of the wireless-drivers-next tree with the printk tree' \
    /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

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).