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=-2.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT 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 10C99C64EBC for ; Tue, 2 Oct 2018 22:37:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1E6B20878 for ; Tue, 2 Oct 2018 22:37:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1E6B20878 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codewreck.org 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 S1727454AbeJCFWt (ORCPT ); Wed, 3 Oct 2018 01:22:49 -0400 Received: from nautica.notk.org ([91.121.71.147]:59029 "EHLO nautica.notk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726666AbeJCFWt (ORCPT ); Wed, 3 Oct 2018 01:22:49 -0400 Received: by nautica.notk.org (Postfix, from userid 1001) id AE877C009; Wed, 3 Oct 2018 00:37:07 +0200 (CEST) Date: Wed, 3 Oct 2018 00:36:52 +0200 From: Dominique Martinet To: Miguel Ojeda Cc: Nick Desaulniers , Andrew Morton , Greg KH , Linux-Next Mailing List , Andreas Dilger , Masahiro Yamada , Michal Marek , Steven Rostedt , Mauro Carvalho Chehab , Olof Johansson , Konstantin Ryabitsev , David Miller , Andrey Ryabinin , Kees Cook , Thomas Gleixner , Ingo Molnar , Paul Lawrence , Sandipan Das , Andrey Konovalov , David Woodhouse , Will Deacon , Philippe Ombredanne , Paul Burton , David Rientjes , Willy Tarreau , Martin Sebor , Christopher Li , Jonathan Corbet , Ted Ts'o , Geert Uytterhoeven , Rasmus Villemoes , Joe Perches , Arnd Bergmann , Stefan Agner , Luc Van Oostenryck , Linus Torvalds , Linux Doc Mailing List , Ext4 Developers List , linux-sparse@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel , Stephen Rothwell Subject: Re: [GIT PULL linux-next] Add Compiler Attributes tree Message-ID: <20181002223652.GA4290@nautica> References: <20181003071059.02b3fd6f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Miguel Ojeda wrote on Wed, Oct 03, 2018: > As I have read, -next is supposed to be a vision of what the merge > window will look like after merging everything, i.e. ideally -rc1. For > that to work for files out-of-tree (like these ones, which are not > maintained by a single tree), changes should be allowed to be stacked > on each other; otherwise, we cannot handle conflicts :-( The rule is the same as with a regular mainline pull; I don't have the reference at hand but in some recent-ish pull request Linus said he prefers the stable version with the conflict, and optionally you can provide a second branch with the conflict resolved for reference, but the pull request should be based on something stable even if it has conflicts If there is a conflict Stefen will resolve it like Linus/Greg would, and the resolved bit will be carried over everyday so it's not much more work -- exactly like a regular pull request for inclusion in the main tree :) (Found another mail arguing for stable base[1], but can't find the mail I was thinking of) [1] http://lkml.kernel.org/r/CA+55aFw+dwofadgvzrM-UCMSih+f1choCwW+xFFM3aPjoRQX_g@mail.gmail.com -- Dominique Martinet