From patchwork Wed Oct 4 01:55:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 148128 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp2466441vqb; Tue, 3 Oct 2023 18:56:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGN1sCuxmweJ/u5DWBiuGts6rbIo05o89bYn3dnbftYYFcqbKepv/hBKTWVUqLSFamBtlVG X-Received: by 2002:a17:903:2441:b0:1c3:61d9:2b32 with SMTP id l1-20020a170903244100b001c361d92b32mr1230162pls.45.1696384590553; Tue, 03 Oct 2023 18:56:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696384590; cv=none; d=google.com; s=arc-20160816; b=FJXWpDIt7JOmM+moswR/L9VcYDeajjzrgzE2BlHYZC+vCXgg8xXPgrPNmpwDXbPsSc xjdjpB77tARxRV0MYk9oUuQ5gCT6jHNdquYvdsptOy7/QIz9OYhl6dA7DeJnfDIldUXR mXfP2th1VkESQrMjDJhB1W4+DOUAWzlvYSXYZYDFpa5BKJh2BJF6nrr+Cgek+YRo2UIL EhQVz6mRZr1XocwgS3KVaQRu4V0W8EYWi+OLgpaRAezeCZbVYBEg+nBGWPXpMzHkrwSB df4gOa07/kLgqBvQNmjKSK22OMw1Z3X50mdhewOav6kLNKEXTFgwMKex4oBsQiFAd9nQ LVnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=vQQTOrIQzcTUloKrntqCTEdQlI8w03nmxcjn2ljn8Ik=; fh=PYaRO5AJAuyozJwYuoZZ5tLbJuCD89pi+gLFe+75L7w=; b=c4tYAwy33/GTAsmiUw6Yup9Jah9gzPryNLuiofO6iU2+LCH/n21LfJ0NRi/RJJQ9HJ ngZQzuQr5/cJ7AAfKhvYWMqXoAaPBYxGF23ffSb6De0Qi/eNPCCjr0TI2u8OwCu+z3Mm DywHIRYBnWKVRPghc6J+mEtDE9O605uhlMSdlpA0S9rS6rwgMAl9PZwihZAkW8lhpr8V 0wkaDMSAv9nccYgrJx8n6vgVMu+dp4sIPmZZK4FXkMfJbNh2nafa6omw3ufi67oYx9gc SlQZpKFUn2G1ffzCwdjmGvMnF9xy31X9LIyBkY0L5frm+dGhb139783vsC/5wkoZhUjb W/OQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=RKK5X73j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id a15-20020a170902710f00b001c604f8de9fsi2470306pll.631.2023.10.03.18.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 18:56:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=RKK5X73j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 85D1E80755F0; Tue, 3 Oct 2023 18:55:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240437AbjJDBzp (ORCPT + 17 others); Tue, 3 Oct 2023 21:55:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231384AbjJDBzo (ORCPT ); Tue, 3 Oct 2023 21:55:44 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5668DA1; Tue, 3 Oct 2023 18:55:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1696384534; bh=vQQTOrIQzcTUloKrntqCTEdQlI8w03nmxcjn2ljn8Ik=; h=Date:From:To:Cc:Subject:From; b=RKK5X73jiLVO7FdZpClX+prqHXs27/uzXcJwD58M9CYacouNjEVh5zWAEaFDWSHIm 4d9EIa2nk23iRR59ZmFbTziM6tv+WMLmDlWHOwUgjlKwyJrBFobAkyzG38Kd2wUmXX w30hdv3Nhj4eYcIU3GOY278poiIvjQnChWSNZ8sbb5eLghVhBGqLvSRr5bVNRIfBFR q0DbOVKcJv1YpK8+8V83H6cvjSAKQdrFwOzp/B5xA5NGUr4pB1A5oZq3AfTszt7NCt nUGj0RnJsaam8Ss5I14/GHUqtvhAhnc6vGUxFTOZedQq8FOHgPvYamDbTDxX0dkNSP MVNMkyCUQsLBg== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S0d7T3ZPJz4xQT; Wed, 4 Oct 2023 12:55:33 +1100 (AEDT) Date: Wed, 4 Oct 2023 12:55:31 +1100 From: Stephen Rothwell To: Greg KH Cc: Greg Kroah-Hartman , John Ogness , Linux Kernel Mailing List , Linux Next Mailing List , Lukas Wunner , Thomas Gleixner Subject: linux-next: manual merge of the tty tree with the tty.current tree Message-ID: <20231004125531.0c61a99d@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=0.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SORTED_RECIPS, SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 03 Oct 2023 18:55:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778788168686557301 X-GMAIL-MSGID: 1778788168686557301 Hi all, Today's linux-next merge of the tty tree got a conflict in: drivers/tty/serial/serial_core.c between commit: 8679328eb859 ("serial: Reduce spinlocked portion of uart_rs485_config()") from the tty.current tree and commit: 559c7ff4e324 ("serial: core: Use port lock wrappers") from the tty 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 drivers/tty/serial/serial_core.c index ca26a8aef2cb,b32bbd7aa3d3..000000000000 --- a/drivers/tty/serial/serial_core.c