From patchwork Mon Aug 9 03:18:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12425299 X-Patchwork-Delegate: kvalo@adurom.com 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=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 7E8C3C432BE for ; Mon, 9 Aug 2021 03:18:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 54CB96101E for ; Mon, 9 Aug 2021 03:18:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232542AbhHIDSh (ORCPT ); Sun, 8 Aug 2021 23:18:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229942AbhHIDSh (ORCPT ); Sun, 8 Aug 2021 23:18:37 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ACA6C061757; Sun, 8 Aug 2021 20:18:17 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Gjh9d6X6Hz9sWX; Mon, 9 Aug 2021 13:18:13 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1628479094; bh=JSjEqkO0SK13kfbGfd0rXE6B3pLcWE5fT+mLWjxOuiw=; h=Date:From:To:Cc:Subject:From; b=nKJDIYvetzsui66DegHwPeFqT0Gb3dN7kKtMnzeKtXFeusjw5KeWSf6uE7gOIRyib +kSmEkj75DJQWP810obJ0c6YkaShU60RMX5kTugApNusgi/RnNjOnDB+jp7VL0wtZr JW4oznlQNA03WJuE8gKZsUWWsSpUSjR5DqEBx6E00JrkSXNPTTSrJYT/6vmDFrnWE0 GijB2ao4HwlslA/or2BZAd37l/CiOr8a4cZEwCBJuk2aDHEcJyhnTvQhI+IPr/7rZv 9b/gFG1OYjvrf8Mpu8MXJgixJfbRYnFn3XQqjkjeKrBgj7DYjx7S6Gd4gKi2atgPEn Ryg7bsoCR9WkQ== Date: Mon, 9 Aug 2021 13:18:13 +1000 From: Stephen Rothwell To: Kalle Valo , Wireless , Petr Mladek Cc: Chris Down , Linux Kernel Mailing List , Linux Next Mailing List , Lukas Bulwahn Subject: linux-next: manual merge of the wireless-drivers-next tree with the printk tree Message-ID: <20210809131813.3989f9e8@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Hi all, 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. diff --cc MAINTAINERS index 5cf181197a50,492bc169c3bd..000000000000 --- a/MAINTAINERS