From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.81]) by mx.groups.io with SMTP id smtpd.web11.2231.1578308433214376527 for ; Mon, 06 Jan 2020 03:00:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Hl9zQB1P; spf=pass (domain: redhat.com, ip: 207.211.31.81, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578308432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L2w2mWV0hj/DHjdLslIIB0MVR57JcWf3noSWlSwTJW4=; b=Hl9zQB1PPkQf5OdGRGDDTAOc/CWaSqols79zGbrJ8m5r2aW3sEd5SGZqk8j+ObE3W0LDlf yWml1kYXsK82T8wVes6mhU4p6BcrerAiMrSjaeUItSebEiFvjWXpMoVNDkftrkfPx/Y6H3 q3sGBnKN992TVQiFt2Zi0+3jQaDDlYw= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-27-7HJjJ_8MMCWtyvMPU0M0ug-1; Mon, 06 Jan 2020 06:00:25 -0500 Received: by mail-wr1-f72.google.com with SMTP id z10so22742386wrt.21 for ; Mon, 06 Jan 2020 03:00:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=lrii5FV8s/id+hBtXOhh/xFtzmVGtVq9rl1+pgDE7IU=; b=Ua4TGM4TvqyVq8nh5ZbgxfPYpYXanJ64aZ2jj9Z3awrDPUdjoZDfC2LVBGNi6+KE8l /JMSciG2DZmSR7/fpVvl3uatSBKhcD3Jp4yAyb77/wyy7FlyulOPIMDC3SKjexQb7Gwo hskhoId8RWZM0W9x2PZPIIPmVbcazZ51/Wog+zyU6eMdTf6299X4CEbTqeS48bo6Q+oS GfJAK7eszAAq47v2an6l/0RjXJzaIat56+VIb7LMpM0ZK9b8G6Fu3PcFw9iXvRQDNQOZ k3oLtB7oeQG/qB2v+eJ5Kn+BVjNoFXJ6SVz1gpRPBtjfoF1HMesY5wioefPM7XxOykFS /asQ== X-Gm-Message-State: APjAAAVVa1JC3Ns5DrhylQMZV+E4/7Qy2YQfNs94mFRNT5mJdLy6uKs9 0F3mitx8TjNQm4kkE3n4K4K75l3XDakiLIvhooPDEfJg7ZqvP2LdelSWDRiPe+zURgMVUD0LbjJ lLSTszEyo0jAJ6Q== X-Received: by 2002:adf:ea0f:: with SMTP id q15mr99266775wrm.324.1578308424792; Mon, 06 Jan 2020 03:00:24 -0800 (PST) X-Google-Smtp-Source: APXvYqyKNZiq67G16Tl9krht2b+AeaBdSTEPbUad6Z5DwrRObvr80rGePA20t1g6BUjM1Rnz+wDO7w== X-Received: by 2002:adf:ea0f:: with SMTP id q15mr99266737wrm.324.1578308424428; Mon, 06 Jan 2020 03:00:24 -0800 (PST) Return-Path: Received: from [192.168.1.35] (34.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.34]) by smtp.gmail.com with ESMTPSA id q3sm74270653wrn.33.2020.01.06.03.00.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 06 Jan 2020 03:00:23 -0800 (PST) Subject: Re: [PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history To: Laszlo Ersek , devel@edk2.groups.io Cc: Leif Lindholm , Michael D Kinney , Andrew Fish References: <20200102192345.14600-1-philmd@redhat.com> <07a65a33-8b5c-6479-90f6-c0ef8cd15c9a@redhat.com> <69a63257-d4b7-a715-2db2-457376dd45de@redhat.com> <5f6d5901-9c19-f5b2-08ec-f7482d868b6b@redhat.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: <58be59dc-fc58-9ae6-6898-70408c1f84c1@redhat.com> Date: Mon, 6 Jan 2020 12:00:22 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <5f6d5901-9c19-f5b2-08ec-f7482d868b6b@redhat.com> X-MC-Unique: 7HJjJ_8MMCWtyvMPU0M0ug-1 X-Mimecast-Spam-Score: 0 Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable On 1/6/20 11:41 AM, Laszlo Ersek wrote: > On 01/03/20 14:56, Philippe Mathieu-Daud=C3=A9 wrote: >> On 1/3/20 2:48 PM, Laszlo Ersek wrote: >=20 >>> Apparently, there is a patch that >>> prevents the series from being merged? Which one? >> >> This comment was about patch 13/32, but Jiewen Yao already reviewed >> it, >=20 > OK, thanks. >=20 >> so this series is fully reviewed by each developer. >=20 > I've now tried applying this series locally (for a github.com pull > request). But git-am fails, on patch#6 ("corrupted patch"). >=20 > I've checked the patch email (as saved from Thunderbird) and I can see > it uses quoted-printable transfer encoding. That has basically never > worked with edk2. Can you please send a v4, with 8-bit encoding? >=20 > Please see: >=20 > [edk2-devel] [PATCH] > BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py >=20 > https://edk2.groups.io/g/devel/message/52323 > http://mid.mail-archive.com/02A34F284D1DA44BB705E61F7180EF0AB5C64C6F@O= RSMSX114.amr.corp.intel.com Ah yes, I enabled this setting globally, but not in my edk2 identity=20 (which is the one I use to avoid utf8 in my last name, which is the=20 single community with UTF-8 issues I've to deal with). --identity=3D A configuration identity. When given, causes values in the sendemail. subsection to take precedence over values in the sendemail section. The default identity is the value of sendemail.identity. I now fixed my config with: $ git config --global sendemail.edk2.transferEncoding 8-bit (btw I'm unable to apply the previously referred patch). >>> Can you please monitor the remaining feedback for this series? If >>> everyone is happy with the v3 updates, and you determine that the >>> patch set is fully reviewed, I can help pick up the new tags, and >>> merge the series. >> >> Since the change is a one-line, I'd prefer avoid respining the whole >> series. >=20 > I think you mean the change is a one-liner *for a commit message* > (namely, Jiewen's R-b). >=20 > I would normally agree (I'd just pick up that R-b from the list), but > again, I can't apply the v3 patches in the first place. Fair enough. >> IMHO the series is ready for step #4 "stewards go through the backlog, >> and decide one by one whether, for person X, the proposed mappings are >> cross-domain or not, and ACK or NACK" which I don't really get. >> I suppose this will be resolved in the open on the mailing list, so >> individuals will get notified their patch got refused. >=20 > Let me quote the original suggestion in-line, from here: >=20 > https://edk2.groups.io/g/devel/message/51906 > http://mid.mail-archive.com/9e212952-a114-57d0-9880-6686edc4d8ae@redha= t.com >=20 > On 12/06/19 13:23, Laszlo Ersek wrote: >> - Collect feedback (from individual reviewers / contributors) for one >> or two weeks >> >> - Accept cross-domain mappings in any patch where the person subject >> to the patch is ACKing the patch from the mapped-to (i.e. "current") >> email address. This is now a *lot* easier to do, because the patch >> series is structured by person. >> >> - After one or two weeks, push all the patches that have been approved >> like explained above. >=20 > This is where we are now. We're about to push the patches with the > direct contributor approvals. >=20 > This covers 32 patches (v3) out of your original 105 (v2). >=20 >> - Repost the rest of the series, CC'd solely to the stewards. We will >> then have to go through the backlog, and decide one by one whether, >> for person X, the proposed mappings are cross-domain or not, and ACK >> or NACK accordingly. >=20 > This is "step 4", and for that, you should please post the *rest* of the > patches: approximately 105-32 =3D 73 patches. >=20 > That is the "backlog". The idea is that the stewards should review > those, because we should be permitted to add email mappings even for > such contributors that do not personally comment on the proposed > mappings, as long as those mappings are not cross-domain. OK, understood now :) Another way can be to not fix broken/obsolete emails, but fix author names. >> >> - Push the second round, drop the rest for good. >=20 > And here the "rest" (to be dropped for good) stands for such patches > that even the stewards don't approve (because the mappings appear > cross-domain, which cannot be approved without direct contributor > feedback). >=20 > Thanks! > Laszlo >=20