Re: linux-next: Tree for Jul 30 [build failure on arm64]
Hi Christoph, On Fri, 31 Jul 2020 11:00:22 +0200 Christoph Hellwig wrote: > > Please just drop the branch for now. I will revert those 4 commits from today's linux-next and all Al needs to do is reset his for-next branch to its parent. -- Cheers, Stephen Rothwell pgptop3INTvLv.pgp Description: OpenPGP digital signature
Re: linux-next: Tree for Jul 30 [build failure on arm64]
Ok, looks like my baseline had arm64 defconfig fail due to a missing include already, so the script didn't see a regression due to the existing failure in ptrauth_keys_init_user. Looks like moving the definіtion to asm-generic/compat.h is a better idea better anyway.
Re: linux-next: Tree for Jul 30 [build failure on arm64]
Please just drop the branch for now.
Re: linux-next: Tree for Jul 30 [build failure on arm64]
Hi,
在 2020/7/31 16:30, Naresh Kamboju 写道:
> On Fri, 31 Jul 2020 at 09:38, Stephen Rothwell wrote:
>>
>> Hi all,
>>
>> On Fri, 31 Jul 2020 10:46:52 +0800 Shaokun Zhang
>> wrote:
>>>
>>> There's a build failure on arm64:
>>>
>>> In file included from ./include/linux/compat.h:17:0,
>>> from ./arch/arm64/include/asm/stat.h:13,
>>> from ./include/linux/stat.h:6,
>>> from ./include/linux/sysfs.h:22,
>>> from ./include/linux/kobject.h:20,
>>> from ./include/linux/of.h:17,
>>> from ./include/linux/irqdomain.h:35,
>>> from ./include/linux/acpi.h:13,
>>> from ./include/acpi/apei.h:9,
>>> from ./include/acpi/ghes.h:5,
>>> from ./include/linux/arm_sdei.h:8,
>>> from arch/arm64/kernel/asm-offsets.c:10:
>>> ./include/linux/fs.h: In function ‘vfs_whiteout’:
>>> ./include/linux/fs.h:1709:32: error: ‘S_IFCHR’ undeclared (first use in
>>> this function)
>>> return vfs_mknod(dir, dentry, S_IFCHR | WHITEOUT_MODE, WHITEOUT_DEV);
>>> ^
>>> ./include/linux/fs.h:1709:32: note: each undeclared identifier is reported
>>> only once for each
>>> function it appears in
>>> ./include/linux/fs.h: At top level:
>>> ./include/linux/fs.h:1855:46: warning: ‘struct kstat’ declared inside
>>> parameter list
>>> int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);
>>> ^
>>> ./include/linux/fs.h:1855:46: warning: its scope is only this definition or
>>> declaration, which is
>>> probably not what you want
>>> ./include/linux/fs.h: In function ‘__mandatory_lock’:
>>> ./include/linux/fs.h:2325:25: error: ‘S_ISGID’ undeclared (first use in
>>> this function)
>>> return (ino->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID;
>>> ^
>>> ./include/linux/fs.h:2325:35: error: ‘S_IXGRP’ undeclared (first use in
>>> this function)
>>> return (ino->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID;
>>>^
>>> ./include/linux/fs.h: In function ‘invalidate_remote_inode’:
>>> ./include/linux/fs.h:2588:6: error: implicit declaration of function
>>> ‘S_ISREG’
>>> [-Werror=implicit-function-declaration]
>>> if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
>>> ^
>>> ./include/linux/fs.h:2588:32: error: implicit declaration of function
>>> ‘S_ISDIR’
>>> [-Werror=implicit-function-declaration]
>>> if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
>>> ^
>>> ./include/linux/fs.h:2589:6: error: implicit declaration of function
>>> ‘S_ISLNK’
>>> [-Werror=implicit-function-declaration]
>>> S_ISLNK(inode->i_mode))
>>> ^
>>> ./include/linux/fs.h: In function ‘execute_ok’:
>>> ./include/linux/fs.h:2768:26: error: ‘S_IXUGO’ undeclared (first use in
>>> this function)
>>> return (inode->i_mode & S_IXUGO) || S_ISDIR(inode->i_mode);
>>
>> Presumably caused by commit
>>
>> b902bfb3f0e9 ("arm64: stop using directly")
>
> I have reverted this commit
> b902bfb3f0e9 ("arm64: stop using directly")
>
> and rebuilt arm64 failed due to below errors/warnings.
>
> make -sk KBUILD_BUILD_USER=TuxBuild -C/linux -j16 ARCH=arm64
> CROSS_COMPILE=aarch64-linux-gnu- HOSTCC=gcc CC="sccache
> aarch64-linux-gnu-gcc" O=build Image
> #
> In file included from ../include/linux/stat.h:6,
> from ../include/linux/sysfs.h:22,
> from ../include/linux/kobject.h:20,
> from ../include/linux/of.h:17,
> from ../include/linux/irqdomain.h:35,
> from ../include/linux/acpi.h:13,
> from ../include/acpi/apei.h:9,
> from ../include/acpi/ghes.h:5,
> from ../include/linux/arm_sdei.h:8,
> from ../arch/arm64/kernel/asm-offsets.c:10:
> ../arch/arm64/include/asm/stat.h:20:2: error: unknown type name ‘compat_u64’
>20 | compat_u64 st_dev;
> |
0a3a4497a1de <"compat: lift compat_s64 and compat_u64 to ">
has removed the compat_s64 and compat_u64.
Thanks,
Shaokun
^~
> ../arch/arm64/include/asm/stat.h:31:2: error: unknown type name ‘compat_u64’
>31 | compat_u64 st_rdev;
> | ^~
> ../arch/arm64/include/asm/stat.h:34:2: error: unknown type name ‘compat_s64’
>34 | compat_s64 st_size;
> | ^~
> ../arch/arm64/include/asm/stat.h:36:2: error: unknown type name ‘compat_u64’
>36 | compat_u64 st_blocks; /* Number of 512-byte blocks allocated. */
> | ^~
> ../arch/arm64/include/asm/stat.h:47:2: error: unknown type name ‘compat_u64’
>47 | compat_u64 st_ino;
> | ^~
> make[2]: *** [../scripts/Makefile.build:114:
> arch/arm64/kernel/asm-offsets.s] Error 1
>
> - Naresh
>
> .
>
Re: linux-next: Tree for Jul 30 [build failure on arm64]
Hi Naresh,
On Fri, 31 Jul 2020 14:00:57 +0530 Naresh Kamboju
wrote:
>
> > Presumably caused by commit
> >
> > b902bfb3f0e9 ("arm64: stop using directly")
>
> I have reverted this commit
> b902bfb3f0e9 ("arm64: stop using directly")
>
> and rebuilt arm64 failed due to below errors/warnings.
That commit was in preparation for the following 3 commits. You would
have to revert them as well to get a good build.
--
Cheers,
Stephen Rothwell
pgpFT0gGioR3f.pgp
Description: OpenPGP digital signature
Re: linux-next: Tree for Jul 30 [build failure on arm64]
On Fri, 31 Jul 2020 at 09:38, Stephen Rothwell wrote:
>
> Hi all,
>
> On Fri, 31 Jul 2020 10:46:52 +0800 Shaokun Zhang
> wrote:
> >
> > There's a build failure on arm64:
> >
> > In file included from ./include/linux/compat.h:17:0,
> > from ./arch/arm64/include/asm/stat.h:13,
> > from ./include/linux/stat.h:6,
> > from ./include/linux/sysfs.h:22,
> > from ./include/linux/kobject.h:20,
> > from ./include/linux/of.h:17,
> > from ./include/linux/irqdomain.h:35,
> > from ./include/linux/acpi.h:13,
> > from ./include/acpi/apei.h:9,
> > from ./include/acpi/ghes.h:5,
> > from ./include/linux/arm_sdei.h:8,
> > from arch/arm64/kernel/asm-offsets.c:10:
> > ./include/linux/fs.h: In function ‘vfs_whiteout’:
> > ./include/linux/fs.h:1709:32: error: ‘S_IFCHR’ undeclared (first use in
> > this function)
> > return vfs_mknod(dir, dentry, S_IFCHR | WHITEOUT_MODE, WHITEOUT_DEV);
> > ^
> > ./include/linux/fs.h:1709:32: note: each undeclared identifier is reported
> > only once for each
> > function it appears in
> > ./include/linux/fs.h: At top level:
> > ./include/linux/fs.h:1855:46: warning: ‘struct kstat’ declared inside
> > parameter list
> > int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);
> > ^
> > ./include/linux/fs.h:1855:46: warning: its scope is only this definition or
> > declaration, which is
> > probably not what you want
> > ./include/linux/fs.h: In function ‘__mandatory_lock’:
> > ./include/linux/fs.h:2325:25: error: ‘S_ISGID’ undeclared (first use in
> > this function)
> > return (ino->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID;
> > ^
> > ./include/linux/fs.h:2325:35: error: ‘S_IXGRP’ undeclared (first use in
> > this function)
> > return (ino->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID;
> >^
> > ./include/linux/fs.h: In function ‘invalidate_remote_inode’:
> > ./include/linux/fs.h:2588:6: error: implicit declaration of function
> > ‘S_ISREG’
> > [-Werror=implicit-function-declaration]
> > if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
> > ^
> > ./include/linux/fs.h:2588:32: error: implicit declaration of function
> > ‘S_ISDIR’
> > [-Werror=implicit-function-declaration]
> > if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
> > ^
> > ./include/linux/fs.h:2589:6: error: implicit declaration of function
> > ‘S_ISLNK’
> > [-Werror=implicit-function-declaration]
> > S_ISLNK(inode->i_mode))
> > ^
> > ./include/linux/fs.h: In function ‘execute_ok’:
> > ./include/linux/fs.h:2768:26: error: ‘S_IXUGO’ undeclared (first use in
> > this function)
> > return (inode->i_mode & S_IXUGO) || S_ISDIR(inode->i_mode);
>
> Presumably caused by commit
>
> b902bfb3f0e9 ("arm64: stop using directly")
I have reverted this commit
b902bfb3f0e9 ("arm64: stop using directly")
and rebuilt arm64 failed due to below errors/warnings.
make -sk KBUILD_BUILD_USER=TuxBuild -C/linux -j16 ARCH=arm64
CROSS_COMPILE=aarch64-linux-gnu- HOSTCC=gcc CC="sccache
aarch64-linux-gnu-gcc" O=build Image
#
In file included from ../include/linux/stat.h:6,
from ../include/linux/sysfs.h:22,
from ../include/linux/kobject.h:20,
from ../include/linux/of.h:17,
from ../include/linux/irqdomain.h:35,
from ../include/linux/acpi.h:13,
from ../include/acpi/apei.h:9,
from ../include/acpi/ghes.h:5,
from ../include/linux/arm_sdei.h:8,
from ../arch/arm64/kernel/asm-offsets.c:10:
../arch/arm64/include/asm/stat.h:20:2: error: unknown type name ‘compat_u64’
20 | compat_u64 st_dev;
| ^~
../arch/arm64/include/asm/stat.h:31:2: error: unknown type name ‘compat_u64’
31 | compat_u64 st_rdev;
| ^~
../arch/arm64/include/asm/stat.h:34:2: error: unknown type name ‘compat_s64’
34 | compat_s64 st_size;
| ^~
../arch/arm64/include/asm/stat.h:36:2: error: unknown type name ‘compat_u64’
36 | compat_u64 st_blocks; /* Number of 512-byte blocks allocated. */
| ^~
../arch/arm64/include/asm/stat.h:47:2: error: unknown type name ‘compat_u64’
47 | compat_u64 st_ino;
| ^~
make[2]: *** [../scripts/Makefile.build:114:
arch/arm64/kernel/asm-offsets.s] Error 1
- Naresh
Re: linux-next: Tree for Jul 30 [build failure on arm64]
Hi all,
On Fri, 31 Jul 2020 10:46:52 +0800 Shaokun Zhang
wrote:
>
> There's a build failure on arm64:
>
> In file included from ./include/linux/compat.h:17:0,
> from ./arch/arm64/include/asm/stat.h:13,
> from ./include/linux/stat.h:6,
> from ./include/linux/sysfs.h:22,
> from ./include/linux/kobject.h:20,
> from ./include/linux/of.h:17,
> from ./include/linux/irqdomain.h:35,
> from ./include/linux/acpi.h:13,
> from ./include/acpi/apei.h:9,
> from ./include/acpi/ghes.h:5,
> from ./include/linux/arm_sdei.h:8,
> from arch/arm64/kernel/asm-offsets.c:10:
> ./include/linux/fs.h: In function ‘vfs_whiteout’:
> ./include/linux/fs.h:1709:32: error: ‘S_IFCHR’ undeclared (first use in this
> function)
> return vfs_mknod(dir, dentry, S_IFCHR | WHITEOUT_MODE, WHITEOUT_DEV);
> ^
> ./include/linux/fs.h:1709:32: note: each undeclared identifier is reported
> only once for each
> function it appears in
> ./include/linux/fs.h: At top level:
> ./include/linux/fs.h:1855:46: warning: ‘struct kstat’ declared inside
> parameter list
> int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);
> ^
> ./include/linux/fs.h:1855:46: warning: its scope is only this definition or
> declaration, which is
> probably not what you want
> ./include/linux/fs.h: In function ‘__mandatory_lock’:
> ./include/linux/fs.h:2325:25: error: ‘S_ISGID’ undeclared (first use in this
> function)
> return (ino->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID;
> ^
> ./include/linux/fs.h:2325:35: error: ‘S_IXGRP’ undeclared (first use in this
> function)
> return (ino->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID;
>^
> ./include/linux/fs.h: In function ‘invalidate_remote_inode’:
> ./include/linux/fs.h:2588:6: error: implicit declaration of function ‘S_ISREG’
> [-Werror=implicit-function-declaration]
> if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
> ^
> ./include/linux/fs.h:2588:32: error: implicit declaration of function
> ‘S_ISDIR’
> [-Werror=implicit-function-declaration]
> if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
> ^
> ./include/linux/fs.h:2589:6: error: implicit declaration of function ‘S_ISLNK’
> [-Werror=implicit-function-declaration]
> S_ISLNK(inode->i_mode))
> ^
> ./include/linux/fs.h: In function ‘execute_ok’:
> ./include/linux/fs.h:2768:26: error: ‘S_IXUGO’ undeclared (first use in this
> function)
> return (inode->i_mode & S_IXUGO) || S_ISDIR(inode->i_mode);
Presumably caused by commit
b902bfb3f0e9 ("arm64: stop using directly")
--
Cheers,
Stephen Rothwell
pgp8qlCaD4kAu.pgp
Description: OpenPGP digital signature
Re: linux-next: Tree for Jul 30 [build failure on arm64]
Hi,
There's a build failure on arm64:
In file included from ./include/linux/compat.h:17:0,
from ./arch/arm64/include/asm/stat.h:13,
from ./include/linux/stat.h:6,
from ./include/linux/sysfs.h:22,
from ./include/linux/kobject.h:20,
from ./include/linux/of.h:17,
from ./include/linux/irqdomain.h:35,
from ./include/linux/acpi.h:13,
from ./include/acpi/apei.h:9,
from ./include/acpi/ghes.h:5,
from ./include/linux/arm_sdei.h:8,
from arch/arm64/kernel/asm-offsets.c:10:
./include/linux/fs.h: In function ‘vfs_whiteout’:
./include/linux/fs.h:1709:32: error: ‘S_IFCHR’ undeclared (first use in this
function)
return vfs_mknod(dir, dentry, S_IFCHR | WHITEOUT_MODE, WHITEOUT_DEV);
^
./include/linux/fs.h:1709:32: note: each undeclared identifier is reported only
once for each
function it appears in
./include/linux/fs.h: At top level:
./include/linux/fs.h:1855:46: warning: ‘struct kstat’ declared inside parameter
list
int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);
^
./include/linux/fs.h:1855:46: warning: its scope is only this definition or
declaration, which is
probably not what you want
./include/linux/fs.h: In function ‘__mandatory_lock’:
./include/linux/fs.h:2325:25: error: ‘S_ISGID’ undeclared (first use in this
function)
return (ino->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID;
^
./include/linux/fs.h:2325:35: error: ‘S_IXGRP’ undeclared (first use in this
function)
return (ino->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID;
^
./include/linux/fs.h: In function ‘invalidate_remote_inode’:
./include/linux/fs.h:2588:6: error: implicit declaration of function ‘S_ISREG’
[-Werror=implicit-function-declaration]
if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
^
./include/linux/fs.h:2588:32: error: implicit declaration of function ‘S_ISDIR’
[-Werror=implicit-function-declaration]
if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
^
./include/linux/fs.h:2589:6: error: implicit declaration of function ‘S_ISLNK’
[-Werror=implicit-function-declaration]
S_ISLNK(inode->i_mode))
^
./include/linux/fs.h: In function ‘execute_ok’:
./include/linux/fs.h:2768:26: error: ‘S_IXUGO’ undeclared (first use in this
function)
return (inode->i_mode & S_IXUGO) || S_ISDIR(inode->i_mode);
Thanks,
Shaokun
在 2020/7/30 19:46, Stephen Rothwell 写道:
> Hi all,
>
> Changes since 20200729:
>
> My fixes tree contains:
>
> dbf24e30ce2e ("device_cgroup: Fix RCU list debugging warning")
>
> Linus' tree gained a build failure for which I revertd a commit.
>
> The vfs tree lost its build failure.
>
> The printk tree lost its build failure.
>
> The net-next tree lost its build failure.
>
> The security tree still had its build failure for which I reverted
> 3 commits.
>
> The iommu tree gained a conflict against the dma-mapping tree.
>
> The tip tree still had its build failure for which I reverted a
> commit.
>
> The vhost tree lost its build failure but gained more for which I applied
> a patch.
>
> The hmm tree gained conflicts against the drm and kvm-ppc trees.
>
> Non-merge commits (relative to Linus' tree): 11751
> 12254 files changed, 603002 insertions(+), 226737 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 htmldocs. 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 328 trees (counting Linus' and 85 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:/
linux-next: Tree for Jul 30
Hi all,
Changes since 20200729:
My fixes tree contains:
dbf24e30ce2e ("device_cgroup: Fix RCU list debugging warning")
Linus' tree gained a build failure for which I revertd a commit.
The vfs tree lost its build failure.
The printk tree lost its build failure.
The net-next tree lost its build failure.
The security tree still had its build failure for which I reverted
3 commits.
The iommu tree gained a conflict against the dma-mapping tree.
The tip tree still had its build failure for which I reverted a
commit.
The vhost tree lost its build failure but gained more for which I applied
a patch.
The hmm tree gained conflicts against the drm and kvm-ppc trees.
Non-merge commits (relative to Linus' tree): 11751
12254 files changed, 603002 insertions(+), 226737 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 htmldocs. 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 328 trees (counting Linus' and 85 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 (d3590ebf6f91 Merge tag 'audit-pr-20200729' of
git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit)
Merging fixes/master (dbf24e30ce2e device_cgroup: Fix RCU list debugging
warning)
Applying: Revert "random32: update the net random state on interrupt and
activity"
Merging kbuild-current/fixes (c2d714d56928 kconfig: qconf: use delete[] instead
of delete to free array)
Merging arc-current/for-curr (11ba468877bb Linux 5.8-rc5)
Merging arm-current/fixes (5c6360ee4a0e ARM: 8988/1: mmu: fix crash in EFI
calls due to p4d typo in create_mapping_late())
Merging arm64-fixes/for-next/fixes (7b7891c7bdfd arm64: vdso32: Fix '--prefix='
value for newer versions of clang)
Merging arm-soc-fixes/arm/fixes (fe1d899f4212 ARM: dts: keystone-k2g-evm: fix
rgmii phy-mode for ksz9031 phy)
Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2)
Merging drivers-memory-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1)
Merging m68k-current/for-linus (3381df095419 m68k: tools: Replace zero-length
array with flexible-array member)
Merging powerpc-fixes/fixes (909adfc66b9a powerpc/64s/hash: Fix hash_preload
running with interrupts enabled)
Merging s390-fixes/fixes (92ed30191993 Linux 5.8-rc7)
Merging sparc/master (17ec0a17e90f sparc: Use fallthrough pseudo-keyword)
Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty
inodes after removing key)
Merging net/master (27a2145d6f82 ibmvnic: Fix IRQ mapping disposal in error
path)
Merging bpf/master (5b801dfb7feb bpf: Fix NULL pointer dereference in
__btf_resolve_helper_id())
Merging ipsec/master (d5dba1376e2b xfrm: esp6: fix the location of the
transport header with encapsulation)
Merging netfilter/master (8e8135862ccb Merge
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging ipvs/master (eadede5f9362 Merge branch 'hns3-fixes')
Merging wireless-drivers/master (1cfd3426ef98 ath10k: Fix NULL pointer
dereference in AHB device probe)
Merging mac80211/master (8ff41cc21714 net: qrtr: Fix an out of bounds read
qrtr_endpoint_post())
Merging rdma-fixes/for-rc (5351a56b1a4c RDMA/mlx5: Fix prefetch memory leak if
get_prefetchable_mr fails)
Merging sound-current/for-linus (7fcd9bb5acd0 ALSA: hda: fix NULL pointer
dereference during suspend)
Merging sound-asoc-fixes/for-linus (11b9fc4286b9 Merge remote-tracking branch
'asoc/for-5.8' into asoc-linus
Re: linux-next: Tree for Jul 30 (drivers/net/phy/mdio-octeon.c: i386)
On 7/29/19 10:15 PM, Stephen Rothwell wrote: > Hi all, > > Changes since 20190729: > on i386: ../drivers/net/phy/mdio-octeon.c: In function ‘octeon_mdiobus_probe’: ../drivers/net/phy/mdio-octeon.c:48:3: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] (u64)devm_ioremap(&pdev->dev, mdio_phys, regsize); ^ In file included from ../drivers/net/phy/mdio-octeon.c:14:0: ../drivers/net/phy/mdio-cavium.h:111:36: error: implicit declaration of function ‘writeq’; did you mean ‘writel’? [-Werror=implicit-function-declaration] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ ../drivers/net/phy/mdio-octeon.c:56:2: note: in expansion of macro ‘oct_mdio_writeq’ oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^~~ ../drivers/net/phy/mdio-cavium.h:111:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ ../drivers/net/phy/mdio-octeon.c:56:2: note: in expansion of macro ‘oct_mdio_writeq’ oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^~~ ../drivers/net/phy/mdio-cavium.h:111:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ ../drivers/net/phy/mdio-octeon.c:77:2: note: in expansion of macro ‘oct_mdio_writeq’ oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^~~ ../drivers/net/phy/mdio-octeon.c: In function ‘octeon_mdiobus_remove’: ../drivers/net/phy/mdio-cavium.h:111:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define oct_mdio_writeq(val, addr) writeq(val, (void *)addr) ^ ../drivers/net/phy/mdio-octeon.c:91:2: note: in expansion of macro ‘oct_mdio_writeq’ oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN); ^~~ -- ~Randy
linux-next: Tree for Jul 30
Hi all, Changes since 20190729: New tree: fsverity The keys tree gained a semantic conflict against the fsverity tree for which I applied a merge fix patch. Non-merge commits (relative to Linus' tree): 2756 3095 files changed, 191869 insertions(+), 78406 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 301 trees (counting Linus' and 72 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 (2a11c76e5301 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging fixes/master (c309b6f24222 Merge tag 'docs/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) Merging kbuild-current/fixes (609488bc979f Linux 5.3-rc2) Merging arc-current/for-curr (24a20b0a443f ARC: [plat-hsdk]: Enable AXI DW DMAC in defconfig) Merging arm-current/fixes (c5d0e49e8d8f ARM: 8867/1: vdso: pass --be8 to linker if necessary) Merging arm-soc-fixes/arm/fixes (7bd9d465140a Merge tag 'imx-fixes-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes) Merging arm64-fixes/for-next/fixes (eca92a53a6ab arm64: module: Mark expected switch fall-through) Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) Merging powerpc-fixes/fixes (609488bc979f Linux 5.3-rc2) Merging s390-fixes/fixes (8480657280ee vfio-ccw: make vfio_ccw_async_region_ops static) Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (7bd6ba4ef4b2 net: hamradio: baycom_epp: Mark expected switch fall-through) Merging bpf/master (5d01ab7bac46 libbpf: fix erroneous multi-closing of BTF FD) Merging ipsec/master (22d6552f827e xfrm interface: fix management of phydev) Merging netfilter/master (91826ba13855 netfilter: add include guard to xt_connlabel.h) Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') Merging wireless-drivers/master (5f9e832c1370 Linus 5.3-rc1) Merging mac80211/master (b55f3b841099 mac80211_hwsim: Fix possible null-pointer dereferences in hwsim_dump_radio_nl()) Merging rdma-fixes/for-rc (b7165bd0d6cb IB/mlx5: Fix RSS Toeplitz setup to be aligned with the HW specification) Merging sound-current/for-linus (37151a41df80 ALSA: pcm: fix lost wakeup event scenarios in snd_pcm_drain) Merging sound-asoc-fixes/for-linus (3a03327120de Merge branch 'asoc-5.3' into asoc-linus) Merging regmap-fixes/for-linus (5f9e832c1370 Linus 5.3-rc1) Merging regulator-fixes/for-linus (a853c0a0b013 regulator: lp87565: Fix probe failure for "ti,lp87565") Merging spi-fixes/for-linus (d24f33303ad1 Merge branch 'spi-5.3' into spi-linus) Merging pci-current/for-linus (5f9e832c1370 Linus 5.3-rc1) Merging driver-core.current/driver-core-linus (5f9e832c1370 Linus 5.3-rc1) Merging tty.current/tty-linus (61d51456f357 vt: Grab console_lock around con_is_bound in show_bind) Merging usb.current/usb-linus (609488bc979f Linux 5.3-rc2) Merging usb-gadget-fixes/fixes (42de8afc40c9 usb: dwc2: Use generic PHY width in params setup) Merging usb-serial-fixes/usb-linus (f8377eff5481 USB: serial: ftdi_sio: add ID for isodebug v1) Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for end
linux-next: Tree for Jul 30
Hi all, Changes since 20180727: Undropped tree: kspp The v4l-dvb tree lost its build failure. The net-next tree lost its build failure. The crypto tree gained a conflict against the net-mext tree. The devicetree tree gained a conflict against the net-next tree. The xen-tip tree gained a build failure due to an interaction with the drm tree for which I applied a merge fix patch. The staging tree gained a build failure due to an interaction with the vfs tree for which I disabled CONFIG_EROFS_FS. The kspp tree still had its build failure but I have reverted a commit from the arm64 tree today instead. The akpm-current tree gained a conflict against the xen-tip tree. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 9550 8760 files changed, 402596 insertions(+), 172203 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 286 trees (counting Linus' and 65 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 (3cfb6772d4cf Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging kbuild-current/fixes (9d3cce1e8b85 Linux 4.18-rc5) Merging arc-current/for-curr (fa52704e2816 ARC: add SMP_CACHE_BYTES value validate) Merging arm-current/fixes (b4c7e2bd2eb4 ARM: 8780/1: ftrace: Only set kernel memory back to read-only after boot) Merging arm64-fixes/for-next/fixes (7b0eb6b41a08 arm64: fix vmemmap BUILD_BUG_ON() triggering on !vmemmap setups) Merging m68k-current/for-linus (b12c8a70643f m68k: Set default dma mask for platform devices) Merging powerpc-fixes/fixes (b03897cf318d powerpc/powernv: Fix save/restore of SPRG3 on entry/exit from stop (idle)) Merging sparc/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (25432eba9cd8 openvswitch: meter: Fix setting meter id for new entries) Merging bpf/master (71eb5255f55b bpf: use GFP_ATOMIC instead of GFP_KERNEL in bpf_parse_prog()) Merging ipsec/master (7284fdf39a91 esp6: fix memleak on error path in esp6_input) Merging netfilter/master (101f0cd4f221 net: ena: Fix use of uninitialized DMA address bits field) Merging ipvs/master (0026129c8629 rhashtable: add restart routine in rhashtable_free_and_destroy()) Merging wireless-drivers/master (299b6365a3b7 brcmfmac: fix regression in parsing NVRAM for multiple devices) Merging mac80211/master (e31f6456c01c cfg80211: never ignore user regulatory hint) Merging rdma-fixes/for-rc (addb8a6559f0 RDMA/uverbs: Expand primary and alt AV port checks) Merging sound-current/for-linus (f59cf9a0551d ALSA: hda - Sleep for 10ms after entering D3 on Conexant codecs) Merging sound-asoc-fixes/for-linus (7adbdeaee174 Merge branch 'asoc-4.18' into asoc-linus) Merging regmap-fixes/for-linus (d72e90f33aa4 Linux 4.18-rc6) Merging regulator-fixes/for-linus (3db3eff91bed Merge branch 'regulator-4.18' into regulator-linus) Merging spi-fixes/for-linus (1ff16738af47 Merge branch 'spi-4.18' into spi-linus) Merging pci-current/for-linus (a54e43f993f8 PCI: mobiveil: Avoid integer
linux-next: Tree for Jul 30
Hi all, Changes since 20150729: The nfsd tree gained a conflict against Linus' tree. The net-next tree gained a conflict against the net tree. The drm-misc tree gained a conflict against Linus' tree. The block tree gained conflicts against the ext3 and f2fs trees and a build failure for which I applied a fix patch. The akpm-current tree lost its build failure. Non-merge commits (relative to Linus' tree): 4787 4876 files changed, 232494 insertions(+), 112420 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, a multi_v7_defconfig for arm and a native build of tools/perf. 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 224 trees (counting Linus' and 32 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 (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) Merging arm-current/fixes (0871b7248113 ARM: fix __virt_to_idmap build error on !MMU) Merging m68k-current/for-linus (1214c525484c m68k: Use for_each_sg()) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-fixes/fixes (120d200a8627 macintosh/ans-lcd: fix build failure after module_init/exit relocation) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (4a10a91756ef Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit) Merging net/master (7ae90a4f9648 bridge: mdb: fix delmdb state in the notification) Merging ipsec/master (158cd4af8ded packet: missing dev_put() in packet_do_bind()) Merging sound-current/for-linus (342e84490574 ALSA: hda - Fix race between PM ops and HDA init/probe) Merging pci-current/for-linus (c9ddbac9c891 PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition) Merging wireless-drivers/master (df2cd4586f17 Merge tag 'iwlwifi-for-kalle-2015-06-12' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (cbfe8fa6cd67 Linux 4.2-rc4) Merging tty.current/tty-linus (cbfe8fa6cd67 Linux 4.2-rc4) Merging usb.current/usb-linus (84b6b023cb33 Merge tag 'fixes-for-v4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) Merging usb-gadget-fixes/fixes (4248bd7d3e2c usb: gadget: f_printer: actually limit the number of instances) Merging usb-serial-fixes/usb-linus (74472233233f USB: sierra: add 1199:68AB device ID) Merging staging.current/staging-linus (cbfe8fa6cd67 Linux 4.2-rc4) Merging char-misc.current/char-misc-linus (cbfe8fa6cd67 Linux 4.2-rc4) Merging input-current/for-linus (3213afb8bf5c Revert "Input: zforce - don't overwrite the stack") Merging crypto-current/master (17fb874dee09 hwrng: core - correct error check of kthread_run call) Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) Merging rr-fixes/fixes (fe0d34d242fa module: weaken locking assertion for oops path.) Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue) Merging kselftest-fixes/fixes (fee50f3c8427 selftests/futex: Fix futex_cmp_requeue_pi() error handling) Merging backlight-fixes/for-back
linux-next: Tree for Jul 30
Hi all, Changes since 20140729: The net tree gained a build failure so I used the version from next-20140729. The pm tree gained a conflict against the arm-soc tree. The modules tree still had its build failure so I used the version from next-20140725. The mmc-uh tree still had its build failure so I used the version from next-20140725. The tip tree still had its build failure, so I used the version from next-20140724. The gpio tree still had its build failure so I used the version from next-20140728. The clk tree gained a conflict against the driver-core tree. Non-merge commits (relative to Linus' tree): 9011 7909 files changed, 334074 insertions(+), 420464 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 224 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 (31dab719fa50 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging fixes/master (1795cd9b3a91 Linux 3.16-rc5) Merging kbuild-current/rc-fixes (dd5a6752ae7d firmware: Create directories for external firmware) Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) Merging arm-current/fixes (91942d17667a ARM: 8112/1: only select ARM_PATCH_PHYS_VIRT if MMU is enabled) Merging m68k-current/for-linus (5bc8c7cdeb6e m68k: Export mach_random_get_entropy to modules) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) Merging sparc/master (31dab719fa50 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging net/master (d92f5dec6325 net: phy: re-apply PHY fixups during phy_register_device) $ git reset --hard HEAD^ Merging next-20140729 version of net Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs) Merging sound-current/for-linus (eb12f72ee724 ALSA: bebob: Correction for return value of special_clk_ctl_put() in error) Merging pci-current/for-linus (bf177a1eb6d1 MAINTAINERS: Update mx6 PCI driver maintainer's email) Merging wireless/master (c01fac1c77a0 ath9k: fix aggregation session lockup) Merging driver-core.current/driver-core-linus (9a3c4145af32 Linux 3.16-rc6) Merging tty.current/tty-linus (1795cd9b3a91 Linux 3.16-rc5) Merging usb.current/usb-linus (9a3c4145af32 Linux 3.16-rc6) Merging usb-gadget-fixes/fixes (a8a85b01d185 usb: musb/cppi41: call musb_ep_select() before accessing an endpoint's CSR) Merging usb-serial-fixes/usb-linus (1795cd9b3a91 Linux 3.16-rc5) Merging staging.current/staging-linus (4aa0abed3a2a staging: vt6655: Fix disassociated messages every 10 seconds) Merging char-misc.current/char-misc-linus (9a3c4145af32 Linux 3.16-rc6) Merging input-current/for-linus (f62d14a8072b Input: document INPUT_PROP_TOPBUTTONPAD) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (f3c400ef473e crypto: arm-aes - fix encryption of unaligned data) Merging ide/master (15ba2236f355 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (356facff5275 of/platform: Fix of_platform_device_destroy iteration of devices) Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.) Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delay
linux-next: Tree for Jul 30
Hi all, Changes since 20130729: The ext4 tree still has its build failure so I used the version from next-20130726. The next-next tree lost its build failure but gained another for which I reverted a commit. The spi tree lost its build failure. The usb-gadget tree gained a conflict against the usb.current tree and a build failure so I used the version from next-20130729. 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. 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. We are up to 223 trees (counting Linus' and 30 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. 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 (5ae90d8 Linux 3.11-rc3) Merging fixes/master (b3a3a9c Merge tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1) Merging arc-current/for-curr (4ffd9e2 ARC: SMP build breakage) Merging arm-current/fixes (ab8d46c0 ARM: 7788/1: elf: fix lpae hwcap feature reporting in proc/cpuinfo) Merging m68k-current/for-linus (ad81f05 Linux 3.11-rc1) Merging metag-fixes/fixes (dfe248b MAINTAINERS: add linux-metag mailing list) Merging powerpc-merge/merge (ff3d79d powerpc/perf: BHRB filter configuration should follow the task) Merging sparc/master (6d128e1 Revert "Makefile: Fix install error with make -j option") Merging net/master (7e44892 igb: fix vlan filtering in promisc mode when not in VT mode) Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling) Merging sound-current/for-linus (a8d3060 ALSA: compress: fix the return value for SNDRV_COMPRESS_VERSION) Merging pci-current/for-linus (aa914f5 PCI: Retry allocation of only the resource type that failed) Merging wireless/master (161915a Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) Merging driver-core.current/driver-core-linus (5ae90d8 Linux 3.11-rc3) Merging tty.current/tty-linus (d5a12ea serial: arc_uart: Fix module alias) Merging usb.current/usb-linus (fed1f1e USB: serial: ftdi_sio: add more RT Systems ftdi devices) Merging staging.current/staging-linus (0207379 staging: zcache: fix "zcache=" kernel parameter) Merging char-misc.current/char-misc-linus (5ae90d8 Linux 3.11-rc3) Merging input-current/for-linus (88ce3c3 Merge branch 'next' into for-linus) Merging md-current/for-linus (f94c0b6 md/raid5: fix interaction of 'replace' and 'recovery'.) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (e70308e Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework") Merging ide/master (6d128e1 Revert "Makefile: Fix install error with make -j option") Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) Merging devicetree-current/devicetree/merge (cf9e236 of/irq: init struct resource to 0 in of_irq_to_resource()) Merging rr-fixes/fixes (96f97a8 virtio: console: return -ENODEV on all read operations after unplug) Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata) Merging vfio-fixes/for-linus (d24cdbf vfio-pci: Avoid deadlock on remove) Merging drm-intel-fi
