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=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 950F0C43142 for ; Fri, 3 Aug 2018 02:44:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E05421724 for ; Fri, 3 Aug 2018 02:44:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E05421724 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=davemloft.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727298AbeHCEid (ORCPT ); Fri, 3 Aug 2018 00:38:33 -0400 Received: from shards.monkeyblade.net ([23.128.96.9]:51586 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726190AbeHCEid (ORCPT ); Fri, 3 Aug 2018 00:38:33 -0400 Received: from localhost (unknown [172.58.41.75]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id 4A2FE13EBDE9F; Thu, 2 Aug 2018 19:44:30 -0700 (PDT) Date: Thu, 02 Aug 2018 19:44:26 -0700 (PDT) Message-Id: <20180802.194426.2272443689594696355.davem@davemloft.net> To: sfr@canb.auug.org.au Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: build failure after merge of the net-next tree From: David Miller In-Reply-To: <20180803121430.25899c83@canb.auug.org.au> References: <20180803121430.25899c83@canb.auug.org.au> X-Mailer: Mew version 6.7 on Emacs 26 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Thu, 02 Aug 2018 19:44:30 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Rothwell Date: Fri, 3 Aug 2018 12:14:30 +1000 > Hi all, > > After merging the net-next tree, today's linux-next build (perf) failed > like this: > > In file included from btf.c:10:0: ... > Caused by commit > > 89b1698c93a9 ("Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net") > > Some of the lines in tools/lib/bpf/btf.[ch] were duplicated (they existed > on both sides of the merge). > > I have used the net-next tree from next-20180802 for today. My bad, I am working on fixing this now. Thanks.