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=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 29D14C17443 for ; Sat, 9 Nov 2019 20:29:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0539E21882 for ; Sat, 9 Nov 2019 20:29:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726778AbfKIU3i (ORCPT ); Sat, 9 Nov 2019 15:29:38 -0500 Received: from shards.monkeyblade.net ([23.128.96.9]:53702 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726718AbfKIU3g (ORCPT ); Sat, 9 Nov 2019 15:29:36 -0500 Received: from localhost (unknown [IPv6:2601:601:9f00:1e2::d71]) (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 E6A6B1474ECF1; Sat, 9 Nov 2019 12:29:35 -0800 (PST) Date: Sat, 09 Nov 2019 12:28:18 -0800 (PST) Message-Id: <20191109.122818.2192239314738108074.davem@davemloft.net> To: mkl@pengutronix.de Cc: netdev@vger.kernel.org, linux-can@vger.kernel.org Subject: Re: request: merge net/master into net-next/master,request: merge net/master into net-next/master From: David Miller In-Reply-To: References: <20191105163215.30194-1-mkl@pengutronix.de> <20191105163215.30194-1-mkl@pengutronix.de> X-Mailer: Mew version 6.8 on Emacs 26.1 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]); Sat, 09 Nov 2019 12:29:36 -0800 (PST) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Marc Kleine-Budde Date: Thu, 7 Nov 2019 09:45:08 +0100 > I've some patches for net-next/master rely on some CAN related changes > in net/master. Can you please merge net/master into net-next/master to > avoid merge conflicts. This has now been done.