Message-ID: <bc0baa2c-e747-b290-672d-619d7925753a@oracle.com>
Date:   Tue, 7 Dec 2021 10:23:48 +0000
Subject: Re: linux-next: manual merge of the akpm-current tree with the nvdimm
 tree
Content-Language: en-US
To:     Christoph Hellwig <hch@lst.de>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Dan Williams <dan.j.williams@intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20211207173938.6d619ba6@canb.auug.org.au>
 <20211207065556.GA4786@lst.de>
From:   Joao Martins <joao.m.martins@oracle.com>
In-Reply-To: <20211207065556.GA4786@lst.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WG9haTRNemZKQStvMUlqVDVNRTA1OFlPMEVxS2NsdW9US1ZhUHpkMmZsQm9E?=
 =?utf-8?B?OHBlaEpNb0FSOGNqMHVuaC9FcFM3U25GNERnRW5DeUF1cUhvRmdwdkJGS1Q5?=
 =?utf-8?B?NHBWa1E4TDMxMjUxbldPdGtqblRtaEk3MkZsTmt0dVVNV3N2QjArd2s3N1hi?=
 =?utf-8?B?MlNHSWV6Q05qaXVIY0RhMjlCZS9QdHdyNk5oY1AxRjV0R3RicDZrNzh5d2ZT?=
 =?utf-8?B?SDBNMkxnVGtJTVBlNVBLL3doMTVNNE9SOGQ1SnkwZlMxSklEMHR2blFIMjQ2?=
 =?utf-8?B?dnZaS2pFcDgzNjhMWGRYVUZic0lYQmlVNUVaVVdpZjVtQmRURDZwYk51aXlX?=
 =?utf-8?B?V2VCUlpKaUVVdEJ1SkhxRGhHOFlLSlFBNE9CVDRlaFluSnh4Q3JHSUl1Z0Vy?=
 =?utf-8?B?VmFFdzFDc1QvalVpTXVob1hmNUQ3VG1YYlowSk95UDNwNG5JdEdkYTRGSUtU?=
 =?utf-8?B?YmI1cWxEZWNDQ3BNKzZkWno2WktrNDVVNnZPckV2OWtNWmp3cFhFVW9ocHFt?=
 =?utf-8?B?YU10K3VIRWFnRHlXOWhFdE03REU0dXFCSzNldXVZUjRBcWRFVDNoR2dycXlj?=
 =?utf-8?B?aWtaQ00vTzFYbzRGVFdybFdaSFEwU0N5UzB3Ui9xU05SbzRHU2N2ZVVKNVJS?=
 =?utf-8?B?YmVaK082SHVxMFlCZ0psNVowYVcyVmtzeldqY3FkUlB5bzlqWnJtdTZnNXhp?=
 =?utf-8?B?cm5hTGF2TlRZK3N5cFNMdWs3WEk3T3RvcWl1V3JReEJJc1NDMittd2RPODRP?=
 =?utf-8?B?SnVwZmlzQ09QY25UT0NHU0Ric2hacjJUV2pZQ29pNldHR2NVTG14d05ScHZ0?=
 =?utf-8?B?aWo4TWFDS1pVcDRGRUxiUUpBbHN4TUZvdFJ0L2RoSXRkWi9BZkRWeDhqU1lz?=
 =?utf-8?B?c2lUK25oNFY5Um5XQlpxOUtVaVdmNDl0RnBTZWhqdmhvNTMxT2dqWFdmNXNO?=
 =?utf-8?B?dHN2TXN3MWh2ajduL1lRZTZVWkxsOWpHOFlzaFo4MnNCb3V4OFhvNHIyRXl3?=
 =?utf-8?B?QU5GbkZlL3NyRnh2RTB0RkxFQXZhTlNtVUxmZE5BaDEwZXZYcUlnQVI2eXhP?=
 =?utf-8?B?U1pwOCt0cWN1ZU5Mc3dNcTY2SFVjZlJXMWhVSUlKMjJFdjRhRE1kUlc2ZGZI?=
 =?utf-8?B?K2MrRnF4eFU2c2RBZnNKRjBMY09zVFk5aCtieU5QZWFNUmdHUGNKYSt2Tm5i?=
 =?utf-8?B?OVR1OHlNTWhSdElrNDFyVDJEck05blp5MWYrLzIvTUNOeDdieXBtd3liNzJ4?=
 =?utf-8?B?bjh4RVJwYU1RQVF6cjNGbi9BcHVLQnl1bVd5TUxMZ204MnppRzNTaEEzQUVj?=
 =?utf-8?B?ZEZTWDMrMEY0WHY1dzdCSDhpVDRjajVCVVVsZUZJbi9wVkJiM2d1QnQrb2tE?=
 =?utf-8?B?eEdPanJ1bHpCS3JvNmZETG04TDZQbGNRSkwwcXhXQ2x2MEEyUTRBekRMeWcx?=
 =?utf-8?B?Y0s5OGwrSzRjOHEyRTJpajZKcGtEVjMxUUc5OWNnTkMzNmplaklqOElSbGp4?=
 =?utf-8?B?RVk4UGNUOHJxWDNnKzJOQXNtS0RKZkF6aUZ6VGk0MHNrTFJRTW1ocUtINEFu?=
 =?utf-8?B?dWZHemN0MzdhZkErd1VmL3BIWnB2RTdvbjU4c1RnckdUM2JmOCsyU3pMb2lS?=
 =?utf-8?B?RzBnR0FBWWlLTzVlNmU2WGxTUXhZVndYSkEzazRLV0JnTXFEbXhaVytMN2NG?=
 =?utf-8?B?c3A1ODRQUmlzTHloTlpieWUybFIvRzcyNkREekVtTUZaZmhoenJCOGVXT3pt?=
 =?utf-8?B?eXdSazRPM3A0L2pNTW41dHNHc1A0TWlTSndTT29zek55aDZiM1hjeWNCTWR2?=
 =?utf-8?B?WVAwN1hxU0dmYXo0TDNmTWFPM0JTUGMxR2NCU2VUM0hTSWxmOTJ2YmoydFhn?=
 =?utf-8?B?dDdQekVwY09iSWk1Vkk2bFRwTmJManA2VmpVdTRURGxFbHkxVkhiUHJxT0JY?=
 =?utf-8?B?UkNGaW1DNHFwbk4xaFFzam41VkpZTzNjaVZnbmNQQ2o4ejJrYzhIY0Nsdzlo?=
 =?utf-8?B?Wmw1Q2tPOTJQK3BWRjEyb2NUYzA2ZXE0NWd4VzByV1p5OGFVWS90K2VvRytB?=
 =?utf-8?B?K0lwS2plaTZZcEp2M09nd0huV1p3ZFQrVE9kVnRXWWtGcUV3dU5aTGJOMmVM?=
 =?utf-8?B?N3FaWWI5VzNoeEtkY1M2M2NjRDY3Mkg4bXUzUnp4SFRUbmx2ZThKa0tlTWRK?=
 =?utf-8?B?L3BMNjZacGtMd2JnbnlXaTJwWVFocnFxc3VWODg4TzRZczIrUGdHNGFob3R6?=
 =?utf-8?B?eUhWa3huWHhZVndjTWNlQTlkV1R3PT0=?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d0a7a1eb-8a89-467b-d0d7-08d9b96bab88
X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB4835.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 10:23:54.3125
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: JiI9ZA5iWj/8agO9/g80nOSjsTN7peJhMpfNybrqg2S+LVxqhaLQejOID7x2y2mPUMKAge2MOMyIWHjrK5Kw5uRxkw2nvOqxpoRTohVDVbw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5028
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10190 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0
 adultscore=0 mlxlogscore=782 bulkscore=0 malwarescore=0 mlxscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2110150000 definitions=main-2112070061
X-Proofpoint-GUID: 16pDhS9No2Xm6osf8f8GebTXL7_7gd47
X-Proofpoint-ORIG-GUID: 16pDhS9No2Xm6osf8f8GebTXL7_7gd47
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 12/7/21 06:55, Christoph Hellwig wrote:
> On Tue, Dec 07, 2021 at 05:39:38PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the akpm-current tree got a conflict in:
>>
>>   mm/memremap.c
>>
>> between commit:
>>
>>   b80892ca022e ("memremap: remove support for external pgmap refcounts")
>>
>> from the nvdimm tree and commit:
>>
>>   30156644eb0d ("mm/memremap: add ZONE_DEVICE support for compound pages")
>>
>> from the akpm-current tree.
> 
> The resolution looks good to me, thanks.
> 
+1, the resolution looks good to me too.