Re: linux-next: Tree for Feb 20
On Thu, 21 Feb 2019 at 09:04, Geert Uytterhoeven wrote:
>
> Hi Shaokun,
>
> On Thu, Feb 21, 2019 at 1:45 AM Zhangshaokun
> wrote:
> > On 2019/2/20 18:05, Ard Biesheuvel wrote:
> > > On Wed, 20 Feb 2019 at 10:58, Jarkko Sakkinen
> > > wrote:
> > >>
> > >> On Wed, Feb 20, 2019 at 11:52:52AM +0200, Jarkko Sakkinen wrote:
> > >>> On Wed, Feb 20, 2019 at 05:11:15PM +0800, Zhangshaokun wrote:
> > There is a compiler failure on arm64 platform, as follow:
> >
> > AS arch/arm64/kvm/hyp.o
> > CC kernel/trace/ring_buffer.o
> > In file included from security/integrity/ima/ima_fs.c:30:0:
> > security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator
> > ‘NONE’
> > hook(NONE) \
> > ^
> > security/integrity/ima/ima.h:188:34: note: in definition of macro
> > ‘__ima_hook_enumify’
> > #define __ima_hook_enumify(ENUM) ENUM,
> > ^
> > security/integrity/ima/ima.h:191:2: note: in expansion of macro
> > ‘__ima_hooks’
> > __ima_hooks(__ima_hook_enumify)
> > ^
> > In file included from ./arch/arm64/include/asm/acpi.h:15:0,
> > from ./include/acpi/acpi_io.h:7,
> > from ./include/linux/acpi.h:47,
> > from ./include/linux/tpm.h:26,
> > from security/integrity/ima/ima.h:25,
> > from security/integrity/ima/ima_fs.c:30:
> > ./include/linux/efi.h:1716:2: note: previous definition of ‘NONE’ was
> > here
> > NONE,
> > ^
> > scripts/Makefile.build:276: recipe for target
> > 'security/integrity/ima/ima_fs.o' failed
> > make[3]: *** [security/integrity/ima/ima_fs.o] Error 1
> >
> > I dug it and it is the commit 901615cb916d ("tpm: move tpm_chip
> > definition to include/linux/tpm.h")
> > >>>
> > >>> This results from a new include in tpm.h:
> > >>>
> > >>> #include
> > >>>
> > >>> Must be fixed either in include/linux/efi.h or security/integrity/ima.h
> > >>> as
> > >>> those files have a name collision. Makes me wonder why neither has taken
> > >>> care of prefixing the constants properly.
> > >>
> > >> Preferably both subsystems should be fixed with proper 'EFI_' and 'IMA_'
> > >> prefixes. Defining a constant named as NONE in a non-generic subsystem
> > >> (e.g. not part of the core data structures of Linux) and especially
> > >> exporting it to include/linux is not too well considered act.
> > >>
> > >
> > > Fixes for this have already been proposed, and should appear in -next
> > > shortly
> > >
> > > The EFI one is here
> > > https://mail.google.com/mail/u/0/#label/linux-efi/FMfcgxwBVgrQRjglPkWRqRqVclGgVDnB
> > >
> >
> > Because of no privilege, the website is denied for me. Anyway, it's nice to
> > have been fixed.
>
> Looks like Ard posted a link to a label in his personal gmail mailbox?
>
Silly me.
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?h=efi/core=5c418dc789a3898717ebf2caa5716ba91a7150b2
Re: linux-next: Tree for Feb 20
Hi Geert,
On 2019/2/21 16:03, Geert Uytterhoeven wrote:
> Hi Shaokun,
>
> On Thu, Feb 21, 2019 at 1:45 AM Zhangshaokun
> wrote:
>> On 2019/2/20 18:05, Ard Biesheuvel wrote:
>>> On Wed, 20 Feb 2019 at 10:58, Jarkko Sakkinen
>>> wrote:
On Wed, Feb 20, 2019 at 11:52:52AM +0200, Jarkko Sakkinen wrote:
> On Wed, Feb 20, 2019 at 05:11:15PM +0800, Zhangshaokun wrote:
>> There is a compiler failure on arm64 platform, as follow:
>>
>> AS arch/arm64/kvm/hyp.o
>> CC kernel/trace/ring_buffer.o
>> In file included from security/integrity/ima/ima_fs.c:30:0:
>> security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator
>> ‘NONE’
>> hook(NONE) \
>>^
>> security/integrity/ima/ima.h:188:34: note: in definition of macro
>> ‘__ima_hook_enumify’
>> #define __ima_hook_enumify(ENUM) ENUM,
>> ^
>> security/integrity/ima/ima.h:191:2: note: in expansion of macro
>> ‘__ima_hooks’
>> __ima_hooks(__ima_hook_enumify)
>> ^
>> In file included from ./arch/arm64/include/asm/acpi.h:15:0,
>> from ./include/acpi/acpi_io.h:7,
>> from ./include/linux/acpi.h:47,
>> from ./include/linux/tpm.h:26,
>> from security/integrity/ima/ima.h:25,
>> from security/integrity/ima/ima_fs.c:30:
>> ./include/linux/efi.h:1716:2: note: previous definition of ‘NONE’ was
>> here
>> NONE,
>> ^
>> scripts/Makefile.build:276: recipe for target
>> 'security/integrity/ima/ima_fs.o' failed
>> make[3]: *** [security/integrity/ima/ima_fs.o] Error 1
>>
>> I dug it and it is the commit 901615cb916d ("tpm: move tpm_chip
>> definition to include/linux/tpm.h")
>
> This results from a new include in tpm.h:
>
> #include
>
> Must be fixed either in include/linux/efi.h or security/integrity/ima.h as
> those files have a name collision. Makes me wonder why neither has taken
> care of prefixing the constants properly.
Preferably both subsystems should be fixed with proper 'EFI_' and 'IMA_'
prefixes. Defining a constant named as NONE in a non-generic subsystem
(e.g. not part of the core data structures of Linux) and especially
exporting it to include/linux is not too well considered act.
>>>
>>> Fixes for this have already been proposed, and should appear in -next
>>> shortly
>>>
>>> The EFI one is here
>>> https://mail.google.com/mail/u/0/#label/linux-efi/FMfcgxwBVgrQRjglPkWRqRqVclGgVDnB
>>>
>>
>> Because of no privilege, the website is denied for me. Anyway, it's nice to
>> have been fixed.
>
> Looks like Ard posted a link to a label in his personal gmail mailbox?
>
Hmm, it seems that, my bad understanding.
Thanks your reply.
> Gr{oetje,eeting}s,
>
> Geert
>
Re: linux-next: Tree for Feb 20
Hi Shaokun,
On Thu, Feb 21, 2019 at 1:45 AM Zhangshaokun wrote:
> On 2019/2/20 18:05, Ard Biesheuvel wrote:
> > On Wed, 20 Feb 2019 at 10:58, Jarkko Sakkinen
> > wrote:
> >>
> >> On Wed, Feb 20, 2019 at 11:52:52AM +0200, Jarkko Sakkinen wrote:
> >>> On Wed, Feb 20, 2019 at 05:11:15PM +0800, Zhangshaokun wrote:
> There is a compiler failure on arm64 platform, as follow:
>
> AS arch/arm64/kvm/hyp.o
> CC kernel/trace/ring_buffer.o
> In file included from security/integrity/ima/ima_fs.c:30:0:
> security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator
> ‘NONE’
> hook(NONE) \
> ^
> security/integrity/ima/ima.h:188:34: note: in definition of macro
> ‘__ima_hook_enumify’
> #define __ima_hook_enumify(ENUM) ENUM,
> ^
> security/integrity/ima/ima.h:191:2: note: in expansion of macro
> ‘__ima_hooks’
> __ima_hooks(__ima_hook_enumify)
> ^
> In file included from ./arch/arm64/include/asm/acpi.h:15:0,
> from ./include/acpi/acpi_io.h:7,
> from ./include/linux/acpi.h:47,
> from ./include/linux/tpm.h:26,
> from security/integrity/ima/ima.h:25,
> from security/integrity/ima/ima_fs.c:30:
> ./include/linux/efi.h:1716:2: note: previous definition of ‘NONE’ was
> here
> NONE,
> ^
> scripts/Makefile.build:276: recipe for target
> 'security/integrity/ima/ima_fs.o' failed
> make[3]: *** [security/integrity/ima/ima_fs.o] Error 1
>
> I dug it and it is the commit 901615cb916d ("tpm: move tpm_chip
> definition to include/linux/tpm.h")
> >>>
> >>> This results from a new include in tpm.h:
> >>>
> >>> #include
> >>>
> >>> Must be fixed either in include/linux/efi.h or security/integrity/ima.h as
> >>> those files have a name collision. Makes me wonder why neither has taken
> >>> care of prefixing the constants properly.
> >>
> >> Preferably both subsystems should be fixed with proper 'EFI_' and 'IMA_'
> >> prefixes. Defining a constant named as NONE in a non-generic subsystem
> >> (e.g. not part of the core data structures of Linux) and especially
> >> exporting it to include/linux is not too well considered act.
> >>
> >
> > Fixes for this have already been proposed, and should appear in -next
> > shortly
> >
> > The EFI one is here
> > https://mail.google.com/mail/u/0/#label/linux-efi/FMfcgxwBVgrQRjglPkWRqRqVclGgVDnB
> >
>
> Because of no privilege, the website is denied for me. Anyway, it's nice to
> have been fixed.
Looks like Ard posted a link to a label in his personal gmail mailbox?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: linux-next: Tree for Feb 20
Hi Ard,
On 2019/2/20 18:05, Ard Biesheuvel wrote:
> On Wed, 20 Feb 2019 at 10:58, Jarkko Sakkinen
> wrote:
>>
>> On Wed, Feb 20, 2019 at 11:52:52AM +0200, Jarkko Sakkinen wrote:
>>> On Wed, Feb 20, 2019 at 05:11:15PM +0800, Zhangshaokun wrote:
There is a compiler failure on arm64 platform, as follow:
AS arch/arm64/kvm/hyp.o
CC kernel/trace/ring_buffer.o
In file included from security/integrity/ima/ima_fs.c:30:0:
security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator
‘NONE’
hook(NONE) \
^
security/integrity/ima/ima.h:188:34: note: in definition of macro
‘__ima_hook_enumify’
#define __ima_hook_enumify(ENUM) ENUM,
^
security/integrity/ima/ima.h:191:2: note: in expansion of macro
‘__ima_hooks’
__ima_hooks(__ima_hook_enumify)
^
In file included from ./arch/arm64/include/asm/acpi.h:15:0,
from ./include/acpi/acpi_io.h:7,
from ./include/linux/acpi.h:47,
from ./include/linux/tpm.h:26,
from security/integrity/ima/ima.h:25,
from security/integrity/ima/ima_fs.c:30:
./include/linux/efi.h:1716:2: note: previous definition of ‘NONE’ was here
NONE,
^
scripts/Makefile.build:276: recipe for target
'security/integrity/ima/ima_fs.o' failed
make[3]: *** [security/integrity/ima/ima_fs.o] Error 1
I dug it and it is the commit 901615cb916d ("tpm: move tpm_chip definition
to include/linux/tpm.h")
>>>
>>> This results from a new include in tpm.h:
>>>
>>> #include
>>>
>>> Must be fixed either in include/linux/efi.h or security/integrity/ima.h as
>>> those files have a name collision. Makes me wonder why neither has taken
>>> care of prefixing the constants properly.
>>
>> Preferably both subsystems should be fixed with proper 'EFI_' and 'IMA_'
>> prefixes. Defining a constant named as NONE in a non-generic subsystem
>> (e.g. not part of the core data structures of Linux) and especially
>> exporting it to include/linux is not too well considered act.
>>
>
> Fixes for this have already been proposed, and should appear in -next shortly
>
> The EFI one is here
> https://mail.google.com/mail/u/0/#label/linux-efi/FMfcgxwBVgrQRjglPkWRqRqVclGgVDnB
>
Because of no privilege, the website is denied for me. Anyway, it's nice to
have been fixed.
Thanks,
Shaokun
> Not sure about the IMA one, Mimi should be able to comment ...
>
> .
>
Re: linux-next: Tree for Feb 20
> Fixes for this have already been proposed, and should appear in -next shortly > > The EFI one is here > https://mail.google.com/mail/u/0/#label/linux-efi/FMfcgxwBVgrQRjglPkWRqRqVclGgVDnB > > Not sure about the IMA one, Mimi should be able to comment ... I've already commented on the other patch and was expecting to see a revised patch. Mimi
Re: linux-next: Tree for Feb 20
On Wed, 20 Feb 2019 at 10:58, Jarkko Sakkinen
wrote:
>
> On Wed, Feb 20, 2019 at 11:52:52AM +0200, Jarkko Sakkinen wrote:
> > On Wed, Feb 20, 2019 at 05:11:15PM +0800, Zhangshaokun wrote:
> > > There is a compiler failure on arm64 platform, as follow:
> > >
> > > AS arch/arm64/kvm/hyp.o
> > > CC kernel/trace/ring_buffer.o
> > > In file included from security/integrity/ima/ima_fs.c:30:0:
> > > security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator
> > > ‘NONE’
> > > hook(NONE) \
> > >^
> > > security/integrity/ima/ima.h:188:34: note: in definition of macro
> > > ‘__ima_hook_enumify’
> > > #define __ima_hook_enumify(ENUM) ENUM,
> > > ^
> > > security/integrity/ima/ima.h:191:2: note: in expansion of macro
> > > ‘__ima_hooks’
> > > __ima_hooks(__ima_hook_enumify)
> > > ^
> > > In file included from ./arch/arm64/include/asm/acpi.h:15:0,
> > > from ./include/acpi/acpi_io.h:7,
> > > from ./include/linux/acpi.h:47,
> > > from ./include/linux/tpm.h:26,
> > > from security/integrity/ima/ima.h:25,
> > > from security/integrity/ima/ima_fs.c:30:
> > > ./include/linux/efi.h:1716:2: note: previous definition of ‘NONE’ was here
> > > NONE,
> > > ^
> > > scripts/Makefile.build:276: recipe for target
> > > 'security/integrity/ima/ima_fs.o' failed
> > > make[3]: *** [security/integrity/ima/ima_fs.o] Error 1
> > >
> > > I dug it and it is the commit 901615cb916d ("tpm: move tpm_chip
> > > definition to include/linux/tpm.h")
> >
> > This results from a new include in tpm.h:
> >
> > #include
> >
> > Must be fixed either in include/linux/efi.h or security/integrity/ima.h as
> > those files have a name collision. Makes me wonder why neither has taken
> > care of prefixing the constants properly.
>
> Preferably both subsystems should be fixed with proper 'EFI_' and 'IMA_'
> prefixes. Defining a constant named as NONE in a non-generic subsystem
> (e.g. not part of the core data structures of Linux) and especially
> exporting it to include/linux is not too well considered act.
>
Fixes for this have already been proposed, and should appear in -next shortly
The EFI one is here
https://mail.google.com/mail/u/0/#label/linux-efi/FMfcgxwBVgrQRjglPkWRqRqVclGgVDnB
Not sure about the IMA one, Mimi should be able to comment ...
Re: linux-next: Tree for Feb 20
On Wed, Feb 20, 2019 at 11:52:52AM +0200, Jarkko Sakkinen wrote:
> On Wed, Feb 20, 2019 at 05:11:15PM +0800, Zhangshaokun wrote:
> > There is a compiler failure on arm64 platform, as follow:
> >
> > AS arch/arm64/kvm/hyp.o
> > CC kernel/trace/ring_buffer.o
> > In file included from security/integrity/ima/ima_fs.c:30:0:
> > security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator
> > ‘NONE’
> > hook(NONE) \
> >^
> > security/integrity/ima/ima.h:188:34: note: in definition of macro
> > ‘__ima_hook_enumify’
> > #define __ima_hook_enumify(ENUM) ENUM,
> > ^
> > security/integrity/ima/ima.h:191:2: note: in expansion of macro
> > ‘__ima_hooks’
> > __ima_hooks(__ima_hook_enumify)
> > ^
> > In file included from ./arch/arm64/include/asm/acpi.h:15:0,
> > from ./include/acpi/acpi_io.h:7,
> > from ./include/linux/acpi.h:47,
> > from ./include/linux/tpm.h:26,
> > from security/integrity/ima/ima.h:25,
> > from security/integrity/ima/ima_fs.c:30:
> > ./include/linux/efi.h:1716:2: note: previous definition of ‘NONE’ was here
> > NONE,
> > ^
> > scripts/Makefile.build:276: recipe for target
> > 'security/integrity/ima/ima_fs.o' failed
> > make[3]: *** [security/integrity/ima/ima_fs.o] Error 1
> >
> > I dug it and it is the commit 901615cb916d ("tpm: move tpm_chip definition
> > to include/linux/tpm.h")
>
> This results from a new include in tpm.h:
>
> #include
>
> Must be fixed either in include/linux/efi.h or security/integrity/ima.h as
> those files have a name collision. Makes me wonder why neither has taken
> care of prefixing the constants properly.
Preferably both subsystems should be fixed with proper 'EFI_' and 'IMA_'
prefixes. Defining a constant named as NONE in a non-generic subsystem
(e.g. not part of the core data structures of Linux) and especially
exporting it to include/linux is not too well considered act.
/Jarkko
Re: linux-next: Tree for Feb 20
On Wed, Feb 20, 2019 at 05:11:15PM +0800, Zhangshaokun wrote:
> There is a compiler failure on arm64 platform, as follow:
>
> AS arch/arm64/kvm/hyp.o
> CC kernel/trace/ring_buffer.o
> In file included from security/integrity/ima/ima_fs.c:30:0:
> security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator ‘NONE’
> hook(NONE) \
>^
> security/integrity/ima/ima.h:188:34: note: in definition of macro
> ‘__ima_hook_enumify’
> #define __ima_hook_enumify(ENUM) ENUM,
> ^
> security/integrity/ima/ima.h:191:2: note: in expansion of macro ‘__ima_hooks’
> __ima_hooks(__ima_hook_enumify)
> ^
> In file included from ./arch/arm64/include/asm/acpi.h:15:0,
> from ./include/acpi/acpi_io.h:7,
> from ./include/linux/acpi.h:47,
> from ./include/linux/tpm.h:26,
> from security/integrity/ima/ima.h:25,
> from security/integrity/ima/ima_fs.c:30:
> ./include/linux/efi.h:1716:2: note: previous definition of ‘NONE’ was here
> NONE,
> ^
> scripts/Makefile.build:276: recipe for target
> 'security/integrity/ima/ima_fs.o' failed
> make[3]: *** [security/integrity/ima/ima_fs.o] Error 1
>
> I dug it and it is the commit 901615cb916d ("tpm: move tpm_chip definition to
> include/linux/tpm.h")
This results from a new include in tpm.h:
#include
Must be fixed either in include/linux/efi.h or security/integrity/ima.h as
those files have a name collision. Makes me wonder why neither has taken
care of prefixing the constants properly.
/Jarkko
Re: linux-next: Tree for Feb 20
There is a compiler failure on arm64 platform, as follow:
AS arch/arm64/kvm/hyp.o
CC kernel/trace/ring_buffer.o
In file included from security/integrity/ima/ima_fs.c:30:0:
security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator ‘NONE’
hook(NONE) \
^
security/integrity/ima/ima.h:188:34: note: in definition of macro
‘__ima_hook_enumify’
#define __ima_hook_enumify(ENUM) ENUM,
^
security/integrity/ima/ima.h:191:2: note: in expansion of macro ‘__ima_hooks’
__ima_hooks(__ima_hook_enumify)
^
In file included from ./arch/arm64/include/asm/acpi.h:15:0,
from ./include/acpi/acpi_io.h:7,
from ./include/linux/acpi.h:47,
from ./include/linux/tpm.h:26,
from security/integrity/ima/ima.h:25,
from security/integrity/ima/ima_fs.c:30:
./include/linux/efi.h:1716:2: note: previous definition of ‘NONE’ was here
NONE,
^
scripts/Makefile.build:276: recipe for target 'security/integrity/ima/ima_fs.o'
failed
make[3]: *** [security/integrity/ima/ima_fs.o] Error 1
I dug it and it is the commit 901615cb916d ("tpm: move tpm_chip definition to
include/linux/tpm.h")
Thanks,
Shaokun
On 2019/2/20 15:43, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20190219:
>
> The asm-generic tree lost its build failure.
>
> The v4l-dvb tree lost its build failure.
>
> The net-next tree gained a conflict against the bpf tree.
>
> The kvm tree still had its build failure so I used a supplied patch.
>
> The akpm-current tree gained a build failure due to an interaction with
> the drm tree for which I applied a merge fix patch.
>
> Non-merge commits (relative to Linus' tree): 8846
> 9249 files changed, 416125 insertions(+), 220692 deletions(-)
>
>
>
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
> are tracking the linux-next tree using git, you should not use "git pull"
> to do so as that will try to merge the new linux-next release with the
> old one. You should use "git fetch" and checkout or reset to the new
> master.
>
> You can see which trees have been included by looking in the Next/Trees
> file in the source. There are also quilt-import.log and merge.log
> files in the Next directory. Between each merge, the tree was built
> with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a
> multi_v7_defconfig for arm and a native build of tools/perf. After
> the final fixups (if any), I do an x86_64 modules_install followed by
> builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit),
> ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc
> and sparc64 defconfig. And finally, a simple boot test of the powerpc
> pseries_le_defconfig kernel in qemu (with and without kvm enabled).
>
> Below is a summary of the state of the merge.
>
> I am currently merging 296 trees (counting Linus' and 69 trees of bug
> fix patches pending for the current merge release).
>
> Stats about the size of the tree over time can be seen at
> http://neuling.org/linux-next-size.html .
>
> Status of my local build tests will be at
> http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
> advice about cross compilers/configs that work, we are always open to add
> more builds.
>
> Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
> Gortmaker for triage and bug fixes.
>
linux-next: Tree for Feb 20
Hi all, Changes since 20190219: The asm-generic tree lost its build failure. The v4l-dvb tree lost its build failure. The net-next tree gained a conflict against the bpf tree. The kvm tree still had its build failure so I used a supplied patch. The akpm-current tree gained a build failure due to an interaction with the drm tree for which I applied a merge fix patch. Non-merge commits (relative to Linus' tree): 8846 9249 files changed, 416125 insertions(+), 220692 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 296 trees (counting Linus' and 69 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (b5372fe5dc84 exec: load_script: Do not exec truncated interpreter path) Merging fixes/master (ed3ce4cfc919 adfs: mark expected switch fall-throughs) Merging kspp-gustavo/for-next/kspp (6f6c95f09001 ASN.1: mark expected switch fall-through) Merging kbuild-current/fixes (207a369e3c08 sh: fix build error for invisible CONFIG_BUILTIN_DTB_SOURCE) Merging arc-current/for-curr (3a939df742e5 ARC: enable uboot support unconditionally) Merging arm-current/fixes (fc67e6f120a3 ARM: 8835/1: dma-mapping: Clear DMA ops on teardown) Merging arm64-fixes/for-next/fixes (0738c8b5915c arm64/neon: Disable -Wincompatible-pointer-types when building with Clang) Merging m68k-current/for-linus (bed1369f5190 m68k: Fix memblock-related crashes) Merging powerpc-fixes/fixes (a58007621be3 powerpc/64s: Fix possible corruption on big endian due to pgd/pud_present()) Merging sparc/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (5cd856a5ef9a Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) Merging bpf/master (f6be4d16039b selftests/bpf: make sure signal interrupts BPF_PROG_TEST_RUN) Merging ipsec/master (660899ddf06a xfrm: Fix inbound traffic via XFRM interfaces across network namespaces) Merging netfilter/master (c93a49b9769e ipvs: fix warning on unused variable) Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects) Merging wireless-drivers/master (d04ca383860b mt76x0u: fix suspend/resume) Merging mac80211/master (83e37e0bdd14 mac80211: Restore vif beacon interval if start ap fails) Merging rdma-fixes/for-rc (48396e80fb65 RDMA/srp: Rework SCSI device reset handling) Merging sound-current/for-linus (268836649c07 Merge tag 'asoc-fix-v5.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (e080eee63441 Merge branch 'asoc-5.0' into asoc-linus) Merging regmap-fixes/for-linus (f17b5f06cb92 Linux 5.0-rc4) Merging regulator-fixes/for-linus (86d2d637fd84 Merge branch 'regulator-5.0' into regulator-linus) Merging spi-fixes/for-linus (5035e90c71bf Merge branch 'spi-5.0' into spi-linus) Merging pci-current/for-linus (f57a98e1b713 PCI: Work around Synopsys duplicate Device ID (HAPS USB3, NXP i.MX)) Merging driver-core.current/driver-core-linus (d13937116f1e Linux 5.0-rc6) Merging tty.current/tty-linus (d13937116f1e Linux 5.0-rc6) Merging usb.current/usb-linus (d13937116f1e Linux 5.0-rc6) Merging usb-gadget-fixes/fixes (a53469a68eb8 usb: phy: am335x: fix race condition
linux-next: Tree for Feb 20
Hi all, Changes since 20180219: The sound-asoc tree lost its build failures. Non-merge commits (relative to Linus' tree): 2441 2914 files changed, 105361 insertions(+), 55486 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 256 trees (counting Linus' and 44 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (79c0ef3e85c0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging fixes/master (7928b2cbe55b Linux 4.16-rc1) Merging kbuild-current/fixes (36c1681678b5 genksyms: drop *.hash.c from .gitignore) Merging arc-current/for-curr (053823335956 arc: dts: use 'atmel' as manufacturer for at24 in axs10x_mb) Merging arm-current/fixes (091f02483df7 ARM: net: bpf: clarify tail_call index) Merging m68k-current/for-linus (2334b1ac1235 MAINTAINERS: Add NuBus subsystem entry) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (2c10636a0b9c powerpc/pseries: Check for zero filled ibm,dynamic-memory property) Merging sparc/master (aebb48f5e465 sparc64: fix typo in CONFIG_CRYPTO_DES_SPARC64 => CONFIG_CRYPTO_CAMELLIA_SPARC64) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (506b0a395f26 tg3: APE heartbeat changes) Merging bpf/master (9c2d63b843a5 bpf: fix mlock precharge on arraymaps) Merging ipsec/master (510c321b5571 xfrm: reuse uncached_list to track xdsts) Merging netfilter/master (cfc2c7405333 netfilter: IDLETIMER: be syzkaller friendly) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (7ac8ff95f48c mvpp2: fix multicast address filter) Merging mac80211/master (3b07029729e3 mac80211: Fix sending ADDBA response for an ongoing session) Merging rdma-fixes/for-rc (2f08ee363fe0 RDMA/restrack: don't use uaccess_kernel()) Merging sound-current/for-linus (fdcc968a3b29 ALSA: hda/realtek: PCI quirk for Fujitsu U7x7) Merging pci-current/for-linus (7928b2cbe55b Linux 4.16-rc1) Merging driver-core.current/driver-core-linus (7928b2cbe55b Linux 4.16-rc1) Merging tty.current/tty-linus (7928b2cbe55b Linux 4.16-rc1) Merging usb.current/usb-linus (fc19b1d09414 Merge tag 'fixes-for-v4.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) Merging usb-gadget-fixes/fixes (98112041bcca usb: dwc3: core: Fix ULPI PHYs and prevent phy_get/ulpi_init during suspend/resume) Merging usb-serial-fixes/usb-linus (d14ac576d10f USB: serial: cp210x: add new device ID ELV ALC 8xxx) Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) Merging phy/fixes (7928b2cbe55b Linux 4.16-rc1) Merging staging.current/staging-linus (6d79bd5bb6c7 staging: android: ion: Zero CMA allocated memory) Merging char-misc.current/char-misc-linus (7ae079aca59f mei: set device client to the disconnected state upon suspend.) Merging input-current/for-linus (ea4f7bd2aca9 Input: matrix_keypad - fix race when disabling interrupts) Merging crypto-current/master (c927b080c67e crypto: s5p-sss - Fix kernel Oops in AES-ECB mode) Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') Merging vfio-fixes/for-linus (563b5cbe334e iommu/arm-smmu-v3: Cope with duplicated Stream IDs) Merging
linux-next: Tree for Feb 20
Hi all, Changes since 20180219: The sound-asoc tree lost its build failures. Non-merge commits (relative to Linus' tree): 2441 2914 files changed, 105361 insertions(+), 55486 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 256 trees (counting Linus' and 44 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (79c0ef3e85c0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging fixes/master (7928b2cbe55b Linux 4.16-rc1) Merging kbuild-current/fixes (36c1681678b5 genksyms: drop *.hash.c from .gitignore) Merging arc-current/for-curr (053823335956 arc: dts: use 'atmel' as manufacturer for at24 in axs10x_mb) Merging arm-current/fixes (091f02483df7 ARM: net: bpf: clarify tail_call index) Merging m68k-current/for-linus (2334b1ac1235 MAINTAINERS: Add NuBus subsystem entry) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (2c10636a0b9c powerpc/pseries: Check for zero filled ibm,dynamic-memory property) Merging sparc/master (aebb48f5e465 sparc64: fix typo in CONFIG_CRYPTO_DES_SPARC64 => CONFIG_CRYPTO_CAMELLIA_SPARC64) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (506b0a395f26 tg3: APE heartbeat changes) Merging bpf/master (9c2d63b843a5 bpf: fix mlock precharge on arraymaps) Merging ipsec/master (510c321b5571 xfrm: reuse uncached_list to track xdsts) Merging netfilter/master (cfc2c7405333 netfilter: IDLETIMER: be syzkaller friendly) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (7ac8ff95f48c mvpp2: fix multicast address filter) Merging mac80211/master (3b07029729e3 mac80211: Fix sending ADDBA response for an ongoing session) Merging rdma-fixes/for-rc (2f08ee363fe0 RDMA/restrack: don't use uaccess_kernel()) Merging sound-current/for-linus (fdcc968a3b29 ALSA: hda/realtek: PCI quirk for Fujitsu U7x7) Merging pci-current/for-linus (7928b2cbe55b Linux 4.16-rc1) Merging driver-core.current/driver-core-linus (7928b2cbe55b Linux 4.16-rc1) Merging tty.current/tty-linus (7928b2cbe55b Linux 4.16-rc1) Merging usb.current/usb-linus (fc19b1d09414 Merge tag 'fixes-for-v4.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) Merging usb-gadget-fixes/fixes (98112041bcca usb: dwc3: core: Fix ULPI PHYs and prevent phy_get/ulpi_init during suspend/resume) Merging usb-serial-fixes/usb-linus (d14ac576d10f USB: serial: cp210x: add new device ID ELV ALC 8xxx) Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) Merging phy/fixes (7928b2cbe55b Linux 4.16-rc1) Merging staging.current/staging-linus (6d79bd5bb6c7 staging: android: ion: Zero CMA allocated memory) Merging char-misc.current/char-misc-linus (7ae079aca59f mei: set device client to the disconnected state upon suspend.) Merging input-current/for-linus (ea4f7bd2aca9 Input: matrix_keypad - fix race when disabling interrupts) Merging crypto-current/master (c927b080c67e crypto: s5p-sss - Fix kernel Oops in AES-ECB mode) Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') Merging vfio-fixes/for-linus (563b5cbe334e iommu/arm-smmu-v3: Cope with duplicated Stream IDs) Merging
linux-next: Tree for Feb 20
Hi all, Changes since 20170217: The pci tree gained a conflict (probably) against Linus' tree. The kspp tree gained a conflict against the net-next tree. The tip tree gained a conflict against the net-next tree. The target-bva tree gained conflicts against the target-updates tree. Non-merge commits (relative to Linus' tree): 9790 10485 files changed, 445345 insertions(+), 205077 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig (with CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 254 trees (counting Linus' and 37 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (137d01df511b Fix missing sanity check in /dev/sg) Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions) Merging arc-current/for-curr (8ba605b607b7 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant) Merging arm-current/fixes (9e3440481845 ARM: 8658/1: uaccess: fix zeroing of 64-bit get_user()) Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list()) Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) Merging powerpc-fixes/fixes (3f91a89d424a powerpc/64: Disable use of radix under a hypervisor) Merging sparc/master (f9a42e0d58cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (00ea1ceebe0d ipv6: release dst on error in ip6_dst_lookup_tail) Merging ipsec/master (e3dc847a5f85 vti6: Don't report path MTU below IPV6_MIN_MTU.) Merging netfilter/master (f95d7a46bc57 netfilter: ctnetlink: Fix regression in CTA_HELP processing) Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware) Merging mac80211/master (0c8ef291d976 Merge branch 'rhashtable-allocation-failure-during-insertion') Merging sound-current/for-linus (af677166cf63 ALSA: hda - adding a new NV HDMI/DP codec ID in the driver) Merging pci-current/for-linus (afe3e4d11bdf PCI/PME: Restore pcie_pme_driver.remove) Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4) Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4) Merging usb.current/usb-linus (d5adbfcd5f7b Linux 4.10-rc7) Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning) Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID) Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1) Merging staging.current/staging-linus (d5adbfcd5f7b Linux 4.10-rc7) Merging char-misc.current/char-misc-linus (d5adbfcd5f7b Linux 4.10-rc7) Merging input-current/for-linus (722c5ac708b4 Input: elan_i2c - add ELAN0605 to the ACPI table) Merging crypto-current/master (7c2cf1c4615c crypto: chcr - Fix key length for RFC4106) Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)") Merging vfio-fixes/for-linus (930a42ded3fe vfio/spapr_tce: Set window
linux-next: Tree for Feb 20
Hi all, Changes since 20170217: The pci tree gained a conflict (probably) against Linus' tree. The kspp tree gained a conflict against the net-next tree. The tip tree gained a conflict against the net-next tree. The target-bva tree gained conflicts against the target-updates tree. Non-merge commits (relative to Linus' tree): 9790 10485 files changed, 445345 insertions(+), 205077 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig (with CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 254 trees (counting Linus' and 37 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (137d01df511b Fix missing sanity check in /dev/sg) Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions) Merging arc-current/for-curr (8ba605b607b7 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant) Merging arm-current/fixes (9e3440481845 ARM: 8658/1: uaccess: fix zeroing of 64-bit get_user()) Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list()) Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) Merging powerpc-fixes/fixes (3f91a89d424a powerpc/64: Disable use of radix under a hypervisor) Merging sparc/master (f9a42e0d58cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (00ea1ceebe0d ipv6: release dst on error in ip6_dst_lookup_tail) Merging ipsec/master (e3dc847a5f85 vti6: Don't report path MTU below IPV6_MIN_MTU.) Merging netfilter/master (f95d7a46bc57 netfilter: ctnetlink: Fix regression in CTA_HELP processing) Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware) Merging mac80211/master (0c8ef291d976 Merge branch 'rhashtable-allocation-failure-during-insertion') Merging sound-current/for-linus (af677166cf63 ALSA: hda - adding a new NV HDMI/DP codec ID in the driver) Merging pci-current/for-linus (afe3e4d11bdf PCI/PME: Restore pcie_pme_driver.remove) Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4) Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4) Merging usb.current/usb-linus (d5adbfcd5f7b Linux 4.10-rc7) Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning) Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID) Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1) Merging staging.current/staging-linus (d5adbfcd5f7b Linux 4.10-rc7) Merging char-misc.current/char-misc-linus (d5adbfcd5f7b Linux 4.10-rc7) Merging input-current/for-linus (722c5ac708b4 Input: elan_i2c - add ELAN0605 to the ACPI table) Merging crypto-current/master (7c2cf1c4615c crypto: chcr - Fix key length for RFC4106) Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)") Merging vfio-fixes/for-linus (930a42ded3fe vfio/spapr_tce: Set window
linux-next: Tree for Feb 20
Hi all, Please do not add any material destined for v3.21 to your linux-next included trees until after v3.20-rc1 has been released. Changes since 20150219: The clk tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 1232 870 files changed, 32474 insertions(+), 19892 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 206 trees (counting Linus' and 30 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (89d3fa45b4ad Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (a16c5f99a28c kbuild: Fix removal of the debian/ directory) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (8e6480667246 ARM: 8299/1: mm: ensure local active ASID is marked as allocated on rollover) Merging m68k-current/for-linus (4436820a98cd m68k/defconfig: Enable Ethernet bridging) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) Merging powerpc-merge-mpe/fixes (c59c961ca511 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) Merging net/master (aa183323312d ehea: Register memory hotplug, reboot and crash hooks on adapter probe) Merging ipsec/master (ac37e2515c1a xfrm: release dst_orig in case of error in xfrm_lookup()) Merging sound-current/for-linus (3cd1ce0420ce ALSA: usb: Fix support for Denon DA-300USB DAC (ID 154e:1003)) Merging pci-current/for-linus (feb28979c137 of/pci: Remove duplicate kfree in of_pci_get_host_bridge_resources()) Merging wireless-drivers/master (aeb2d2a4c0ae rtlwifi: Remove logging statement that is no longer needed) Merging driver-core.current/driver-core-linus (26bc420b59a3 Linux 3.19-rc6) Merging tty.current/tty-linus (ec6f34e5b552 Linux 3.19-rc5) Merging usb.current/usb-linus (e36f014edff7 Linux 3.19-rc7) Merging usb-gadget-fixes/fixes (f5af19d10d15 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging usb-serial-fixes/usb-linus (a6f0331236fa USB: cp210x: add ID for RUGGEDCOM USB Serial Console) Merging staging.current/staging-linus (e36f014edff7 Linux 3.19-rc7) Merging char-misc.current/char-misc-linus (e36f014edff7 Linux 3.19-rc7) Merging input-current/for-linus (4ba24fef3eb3 Merge branch 'next' into for-linus) Merging crypto-current/master (96692a7305c4 crypto: tcrypt - do not allocate iv on stack for aead speed tests) Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging devicetree-current/devicetree/merge (6b1271de3723 of/unittest: Overlays with sub-devices tests) Merging rr-fixes/fixes (f47689345931 lguest: update help text.) Merging vfio-fixes/for-linus (7c2e211f3c95 vfio-pci: Fix the check on pci device type in vfio_pci_probe()) Merging kselftest-fixes/fixes (f5db310d77ef selftests/vm: fix link error for transhuge-stress test) Merging drm-intel-fixes/for-linux-next-fixes (bfa76d495765 Linux 3.19) Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic)
linux-next: Tree for Feb 20
Hi all, Please do not add any material destined for v3.21 to your linux-next included trees until after v3.20-rc1 has been released. Changes since 20150219: The clk tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 1232 870 files changed, 32474 insertions(+), 19892 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use git pull to do so as that will try to merge the new linux-next release with the old one. You should use git fetch and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 206 trees (counting Linus' and 30 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (89d3fa45b4ad Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (a16c5f99a28c kbuild: Fix removal of the debian/ directory) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (8e6480667246 ARM: 8299/1: mm: ensure local active ASID is marked as allocated on rollover) Merging m68k-current/for-linus (4436820a98cd m68k/defconfig: Enable Ethernet bridging) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) Merging powerpc-merge-mpe/fixes (c59c961ca511 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) Merging net/master (aa183323312d ehea: Register memory hotplug, reboot and crash hooks on adapter probe) Merging ipsec/master (ac37e2515c1a xfrm: release dst_orig in case of error in xfrm_lookup()) Merging sound-current/for-linus (3cd1ce0420ce ALSA: usb: Fix support for Denon DA-300USB DAC (ID 154e:1003)) Merging pci-current/for-linus (feb28979c137 of/pci: Remove duplicate kfree in of_pci_get_host_bridge_resources()) Merging wireless-drivers/master (aeb2d2a4c0ae rtlwifi: Remove logging statement that is no longer needed) Merging driver-core.current/driver-core-linus (26bc420b59a3 Linux 3.19-rc6) Merging tty.current/tty-linus (ec6f34e5b552 Linux 3.19-rc5) Merging usb.current/usb-linus (e36f014edff7 Linux 3.19-rc7) Merging usb-gadget-fixes/fixes (f5af19d10d15 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging usb-serial-fixes/usb-linus (a6f0331236fa USB: cp210x: add ID for RUGGEDCOM USB Serial Console) Merging staging.current/staging-linus (e36f014edff7 Linux 3.19-rc7) Merging char-misc.current/char-misc-linus (e36f014edff7 Linux 3.19-rc7) Merging input-current/for-linus (4ba24fef3eb3 Merge branch 'next' into for-linus) Merging crypto-current/master (96692a7305c4 crypto: tcrypt - do not allocate iv on stack for aead speed tests) Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging devicetree-current/devicetree/merge (6b1271de3723 of/unittest: Overlays with sub-devices tests) Merging rr-fixes/fixes (f47689345931 lguest: update help text.) Merging vfio-fixes/for-linus (7c2e211f3c95 vfio-pci: Fix the check on pci device type in vfio_pci_probe()) Merging kselftest-fixes/fixes (f5db310d77ef selftests/vm: fix link error for transhuge-stress test) Merging drm-intel-fixes/for-linux-next-fixes (bfa76d495765 Linux 3.19) Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) Merging
linux-next: Tree for Feb 20
Hi all,
If you see failures in building this tree due to missing declarations of
k..alloc/free, then it may be caused by commit 2bd59d48ebfb ("cgroup:
convert to kernfs"). Please send Tejun Heo a patch
adding an inclusion of linux/slab.h to the appropriate file(s).
This tree fails (more than usual) the powerpc allyesconfig build.
Changes since 20140219:
New tree: clang
The imx-mxs tree gained a conflict against the arm-soc tree.
The powerpc tree still had its build failure.
The mfd-lj tree still had its build failure so I used the version from
next-20140210.
The hid tree gained conflicts against Lunus' tree.
The sound-asoc tree gained a build failure so I used the version from
next-20140219 (with a driver disabled because of yesterday's error).
Non-merge commits (relative to Linus' tree): 3539
3718 files changed, 126532 insertions(+), 67391 deletions(-)
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a
multi_v7_defconfig for arm. After the final fixups (if any), it is also
built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and
allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final
link) and i386, sparc, sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
I am currently merging 210 trees (counting Linus' and 28 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (e95003c3f9cc Merge tag 'nfs-for-3.14-4' of
git://git.linux-nfs.org/projects/trondmy/linux-nfs)
Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator)
Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1)
Merging arc-current/for-curr (7e22e91102c6 Linux 3.13-rc8)
Merging arm-current/fixes (39544ac9df20 ARM: 7957/1: add DSB after icache flush
in __flush_icache_all())
Merging m68k-current/for-linus (7247f55381d5 m68k: Wire up sched_setattr and
sched_getattr)
Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2)
Merging powerpc-merge/merge (66f9af83e56b powerpc/eeh: Disable EEH on reboot)
Merging sparc/master (738b52bb9845 Merge tag 'microblaze-3.14-rc3' of
git://git.monstr.eu/linux-2.6-microblaze)
Merging net/master (d554f73df6bc xen-netfront: reset skb network header before
checksum)
Merging ipsec/master (960dfc4eb23a Merge branch 'drm-fixes' of
git://people.freedesktop.org/~airlied/linux)
Merging sound-current/for-linus (13c12dbe3a2c ALSA: hda/ca0132 - Fix recording
from mode id 0x8)
Merging pci-current/for-linus (fc40363b2140 ahci: Fix broken fallback to single
MSI mode)
Merging wireless/master (4885c8731a34 hostap: fix "hostap: proc: Use
remove_proc_subtree()")
Merging driver-core.current/driver-core-linus (6d0abeca3242 Linux 3.14-rc3)
Merging tty.current/tty-linus (6d0abeca3242 Linux 3.14-rc3)
Merging usb.current/usb-linus (64fe1891696c phy: let phy_provider_register be
the last step in registering PHY)
Merging staging.current/staging-linus (6d0abeca3242 Linux 3.14-rc3)
Merging char-misc.current/char-misc-linus (accb884b32e8 mei: set client's
read_cb to NULL when flow control fails)
Merging input-current/for-linus (70b0052425ff Input: da9052_onkey - use correct
register bit for key status)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard"
stripe)
Merging crypto-current/master (ee97dc7db4cb crypto: s390 - fix des and des3_ede
ctr concurrency issue)
Merging ide/master (738b52bb9845 Merge tag 'microblaze-3.14-rc3' of
git://git.monstr.eu/linux-2.6-microblaze)
Merging dwmw2/master
linux-next: Tree for Feb 20
Hi all, If you see failures in building this tree due to missing declarations of k..alloc/free, then it may be caused by commit 2bd59d48ebfb (cgroup: convert to kernfs). Please send Tejun Heo t...@kernel.org a patch adding an inclusion of linux/slab.h to the appropriate file(s). This tree fails (more than usual) the powerpc allyesconfig build. Changes since 20140219: New tree: clang The imx-mxs tree gained a conflict against the arm-soc tree. The powerpc tree still had its build failure. The mfd-lj tree still had its build failure so I used the version from next-20140210. The hid tree gained conflicts against Lunus' tree. The sound-asoc tree gained a build failure so I used the version from next-20140219 (with a driver disabled because of yesterday's error). Non-merge commits (relative to Linus' tree): 3539 3718 files changed, 126532 insertions(+), 67391 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use git pull to do so as that will try to merge the new linux-next release with the old one. You should use git fetch as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. I am currently merging 210 trees (counting Linus' and 28 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (e95003c3f9cc Merge tag 'nfs-for-3.14-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1) Merging arc-current/for-curr (7e22e91102c6 Linux 3.13-rc8) Merging arm-current/fixes (39544ac9df20 ARM: 7957/1: add DSB after icache flush in __flush_icache_all()) Merging m68k-current/for-linus (7247f55381d5 m68k: Wire up sched_setattr and sched_getattr) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (66f9af83e56b powerpc/eeh: Disable EEH on reboot) Merging sparc/master (738b52bb9845 Merge tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze) Merging net/master (d554f73df6bc xen-netfront: reset skb network header before checksum) Merging ipsec/master (960dfc4eb23a Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) Merging sound-current/for-linus (13c12dbe3a2c ALSA: hda/ca0132 - Fix recording from mode id 0x8) Merging pci-current/for-linus (fc40363b2140 ahci: Fix broken fallback to single MSI mode) Merging wireless/master (4885c8731a34 hostap: fix hostap: proc: Use remove_proc_subtree()) Merging driver-core.current/driver-core-linus (6d0abeca3242 Linux 3.14-rc3) Merging tty.current/tty-linus (6d0abeca3242 Linux 3.14-rc3) Merging usb.current/usb-linus (64fe1891696c phy: let phy_provider_register be the last step in registering PHY) Merging staging.current/staging-linus (6d0abeca3242 Linux 3.14-rc3) Merging char-misc.current/char-misc-linus (accb884b32e8 mei: set client's read_cb to NULL when flow control fails) Merging input-current/for-linus (70b0052425ff Input: da9052_onkey - use correct register bit for key status) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding discard stripe) Merging crypto-current/master (ee97dc7db4cb crypto: s390 - fix des and des3_ede ctr concurrency issue) Merging ide/master (738b52bb9845 Merge tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze) Merging
Re: linux-next: Tree for Feb 20
On Thu, 2008-02-21 at 02:20 +1100, Stephen Rothwell wrote: > Hi James, > > On Wed, 20 Feb 2008 08:59:20 -0600 James Bottomley <[EMAIL PROTECTED]> wrote: > > > > Is the merge log available anywhere yet? > > Are you looking for more that what is in Next/merge.log in the tree? Yes, that's it, thanks! James -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
James Bottomley wrote: > On Wed, 2008-02-20 at 16:34 +1100, Stephen Rothwell wrote: >> There were no merge conflicts and only one build failure! > > Is the merge log available anywhere yet? Yes, there is the Next/merge.log file in linux-next. http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=blob;f=Next/merge.log;hb=HEAD This is also now documented on the pages i setup on http://linux.f-seidel.de/linux-next/ while this http://linux.f-seidel.de/linux-next/pmwiki/pmwiki.php?n=Linux-next.ShortSummary holds most of it in a short form. Thanks, Frank -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
Hi James, On Wed, 20 Feb 2008 08:59:20 -0600 James Bottomley <[EMAIL PROTECTED]> wrote: > > Is the merge log available anywhere yet? Are you looking for more that what is in Next/merge.log in the tree? -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpwG0ByAcY4r.pgp Description: PGP signature
Re: linux-next: Tree for Feb 20
On Wed, 2008-02-20 at 16:34 +1100, Stephen Rothwell wrote: > Hi all, > > I have created today's linux-next tree at > git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git. > > You can see which trees have been included by looking in the Next/Trees > file in the source. There are also quilt-import.log and merge.log files > in the Next directory. Between each merge, the tree was built with > allmodconfig for both powerpc and x86_64. > > There were no merge conflicts and only one build failure! Is the merge log available anywhere yet? James -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
On Wed, Feb 20, 2008 at 04:34:57PM +1100, Stephen Rothwell wrote: >... > I will stop making these announcements now unless there is some change to > the tree or things people should know. There should be a new tree every > (Australian Capital Territory) working day. I'd recommend removing linux-arch from daily emails but linux-kernel will this month for the first time average over 500 mails/day so there shouldn't be any reason against daily postings here. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
On Wed, Feb 20, 2008 at 04:34:57PM +1100, Stephen Rothwell wrote: ... I will stop making these announcements now unless there is some change to the tree or things people should know. There should be a new tree every (Australian Capital Territory) working day. I'd recommend removing linux-arch from daily emails but linux-kernel will this month for the first time average over 500 mails/day so there shouldn't be any reason against daily postings here. cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
On Wed, 2008-02-20 at 16:34 +1100, Stephen Rothwell wrote: Hi all, I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with allmodconfig for both powerpc and x86_64. There were no merge conflicts and only one build failure! Is the merge log available anywhere yet? James -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
James Bottomley wrote: On Wed, 2008-02-20 at 16:34 +1100, Stephen Rothwell wrote: There were no merge conflicts and only one build failure! Is the merge log available anywhere yet? Yes, there is the Next/merge.log file in linux-next. http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=blob;f=Next/merge.log;hb=HEAD This is also now documented on the pages i setup on http://linux.f-seidel.de/linux-next/ while this http://linux.f-seidel.de/linux-next/pmwiki/pmwiki.php?n=Linux-next.ShortSummary holds most of it in a short form. Thanks, Frank -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
On Thu, 2008-02-21 at 02:20 +1100, Stephen Rothwell wrote: Hi James, On Wed, 20 Feb 2008 08:59:20 -0600 James Bottomley [EMAIL PROTECTED] wrote: Is the merge log available anywhere yet? Are you looking for more that what is in Next/merge.log in the tree? Yes, that's it, thanks! James -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
Stephen Rothwell wrote: > That would work. Chris has the right idea, though. Just set up > linux-next as a remote on any existing clone of Linus' tree and the > "fetch" will forcibly update the linux-next/master branch (remember to > not have that branch checked out when you fetch). > > If you keep a continuing git tree for this, you will have the history of > all the next trees because I tag each one. Thanks for that hint. Added it to the FAQ on the Wiki (http://linux.f-seidel.de/linux-next/pmwiki/). Frank -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
Greg KH wrote: On Wed, Feb 20, 2008 at 04:34:57PM +1100, Stephen Rothwell wrote: Hi all, I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with allmodconfig for both powerpc and x86_64. What's the best way to constantly follow this tree? I had cloned it a while ago, but now if I 'git pull' it wants to merge things, which isn't right. I'm guessing that this is constantly being rebased? Against what, Linus's tree? So we should be able to clone Linus's tree, and then pull in -next? Or am I totally missing something here? You can use 'git fetch -f' to override your local tree with the remote contents. I'm pretty sure there's a better way to do it, but I don't know it... Jeff -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
Hi Greg, On Tue, 19 Feb 2008 21:50:55 -0800 Greg KH <[EMAIL PROTECTED]> wrote: > > What's the best way to constantly follow this tree? I had cloned it a > while ago, but now if I 'git pull' it wants to merge things, which isn't > right. > > I'm guessing that this is constantly being rebased? Against what, > Linus's tree? So we should be able to clone Linus's tree, and then pull > in -next? That would work. Chris has the right idea, though. Just set up linux-next as a remote on any existing clone of Linus' tree and the "fetch" will forcibly update the linux-next/master branch (remember to not have that branch checked out when you fetch). If you keep a continuing git tree for this, you will have the history of all the next trees because I tag each one. > Or am I totally missing something here? I said in the original announcement that the "master" branch would be rebasing every day (well, I actually said that I would recreate the tree every day). Each day, I start with the latest version of Linus' tree (my "stable" branch) and then merge all the subsystem trees on that. > I like seeing these, to know that things are at least still working. I > imagine you could script them, or just send them to the linux-next list > if there are no problems, but lkml should probably be notified of any > issues, right? Sounds like a plan. So new "normal" announcements will happen on the linux-next mailing list and "abnormal" ones to LKML as well (at least). -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpsMkb4fDYGF.pgp Description: PGP signature
Re: linux-next: Tree for Feb 20
On Tue, Feb 19, 2008 at 09:50:55PM -0800, Greg KH wrote: > What's the best way to constantly follow this tree? I had cloned it > a while ago, but now if I 'git pull' it wants to merge things, which > isn't right. I would guess: $ git remote add linux-next git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git $ git fetch linux-next then use the remote branch names when poking about: $ git log -p linux-next/master etc? Or is there a better way? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
From: Greg KH <[EMAIL PROTECTED]> Date: Tue, 19 Feb 2008 21:50:55 -0800 > On Wed, Feb 20, 2008 at 04:34:57PM +1100, Stephen Rothwell wrote: > > I will stop making these announcements now unless there is some change to > > the tree or things people should know. There should be a new tree every > > (Australian Capital Territory) working day. > > I like seeing these, to know that things are at least still working. FWIW, I like seeing them too. It acts as a catalist in my inbox which works as a TODO list. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
On Wed, Feb 20, 2008 at 04:34:57PM +1100, Stephen Rothwell wrote: > Hi all, > > I have created today's linux-next tree at > git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git. > > You can see which trees have been included by looking in the Next/Trees > file in the source. There are also quilt-import.log and merge.log files > in the Next directory. Between each merge, the tree was built with > allmodconfig for both powerpc and x86_64. What's the best way to constantly follow this tree? I had cloned it a while ago, but now if I 'git pull' it wants to merge things, which isn't right. I'm guessing that this is constantly being rebased? Against what, Linus's tree? So we should be able to clone Linus's tree, and then pull in -next? Or am I totally missing something here? > There were no merge conflicts and only one build failure! > > We are up to 27 trees, more are welcome (even if they are currently > empty). I would encourage architecture maintainers, in particular, to > set up a git branch or quilt tree now to avoid the rush after RC2 :-) > > I will stop making these announcements now unless there is some change to > the tree or things people should know. There should be a new tree every > (Australian Capital Territory) working day. I like seeing these, to know that things are at least still working. I imagine you could script them, or just send them to the linux-next list if there are no problems, but lkml should probably be notified of any issues, right? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: Tree for Feb 20
Hi all, I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with allmodconfig for both powerpc and x86_64. There were no merge conflicts and only one build failure! We are up to 27 trees, more are welcome (even if they are currently empty). I would encourage architecture maintainers, in particular, to set up a git branch or quilt tree now to avoid the rush after RC2 :-) I will stop making these announcements now unless there is some change to the tree or things people should know. There should be a new tree every (Australian Capital Territory) working day. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpUnX4GJ2MQQ.pgp Description: PGP signature
linux-next: Tree for Feb 20
Hi all, I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with allmodconfig for both powerpc and x86_64. There were no merge conflicts and only one build failure! We are up to 27 trees, more are welcome (even if they are currently empty). I would encourage architecture maintainers, in particular, to set up a git branch or quilt tree now to avoid the rush after RC2 :-) I will stop making these announcements now unless there is some change to the tree or things people should know. There should be a new tree every (Australian Capital Territory) working day. -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpUnX4GJ2MQQ.pgp Description: PGP signature
Re: linux-next: Tree for Feb 20
On Tue, Feb 19, 2008 at 09:50:55PM -0800, Greg KH wrote: What's the best way to constantly follow this tree? I had cloned it a while ago, but now if I 'git pull' it wants to merge things, which isn't right. I would guess: $ git remote add linux-next git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git $ git fetch linux-next then use the remote branch names when poking about: $ git log -p linux-next/master etc? Or is there a better way? -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
On Wed, Feb 20, 2008 at 04:34:57PM +1100, Stephen Rothwell wrote: Hi all, I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with allmodconfig for both powerpc and x86_64. What's the best way to constantly follow this tree? I had cloned it a while ago, but now if I 'git pull' it wants to merge things, which isn't right. I'm guessing that this is constantly being rebased? Against what, Linus's tree? So we should be able to clone Linus's tree, and then pull in -next? Or am I totally missing something here? There were no merge conflicts and only one build failure! We are up to 27 trees, more are welcome (even if they are currently empty). I would encourage architecture maintainers, in particular, to set up a git branch or quilt tree now to avoid the rush after RC2 :-) I will stop making these announcements now unless there is some change to the tree or things people should know. There should be a new tree every (Australian Capital Territory) working day. I like seeing these, to know that things are at least still working. I imagine you could script them, or just send them to the linux-next list if there are no problems, but lkml should probably be notified of any issues, right? thanks, greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
From: Greg KH [EMAIL PROTECTED] Date: Tue, 19 Feb 2008 21:50:55 -0800 On Wed, Feb 20, 2008 at 04:34:57PM +1100, Stephen Rothwell wrote: I will stop making these announcements now unless there is some change to the tree or things people should know. There should be a new tree every (Australian Capital Territory) working day. I like seeing these, to know that things are at least still working. FWIW, I like seeing them too. It acts as a catalist in my inbox which works as a TODO list. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
Hi Greg, On Tue, 19 Feb 2008 21:50:55 -0800 Greg KH [EMAIL PROTECTED] wrote: What's the best way to constantly follow this tree? I had cloned it a while ago, but now if I 'git pull' it wants to merge things, which isn't right. I'm guessing that this is constantly being rebased? Against what, Linus's tree? So we should be able to clone Linus's tree, and then pull in -next? That would work. Chris has the right idea, though. Just set up linux-next as a remote on any existing clone of Linus' tree and the fetch will forcibly update the linux-next/master branch (remember to not have that branch checked out when you fetch). If you keep a continuing git tree for this, you will have the history of all the next trees because I tag each one. Or am I totally missing something here? I said in the original announcement that the master branch would be rebasing every day (well, I actually said that I would recreate the tree every day). Each day, I start with the latest version of Linus' tree (my stable branch) and then merge all the subsystem trees on that. I like seeing these, to know that things are at least still working. I imagine you could script them, or just send them to the linux-next list if there are no problems, but lkml should probably be notified of any issues, right? Sounds like a plan. So new normal announcements will happen on the linux-next mailing list and abnormal ones to LKML as well (at least). -- Cheers, Stephen Rothwell[EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/ pgpsMkb4fDYGF.pgp Description: PGP signature
Re: linux-next: Tree for Feb 20
Greg KH wrote: On Wed, Feb 20, 2008 at 04:34:57PM +1100, Stephen Rothwell wrote: Hi all, I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with allmodconfig for both powerpc and x86_64. What's the best way to constantly follow this tree? I had cloned it a while ago, but now if I 'git pull' it wants to merge things, which isn't right. I'm guessing that this is constantly being rebased? Against what, Linus's tree? So we should be able to clone Linus's tree, and then pull in -next? Or am I totally missing something here? You can use 'git fetch -f' to override your local tree with the remote contents. I'm pretty sure there's a better way to do it, but I don't know it... Jeff -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Feb 20
Stephen Rothwell wrote: That would work. Chris has the right idea, though. Just set up linux-next as a remote on any existing clone of Linus' tree and the fetch will forcibly update the linux-next/master branch (remember to not have that branch checked out when you fetch). If you keep a continuing git tree for this, you will have the history of all the next trees because I tag each one. Thanks for that hint. Added it to the FAQ on the Wiki (http://linux.f-seidel.de/linux-next/pmwiki/). Frank -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
