From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87874C4338F for ; Tue, 17 Aug 2021 17:01:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5F10460FD9 for ; Tue, 17 Aug 2021 17:01:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229723AbhHQRCT (ORCPT ); Tue, 17 Aug 2021 13:02:19 -0400 Received: from m43-7.mailgun.net ([69.72.43.7]:19796 "EHLO m43-7.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229699AbhHQRCS (ORCPT ); Tue, 17 Aug 2021 13:02:18 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1629219705; h=Content-Type: MIME-Version: Message-ID: Date: References: In-Reply-To: Subject: Cc: To: From: Sender; bh=LYwT4eDRj2JiICfdihGDs8jIqG9wwZd/0YayCwFiVtU=; b=BnFEQM9SEkEC4sn5/262/zzk16SWlDyZzHF1jnI706v6r5Fj+fLzeDFxACksG82akNkN3kzf Y/0p6P98tjDxpM1n0iBI4l1s1ia+GSk4/4gohlgQnt70o6YMNQ2PlbSBbXdxWEiKA4aOp5N3 lK3HKCRilhcd7zFoG17um8y9Jzc= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyJmNGRkZiIsICJsaW51eC1uZXh0QHZnZXIua2VybmVsLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n04.prod.us-west-2.postgun.com with SMTP id 611beb65f746c298d9b1f585 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Tue, 17 Aug 2021 17:01:25 GMT Sender: kvalo=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id C28C9C43617; Tue, 17 Aug 2021 17:01:24 +0000 (UTC) Received: from tykki (tynnyri.adurom.net [51.15.11.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: kvalo) by smtp.codeaurora.org (Postfix) with ESMTPSA id CA75AC4338F; Tue, 17 Aug 2021 17:01:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.codeaurora.org CA75AC4338F Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=codeaurora.org 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 In-Reply-To: <20210809131813.3989f9e8@canb.auug.org.au> (Stephen Rothwell's message of "Mon, 9 Aug 2021 13:18:13 +1000") References: <20210809131813.3989f9e8@canb.auug.org.au> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) Date: Tue, 17 Aug 2021 20:01:16 +0300 Message-ID: <87bl5wf1k3.fsf@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org Stephen Rothwell 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