Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp222803rwb; Mon, 26 Sep 2022 17:41:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4t4W/Z+6aNIG94OWVRORIv6FtYAg6iVltx07hAgTDKqIbUOCSJQZ4TwRQHM5RTsaARcVAj X-Received: by 2002:a05:6402:3806:b0:450:bad8:8cd5 with SMTP id es6-20020a056402380600b00450bad88cd5mr25436472edb.305.1664239309281; Mon, 26 Sep 2022 17:41:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664239309; cv=none; d=google.com; s=arc-20160816; b=QmI1zV6VAVoC3LFWZ8YiA1SYsUKD/APYGefNx0v2XmxJG2TIhOkspvKgYZWEmVrBg0 7AKna03pVrYUEHCq00t6yNXSMDWN6F5sccremC2rvxsEVc4jkMXxvLM0W7m8owl/N8dJ oRMJDK7CnEHxDfsN9MzeWc7mwPQ5ZM7PXxlfBmh/Rs4appmS3EED4dEvDPWGvuiIcwBl lWP4pfu1wiDRO02i8oDyxY8V+4YNva0iW1+NYqY30Y0VjjZ8B86ndmKy8scqS2tIqEtq iWMXqw+Mc7PkFju3EOV8QgvpXgcNBbHT2I5F5bdKEMc2CW3logO2cEakQw3/hQAgI6dD 2sVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=sFLM3hWjEXTyJ0yd/oOnEhVxJLIE8bZjTLH0y3jGgF4=; b=KgWyhgqEHZx150PAdu23vYwTEaFfDWD6cREuoiAMZciiEL7sQLWGDQkvrbVlqzIv0+ wuBqNEVg3G7Xg6Xil2dpyHVbUh3GXleBjrynscVqXlygG/rSznPnDJLOrEy42c13LkI5 IYu9FnABJOP10juupIG96bAd0xoNQQdNalydImgOBYeRPqBwMvk8B6eRm5Oag/Tsog8B mZ2nrg4ZwZLq+boYA6xGWeVCooNFEAfz44qkzWe+A9mmyizKKIDtgUFrF8KhdDYFElRt dV4EDgbxMrEq/Cosl/L5qwsM/PmFDj+Yxov3EcCO3KaemMaxlySJp3hx+rcVAdhwPYjS WSmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="gA7/k/dU"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i6-20020a50d746000000b004462de364fesi163913edj.597.2022.09.26.17.41.22; Mon, 26 Sep 2022 17:41:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="gA7/k/dU"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230454AbiI0ACI (ORCPT + 99 others); Mon, 26 Sep 2022 20:02:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229716AbiI0ACF (ORCPT ); Mon, 26 Sep 2022 20:02:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 153FA9F194; Mon, 26 Sep 2022 17:02:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BF4456116E; Tue, 27 Sep 2022 00:02:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E603EC433D6; Tue, 27 Sep 2022 00:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664236922; bh=ZdXYo6em+HlkUDfGbNHS0iWVRZqCG576sXLjR0nNhsw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gA7/k/dUl4T5FQxoUSKD1VS2619ryVOXQxt/mIZ7Fk+vey2WTkfWfQh+0BP2QPrj+ LTGWID1L++5fNxohctqOtyzCc8HVDWNrT9snCldg7EHUO6spOn1ljMxur6Q3kaczV3 +ORoIdE5yfNkGtZogaNpapBaFyoeoyWEpTSPtCBXq0wylT54eKerhtVk54g+AwX3Xt sDdwBzAYyKcLmYVGYCKp9LPlgMbwy9bmVJZbvWp77L8q1TGDSdrzdGsGNRudnsn/at 11BK6UdBvfW2ng3KVQwo8vZ4xZ+S3I/6dLAT3SFQVcQU7460Ok+OvhPB70qjo2p5VD EWURNpJNW/3mw== Date: Tue, 27 Sep 2022 01:01:57 +0100 From: Mark Brown To: =?utf-8?B?0L3QsNCx?= Cc: Greg KH , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the tty tree with the drivers-misc tree Message-ID: References: <20220926213414.792065-1-broonie@kernel.org> <20220926231111.grxrydvfksyyk6t3@tarta.nabijaczleweli.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="QLXosb7uQZuyUgdl" Content-Disposition: inline In-Reply-To: <20220926231111.grxrydvfksyyk6t3@tarta.nabijaczleweli.xyz> X-Cookie: You may be recognized soon. Hide. X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 --QLXosb7uQZuyUgdl Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Sep 27, 2022 at 01:11:11AM +0200, =D0=BD=D0=B0=D0=B1 wrote: > Similar situation as > https://lore.kernel.org/all/20220926210631.657728-1-broonie@kernel.org/t > but the merge appears horribly broken only in the non-english files, > the english diff seems mostly fine. The non-English files just carried on the prior merge problem (in general I default to skipping out on merge conflicts in documentation in languages I can't read, admittedly this is usually also in non-latin scripts). --QLXosb7uQZuyUgdl Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmMyPXQACgkQJNaLcl1U h9DsiQf/RH/M+341fn7zo+v8/U0Jyfb6xvKzowwuWqSPPaImjIQsqNV9PVaF/5ls yjIABgsCz/3HtjjIyg70EgT3SNmXdo3F595a8AieJwVC9FBM9kp4x7al/7PZxvGc ExapevQ90oi+7aEXfu6HmtfqbTrASsVqwE8CCV9EEP57awmmPQlFDQEAn4D3GuHQ IDUUYmoWUVm7ENgUobp1oQLl9h5t+G2dVLAbjNebTCPwrN5uNwETQj7Dz6nq6jCA NHoShtjPl7dgHceAHPvYJCYQU4Fo30lvAA+R0tuRM5ph3WAzWxrGTDafRVTtZlpu V1VhWXyUCoHKTgUM7llLTlKXM+F6pA== =aJos -----END PGP SIGNATURE----- --QLXosb7uQZuyUgdl--