linux-kernel - Re: linux-next: manual merge of the wireless-drivers-next tree with the printk tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <87bl5wf1k3.fsf@codeaurora.org>
Date:   Tue, 17 Aug 2021 20:01:16 +0300
From:   Kalle Valo <kvalo@...eaurora.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Wireless <linux-wireless@...r.kernel.org>,
        Petr Mladek <pmladek@...e.com>,
        Chris Down <chris@...isdown.name>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Lukas Bulwahn <lukas.bulwahn@...il.com>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the printk tree

Stephen Rothwell <sfr@...b.auug.org.au> writes:

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

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

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches