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=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 15AB7C4CECE for ; Fri, 13 Mar 2020 19:52:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1CC5206EB for ; Fri, 13 Mar 2020 19:52:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="H/4G0a4i" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727354AbgCMTwM (ORCPT ); Fri, 13 Mar 2020 15:52:12 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:36762 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726477AbgCMTwK (ORCPT ); Fri, 13 Mar 2020 15:52:10 -0400 Received: by mail-lf1-f68.google.com with SMTP id s1so8867025lfd.3; Fri, 13 Mar 2020 12:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=jIzR2VF5pztT8bGJoCnv210VBMIFx941tvF4lgwyJhk=; b=H/4G0a4inqFmyc/ZgU9YotdnJII5m3EQDJJrxGps6EtV0QFXrC//vl5+03L3cOHdGy rMuPqzftPUB77oaFRc0jdyTu0Yd6DIIQSwMTTRG/sHMUExTW8d1AayCkiDJJQG10AnNu wF51wj5tDrEa/x/K4FUtkoVv7DcbniTMXF8sWXczVij4/XuwPKHrgdF/Dsuj3PyShFF8 JlyZvWRVMrR+UgaSu/cQLLQTUZ0gyWV/trt4RNPtAcBWFKC1fRpRh6qJlYAIB2iiHe7x S7sAQ+KVKb6x3q9rQahoc4H/t+Vfyzt/KUe9t3Hd9nhA2g22AnR9lR6X+FdWPH39Wlfr QVkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=jIzR2VF5pztT8bGJoCnv210VBMIFx941tvF4lgwyJhk=; b=BihbkNG7oQ9vxR4qDFz2nU8scLKdMEWWqYyJDLbga6k6uWXJfxqllEF6wURbwSOMs6 BvH2QO8RF3/Xo6KxRKSBLxdhVFIbElQoxb1hgTfjm1XqrVAN3afxpjDO8nBPrC7p+G7n qqyIGL5XZFVJU01FcQ8llbOjTuNVhgz88oQKNAcLffB0I+jZLbDM+XznR/G+Q8XEUE6n 2/ZdRLZSxWSIf0jGippVRVJOVfMCES+Bvc21AnrLg1LIxvRq9zgByIpk0vOlEaBAdT2V YaL9+WxG2w0fX42LErzKxWVIJEN8Zh/kY5pzwyi/ANcI+FdvQ2l9ma+CIIBjuAJ5/rME nC6g== X-Gm-Message-State: ANhLgQ3eg2Yh4rJxL7q6Eo4+311fSzEpBLSOFqP9rcilEDNIaNx9dGy+ G+BboGZAYDO7IUWIv3sDkqmdOoyO/TOHOqtsyg8= X-Google-Smtp-Source: ADFU+vuyob2kNVFX2qwNK4cHEIyyfQOOrYJ9edLrWt/ZgCK5EyTlrU/7fRLKklUBicSDGHyC6BLUkY/zy7R10T1EXd0= X-Received: by 2002:a19:a401:: with SMTP id q1mr9255620lfc.157.1584129126306; Fri, 13 Mar 2020 12:52:06 -0700 (PDT) MIME-Version: 1.0 References: <20200313135850.2329f480@canb.auug.org.au> In-Reply-To: <20200313135850.2329f480@canb.auug.org.au> From: Alexei Starovoitov Date: Fri, 13 Mar 2020 12:51:54 -0700 Message-ID: Subject: Re: linux-next: manual merge of the bpf-next tree with the jc_docs tree To: Stephen Rothwell Cc: Daniel Borkmann , Alexei Starovoitov , Networking , Jonathan Corbet , Linux Next Mailing List , Linux Kernel Mailing List , Stephen Kitt Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 12, 2020 at 7:59 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the bpf-next tree got a conflict in: > > Documentation/admin-guide/sysctl/kernel.rst > > between commit: > > a3cb66a50852 ("docs: pretty up sysctl/kernel.rst") > > from the jc_docs tree and commit: > > c480a3b79cbc ("docs: sysctl/kernel: Document BPF entries") > > from the bpf-next tree. I dropped this commit from bpf-next, since it causes unnecessary conflicts. Please steer it via Jon's tree. Thanks