From mboxrd@z Thu Jan 1 00:00:00 1970 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=-4.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 CD42CC433E3 for ; Tue, 14 Jul 2020 08:19:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A9FF921897 for ; Tue, 14 Jul 2020 08:19:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="XYiTOvRA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726461AbgGNITi (ORCPT ); Tue, 14 Jul 2020 04:19:38 -0400 Received: from ozlabs.org ([203.11.71.1]:32839 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725793AbgGNITi (ORCPT ); Tue, 14 Jul 2020 04:19:38 -0400 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 4B5YMq4R6kz9sDX; Tue, 14 Jul 2020 18:19:35 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1594714776; bh=5FTY9IYSNtTjBV9hCkBrN5BM8oS4XK8NEYCYAmC4pho=; h=Date:From:To:Cc:Subject:From; b=XYiTOvRAwF0WInq7fmx9uySQwHS4QU7+5H4wNOXfe5qujQyFqufHzXjv/gV4rAURK 7qc7LkQ+72RkF0nxyN9X7vZk2EMHfOAzEt5nPAT0OMJZaFsBucslFNG9TYQ/HI/w9q AT/AihDv9ikR4MY2i3Z+f+GIBHvCd4kHdr+Tbl4BwAepTQRrx1nx89Hr2qtkdDvuXY 4WvWTPJi9twzf3GoKZ/Xix7HVyhjUDUOljPnAsC9UAiQxMaQUQVStkFDPD+pWh9Iu1 VraZ+nWWt4gCXkr0WyLblK6wV2Q8ZhdgZWwEU3+Ab6T2iKs6DIG/+AAeXHvp1WtUBQ iaNESJaKdNHog== Date: Tue, 14 Jul 2020 18:19:34 +1000 From: Stephen Rothwell To: Andrew Morton , Jonathan Corbet Cc: Linux Next Mailing List , Linux Kernel Mailing List , Randy Dunlap , Michal Hocko Subject: linux-next: manual merge of the akpm-current tree with the jc_docs tree Message-ID: <20200714181934.58fc201c@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/pWHLCaf7d0uibWm8g.V_EP+"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/pWHLCaf7d0uibWm8g.V_EP+ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: Documentation/filesystems/proc.rst between commit: 059db4341303 ("Documentation/filesystems/proc.rst: copy-editing cleanup") from the jc_docs tree and commit: 7079aa70a489 ("doc, mm: clarify /proc//oom_score value range") from the akpm-current 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. --=20 Cheers, Stephen Rothwell diff --cc Documentation/filesystems/proc.rst index e024a9efffd8,78a0dec323a3..000000000000 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@@ -1680,7 -1673,10 +1672,10 @@@ requires CAP_SYS_RESOURCE 3.2 /proc//oom_score - Display current oom-killer score ------------------------------------------------------------- =20 + Please note that the exported value includes oom_score_adj so it is effec= tively + in range [0,2000]. +=20 -This file can be used to check the current score used by the oom-killer i= s for +This file can be used to check the current score used by the oom-killer f= or any given . Use it together with /proc//oom_score_adj to tune w= hich process should be killed in an out-of-memory situation. =20 --Sig_/pWHLCaf7d0uibWm8g.V_EP+ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8NapYACgkQAVBC80lX 0GyXuwf/dvy90fXsK1Ge1EvLGc0AaEgeuMrARjFynOSHOEwAUWtmXAo23qd6HvXI SzrSC9FH61rjd/XEtJT/qPPBPd1POeK4+vX1aZ452zxNVZJB442N3ksm+BKqgGDv kXtWtRjjg8ath8PNCR9d6LXuTKvZ5jmlHrcYcKKXnCS5NLF1EjZW06wdLaVOPnEn E4i6riAstKMdHEeN11rXqeRAR06sdhBQ0/gPEpwDQ3L3Btv7tJin0mPMLjrvkXwa pO6kNNtKs7vil6aJDqpyQCxoYGe1hXUgzkgKZXcoN7dfxW3IylEGqzYCdMmTLpl9 KvFibtj9qHs5ReEnBACbGMCyfxFBpw== =R6FN -----END PGP SIGNATURE----- --Sig_/pWHLCaf7d0uibWm8g.V_EP+--