From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758185AbdKOUUB (ORCPT ); Wed, 15 Nov 2017 15:20:01 -0500 Received: from mail-it0-f54.google.com ([209.85.214.54]:42230 "EHLO mail-it0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932884AbdKOUTw (ORCPT ); Wed, 15 Nov 2017 15:19:52 -0500 X-Google-Smtp-Source: AGs4zMYbgIkbOYSUKdJge2lLdiInk9IlDL2Pheu7M0VG3W6lXRS1TqQjH2n8GFqXsi1PN4825oiljntVE3TR9ogexQ0= MIME-Version: 1.0 In-Reply-To: <20171115.203352.827797930375567595.davem@davemloft.net> References: <20171115.203352.827797930375567595.davem@davemloft.net> From: Linus Torvalds Date: Wed, 15 Nov 2017 12:19:50 -0800 X-Google-Sender-Auth: dGTx4T41lbZeD-rZ1hAs_lASCf0 Message-ID: Subject: Re: [GIT] Networking To: David Miller , Ingo Molnar , Peter Zijlstra Cc: Andrew Morton , Network Development , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 15, 2017 at 3:33 AM, David Miller wrote: > > Highlights: Lowlights: 1) it duplicated a commit from the hrtimer tree, which had been cleaned up and rewritten, but then merging the second copy of the commit re-introduced the bad code that had been cleaned up. I'm talking about commits - 7d9285e82db5: perf/bpf: Extend the perf_event_read_local() interface, a.k.a. "bpf: perf event change needed for subsequent bpf helpers" - 97562633bcba bpf: perf event change needed for subsequent bpf helpers where apparently there was no discussion between the groups about the subsequent changes. And this must have shown up in linux-next as a conflict, but no mention of it from either the perf event tree or the networking tree merge. Although it is of course possible that depending on merge order, the problem never showed up in next. Linus