From: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Greg KH <gregkh@linuxfoundation.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Andreas Dilger <adilger.kernel@dilger.ca>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Michal Marek <michal.lkml@markovi.net>,
Steven Rostedt <rostedt@goodmis.org>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
Olof Johansson <olof@lxom.net>,
Konstantin Ryabitsev <konstantin@linuxfoundation.org>,
David Miller <davem@davemloft.net>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
Kees Cook <keescook@chromium.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>,
Paul Lawrence <paullawrence@google.com>,
Sandipan Das <sandipan@linux.vnet.ibm.com>,
Andrey Konovalov <andreyknvl@google.com>,
David Woodhouse <dwmw2@infradead.org>,
Will Deacon <will.deacon@arm.com>,
Philippe Ombredanne <pombredanne@nexb.com>,
Paul Burton <paul.burton@mips.com>,
David Rientjes <rientjes@google.com>, Willy Tarreau <w@1wt.eu>,
Martin Sebor <msebor@gmail.com>,
Christopher Li <sparse@chrisli.org>,
Jonathan Corbet <corbet@lwn.net>, "Ted Ts'o" <tytso@mit.edu>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Joe Perches <joe@perches.com>, Arnd Bergmann <arnd@arndb.de>,
Dominique Martinet <asmadeus@codewreck.org>,
Stefan Agner <stefan@agner.ch>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux Doc Mailing List <linux-doc@vger.kernel.org>,
Ext4 Developers List <linux-ext4@vger.kernel.org>,
linux-sparse@vger.kernel.org, linux-kbuild@vger.kernel.org,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL linux-next] Add Compiler Attributes tree
Date: Wed, 3 Oct 2018 00:04:29 +0200 [thread overview]
Message-ID: <CANiq72nh0nybEC8SizQ9rv=RvncMuTH-dt5vciRtvQ1aFBzJcg@mail.gmail.com> (raw)
In-Reply-To: <20181003071059.02b3fd6f@canb.auug.org.au>
Hi Stephen,
On Tue, Oct 2, 2018 at 11:11 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Miguel,
>
> On Tue, 2 Oct 2018 15:47:12 +0200 Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> wrote:
> >
> > The Compiler Attributes series has been stable for 10+ days. To
> > increase testing before 4.20, I would to request it being picked up
> > for -next.
> >
> > The changes w.r.t. v5 in the LKML:
> >
> > - Rebased on top of next-20180928, which required removing
>
> Unfortunately, trees/branches included in linux-next must be based on
> something stable (usually Linus' tree, but it could be another
> tree/branch that is included in linux-next that does not rebase).
> Linux-next itself rebases every day, so snything based on it would drag
> in a previous version of all the other trees :-(
I assumed you could apply changes as a diff/patches/cherry-pick, not
as a merge, for those that went on top of others (so that at the new
merge window, conflicts were already solved). Otherwise, why are
next-* tags/branches provided anyway?
>
> > aligned_largest, which was removed by 9503cd9cbaba
> > ("include/linux/compiler*.h: add version detection to
> > asm_volatile_goto").
>
> That commit is from Andrew's patch series which also rebases (usually
> at least every week), so you cannot depend on it.
Then who is solving the conflict?
Thanks!
Cheers,
Miguel
prev parent reply other threads:[~2018-10-02 22:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 13:47 [GIT PULL linux-next] Add Compiler Attributes tree Miguel Ojeda
2018-10-02 21:10 ` Stephen Rothwell
2018-10-02 21:16 ` Nick Desaulniers
2018-10-02 22:12 ` Miguel Ojeda
2018-10-02 22:36 ` Dominique Martinet
2018-10-02 23:00 ` Stephen Rothwell
2018-10-03 12:34 ` Miguel Ojeda
2018-10-03 13:00 ` Steven Rostedt
2018-10-03 12:14 ` Miguel Ojeda
2018-10-03 12:30 ` Steven Rostedt
2018-10-02 23:24 ` Theodore Y. Ts'o
2018-10-03 11:54 ` Miguel Ojeda
2018-10-03 15:33 ` Theodore Y. Ts'o
2018-10-03 21:23 ` Miguel Ojeda
2018-10-03 21:41 ` Miguel Ojeda
2018-10-04 5:01 ` Theodore Y. Ts'o
2018-10-04 9:06 ` Miguel Ojeda
2018-10-02 22:04 ` Miguel Ojeda [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CANiq72nh0nybEC8SizQ9rv=RvncMuTH-dt5vciRtvQ1aFBzJcg@mail.gmail.com' \
--to=miguel.ojeda.sandonis@gmail.com \
--cc=adilger.kernel@dilger.ca \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@google.com \
--cc=arnd@arndb.de \
--cc=aryabinin@virtuozzo.com \
--cc=asmadeus@codewreck.org \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=dwmw2@infradead.org \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=keescook@chromium.org \
--cc=konstantin@linuxfoundation.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-sparse@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=luc.vanoostenryck@gmail.com \
--cc=mchehab+samsung@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=mingo@kernel.org \
--cc=msebor@gmail.com \
--cc=ndesaulniers@google.com \
--cc=olof@lxom.net \
--cc=paul.burton@mips.com \
--cc=paullawrence@google.com \
--cc=pombredanne@nexb.com \
--cc=rientjes@google.com \
--cc=rostedt@goodmis.org \
--cc=sandipan@linux.vnet.ibm.com \
--cc=sfr@canb.auug.org.au \
--cc=sparse@chrisli.org \
--cc=stefan@agner.ch \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=w@1wt.eu \
--cc=will.deacon@arm.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).