lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 3 Oct 2018 00:04:29 +0200 From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Andrew Morton <akpm@...ux-foundation.org>, Greg KH <gregkh@...uxfoundation.org>, Linux-Next Mailing List <linux-next@...r.kernel.org>, Andreas Dilger <adilger.kernel@...ger.ca>, Masahiro Yamada <yamada.masahiro@...ionext.com>, Michal Marek <michal.lkml@...kovi.net>, Steven Rostedt <rostedt@...dmis.org>, Mauro Carvalho Chehab <mchehab+samsung@...nel.org>, Olof Johansson <olof@...m.net>, Konstantin Ryabitsev <konstantin@...uxfoundation.org>, David Miller <davem@...emloft.net>, Andrey Ryabinin <aryabinin@...tuozzo.com>, Kees Cook <keescook@...omium.org>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...nel.org>, Paul Lawrence <paullawrence@...gle.com>, Sandipan Das <sandipan@...ux.vnet.ibm.com>, Andrey Konovalov <andreyknvl@...gle.com>, David Woodhouse <dwmw2@...radead.org>, Will Deacon <will.deacon@....com>, Philippe Ombredanne <pombredanne@...b.com>, Paul Burton <paul.burton@...s.com>, David Rientjes <rientjes@...gle.com>, Willy Tarreau <w@....eu>, Martin Sebor <msebor@...il.com>, Christopher Li <sparse@...isli.org>, Jonathan Corbet <corbet@....net>, "Ted Ts'o" <tytso@....edu>, Geert Uytterhoeven <geert@...ux-m68k.org>, Rasmus Villemoes <linux@...musvillemoes.dk>, Joe Perches <joe@...ches.com>, Arnd Bergmann <arnd@...db.de>, Dominique Martinet <asmadeus@...ewreck.org>, Stefan Agner <stefan@...er.ch>, Luc Van Oostenryck <luc.vanoostenryck@...il.com>, Nick Desaulniers <ndesaulniers@...gle.com>, Linus Torvalds <torvalds@...ux-foundation.org>, Linux Doc Mailing List <linux-doc@...r.kernel.org>, Ext4 Developers List <linux-ext4@...r.kernel.org>, linux-sparse@...r.kernel.org, linux-kbuild@...r.kernel.org, linux-kernel <linux-kernel@...r.kernel.org> Subject: Re: [GIT PULL linux-next] Add Compiler Attributes tree Hi Stephen, On Tue, Oct 2, 2018 at 11:11 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote: > > Hi Miguel, > > On Tue, 2 Oct 2018 15:47:12 +0200 Miguel Ojeda <miguel.ojeda.sandonis@...il.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
Powered by blists - more mailing lists