Re: linux-next: Tree for Dec 20
On Thu, Dec 20, 2018 at 07:42:45PM +1100, Stephen Rothwell wrote: > Hi all, > > Changes since 20181219: > > The rdma tree lost its build failure. > > The net-next tree gained conflicts against the net tree and a build > failure for which I applied a merge fix patch. > > The tip tree gained a conflict against the kbuild tree. > > The char-misc tree gained a conflict against the net-next tree. > > The akpm-current tree gained a conflict against the asm-generic tree. > > Non-merge commits (relative to Linus' tree): 10141 > 10302 files changed, 483215 insertions(+), 268840 deletions(-) > I won't even try a detailed analysis. Those interested may check https://kerneltests.org/builders/. Guenter --- Build results: total: 158 pass: 140 fail: 18 Failed builds: alpha:allmodconfig arm:allmodconfig csky:defconfig csky:allnoconfig csky:tinyconfig ia64:defconfig ia64:allnoconfig ia64:tinyconfig mips:allmodconfig mips:cavium_octeon_defconfig nds32:allmodconfig parisc:defconfig parisc:allnoconfig parisc:tinyconfig parisc:allmodconfig parisc:generic-32bit_defconfig sparc64:allmodconfig xtensa:allmodconfig Qemu test results: total: 328 pass: 239 fail: 89 Failed tests: arm:vexpress-a9:multi_v7_defconfig:vexpress-v2p-ca9:rootfs arm:vexpress-a15:multi_v7_defconfig:vexpress-v2p-ca15-tc1:rootfs arm:vexpress-a15-a7:multi_v7_defconfig:vexpress-v2p-ca15_a7:rootfs arm:beagle:multi_v7_defconfig:omap3-beagle:rootfs arm:beaglexm:multi_v7_defconfig:omap3-beagle-xm:rootfs arm:overo:multi_v7_defconfig:omap3-overo-tobi:rootfs arm:midway:multi_v7_defconfig:ecx-2000:initrd arm:sabrelite:multi_v7_defconfig:imx6dl-sabrelite:initrd arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zc702:rootfs arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zc706:rootfs arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zed:rootfs arm:cubieboard:multi_v7_defconfig:sun4i-a10-cubieboard:initrd arm:raspi2:multi_v7_defconfig:bcm2836-rpi-2-b:rootfs arm:virt:multi_v7_defconfig:rootfs arm:smdkc210:exynos_defconfig:exynos4210-smdkv310:initrd arm64:virt:defconfig:smp:mem512:initrd arm64:virt:defconfig:smp2:mem512:usb-xhci:rootfs arm64:virt:defconfig:smp4:mem512:usb-uas-xhci:rootfs arm64:virt:defconfig:smp6:mem512:virtio:rootfs arm64:virt:defconfig:smp8:mem512:virtio-pci:rootfs arm64:virt:defconfig:smp:mem512:virtio-blk:rootfs arm64:virt:defconfig:smp2:mem512:nvme:rootfs arm64:virt:defconfig:smp4:mem512:mmc:rootfs arm64:virt:defconfig:smp6:mem512:scsi[DC395]:rootfs arm64:virt:defconfig:smp8:mem512:scsi[AM53C974]:rootfs arm64:virt:defconfig:smp2:mem512:scsi[MEGASAS]:rootfs arm64:virt:defconfig:smp4:mem512:scsi[MEGASAS2]:rootfs arm64:virt:defconfig:smp6:mem512:scsi[53C810]:rootfs arm64:virt:defconfig:smp8:mem512:scsi[53C895A]:rootfs arm64:virt:defconfig:smp:mem512:scsi[FUSION]:rootfs arm64:virt:defconfig:smp2:mem512:scsi[virtio]:rootfs arm64:xlnx-zcu102:defconfig:smp:mem2G:initrd:xilinx/zynqmp-zcu102-rev1.0 arm64:xlnx-zcu102:defconfig:smp2:mem2G:sd1:rootfs:xilinx/zynqmp-zcu102-rev1.0 arm64:xlnx-zcu102:defconfig:smp4:mem2G:sata:rootfs:xilinx/zynqmp-zcu102-rev1.0 arm64:raspi3:defconfig:smp:mem1G:initrd:broadcom/bcm2837-rpi-3-b arm64:raspi3:defconfig:smp4:mem1G:sd:rootfs:broadcom/bcm2837-rpi-3-b arm64:virt:defconfig:nosmp:mem512:initrd arm64:xlnx-zcu102:defconfig:nosmp:mem2G:initrd:xilinx/zynqmp-zcu102-rev1.0 arm64:xlnx-zcu102:defconfig:nosmp:mem2G:sd1:rootfs:xilinx/zynqmp-zcu102-rev1.0 parisc:defconfig:smp:initrd parisc:defconfig:smp:mmc:rootfs parisc:defconfig:smp:nvme:rootfs parisc:defconfig:smp:sata-cmd646:rootfs parisc:defconfig:smp:scsi:rootfs parisc:defconfig:smp:scsi[53C895A]:rootfs parisc:defconfig:smp:scsi[DC395]:rootfs parisc:defconfig:smp:scsi[AM53C974]:rootfs parisc:defconfig:nosmp:usb-ohci:rootfs parisc:defconfig:nosmp:usb-ehci:rootfs parisc:defconfig:nosmp:usb-xhci:rootfs parisc:defconfig:nosmp:usb-uas-ehci:rootfs parisc:defconfig:nosmp:usb-uas-xhci:rootfs parisc:defconfig:nosmp:initrd parisc:defconfig:nosmp:mmc:rootfs parisc:defconfig:nosmp:nvme:rootfs ppc:mpc8544ds:mpc85xx_defconfig:initrd ppc:mpc8544ds:mpc85xx_defconfig:scsi[53C895A]:rootfs ppc:mpc8544ds:mpc85xx_defconfig:sata-sii3112:rootfs ppc:mpc8544ds:mpc85xx_defconfig:mmc:rootfs ppc:mpc8544ds:mpc85xx_smp_defconfig:initrd ppc:mpc8544ds:mpc85xx_smp_defconfig:scsi[DC395]:rootfs
linux-next: Tree for Dec 20
Hi all, Changes since 20181219: The rdma tree lost its build failure. The net-next tree gained conflicts against the net tree and a build failure for which I applied a merge fix patch. The tip tree gained a conflict against the kbuild tree. The char-misc tree gained a conflict against the net-next tree. The akpm-current tree gained a conflict against the asm-generic tree. Non-merge commits (relative to Linus' tree): 10141 10302 files changed, 483215 insertions(+), 268840 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 292 trees (counting Linus' and 69 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (62393dbcbe0f Merge tag 'for-linus-20181218' of git://git.kernel.dk/linux-block) Merging fixes/master (d8c137546ef8 powerpc: tag implicit fall throughs) Merging kbuild-current/fixes (ef7cfd00b2ca kbuild: fix false positive warning/error about missing libelf) Merging arc-current/for-curr (bc2cbf2cc506 ARC: perf: map generic branches to correct hardware condition) Merging arm-current/fixes (c2a3831df6dc ARM: 8816/1: dma-mapping: fix potential uninitialized return) Merging arm64-fixes/for-next/fixes (3238c359acee arm64: dma-mapping: Fix FORCE_CONTIGUOUS buffer clearing) Merging m68k-current/for-linus (bed1369f5190 m68k: Fix memblock-related crashes) Merging powerpc-fixes/fixes (a225f1567405 powerpc/ptrace: replace ptrace_report_syscall() with a tracehook call) Merging sparc/master (cf76c364a1e1 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (fb2427454631 ipv6: explicitly initialize udp6_addr in udp_sock_create6()) Merging bpf/master (bcb671c2fa0e bpf: promote bpf_perf_event.h to mandatory UAPI header) Merging ipsec/master (3061169a47ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging netfilter/master (9e69efd45321 Merge branch 'vhost-fixes') Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set) Merging wireless-drivers/master (53884577fbce ath10k: skip sending quiet mode cmd for WCN3990) Merging mac80211/master (34b1e0e9efe1 mac80211: free skb fraglist before freeing the skb) Merging rdma-fixes/for-rc (37fbd834b4e4 IB/core: Fix oops in netdev_next_upper_dev_rcu()) Merging sound-current/for-linus (0bea4cc83835 ALSA: hda/realtek: Enable audio jacks of ASUS UX433FN/UX333FA with ALC294) Merging sound-asoc-fixes/for-linus (3031782c33f1 Merge branch 'asoc-4.20' into asoc-linus) Merging regmap-fixes/for-linus (7566ec393f41 Linux 4.20-rc7) Merging regulator-fixes/for-linus (942e829a2ecc Merge branch 'regulator-4.20' into regulator-linus) Merging spi-fixes/for-linus (111c49e0eef9 Merge branch 'spi-4.20' into spi-linus) Merging pci-current/for-linus (1063a5148ac9 PCI/AER: Queue one GHES event, not several uninitialized ones) Merging driver-core.current/driver-core-linus (2595646791c3 Linux 4.20-rc5) Merging tty.current/tty-linus (3c9dc275dba1 Revert "serial: 8250: Fix clearing FIFOs in RS485 mode again") Merging usb.current/usb-linus (2419f30a4a4f USB: xhci: fix 'broken_suspend' placement in struct xchi_hcd) Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of out transfers when DMA is
linux-next: Tree for Dec 20
Hi all, Changes since 20171219: The usb tree gained a conflict against the usb.current tree. The staging tree gained a conflict against the char-misc-next tree. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 5152 5400 files changed, 193652 insertions(+), 153296 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 253 trees (counting Linus' and 43 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 (ace52288edf0 Merge tag 'for-linus-20171218' of git://git.infradead.org/linux-mtd) Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging kbuild-current/fixes (cfe17c9bbe6a kbuild: move cc-option and cc-disable-warning after incl. arch Makefile) Merging arc-current/for-curr (bb6892a6366a ARC: [plat-axs103] refactor the quad core DT quirk code) Merging arm-current/fixes (36b0cb84ee85 ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch) Merging m68k-current/for-linus (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (110df8bd3e41 powerpc/perf: Fix kfree memory allocated for nest pmus) Merging sparc/master (a0908a1b7d68 Merge branch 'akpm' (patches from Andrew)) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (d03a45572efa ipv4: fib: Fix metrics match when deleting a route) Merging bpf/master (71af812aa3f2 Fix tools and testing build.) Merging ipsec/master (acf568ee859f xfrm: Reinject transport-mode packets through tasklet) Merging netfilter/master (d6da83813fb3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (a41886f56b7b Merge tag 'iwlwifi-for-kalle-2017-12-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging mac80211/master (04a7279ff12f cfg80211: ship certificates as hex files) Merging sound-current/for-linus (5a15f289ee87 ALSA: usb-audio: Fix the missing ctl name suffix at parsing SU) Merging pci-current/for-linus (1291a0d5049d Linux 4.15-rc4) Merging driver-core.current/driver-core-linus (f57ab9a01a36 drivers: base: cacheinfo: fix cache type for non-architected system cache) Merging tty.current/tty-linus (50c4c4e268a2 Linux 4.15-rc3) Merging usb.current/usb-linus (76916b663e8d Merge tag 'usb-ci-v4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-linus) Merging usb-gadget-fixes/fixes (1291a0d5049d Linux 4.15-rc4) Merging usb-serial-fixes/usb-linus (3920bb713038 USB: serial: option: adding support for YUGA CLM920-NC5) Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) Merging phy/fixes (2b88212c4cc6 phy: rcar-gen3-usb2: select USB_COMMON) Merging staging.current/staging-linus (d6b246bb7a29 staging: android: ion: Fix dma direction for dma_sync_sg_for_cpu/device) Merging char-misc.current/char-misc-linus (7f3dc0088b98 binder: fix proc->files use-after-free) Merging input-current/for-linus (8b7e9d9e2d8b Input: hideep - fix compile error
linux-next: Tree for Dec 20
Hi all, Changes since 20171219: The usb tree gained a conflict against the usb.current tree. The staging tree gained a conflict against the char-misc-next tree. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 5152 5400 files changed, 193652 insertions(+), 153296 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 253 trees (counting Linus' and 43 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 (ace52288edf0 Merge tag 'for-linus-20171218' of git://git.infradead.org/linux-mtd) Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging kbuild-current/fixes (cfe17c9bbe6a kbuild: move cc-option and cc-disable-warning after incl. arch Makefile) Merging arc-current/for-curr (bb6892a6366a ARC: [plat-axs103] refactor the quad core DT quirk code) Merging arm-current/fixes (36b0cb84ee85 ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch) Merging m68k-current/for-linus (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (110df8bd3e41 powerpc/perf: Fix kfree memory allocated for nest pmus) Merging sparc/master (a0908a1b7d68 Merge branch 'akpm' (patches from Andrew)) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (d03a45572efa ipv4: fib: Fix metrics match when deleting a route) Merging bpf/master (71af812aa3f2 Fix tools and testing build.) Merging ipsec/master (acf568ee859f xfrm: Reinject transport-mode packets through tasklet) Merging netfilter/master (d6da83813fb3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (a41886f56b7b Merge tag 'iwlwifi-for-kalle-2017-12-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging mac80211/master (04a7279ff12f cfg80211: ship certificates as hex files) Merging sound-current/for-linus (5a15f289ee87 ALSA: usb-audio: Fix the missing ctl name suffix at parsing SU) Merging pci-current/for-linus (1291a0d5049d Linux 4.15-rc4) Merging driver-core.current/driver-core-linus (f57ab9a01a36 drivers: base: cacheinfo: fix cache type for non-architected system cache) Merging tty.current/tty-linus (50c4c4e268a2 Linux 4.15-rc3) Merging usb.current/usb-linus (76916b663e8d Merge tag 'usb-ci-v4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-linus) Merging usb-gadget-fixes/fixes (1291a0d5049d Linux 4.15-rc4) Merging usb-serial-fixes/usb-linus (3920bb713038 USB: serial: option: adding support for YUGA CLM920-NC5) Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) Merging phy/fixes (2b88212c4cc6 phy: rcar-gen3-usb2: select USB_COMMON) Merging staging.current/staging-linus (d6b246bb7a29 staging: android: ion: Fix dma direction for dma_sync_sg_for_cpu/device) Merging char-misc.current/char-misc-linus (7f3dc0088b98 binder: fix proc->files use-after-free) Merging input-current/for-linus (8b7e9d9e2d8b Input: hideep - fix compile error
Re: linux-next: Tree for Dec 20
On Mon, Dec 19, 2016 at 8:55 PM, Stephen Rothwellwrote: > Hi all, > > Please do not add any material for v4.11 to your linux-next included > branches until after v4.10-rc1 has been released. Some recent MIPS build fails showed up, mindless bisect run says: ad1ccae78b7d7508b39f742631e210407033e8e6 is the first bad commit commit ad1ccae78b7d7508b39f742631e210407033e8e6 Author: Ralf Baechle Date: Thu Dec 15 12:39:22 2016 +0100 MIPS: IP22: Fix build error due to binutils 2.25 uselessnes. Seems the fix upsets other older junk ; locally I have: $ mips-linux-ld -v GNU ld (GNU Binutils) 2.22 Appears on "allnoconfig" and several other mips builds. I gave Ralf a heads up on IRC as well.. Paul. -- > > Changes since 20161219: > > The kvm tree lost its build failure. > > Non-merge commits (relative to Linus' tree): 566 > 1073 files changed, 26213 insertions(+), 8676 deletions(-) >
Re: linux-next: Tree for Dec 20
On Mon, Dec 19, 2016 at 8:55 PM, Stephen Rothwell wrote: > Hi all, > > Please do not add any material for v4.11 to your linux-next included > branches until after v4.10-rc1 has been released. Some recent MIPS build fails showed up, mindless bisect run says: ad1ccae78b7d7508b39f742631e210407033e8e6 is the first bad commit commit ad1ccae78b7d7508b39f742631e210407033e8e6 Author: Ralf Baechle Date: Thu Dec 15 12:39:22 2016 +0100 MIPS: IP22: Fix build error due to binutils 2.25 uselessnes. Seems the fix upsets other older junk ; locally I have: $ mips-linux-ld -v GNU ld (GNU Binutils) 2.22 Appears on "allnoconfig" and several other mips builds. I gave Ralf a heads up on IRC as well.. Paul. -- > > Changes since 20161219: > > The kvm tree lost its build failure. > > Non-merge commits (relative to Linus' tree): 566 > 1073 files changed, 26213 insertions(+), 8676 deletions(-) >
linux-next: Tree for Dec 20
Hi all, Please do not add any material for v4.11 to your linux-next included branches until after v4.10-rc1 has been released. Changes since 20161219: The kvm tree lost its build failure. Non-merge commits (relative to Linus' tree): 566 1073 files changed, 26213 insertions(+), 8676 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 (with KALLSYMS_EXTRA_PASS=1) and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 246 trees (counting Linus' and 35 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 (e93b1cc8a896 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging kbuild-current/rc-fixes (152b695d7437 builddeb: fix cross-building to arm64 producing host-arch debs) Merging arc-current/for-curr (08fe007968b2 ARC: mm: arc700: Don't assume 2 colours for aliasing VIPT dcache) Merging arm-current/fixes (8478132a8784 Revert "arm: move exports to definitions") Merging m68k-current/for-linus (7e251bb21ae0 m68k: Fix ndelay() macro) Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) Merging powerpc-fixes/fixes (69973b830859 Linux 4.9) Merging sparc/master (e93b1cc8a896 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging net/master (ad688cdbb076 stmmac: fix memory barriers) Merging ipsec/master (bc3913a5378c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging netfilter/master (a220871be66f virtio-net: correctly enable multiqueue) Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging wireless-drivers/master (fcd2042e8d36 mwifiex: printk() overflow with 32-byte SSIDs) Merging mac80211/master (a17d93ff3a95 mac80211: fix legacy and invalid rx-rate report) Merging sound-current/for-linus (995c6a7fd9b9 ALSA: hiface: Fix M2Tech hiFace driver sampling rate change) Merging pci-current/for-linus (e42010d8207f PCI: Set Read Completion Boundary to 128 iff Root Port supports it (_HPX)) Merging driver-core.current/driver-core-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging tty.current/tty-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging usb.current/usb-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging usb-gadget-fixes/fixes (05e78c6933d6 usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match()) Merging usb-serial-fixes/usb-linus (46490c347df4 USB: serial: option: add dlink dwm-158) Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) Merging phy/fixes (4320f9d4c183 phy: sun4i: check PMU presence when poking unknown bit of pmu) Merging staging.current/staging-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging char-misc.current/char-misc-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging input-current/for-linus (67626c932302 Input: synaptics_i2c - change msleep to usleep_range for small msecs) Merging crypto-current/master (8759fec4af22 crypto: marvell - Copy IVDIG before launching partial DMA ahash requests) Merging ide/master (797cee982eef Merge branch
linux-next: Tree for Dec 20
Hi all, Please do not add any material for v4.11 to your linux-next included branches until after v4.10-rc1 has been released. Changes since 20161219: The kvm tree lost its build failure. Non-merge commits (relative to Linus' tree): 566 1073 files changed, 26213 insertions(+), 8676 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 (with KALLSYMS_EXTRA_PASS=1) and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 246 trees (counting Linus' and 35 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 (e93b1cc8a896 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging kbuild-current/rc-fixes (152b695d7437 builddeb: fix cross-building to arm64 producing host-arch debs) Merging arc-current/for-curr (08fe007968b2 ARC: mm: arc700: Don't assume 2 colours for aliasing VIPT dcache) Merging arm-current/fixes (8478132a8784 Revert "arm: move exports to definitions") Merging m68k-current/for-linus (7e251bb21ae0 m68k: Fix ndelay() macro) Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) Merging powerpc-fixes/fixes (69973b830859 Linux 4.9) Merging sparc/master (e93b1cc8a896 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging net/master (ad688cdbb076 stmmac: fix memory barriers) Merging ipsec/master (bc3913a5378c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging netfilter/master (a220871be66f virtio-net: correctly enable multiqueue) Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging wireless-drivers/master (fcd2042e8d36 mwifiex: printk() overflow with 32-byte SSIDs) Merging mac80211/master (a17d93ff3a95 mac80211: fix legacy and invalid rx-rate report) Merging sound-current/for-linus (995c6a7fd9b9 ALSA: hiface: Fix M2Tech hiFace driver sampling rate change) Merging pci-current/for-linus (e42010d8207f PCI: Set Read Completion Boundary to 128 iff Root Port supports it (_HPX)) Merging driver-core.current/driver-core-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging tty.current/tty-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging usb.current/usb-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging usb-gadget-fixes/fixes (05e78c6933d6 usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match()) Merging usb-serial-fixes/usb-linus (46490c347df4 USB: serial: option: add dlink dwm-158) Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) Merging phy/fixes (4320f9d4c183 phy: sun4i: check PMU presence when poking unknown bit of pmu) Merging staging.current/staging-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging char-misc.current/char-misc-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging input-current/for-linus (67626c932302 Input: synaptics_i2c - change msleep to usleep_range for small msecs) Merging crypto-current/master (8759fec4af22 crypto: marvell - Copy IVDIG before launching partial DMA ahash requests) Merging ide/master (797cee982eef Merge branch
Re: linux-next: Tree for Dec 20 (brocade/bna)
On 12/19/13 22:25, Stephen Rothwell wrote: > Hi all, > > Changes since 20131219: > on i386: drivers/net/ethernet/brocade/bna/bnad.c: In function 'bnad_start_xmit': drivers/net/ethernet/brocade/bna/bnad.c:3074:26: error: 'struct bnad_tx_vector' has no member named 'dma_len' CONFIG_NEED_DMA_MAP_STATE is not enabled. -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Dec 20 (brocade/bna)
On 12/19/13 22:25, Stephen Rothwell wrote: Hi all, Changes since 20131219: on i386: drivers/net/ethernet/brocade/bna/bnad.c: In function 'bnad_start_xmit': drivers/net/ethernet/brocade/bna/bnad.c:3074:26: error: 'struct bnad_tx_vector' has no member named 'dma_len' CONFIG_NEED_DMA_MAP_STATE is not enabled. -- ~Randy -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: Tree for Dec 20
Hi all, Changes since 20131219: New tree: clockevents The powerpc tree still had its build failure for which I applied a supplied patch. The sound-asoc tree gained a conflict against the slave-dma tree. The net-next tree lost its new build failure. The mmc tree still had its build failure so I used the version from next-20131212. The spi tree gained a conflict against the mpc5xxx tree. The clockevents tree gained a conflict against Linus' tree. The usb-gadget lost its build failure. The akpm-current tree still had its build failures for which I applied patches. Non-merge commits (relative to Linus' tree): 5223 5421 files changed, 250649 insertions(+), 134680 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. I am currently merging 210 trees (counting Linus' and 29 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (f7556698a369 Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux) Merging arc-current/for-curr (319e2e3f63c3 Linux 3.13-rc4) Merging arm-current/fixes (b713aa0b1501 ARM: fix asm/memory.h build error) Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (803c2d2f84da powerpc/powernv: Fix OPAL LPC access in Little Endian) Merging sparc/master (1de425c7b271 sparc64: Fix build regression) Merging net/master (c047e0707307 bnx2x: downgrade "valid ME register value" message level) Merging ipsec/master (239c78db9c41 net: clear local_df when passing skb between namespaces) Merging sound-current/for-linus (356f402da0f9 Merge tag 'asoc-v3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (f0b75693cbb2 MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers) Merging wireless/master (b7e047358449 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging driver-core.current/driver-core-linus (a8b14744429f sysfs: give different locking key to regular and bin files) Merging tty.current/tty-linus (c2db11eca089 tty: xuartps: Properly guard sysrq specific code) Merging usb.current/usb-linus (fb5f1834c322 usb: ohci-at91: fix irq and iomem resource retrieval) Merging staging.current/staging-linus (fd6040ed57d8 imx-drm: imx-drm-core: improve safety of imx_drm_add_crtc()) Merging char-misc.current/char-misc-linus (319e2e3f63c3 Linux 3.13-rc4) Merging input-current/for-linus (2a4d81547b88 Input: define KEY_WWAN for Wireless WAN) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (389a5390583a crypto: scatterwalk - Use sg_chain_ptr on chain entries) Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert
linux-next: Tree for Dec 20
Hi all, Changes since 20131219: New tree: clockevents The powerpc tree still had its build failure for which I applied a supplied patch. The sound-asoc tree gained a conflict against the slave-dma tree. The net-next tree lost its new build failure. The mmc tree still had its build failure so I used the version from next-20131212. The spi tree gained a conflict against the mpc5xxx tree. The clockevents tree gained a conflict against Linus' tree. The usb-gadget lost its build failure. The akpm-current tree still had its build failures for which I applied patches. Non-merge commits (relative to Linus' tree): 5223 5421 files changed, 250649 insertions(+), 134680 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use git pull to do so as that will try to merge the new linux-next release with the old one. You should use git fetch as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. I am currently merging 210 trees (counting Linus' and 29 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwell s...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (f7556698a369 Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make make install not depend on vmlinux) Merging arc-current/for-curr (319e2e3f63c3 Linux 3.13-rc4) Merging arm-current/fixes (b713aa0b1501 ARM: fix asm/memory.h build error) Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (803c2d2f84da powerpc/powernv: Fix OPAL LPC access in Little Endian) Merging sparc/master (1de425c7b271 sparc64: Fix build regression) Merging net/master (c047e0707307 bnx2x: downgrade valid ME register value message level) Merging ipsec/master (239c78db9c41 net: clear local_df when passing skb between namespaces) Merging sound-current/for-linus (356f402da0f9 Merge tag 'asoc-v3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (f0b75693cbb2 MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers) Merging wireless/master (b7e047358449 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging driver-core.current/driver-core-linus (a8b14744429f sysfs: give different locking key to regular and bin files) Merging tty.current/tty-linus (c2db11eca089 tty: xuartps: Properly guard sysrq specific code) Merging usb.current/usb-linus (fb5f1834c322 usb: ohci-at91: fix irq and iomem resource retrieval) Merging staging.current/staging-linus (fd6040ed57d8 imx-drm: imx-drm-core: improve safety of imx_drm_add_crtc()) Merging char-misc.current/char-misc-linus (319e2e3f63c3 Linux 3.13-rc4) Merging input-current/for-linus (2a4d81547b88 Input: define KEY_WWAN for Wireless WAN) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding discard stripe) Merging crypto-current/master (389a5390583a crypto: scatterwalk - Use sg_chain_ptr on chain entries) Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (44033109e99c
linux-next: Tree for Dec 20
Hi all, Changes since 20121219: Lots of conflicts are migrating between trees. The infiniband tree gained a build failure so I used the version from next-20121219. Ths signal tree gained conflicts against Linus' and the cris trees. The akpm tree lost lots of 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 213 trees (counting Linus' and 28 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 (2f0bf92 Merge tag 'xtensa-20121218' of git://github.com/czankel/xtensa-linux) Merging fixes/master (791cb02 OMAP: common.c: remove init call to vram fixup) Merging kbuild-current/rc-fixes (bad9955 menuconfig: Replace CIRCLEQ by list_head-style lists.) Merging arm-current/fixes (dad5451 ARM: 7605/1: vmlinux.lds: Move .notes section next to the rodata) Merging m68k-current/for-linus (5fec45a m68k/sun3: Fix instruction faults) Merging powerpc-merge/merge (e716e01 powerpc/eeh: Do not invalidate PE properly) Merging sparc/master (6cb9c36 sparc: huge_ptep_set_* functions need to call set_huge_pte_at()) Merging net/master (f8b8403 net: qmi_wwan: add ZTE MF880) Merging sound-current/for-linus (d846b17 ALSA: hda - Fix build without CONFIG_PM) Merging pci-current/for-linus (ff8e59b PCI/portdrv: Don't create hotplug slots unless port supports hotplug) Merging wireless/master (009b969 wireless: fix Atheros drivers compilation) Merging driver-core.current/driver-core-linus (9360b53 Revert "bdi: add a user-tunable cpu_list for the bdi flusher threads") Merging tty.current/tty-linus (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging usb.current/usb-linus (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging staging.current/staging-linus (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging char-misc.current/char-misc-linus (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging input-current/for-linus (022573c Merge branch 'next' into for-linus) Merging md-current/for-linus (a9add5d md/raid5: add blktrace calls) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (a2c0911 crypto: caam - Updated SEC-4.0 device tree binding for ERA information.) Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops) Merging dwmw2/master (2c37d57 x86: add CONFIG_X86_MOVBE option) CONFLICT (content): Merge conflict in arch/x86/Kconfig.cpu CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/Kconfig Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6) Merging devicetree-current/devicetree/merge (80c2022 of: Fix export of of_find_matching_node_and_match()) Merging spi-current/spi/merge (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().) Merging gpio-current/gpio/merge (488a00f gpio/ich: Add missing spinlock init) Merging
linux-next: Tree for Dec 20
Hi all, Changes since 20121219: Lots of conflicts are migrating between trees. The infiniband tree gained a build failure so I used the version from next-20121219. Ths signal tree gained conflicts against Linus' and the cris trees. The akpm tree lost lots of 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 213 trees (counting Linus' and 28 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 (2f0bf92 Merge tag 'xtensa-20121218' of git://github.com/czankel/xtensa-linux) Merging fixes/master (791cb02 OMAP: common.c: remove init call to vram fixup) Merging kbuild-current/rc-fixes (bad9955 menuconfig: Replace CIRCLEQ by list_head-style lists.) Merging arm-current/fixes (dad5451 ARM: 7605/1: vmlinux.lds: Move .notes section next to the rodata) Merging m68k-current/for-linus (5fec45a m68k/sun3: Fix instruction faults) Merging powerpc-merge/merge (e716e01 powerpc/eeh: Do not invalidate PE properly) Merging sparc/master (6cb9c36 sparc: huge_ptep_set_* functions need to call set_huge_pte_at()) Merging net/master (f8b8403 net: qmi_wwan: add ZTE MF880) Merging sound-current/for-linus (d846b17 ALSA: hda - Fix build without CONFIG_PM) Merging pci-current/for-linus (ff8e59b PCI/portdrv: Don't create hotplug slots unless port supports hotplug) Merging wireless/master (009b969 wireless: fix Atheros drivers compilation) Merging driver-core.current/driver-core-linus (9360b53 Revert bdi: add a user-tunable cpu_list for the bdi flusher threads) Merging tty.current/tty-linus (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging usb.current/usb-linus (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging staging.current/staging-linus (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging char-misc.current/char-misc-linus (1ebaf4f Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging input-current/for-linus (022573c Merge branch 'next' into for-linus) Merging md-current/for-linus (a9add5d md/raid5: add blktrace calls) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (a2c0911 crypto: caam - Updated SEC-4.0 device tree binding for ERA information.) Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops) Merging dwmw2/master (2c37d57 x86: add CONFIG_X86_MOVBE option) CONFLICT (content): Merge conflict in arch/x86/Kconfig.cpu CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/Kconfig Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6) Merging devicetree-current/devicetree/merge (80c2022 of: Fix export of of_find_matching_node_and_match()) Merging spi-current/spi/merge (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().) Merging gpio-current/gpio/merge (488a00f gpio/ich: Add missing spinlock init) Merging