linux-next: Tree for Jul 8
Hi all, Changes since 20200707: New tree: set_fs My fixes tree contains: dbf24e30ce2e ("device_cgroup: Fix RCU list debugging warning") b236d81d9e4f ("powerpc/boot/dts: Fix dtc "pciex" warnings") The kbuild tree still had its build failure for which I reverted a commit. The f2fs tree gained a conflict against the fscrypt tree. The xfs tree lost its build failure. The jc_docs tree gained a conflict against the fscrypt and f2fs trees. The security tree gained a build failure for which I applied a patch. The spi tree gained a conflict against the mtd tree. The tip tree still had one build failure for which I reverted a commit. The set_fs tree gained conflicts against the btrfs and pm trees. The akpm-current tree gained a conflict against the fscrypt tree. Non-merge commits (relative to Linus' tree): 5576 6439 files changed, 351697 insertions(+), 130843 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 324 trees (counting Linus' and 83 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 (6d12075ddeed Merge tag 'mtd/fixes-for-5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux) Merging fixes/master (b236d81d9e4f powerpc/boot/dts: Fix dtc "pciex" warnings) Merging kbuild-current/fixes (736bb11898ef modpost: remove use of non-standard strsep() in HOSTCC code) Merging arc-current/for-curr (10011f7d95de ARCv2: support loop buffer (LPB) disabling) Merging arm-current/fixes (3866f217aaa8 ARM: 8977/1: ptrace: Fix mask for thumb breakpoint hook) Merging arm-soc-fixes/arm/fixes (42d3f7e8da1b Merge tag 'imx-fixes-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes) Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2) Merging arm64-fixes/for-next/fixes (9b23d95c539e arm64: Add KRYO4XX silver CPU cores to erratum list 1530923 and 1024718) Merging m68k-current/for-linus (3381df095419 m68k: tools: Replace zero-length array with flexible-array member) Merging powerpc-fixes/fixes (19ab500edb5d powerpc/mm/pkeys: Make pkey access check work on execute_only_key) Merging s390-fixes/fixes (075ebfe19fa3 Merge tag 'vfio-ccw-20200703' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into fixes) Merging sparc/master (5124b31c1e90 sparc: piggyback: handle invalid image) Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key) Merging net/master (8367b3ab6e9a net/sched: act_ct: add miss tcf_lastuse_update.) Merging bpf/master (0f57a1e522f4 Merge branch 'net-rmnet-fix-interface-leak-for-rmnet-module') Merging ipsec/master (4f47e8ab6ab7 xfrm: policy: match with both mark and mask on user interfaces) Merging netfilter/master (eadede5f9362 Merge branch 'hns3-fixes') Merging ipvs/master (d005fbb855d3 netfilter: conntrack: refetch conntrack after nf_conntrack_update()) Merging wireless-drivers/master (dc7bd30b97aa mt76: mt7615: fix EEPROM buffer size) Merging mac80211/master (8ff41cc21714 net: qrtr: Fix an out of bounds read qrtr_endpoint_post()) Merging rdma-fixes/for-rc (f427f4d6214c IB/sa: Resolv use-after-free in ib_nl_make_request()) Merging sound-current/for-linus (f79a732a8325 ALSA: compress: fix partial_drain completion state) Merging sound-asoc-fixes/for-linus (b89d50899c17
Re: linux-next: Tree for Jul 8 --> bootup failure on s390x (bisected)
On 08.07.19 20:06, Al Viro wrote: > On Mon, Jul 08, 2019 at 06:52:14PM +0200, Christian Borntraeger wrote: > >> smp: Brought up 1 node, 1 CPU >> Unable to handle kernel pointer dereference in virtual kernel address space >> Failing address: 3a07 TEID: 3a070407 >> Fault in home space mode while using kernel ASCE. >> AS:3a780007 R3:7ffd0007 S:7ffd4800 >> P:3a07021d >> Oops: 0004 ilc:2 [#1] SMP >> Modules linked in: >> CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.2.0-rc5-00101-gcb8f0b366109 #14 >> Hardware name: IBM 2964 NC9 712 (KVM/Linux) >> Krnl PSW : 0704e0018000 3974b580 >> (shmem_parse_monolithic+0x88/0x100) >>R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 RI:0 EA:3 >> Krnl GPRS: 003d 3a07040e >> 003d >>3a07040f 006d 0001 >> >>7f7c1c00 3a07040a >> >>7f7e4000 3a190d78 3974b56c >> 03e00031fd38 >> Krnl Code: 3974b574: b920002acgr %r2,%r10 >>3974b578: a784001bbrc 8,3974b5ae >> #3974b57c: 41402001la %r4,1(%r2) >> >3974b580: 92002000mvi 0(%r2),0 >>3974b584: a709lghi%r0,0 >>3974b588: b9040014lgr %r1,%r4 >>3974b58c: b25e0001srst%r0,%r1 >>3974b590: a714fffebrc 1,3974b58c >> Call Trace: >> ([<03e00031fd80>] 0x3e00031fd80) >> [<39811662>] vfs_kern_mount.part.0+0x9a/0xc8 >> [<3a302fc0>] devtmpfs_init+0x38/0x140 >> [<3a302e0a>] driver_init+0x22/0x60 >> [<3a2beff8>] kernel_init_freeable+0x298/0x4f0 >> [<39e7b53a>] kernel_init+0x22/0x148 >> [<39e87b70>] ret_from_fork+0x30/0x34 >> [<39e87b74>] kernel_thread_starter+0x0/0xc >> INFO: lockdep is turned off. >> [...] > > Oh, fuck... OK, I understand what's going on; sorry, my fault. Could you > verify that the following helps? Yes, it does. > > diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c > index 52312c665a38..30d0523014e0 100644 > --- a/drivers/base/devtmpfs.c > +++ b/drivers/base/devtmpfs.c > @@ -431,9 +431,10 @@ static int devtmpfsd(void *p) > */ > int __init devtmpfs_init(void) > { > + char opts[] = "mode=0755"; > int err; > > - mnt = vfs_kern_mount(_fs_type, 0, "devtmpfs", "mode=0755"); > + mnt = vfs_kern_mount(_fs_type, 0, "devtmpfs", opts); > if (IS_ERR(mnt)) { > printk(KERN_ERR "devtmpfs: unable to create devtmpfs %ld\n", > PTR_ERR(mnt)); >
Re: linux-next: Tree for Jul 8 --> bootup failure on s390x (bisected)
On Mon, Jul 08, 2019 at 06:52:14PM +0200, Christian Borntraeger wrote: > smp: Brought up 1 node, 1 CPU > Unable to handle kernel pointer dereference in virtual kernel address space > Failing address: 3a07 TEID: 3a070407 > Fault in home space mode while using kernel ASCE. > AS:3a780007 R3:7ffd0007 S:7ffd4800 P:3a07021d > Oops: 0004 ilc:2 [#1] SMP > Modules linked in: > CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.2.0-rc5-00101-gcb8f0b366109 #14 > Hardware name: IBM 2964 NC9 712 (KVM/Linux) > Krnl PSW : 0704e0018000 3974b580 > (shmem_parse_monolithic+0x88/0x100) >R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 RI:0 EA:3 > Krnl GPRS: 003d 3a07040e 003d >3a07040f 006d 0001 >7f7c1c00 3a07040a >7f7e4000 3a190d78 3974b56c 03e00031fd38 > Krnl Code: 3974b574: b920002a cgr %r2,%r10 >3974b578: a784001b brc 8,3974b5ae > #3974b57c: 41402001 la %r4,1(%r2) > >3974b580: 92002000 mvi 0(%r2),0 >3974b584: a709 lghi%r0,0 >3974b588: b9040014 lgr %r1,%r4 >3974b58c: b25e0001 srst%r0,%r1 >3974b590: a714fffe brc 1,3974b58c > Call Trace: > ([<03e00031fd80>] 0x3e00031fd80) > [<39811662>] vfs_kern_mount.part.0+0x9a/0xc8 > [<3a302fc0>] devtmpfs_init+0x38/0x140 > [<3a302e0a>] driver_init+0x22/0x60 > [<3a2beff8>] kernel_init_freeable+0x298/0x4f0 > [<39e7b53a>] kernel_init+0x22/0x148 > [<39e87b70>] ret_from_fork+0x30/0x34 > [<39e87b74>] kernel_thread_starter+0x0/0xc > INFO: lockdep is turned off. > [...] Oh, fuck... OK, I understand what's going on; sorry, my fault. Could you verify that the following helps? diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index 52312c665a38..30d0523014e0 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c @@ -431,9 +431,10 @@ static int devtmpfsd(void *p) */ int __init devtmpfs_init(void) { + char opts[] = "mode=0755"; int err; - mnt = vfs_kern_mount(_fs_type, 0, "devtmpfs", "mode=0755"); + mnt = vfs_kern_mount(_fs_type, 0, "devtmpfs", opts); if (IS_ERR(mnt)) { printk(KERN_ERR "devtmpfs: unable to create devtmpfs %ld\n", PTR_ERR(mnt));
Re: linux-next: Tree for Jul 8 --> bootup failure on s390x (bisected)
Al, linux-next July 8th fails to bootup on s390x (linux-next from July 4th did still work) [...] smp: Brought up 1 node, 1 CPU Unable to handle kernel pointer dereference in virtual kernel address space Failing address: 3a07 TEID: 3a070407 Fault in home space mode while using kernel ASCE. AS:3a780007 R3:7ffd0007 S:7ffd4800 P:3a07021d Oops: 0004 ilc:2 [#1] SMP Modules linked in: CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.2.0-rc5-00101-gcb8f0b366109 #14 Hardware name: IBM 2964 NC9 712 (KVM/Linux) Krnl PSW : 0704e0018000 3974b580 (shmem_parse_monolithic+0x88/0x100) R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 RI:0 EA:3 Krnl GPRS: 003d 3a07040e 003d 3a07040f 006d 0001 7f7c1c00 3a07040a 7f7e4000 3a190d78 3974b56c 03e00031fd38 Krnl Code: 3974b574: b920002a cgr %r2,%r10 3974b578: a784001b brc 8,3974b5ae #3974b57c: 41402001 la %r4,1(%r2) >3974b580: 92002000 mvi 0(%r2),0 3974b584: a709 lghi%r0,0 3974b588: b9040014 lgr %r1,%r4 3974b58c: b25e0001 srst%r0,%r1 3974b590: a714fffe brc 1,3974b58c Call Trace: ([<03e00031fd80>] 0x3e00031fd80) [<39811662>] vfs_kern_mount.part.0+0x9a/0xc8 [<3a302fc0>] devtmpfs_init+0x38/0x140 [<3a302e0a>] driver_init+0x22/0x60 [<3a2beff8>] kernel_init_freeable+0x298/0x4f0 [<39e7b53a>] kernel_init+0x22/0x148 [<39e87b70>] ret_from_fork+0x30/0x34 [<39e87b74>] kernel_thread_starter+0x0/0xc INFO: lockdep is turned off. [...] bisect points to f6ab6e953ab3b37b10646aabede8d8731f54cc61 is the first bad commit commit f6ab6e953ab3b37b10646aabede8d8731f54cc61 Author: Al Viro Date: Sat Jun 1 18:43:09 2019 -0400 devtmpfs: don't mix {ramfs,shmem}_fill_super() with mount_single() Create an internal-only type matching the current devtmpfs, never register it and have one kernel-internal mount done. That thing gets mounted only once, so it is free to use mount_nodev(). The "public" devtmpfs (the one we do register, and only after the internal mount of the real thing is done) simply gets and returns an extra reference to the internal superblock. Signed-off-by: Al Viro :04 04 4874d86e78685322401d6284d458ae323620573c e3c5780581792df416a4c272b583f76b98321080 M drivers I can confirm that f6ab6e953ab3b37b10646aabede8d8731f54cc61 has the issue and f6ab6e953ab3b37b10646aabede8d8731f54cc61^ has not.
linux-next: Tree for Jul 8
Hi all, Changes since 20190705: The kbuild tree lost its build failure. The vfs tree gained a conflict against the nfsd tree. The jc_docs tree gained a conflict against the vfs tree. The rdma tree lost its build failures but gained another so I used the version from next-20190628. The netfilter-next tree gained a build failure due to an interaction with the kbuild tree for which I applied a merge fix patch. The gfs2 tree gained a conflict against the vfs tree. The drm tree gained a conflict against the vfs tree and a build failure due to an interaction with the vfs tree for which I applied a merge fix patch. The slave-dma tree lost its build failure. The edac-amd tree gained a conflict against the risc-v tree. The kvm-arm tree gained a conflict against the arm64 tree. The driver-core tree gained conflicts against the vfs and nfs trees. The char-misc tree gained a build failure due to an interaction with the vfs tree for which I applied a merge fix patch. The nvdimm tree lost its build failure. The akpm-current tree gained a conflict against the powerpc tree. Non-merge commits (relative to Linus' tree): 11928 11172 files changed, 863413 insertions(+), 322536 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 299 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 (46713c3d2f8d Merge tag 'for-linus-20190706' of git://git.kernel.dk/linux-block) Merging fixes/master (3ab4436f688c Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux) Merging kspp-gustavo/for-next/kspp (034e673710d3 platform/x86: acer-wmi: Mark expected switch fall-throughs) Merging kbuild-current/fixes (d1fdb6d8f6a4 Linux 5.2-rc4) Merging arc-current/for-curr (5c100a5d6245 ARC: hide unused function unw_hdr_alloc) Merging arm-current/fixes (c5d0e49e8d8f ARM: 8867/1: vdso: pass --be8 to linker if necessary) Merging arm-soc-fixes/arm/fixes (2659dc8d225c Merge tag 'davinci-fixes-for-v5.2-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/fixes) Merging arm64-fixes/for-next/fixes (aa69fb62bea1 arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly) Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping) Merging powerpc-fixes/fixes (b7cbb5240130 Merge tag 'powerpc-5.2-6' into fixes) Merging s390-fixes/fixes (11aff183225c vfio-ccw: Destroy kmem cache region on module exit) Merging sparc/master (15d5dfaf4adb sparc: fix unknown type name u_int in uapi header) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (ccd1479e4839 Merge branch 'net-tls-fix-poll-wake-up') Merging bpf/master (9d1bc24b52fb bonding: validate ip header before check IPPROTO_IGMP) Merging ipsec/master (56c5ee1a5823 xfrm interface: fix memory leak on creation) Merging netfilter/master (1c5ec78272e3 netfilter: nfnetlink: avoid deadlock due to synchronous request_module) Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') Merging wireless-drivers/master (2a92b08b1855 mt76: usb: fix rx A-MSDU support) Merging mac80211/master (d2ce8d6bfcfe nl80211: Fix undefined behavior in bit shift) Merging rdma-fixes/for-rc (4b972a01a7da Linux 5.2-rc6) Merging
Re: linux-next: Tree for Jul 8
On Fri, Jul 08, 2016 at 06:03:38PM +1000, Stephen Rothwell wrote: > Hi all, > > Changes since 20160707: > > New trees: netfilter and netfilter-next > > The drm-msm tree gained a conflict against the arm tree. > > The block tree gained conflicts against Linus' and the btrfs-kdave trees. > > The userns tree gained a conflict against Linus' tree. > > Non-merge commits (relative to Linus' tree): 7460 > 6931 files changed, 350754 insertions(+), 147233 deletions(-) > Build results: total: 148 pass: 136 fail: 12 Failed builds: arc:defconfig arc:allnoconfig arc:tb10x_defconfig arc:axs103_defconfig arc:nsim_hs_smp_defconfig arc:vdk_hs38_smp_defconfig arm:allmodconfig arm64:allmodconfig hexagon:defconfig hexagon:allnoconfig mips:ath79_defconfig mips:malta_defconfig Qemu test results: total: 107 pass: 95 fail: 12 Failed tests: arm64:smp:defconfig arm64:nosmp:defconfig mips:malta_defconfig:nosmp mips:malta_defconfig:smp mips64:malta_defconfig:nosmp mips64:malta_defconfig:smp mipsel:malta_defconfig:nosmp mipsel:malta_defconfig:smp mipsel64:malta_defconfig:nosmp mipsel64:malta_defconfig:smp xtensa:dc233c:ml605:generic_kc705_defconfig xtensa:dc233c:kc705:generic_kc705_defconfig Details are available at http://kerneltests.org/builders. Thanks, Guenter
Re: linux-next: Tree for Jul 8
On Fri, Jul 08, 2016 at 06:03:38PM +1000, Stephen Rothwell wrote: > Hi all, > > Changes since 20160707: > > New trees: netfilter and netfilter-next > > The drm-msm tree gained a conflict against the arm tree. > > The block tree gained conflicts against Linus' and the btrfs-kdave trees. > > The userns tree gained a conflict against Linus' tree. > > Non-merge commits (relative to Linus' tree): 7460 > 6931 files changed, 350754 insertions(+), 147233 deletions(-) > Build results: total: 148 pass: 136 fail: 12 Failed builds: arc:defconfig arc:allnoconfig arc:tb10x_defconfig arc:axs103_defconfig arc:nsim_hs_smp_defconfig arc:vdk_hs38_smp_defconfig arm:allmodconfig arm64:allmodconfig hexagon:defconfig hexagon:allnoconfig mips:ath79_defconfig mips:malta_defconfig Qemu test results: total: 107 pass: 95 fail: 12 Failed tests: arm64:smp:defconfig arm64:nosmp:defconfig mips:malta_defconfig:nosmp mips:malta_defconfig:smp mips64:malta_defconfig:nosmp mips64:malta_defconfig:smp mipsel:malta_defconfig:nosmp mipsel:malta_defconfig:smp mipsel64:malta_defconfig:nosmp mipsel64:malta_defconfig:smp xtensa:dc233c:ml605:generic_kc705_defconfig xtensa:dc233c:kc705:generic_kc705_defconfig Details are available at http://kerneltests.org/builders. Thanks, Guenter
linux-next: Tree for Jul 8
Hi all, Changes since 20160707: New trees: netfilter and netfilter-next The drm-msm tree gained a conflict against the arm tree. The block tree gained conflicts against Linus' and the btrfs-kdave trees. The userns tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 7460 6931 files changed, 350754 insertions(+), 147233 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 (this fails its final link) and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 238 trees (counting Linus' and 35 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 Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (ac904ae6e6f0 Merge branch 'for-linus' of git://git.kernel.dk/linux-block) Merging fixes/master (5edb56491d48 Linux 4.7-rc3) Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled) Merging arm-current/fixes (56530f5d2ddc ARM: 8579/1: mm: Fix definition of pmd_mknotpresent) Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic ) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging powerpc-fixes/fixes (eb584b3ee4d3 powerpc/tm: Fix stack pointer corruption in __tm_recheckpoint()) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging net/master (bc86765181aa Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.) Merging netfilter/master (62131e5d7352 netfilter: nft_meta: set skb->nf_trace appropriately) Merging ipvs/master (3777ed688fba ipvs: fix bind to link-local mcast IPv6 address in backup) Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) Merging mac80211/master (16a910a6722b cfg80211: handle failed skb allocation) Merging sound-current/for-linus (9cd25743765c ALSA: hda/realtek: Add Lenovo L460 to docking unit fixup) Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code) Merging driver-core.current/driver-core-linus (33688abb2802 Linux 4.7-rc4) Merging tty.current/tty-linus (a99cde438de0 Linux 4.7-rc6) Merging usb.current/usb-linus (a99cde438de0 Linux 4.7-rc6) Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5) Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) Merging staging.current/staging-linus (a99cde438de0 Linux 4.7-rc6) Merging char-misc.current/char-misc-linus (33688abb2802 Linux 4.7-rc4) Merging input-current/for-linus (caca925fca4f Input: xpad - validate USB endpoint count during probe) Merging crypto-current/master (055ddaace035 crypto: user - re-add size check for CRYPTO_MSG_GETALG) Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read) Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle
linux-next: Tree for Jul 8
Hi all, Changes since 20160707: New trees: netfilter and netfilter-next The drm-msm tree gained a conflict against the arm tree. The block tree gained conflicts against Linus' and the btrfs-kdave trees. The userns tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 7460 6931 files changed, 350754 insertions(+), 147233 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 (this fails its final link) and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 238 trees (counting Linus' and 35 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 Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (ac904ae6e6f0 Merge branch 'for-linus' of git://git.kernel.dk/linux-block) Merging fixes/master (5edb56491d48 Linux 4.7-rc3) Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled) Merging arm-current/fixes (56530f5d2ddc ARM: 8579/1: mm: Fix definition of pmd_mknotpresent) Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic ) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging powerpc-fixes/fixes (eb584b3ee4d3 powerpc/tm: Fix stack pointer corruption in __tm_recheckpoint()) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging net/master (bc86765181aa Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.) Merging netfilter/master (62131e5d7352 netfilter: nft_meta: set skb->nf_trace appropriately) Merging ipvs/master (3777ed688fba ipvs: fix bind to link-local mcast IPv6 address in backup) Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) Merging mac80211/master (16a910a6722b cfg80211: handle failed skb allocation) Merging sound-current/for-linus (9cd25743765c ALSA: hda/realtek: Add Lenovo L460 to docking unit fixup) Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code) Merging driver-core.current/driver-core-linus (33688abb2802 Linux 4.7-rc4) Merging tty.current/tty-linus (a99cde438de0 Linux 4.7-rc6) Merging usb.current/usb-linus (a99cde438de0 Linux 4.7-rc6) Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5) Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) Merging staging.current/staging-linus (a99cde438de0 Linux 4.7-rc6) Merging char-misc.current/char-misc-linus (33688abb2802 Linux 4.7-rc4) Merging input-current/for-linus (caca925fca4f Input: xpad - validate USB endpoint count during probe) Merging crypto-current/master (055ddaace035 crypto: user - re-add size check for CRYPTO_MSG_GETALG) Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read) Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle
linux-next: Tree for Jul 8
Hi all, Changes since 20150707: Renamed trees: powerpc-merge to powerpc-merge-benh powerpc to powerpc-benh New trees: powerpc-fixes and powerpc The tip tree gained a build failure so I used the version from next-20150707. The vhost tree gaiend a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 808 907 files changed, 56701 insertions(+), 13727 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 223 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 (4f273959b850 mei: nfc: fix deadlock on shutdown/suspend path) 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 (c517d838eb7d Linux 4.0-rc1) Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) Merging arm-current/fixes (11b8b25ce4f8 ARM: fix lockdep unannotated irqs-off warning) 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 (b32aadc1a8ed powerpc/powernv: Fix race in updating core_idle_state) Merging powerpc-merge-mpe/fixes (a8956a7b7232 powerpc/powernv: Fix opal-elog interrupt handler) Merging powerpc-merge-benh/merge (c517d838eb7d Linux 4.0-rc1) Merging sparc/master (4a10a91756ef Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit) Merging net/master (fda8b18c515a cxgb4: Fix incorrect sequence numbers shown in devlog) Merging ipsec/master (31a418986a58 xen: netback: read hotplug script once at start of day.) Merging sound-current/for-linus (e828b23734bf ALSA: hda - add codec ID for Broxton display audio codec) Merging pci-current/for-linus (552bc94ebeeb PCI: Preserve resource size during alignment reordering) Merging wireless-drivers/master (38fe44e61a89 Merge tag 'iwlwifi-for-kalle-2015-05-28' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (d770e558e219 Linux 4.2-rc1) Merging tty.current/tty-linus (d770e558e219 Linux 4.2-rc1) Merging usb.current/usb-linus (d4669bb1427c Merge tag 'fixes-for-v4.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) Merging usb-gadget-fixes/fixes (b2e2c94b878b usb: gadget: f_midi: fix error recovery path) Merging usb-serial-fixes/usb-linus (f98a7aa81eee USB: cp210x: add ID for Aruba Networks controllers) Merging staging.current/staging-linus (cbe4f4434ded staging:lustre: remove irq.h from socklnd.h) Merging char-misc.current/char-misc-linus (d770e558e219 Linux 4.2-rc1) Merging input-current/for-linus (539c4b88146c Input: elan_i2c - change the hover event from MT to ST) Merging crypto-current/master (acb33cc541d7 crypto: omap-des - Fix unmapping of dma channels) 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 (f36963c9d3f6 cpumask_set_cpu_local_first => cpumask_local_spread, lament) Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout) Merging kselftest-fixes/fixes (ba155e2d21f6 Linux 4.1-rc5) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight:
linux-next: Tree for Jul 8
Hi all, Changes since 20150707: Renamed trees: powerpc-merge to powerpc-merge-benh powerpc to powerpc-benh New trees: powerpc-fixes and powerpc The tip tree gained a build failure so I used the version from next-20150707. The vhost tree gaiend a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 808 907 files changed, 56701 insertions(+), 13727 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 223 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 (4f273959b850 mei: nfc: fix deadlock on shutdown/suspend path) 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 (c517d838eb7d Linux 4.0-rc1) Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) Merging arm-current/fixes (11b8b25ce4f8 ARM: fix lockdep unannotated irqs-off warning) 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 (b32aadc1a8ed powerpc/powernv: Fix race in updating core_idle_state) Merging powerpc-merge-mpe/fixes (a8956a7b7232 powerpc/powernv: Fix opal-elog interrupt handler) Merging powerpc-merge-benh/merge (c517d838eb7d Linux 4.0-rc1) Merging sparc/master (4a10a91756ef Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit) Merging net/master (fda8b18c515a cxgb4: Fix incorrect sequence numbers shown in devlog) Merging ipsec/master (31a418986a58 xen: netback: read hotplug script once at start of day.) Merging sound-current/for-linus (e828b23734bf ALSA: hda - add codec ID for Broxton display audio codec) Merging pci-current/for-linus (552bc94ebeeb PCI: Preserve resource size during alignment reordering) Merging wireless-drivers/master (38fe44e61a89 Merge tag 'iwlwifi-for-kalle-2015-05-28' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (d770e558e219 Linux 4.2-rc1) Merging tty.current/tty-linus (d770e558e219 Linux 4.2-rc1) Merging usb.current/usb-linus (d4669bb1427c Merge tag 'fixes-for-v4.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) Merging usb-gadget-fixes/fixes (b2e2c94b878b usb: gadget: f_midi: fix error recovery path) Merging usb-serial-fixes/usb-linus (f98a7aa81eee USB: cp210x: add ID for Aruba Networks controllers) Merging staging.current/staging-linus (cbe4f4434ded staging:lustre: remove irq.h from socklnd.h) Merging char-misc.current/char-misc-linus (d770e558e219 Linux 4.2-rc1) Merging input-current/for-linus (539c4b88146c Input: elan_i2c - change the hover event from MT to ST) Merging crypto-current/master (acb33cc541d7 crypto: omap-des - Fix unmapping of dma channels) 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 (f36963c9d3f6 cpumask_set_cpu_local_first = cpumask_local_spread, lament) Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout) Merging kselftest-fixes/fixes (ba155e2d21f6 Linux 4.1-rc5) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm:
linux-next: Tree for Jul 8
Hi all, Changes since 20140707: My fixes tree contains: powerpc: Disable RELOCATABLE for COMPILE_TEST with PPC64 The net tree still had its build failure for which I reverted a commit. The regulator tree gained a build failure so I used the version from next-20140707. The iommu tree gained a build failure so I used the version from next-20140707. The staging tree still had its build failure for which I disabled a driver. The akpm-current tree still had its build failure for which I applied a patch. Non-merge commits (relative to Linus' tree): 3916 3692 files changed, 146203 insertions(+), 190637 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 222 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 (448bfad8a185 Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux) Merging fixes/master (b8accbbce667 powerpc: Disable RELOCATABLE for COMPILE_TEST with PPC64) Merging kbuild-current/rc-fixes (c79624c1a698 kbuild: Fix packaging targets with relative $(srctree)) Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) Merging arm-current/fixes (9a2c33a422d6 ARM: l2c: fix revision checking) Merging m68k-current/for-linus (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo()) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging powerpc-merge/merge (6663a4fa6711 powerpc: Don't skip ePAPR spin-table CPUs) Merging sparc/master (894e552cfaa3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) Merging net/master (68b7107b6298 ipv4: icmp: Fix pMTU handling for rare case) $ git am -3 ../patches/0001-Revert-net-stmmac-add-platform-init-exit-for-Altera-.patch Applying: Revert "net: stmmac: add platform init/exit for Altera's ARM socfpga" Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs) Merging sound-current/for-linus (525549d7342f ALSA: hda: Fix build warning) Merging pci-current/for-linus (bf177a1eb6d1 MAINTAINERS: Update mx6 PCI driver maintainer's email) Merging wireless/master (2c4db12ec469 rt2800usb: Don't perform DMA from stack) Merging driver-core.current/driver-core-linus (cd3de83f1476 Linux 3.16-rc4) Merging tty.current/tty-linus (a497c3ba1d97 Linux 3.16-rc2) Merging usb.current/usb-linus (e4adcff09ca3 usb: chipidea: udc: delete td from req's td list at ep_dequeue) Merging usb-gadget-fixes/fixes (8035691365b8 usb: musb: dsps: fix the base address for accessing the mode register) Merging usb-serial-fixes/usb-linus (3d28bd840b2d usb: option: Add ID for Telewell TW-LTE 4G v2) Merging staging.current/staging-linus (6b64168de843 Merge tag 'iio-fixes-for-3.16b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging char-misc.current/char-misc-linus (a497c3ba1d97 Linux 3.16-rc2) Merging input-current/for-linus (31972f6e517d Input: ti_am335x_tsc - warn about incorrect spelling) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (cfe82d4f45c7 crypto: sha512_ssse3 - fix byte count to bit count conversion) Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies) 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
linux-next: Tree for Jul 8
Hi all, Changes since 20140707: My fixes tree contains: powerpc: Disable RELOCATABLE for COMPILE_TEST with PPC64 The net tree still had its build failure for which I reverted a commit. The regulator tree gained a build failure so I used the version from next-20140707. The iommu tree gained a build failure so I used the version from next-20140707. The staging tree still had its build failure for which I disabled a driver. The akpm-current tree still had its build failure for which I applied a patch. Non-merge commits (relative to Linus' tree): 3916 3692 files changed, 146203 insertions(+), 190637 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 222 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 (448bfad8a185 Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux) Merging fixes/master (b8accbbce667 powerpc: Disable RELOCATABLE for COMPILE_TEST with PPC64) Merging kbuild-current/rc-fixes (c79624c1a698 kbuild: Fix packaging targets with relative $(srctree)) Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) Merging arm-current/fixes (9a2c33a422d6 ARM: l2c: fix revision checking) Merging m68k-current/for-linus (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo()) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging powerpc-merge/merge (6663a4fa6711 powerpc: Don't skip ePAPR spin-table CPUs) Merging sparc/master (894e552cfaa3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) Merging net/master (68b7107b6298 ipv4: icmp: Fix pMTU handling for rare case) $ git am -3 ../patches/0001-Revert-net-stmmac-add-platform-init-exit-for-Altera-.patch Applying: Revert net: stmmac: add platform init/exit for Altera's ARM socfpga Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs) Merging sound-current/for-linus (525549d7342f ALSA: hda: Fix build warning) Merging pci-current/for-linus (bf177a1eb6d1 MAINTAINERS: Update mx6 PCI driver maintainer's email) Merging wireless/master (2c4db12ec469 rt2800usb: Don't perform DMA from stack) Merging driver-core.current/driver-core-linus (cd3de83f1476 Linux 3.16-rc4) Merging tty.current/tty-linus (a497c3ba1d97 Linux 3.16-rc2) Merging usb.current/usb-linus (e4adcff09ca3 usb: chipidea: udc: delete td from req's td list at ep_dequeue) Merging usb-gadget-fixes/fixes (8035691365b8 usb: musb: dsps: fix the base address for accessing the mode register) Merging usb-serial-fixes/usb-linus (3d28bd840b2d usb: option: Add ID for Telewell TW-LTE 4G v2) Merging staging.current/staging-linus (6b64168de843 Merge tag 'iio-fixes-for-3.16b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging char-misc.current/char-misc-linus (a497c3ba1d97 Linux 3.16-rc2) Merging input-current/for-linus (31972f6e517d Input: ti_am335x_tsc - warn about incorrect spelling) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding discard stripe) Merging crypto-current/master (cfe82d4f45c7 crypto: sha512_ssse3 - fix byte count to bit count conversion) Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies) 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
linux-next: Tree for Jul 8
Hi all, Changes since 20130705: The v4l-dvb tree gained a build failure for which I reverted a commit. The pm tree lost its build failure. The vhost tree gained a conflict against the target-updates tree. The arm-soc tree gained a conflict against Linus' tree. The akpm tree gained a conflict against the drm-intel tree and lost a few patches that turned up elsewhere. I also remove a patch that was causing problems and applied another fix patch. The cpuinit tree lost some patches that turned up in Linus' tree. 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 228 trees (counting Linus' and 31 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 (d2b4a64 Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma) Merging fixes/master (8177a9d lseek(fd, n, SEEK_END) does *not* go to eof - n) Merging kbuild-current/rc-fixes (42a0940 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes) Merging arc-current/for-curr (baadb8f ARC: warn on improper stack unwind FDE entries) Merging arm-current/fixes (3e0a07f ARM: 7773/1: PJ4B: Add support for errata 4742) Merging m68k-current/for-linus (767bcb4 Merge branch 'exotic-arch-fixes' into for-next) Merging powerpc-merge/merge (ea461ab powerpc/eeh: Fix fetching bus for single-dev-PE) Merging sparc/master (c069114 mn10300: Fix include dependency in irqflags.h et al.) Merging net/master (8bb495e Linux 3.10) Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling) Merging sound-current/for-linus (69de3f0 ALSA: hda - Keep halting ALC5505 DSP) Merging pci-current/for-linus (65694c5 x86/PCI: Map PCI setup data with ioremap() so it can be in highmem) Merging wireless/master (57bf744 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging driver-core.current/driver-core-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core) Merging tty.current/tty-linus (9e895ac Linux 3.10-rc7) Merging usb.current/usb-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core) Merging staging.current/staging-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core) Merging char-misc.current/char-misc-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core) Merging input-current/for-linus (62f548d Input: cyttsp4 - use 16bit address for I2C/SPI communication) Merging md-current/for-linus (1376512 md/raid10: fix bug which causes all RAID10 reshapes to move no data.) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (02c0241 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto) Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) 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
linux-next: Tree for Jul 8
Hi all, Changes since 20130705: The v4l-dvb tree gained a build failure for which I reverted a commit. The pm tree lost its build failure. The vhost tree gained a conflict against the target-updates tree. The arm-soc tree gained a conflict against Linus' tree. The akpm tree gained a conflict against the drm-intel tree and lost a few patches that turned up elsewhere. I also remove a patch that was causing problems and applied another fix patch. The cpuinit tree lost some patches that turned up in Linus' tree. 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 228 trees (counting Linus' and 31 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 (d2b4a64 Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma) Merging fixes/master (8177a9d lseek(fd, n, SEEK_END) does *not* go to eof - n) Merging kbuild-current/rc-fixes (42a0940 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes) Merging arc-current/for-curr (baadb8f ARC: warn on improper stack unwind FDE entries) Merging arm-current/fixes (3e0a07f ARM: 7773/1: PJ4B: Add support for errata 4742) Merging m68k-current/for-linus (767bcb4 Merge branch 'exotic-arch-fixes' into for-next) Merging powerpc-merge/merge (ea461ab powerpc/eeh: Fix fetching bus for single-dev-PE) Merging sparc/master (c069114 mn10300: Fix include dependency in irqflags.h et al.) Merging net/master (8bb495e Linux 3.10) Merging ipsec/master (01cb71d net_sched: restore overhead xxx handling) Merging sound-current/for-linus (69de3f0 ALSA: hda - Keep halting ALC5505 DSP) Merging pci-current/for-linus (65694c5 x86/PCI: Map PCI setup data with ioremap() so it can be in highmem) Merging wireless/master (57bf744 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging driver-core.current/driver-core-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core) Merging tty.current/tty-linus (9e895ac Linux 3.10-rc7) Merging usb.current/usb-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core) Merging staging.current/staging-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core) Merging char-misc.current/char-misc-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core) Merging input-current/for-linus (62f548d Input: cyttsp4 - use 16bit address for I2C/SPI communication) Merging md-current/for-linus (1376512 md/raid10: fix bug which causes all RAID10 reshapes to move no data.) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (02c0241 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto) Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) 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