Re: linux-next: Tree for Nov 24 (drivers/pinctrl/pinctrl-microchip-sgpio.c)
On 11/23/20 11:07 PM, Stephen Rothwell wrote: > Hi all, > > Changes since 20201123: > on i386 or x86_64: # CONFIG_OF is not set ../drivers/pinctrl/pinctrl-microchip-sgpio.c: In function ‘microchip_sgpio_register_bank’: ../drivers/pinctrl/pinctrl-microchip-sgpio.c:597:4: error: ‘struct gpio_chip’ has no member named ‘of_node’ gc->of_node = to_of_node(fwnode); ^~ ../drivers/pinctrl/pinctrl-microchip-sgpio.c:606:4: error: ‘struct gpio_chip’ has no member named ‘of_xlate’ gc->of_xlate = microchip_sgpio_of_xlate; ^~ ../drivers/pinctrl/pinctrl-microchip-sgpio.c:607:4: error: ‘struct gpio_chip’ has no member named ‘of_gpio_n_cells’ gc->of_gpio_n_cells = 3; ^~ Full randconfig file is attached. -- ~Randy Reported-by: Randy Dunlap config-r6380.xz Description: application/xz
linux-next: Tree for Nov 24
Hi all, Changes since 20201123: Linus' tree lost its build failure (or will shortly - fix in powerpc-fixes). The arm-soc tree gained a build failure so I used the version from next-20201123. The s390 tree gained a conflict against the asm-generic tree. Non-merge commits (relative to Linus' tree): 7005 6992 files changed, 593176 insertions(+), 117054 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 327 trees (counting Linus' and 85 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (418baf2c28f3 Linux 5.10-rc5) Merging fixes/fixes (418baf2c28f3 Linux 5.10-rc5) Merging kbuild-current/fixes (d1889589a4f5 builddeb: Fix rootless build in setuid/setgid directory) Merging arc-current/for-curr (f737561c7096 ARC: stack unwinding: reorganize how initial register state setup) Merging arm-current/fixes (9fa2e7af3d53 ARM: 9019/1: kprobes: Avoid fortify_panic() when copying optprobe template) Merging arm64-fixes/for-next/fixes (774c4a3b5e5f ACPI/IORT: Fix doc warnings in iort.c) Merging arm-soc-fixes/arm/fixes (4765df4d3a13 Merge tag 'v5.10-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes) Merging drivers-memory-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging m68k-current/for-linus (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver) Merging powerpc-fixes/fixes (b6b79dd53082 powerpc/64s: Fix allnoconfig build since uaccess flush) Merging s390-fixes/fixes (1179f170b6f0 s390: fix fpu restore in entry.S) Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) Merging net/master (f9b036532108 Merge branch 'ibmvnic-fixes-in-reset-path') Merging bpf/master (178648916e73 xsk: Fix incorrect netdev reference count) Merging ipsec/master (48f486e13ffd net: xfrm: fix memory leak in xfrm_user_policy()) Merging netfilter/master (986fbd9842ba netfilter: nf_tables: avoid false-postive lockdep splat) Merging ipvs/master (986fbd9842ba netfilter: nf_tables: avoid false-postive lockdep splat) Merging wireless-drivers/master (fe56d05ee6c8 iwlwifi: mvm: fix kernel panic in case of assert during CSA) Merging mac80211/master (849920c70339 devlink: Add missing genlmsg_cancel() in devlink_nl_sb_port_pool_fill()) Merging rdma-fixes/for-rc (418baf2c28f3 Linux 5.10-rc5) Merging sound-current/for-linus (92666d45adcf ALSA: hda/realtek - Fixed Dell AIO wrong sound tone) Merging sound-asoc-fixes/for-linus (8f05568156ea Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus) Merging regmap-fixes/for-linus (3650b228f83a Linux 5.10-rc1) Merging regulator-fixes/for-linus (2ba546ebe0ce regulator: ti-abb: Fix array out of bound read access on the first transition) Merging spi-fixes/for-linus (03cfdb8444c0 Merge remote-tracking branch 'spi/for-5.10' into spi-linus) Merging pci-current/for-linus (cce14622a703 PCI: Add function 1 DMA alias quirk for Marvell 9215 SATA controller) Merging driver-core.current/driver-core-linus (f8394f232b1e Linux 5.10-rc3) Merging tty.current/tty-linus (418baf2c28f3 Linux 5.10-rc5) Merging usb.current/usb-linus (f3bc432aa8a7 USB: core: Change %pK for __user pointers to %px) Merging
linux-next: Tree for Nov 24
Hi all, Please do not add any v4.16 material to your linux-next included trees until v4.15-rc1 has been released. Changes since 20171123: The drm tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 766 849 files changed, 17680 insertions(+), 8497 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 246 trees (counting Linus' and 40 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 (5a787756b809 Merge tag 'pwm/for-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm) Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging kbuild-current/fixes (bb3f38c3c5b7 kbuild: clang: fix build failures with sparse check) Merging arc-current/for-curr (82385732b1c9 ARC: perf: avoid vmalloc backed mmap) Merging arm-current/fixes (400eeffaffc7 ARM: 8722/1: mm: make STRICT_KERNEL_RWX effective for LPAE) 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 (4d6c51b107cc powerpc/64s: Fix Power9 DD2.1 logic in DT CPU features) Merging sparc/master (0c86a6bd85ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (9ed33805cdf8 Merge branch 'ipvlan-Fix-insufficient-skb-linear-check') Merging ipsec/master (94802151894d Revert "xfrm: Fix stack-out-of-bounds read in xfrm_state_find.") Merging netfilter/master (fbcd253d2448 netfilter: conntrack: lower timeout to RETRANS seconds if window is 0) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (ed59b7d53c95 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging mac80211/master (a13e8d418f3c Merge tag 'mac80211-for-davem-2017-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) Merging sound-current/for-linus (9ceace3c9c18 ALSA: hda: Add Raven PCI ID) Merging pci-current/for-linus (1b6115fbe3b3 Merge tag 'pci-v4.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) Merging driver-core.current/driver-core-linus (cf9b0772f2e4 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) Merging tty.current/tty-linus (894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging usb.current/usb-linus (894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging usb-gadget-fixes/fixes (7c80f9e4a588 usb: usbtest: fix NULL pointer dereference) Merging usb-serial-fixes/usb-linus (0b07194bb55e Linux 4.14-rc7) Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) Merging phy/fixes (2fb850092fd9 phy: rockchip-typec: Check for errors from tcphy_phy_init()) Merging staging.current/staging-linus (894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging char-misc.current/char-misc-linus
linux-next: Tree for Nov 24
Hi all, Please do not add any v4.16 material to your linux-next included trees until v4.15-rc1 has been released. Changes since 20171123: The drm tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 766 849 files changed, 17680 insertions(+), 8497 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 246 trees (counting Linus' and 40 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 (5a787756b809 Merge tag 'pwm/for-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm) Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging kbuild-current/fixes (bb3f38c3c5b7 kbuild: clang: fix build failures with sparse check) Merging arc-current/for-curr (82385732b1c9 ARC: perf: avoid vmalloc backed mmap) Merging arm-current/fixes (400eeffaffc7 ARM: 8722/1: mm: make STRICT_KERNEL_RWX effective for LPAE) 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 (4d6c51b107cc powerpc/64s: Fix Power9 DD2.1 logic in DT CPU features) Merging sparc/master (0c86a6bd85ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (9ed33805cdf8 Merge branch 'ipvlan-Fix-insufficient-skb-linear-check') Merging ipsec/master (94802151894d Revert "xfrm: Fix stack-out-of-bounds read in xfrm_state_find.") Merging netfilter/master (fbcd253d2448 netfilter: conntrack: lower timeout to RETRANS seconds if window is 0) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (ed59b7d53c95 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging mac80211/master (a13e8d418f3c Merge tag 'mac80211-for-davem-2017-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) Merging sound-current/for-linus (9ceace3c9c18 ALSA: hda: Add Raven PCI ID) Merging pci-current/for-linus (1b6115fbe3b3 Merge tag 'pci-v4.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) Merging driver-core.current/driver-core-linus (cf9b0772f2e4 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) Merging tty.current/tty-linus (894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging usb.current/usb-linus (894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging usb-gadget-fixes/fixes (7c80f9e4a588 usb: usbtest: fix NULL pointer dereference) Merging usb-serial-fixes/usb-linus (0b07194bb55e Linux 4.14-rc7) Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) Merging phy/fixes (2fb850092fd9 phy: rockchip-typec: Check for errors from tcphy_phy_init()) Merging staging.current/staging-linus (894025f24bd0 Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging char-misc.current/char-misc-linus
Re: linux-next: Tree for Nov 24
On Thu, Nov 24, 2016 at 12:35 AM, Stephen Rothwellwrote: > Hi all, > > Changes since 20161123: > > Removed tree: remoteproc (no longer used) > > The powerpc tree gained a conflict against the powerpc-fixes tree. > > The kvm-ppc-paulus tree gained conflicts against the powerpc-fixes and > powerpc trees. > > The staging tree gained a conflict against the net-next tree. > > The akpm-current tree gained a build failure for which I disabled > CONFIG_KEXEC_FILE on powerpc. > > Non-merge commits (relative to Linus' tree): 7885 > 7978 files changed, 461386 insertions(+), 174925 deletions(-) One of the PPC configs failed today. An automated bisect leads to the following commit: commit 1704a81ccebc69b5223220df97cde8a645271828 Author: Paul Mackerras Date: Fri Nov 18 08:47:08 2016 +1100 KVM: PPC: Book3S HV: Use msgsnd for IPIs to other cores on POWER9 On POWER9, the msgsnd instruction is able to send interrupts to other cores, as well as other threads on the local core. Since msgsnd is generally simpler and faster than sending an IPI via the XICS, we use msgsnd for all IPIs sent by KVM on POWER9. Signed-off-by: Paul Mackerras Here is the fail link: http://kisskb.ellerman.id.au/kisskb/buildresult/12866462/ Paul. -- > > > > 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 243 trees (counting Linus' and 34 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 >
Re: linux-next: Tree for Nov 24
On Thu, Nov 24, 2016 at 12:35 AM, Stephen Rothwell wrote: > Hi all, > > Changes since 20161123: > > Removed tree: remoteproc (no longer used) > > The powerpc tree gained a conflict against the powerpc-fixes tree. > > The kvm-ppc-paulus tree gained conflicts against the powerpc-fixes and > powerpc trees. > > The staging tree gained a conflict against the net-next tree. > > The akpm-current tree gained a build failure for which I disabled > CONFIG_KEXEC_FILE on powerpc. > > Non-merge commits (relative to Linus' tree): 7885 > 7978 files changed, 461386 insertions(+), 174925 deletions(-) One of the PPC configs failed today. An automated bisect leads to the following commit: commit 1704a81ccebc69b5223220df97cde8a645271828 Author: Paul Mackerras Date: Fri Nov 18 08:47:08 2016 +1100 KVM: PPC: Book3S HV: Use msgsnd for IPIs to other cores on POWER9 On POWER9, the msgsnd instruction is able to send interrupts to other cores, as well as other threads on the local core. Since msgsnd is generally simpler and faster than sending an IPI via the XICS, we use msgsnd for all IPIs sent by KVM on POWER9. Signed-off-by: Paul Mackerras Here is the fail link: http://kisskb.ellerman.id.au/kisskb/buildresult/12866462/ Paul. -- > > > > 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 243 trees (counting Linus' and 34 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 >
Re: linux-next: Tree for Nov 24
On Thu, Nov 24, 2016 at 12:35 AM, Stephen Rothwellwrote: > Hi all, > > Changes since 20161123: > > Removed tree: remoteproc (no longer used) > > The powerpc tree gained a conflict against the powerpc-fixes tree. > > The kvm-ppc-paulus tree gained conflicts against the powerpc-fixes and > powerpc trees. > > The staging tree gained a conflict against the net-next tree. > > The akpm-current tree gained a build failure for which I disabled > CONFIG_KEXEC_FILE on powerpc. > > Non-merge commits (relative to Linus' tree): 7885 > 7978 files changed, 461386 insertions(+), 174925 deletions(-) The parisc allmodconfig started failing recently. An automated bisect comes up with the following commit: af3dcc1705ead3cbff4450a1b16c8b060c7ef69a is the first bad commit commit af3dcc1705ead3cbff4450a1b16c8b060c7ef69a Author: Helge Deller Date: Tue Nov 22 18:08:30 2016 +0100 parisc: Switch to generic sched_clock implementation Drop the open-coded sched_clock() function and replace it by the provided GENERIC_SCHED_CLOCK implementation. We have seen quite some hung tasks in the past, which seem to be fixed by this patch. Signed-off-by: Helge Deller Cc: # v4.8 Paul. -- > > > > 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 243 trees (counting Linus' and 34 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 >
Re: linux-next: Tree for Nov 24
On Thu, Nov 24, 2016 at 12:35 AM, Stephen Rothwell wrote: > Hi all, > > Changes since 20161123: > > Removed tree: remoteproc (no longer used) > > The powerpc tree gained a conflict against the powerpc-fixes tree. > > The kvm-ppc-paulus tree gained conflicts against the powerpc-fixes and > powerpc trees. > > The staging tree gained a conflict against the net-next tree. > > The akpm-current tree gained a build failure for which I disabled > CONFIG_KEXEC_FILE on powerpc. > > Non-merge commits (relative to Linus' tree): 7885 > 7978 files changed, 461386 insertions(+), 174925 deletions(-) The parisc allmodconfig started failing recently. An automated bisect comes up with the following commit: af3dcc1705ead3cbff4450a1b16c8b060c7ef69a is the first bad commit commit af3dcc1705ead3cbff4450a1b16c8b060c7ef69a Author: Helge Deller Date: Tue Nov 22 18:08:30 2016 +0100 parisc: Switch to generic sched_clock implementation Drop the open-coded sched_clock() function and replace it by the provided GENERIC_SCHED_CLOCK implementation. We have seen quite some hung tasks in the past, which seem to be fixed by this patch. Signed-off-by: Helge Deller Cc: # v4.8 Paul. -- > > > > 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 243 trees (counting Linus' and 34 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 >
linux-next: Tree for Nov 24
Hi all, Changes since 20161123: Removed tree: remoteproc (no longer used) The powerpc tree gained a conflict against the powerpc-fixes tree. The kvm-ppc-paulus tree gained conflicts against the powerpc-fixes and powerpc trees. The staging tree gained a conflict against the net-next tree. The akpm-current tree gained a build failure for which I disabled CONFIG_KEXEC_FILE on powerpc. Non-merge commits (relative to Linus' tree): 7885 7978 files changed, 461386 insertions(+), 174925 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 243 trees (counting Linus' and 34 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 (4d92c8d036a7 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) 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 (c6a385539175 kbuild: Steal gcc's pie from the very beginning) Merging arc-current/for-curr (a25f0944ba9b Linux 4.9-rc5) Merging arm-current/fixes (575f6e7a97ab ARM: 8630/1: don't use assembler macro arguments with EXPORT_SYMBOL()) 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 (9e5f68842276 powerpc: Fix missing CRCs, add more asm-prototypes.h declarations) Merging sparc/master (9dd35d6882a1 sparc: drop duplicate header scatterlist.h) Merging net/master (c9b8af133019 flow_dissect: call init_default_flow_dissectors() earlier) Merging ipsec/master (6b2264878155 flowcache: Increase threshold for refusing new allocations) Merging netfilter/master (9b6c14d51bd2 net: tcp response should set oif only if it is L3 master) Merging ipvs/master (9b6c14d51bd2 net: tcp response should set oif only if it is L3 master) Merging wireless-drivers/master (fcd2042e8d36 mwifiex: printk() overflow with 32-byte SSIDs) Merging mac80211/master (51b9a31c42ed tipc: eliminate obsolete socket locking policy description) Merging sound-current/for-linus (6ff1a25318eb ALSA: usb-audio: Fix use-after-free of usb_device at disconnect) 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 (a25f0944ba9b Linux 4.9-rc5) Merging tty.current/tty-linus (a909d3e63699 Linux 4.9-rc3) Merging usb.current/usb-linus (c0da038d7afe Merge tag 'usb-serial-4.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) Merging usb-gadget-fixes/fixes (05e78c6933d6 usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match()) Merging usb-serial-fixes/usb-linus (2ab13292d7a3 USB: serial: cp210x: add ID for the Zone DPMX) 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 (a25f0944ba9b Linux 4.9-rc5) Merging char-misc.current/char-misc-linus (a25f0944ba9b Linux 4.9-rc5) Merging input-current/for-linus (e9fb7cc63801 Input: psmouse - disable automatic probing of BYD touchpads) Merging crypto-current/master (c8467f7a3620 crypto: scatterwalk - Remove
linux-next: Tree for Nov 24
Hi all, Changes since 20161123: Removed tree: remoteproc (no longer used) The powerpc tree gained a conflict against the powerpc-fixes tree. The kvm-ppc-paulus tree gained conflicts against the powerpc-fixes and powerpc trees. The staging tree gained a conflict against the net-next tree. The akpm-current tree gained a build failure for which I disabled CONFIG_KEXEC_FILE on powerpc. Non-merge commits (relative to Linus' tree): 7885 7978 files changed, 461386 insertions(+), 174925 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 243 trees (counting Linus' and 34 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 (4d92c8d036a7 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) 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 (c6a385539175 kbuild: Steal gcc's pie from the very beginning) Merging arc-current/for-curr (a25f0944ba9b Linux 4.9-rc5) Merging arm-current/fixes (575f6e7a97ab ARM: 8630/1: don't use assembler macro arguments with EXPORT_SYMBOL()) 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 (9e5f68842276 powerpc: Fix missing CRCs, add more asm-prototypes.h declarations) Merging sparc/master (9dd35d6882a1 sparc: drop duplicate header scatterlist.h) Merging net/master (c9b8af133019 flow_dissect: call init_default_flow_dissectors() earlier) Merging ipsec/master (6b2264878155 flowcache: Increase threshold for refusing new allocations) Merging netfilter/master (9b6c14d51bd2 net: tcp response should set oif only if it is L3 master) Merging ipvs/master (9b6c14d51bd2 net: tcp response should set oif only if it is L3 master) Merging wireless-drivers/master (fcd2042e8d36 mwifiex: printk() overflow with 32-byte SSIDs) Merging mac80211/master (51b9a31c42ed tipc: eliminate obsolete socket locking policy description) Merging sound-current/for-linus (6ff1a25318eb ALSA: usb-audio: Fix use-after-free of usb_device at disconnect) 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 (a25f0944ba9b Linux 4.9-rc5) Merging tty.current/tty-linus (a909d3e63699 Linux 4.9-rc3) Merging usb.current/usb-linus (c0da038d7afe Merge tag 'usb-serial-4.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) Merging usb-gadget-fixes/fixes (05e78c6933d6 usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match()) Merging usb-serial-fixes/usb-linus (2ab13292d7a3 USB: serial: cp210x: add ID for the Zone DPMX) 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 (a25f0944ba9b Linux 4.9-rc5) Merging char-misc.current/char-misc-linus (a25f0944ba9b Linux 4.9-rc5) Merging input-current/for-linus (e9fb7cc63801 Input: psmouse - disable automatic probing of BYD touchpads) Merging crypto-current/master (c8467f7a3620 crypto: scatterwalk - Remove
linux-next: Tree for Nov 24
Hi all, Changes since 20151123: The net-next tree gained a conflict against the net tree. The drm-panel tree gained a build failure so I used the version from next-20151123. Non-merge commits (relative to Linus' tree): 2366 2981 files changed, 92039 insertions(+), 35632 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), I do an x86_64 modules_install followed by builds for powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig (this fails its final link) and pseries_le_defconfig and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 231 trees (counting Linus' and 36 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 (a2931547eee1 Merge tag 'linux-kselftest-4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) Merging fixes/master (25cb62b76430 Linux 4.3-rc5) Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) Merging arc-current/for-curr (049e6dde7e57 Linux 4.3-rc4) Merging arm-current/fixes (28fa99b7645a ARM: wire up mlock2 syscall) Merging m68k-current/for-linus (21d380e54c30 m68k: Wire up mlock2) 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 (1451ad03fac3 powerpc: Wire up sys_mlock2()) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (2c302e7e4105 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging net/master (3d1a54e801b6 net/hsr: fix a warning message) Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops) Merging ipvs/master (086f332167d6 netfilter: nf_tables: add clone interface to expression operations) Merging wireless-drivers/master (eeec5d0ef7ee rtlwifi: rtl8821ae: Fix lockups on boot) Merging mac80211/master (5ff3ca288894 mac80211: don't teardown sdata on sdata stop) Merging sound-current/for-linus (196543d54574 ALSA: hda - Apply HP headphone fixups more generically) Merging pci-current/for-linus (8005c49d9aea Linux 4.4-rc1) Merging driver-core.current/driver-core-linus (8005c49d9aea Linux 4.4-rc1) Merging tty.current/tty-linus (bd63acf9e9a6 serial: export fsl8250_handle_irq) Merging usb.current/usb-linus (19cd80a21482 usblp: do not set TASK_INTERRUPTIBLE before lock) Merging usb-gadget-fixes/fixes (f74875dc3613 usb: dwc2: fix kernel oops during driver probe) Merging usb-serial-fixes/usb-linus (a0e80fbd56b4 USB: serial: Another Infineon flash loader USB ID) Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference) Merging staging.current/staging-linus (1ec218373b8e Linux 4.4-rc2) Merging char-misc.current/char-misc-linus (1ec218373b8e Linux 4.4-rc2) Merging input-current/for-linus (0c6da0733bff Input: parkbd - clear unused function pointers) Merging crypto-current/master (79960943fdc1 crypto: talitos - Fix timing leak in ESP ICV verification) Merging ide/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr()) Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue) Merging kselftest-fixes/fixes (2ce47b44b25d selftests/seccomp: Get page size from sysconf) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have
linux-next: Tree for Nov 24
Hi all, Changes since 20151123: The net-next tree gained a conflict against the net tree. The drm-panel tree gained a build failure so I used the version from next-20151123. Non-merge commits (relative to Linus' tree): 2366 2981 files changed, 92039 insertions(+), 35632 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), I do an x86_64 modules_install followed by builds for powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig (this fails its final link) and pseries_le_defconfig and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 231 trees (counting Linus' and 36 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 (a2931547eee1 Merge tag 'linux-kselftest-4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) Merging fixes/master (25cb62b76430 Linux 4.3-rc5) Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) Merging arc-current/for-curr (049e6dde7e57 Linux 4.3-rc4) Merging arm-current/fixes (28fa99b7645a ARM: wire up mlock2 syscall) Merging m68k-current/for-linus (21d380e54c30 m68k: Wire up mlock2) 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 (1451ad03fac3 powerpc: Wire up sys_mlock2()) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (2c302e7e4105 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging net/master (3d1a54e801b6 net/hsr: fix a warning message) Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops) Merging ipvs/master (086f332167d6 netfilter: nf_tables: add clone interface to expression operations) Merging wireless-drivers/master (eeec5d0ef7ee rtlwifi: rtl8821ae: Fix lockups on boot) Merging mac80211/master (5ff3ca288894 mac80211: don't teardown sdata on sdata stop) Merging sound-current/for-linus (196543d54574 ALSA: hda - Apply HP headphone fixups more generically) Merging pci-current/for-linus (8005c49d9aea Linux 4.4-rc1) Merging driver-core.current/driver-core-linus (8005c49d9aea Linux 4.4-rc1) Merging tty.current/tty-linus (bd63acf9e9a6 serial: export fsl8250_handle_irq) Merging usb.current/usb-linus (19cd80a21482 usblp: do not set TASK_INTERRUPTIBLE before lock) Merging usb-gadget-fixes/fixes (f74875dc3613 usb: dwc2: fix kernel oops during driver probe) Merging usb-serial-fixes/usb-linus (a0e80fbd56b4 USB: serial: Another Infineon flash loader USB ID) Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference) Merging staging.current/staging-linus (1ec218373b8e Linux 4.4-rc2) Merging char-misc.current/char-misc-linus (1ec218373b8e Linux 4.4-rc2) Merging input-current/for-linus (0c6da0733bff Input: parkbd - clear unused function pointers) Merging crypto-current/master (79960943fdc1 crypto: talitos - Fix timing leak in ESP ICV verification) Merging ide/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr()) Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue) Merging kselftest-fixes/fixes (2ce47b44b25d selftests/seccomp: Get page size from sysconf) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have
linux-next: Tree for Nov 24
Hi all, Unfortunately, I lost most of the log today ... sorry about that. Changes since 20141121: The sunxi tree gained a conflict against the arm-soc tree. The v4l-dvb tree gained a conflict againt the arm-soc tree. The omap_dss2 tree still had its build failure for which I applied a patch. The i2c tree gained a build failure for which I reverted a commit. The iommu tree gained a conflict against the tegra tree. The tip tree gained a conflict against the pci tree. The ftrace tree lost its build failure. The kvm tree gained a build failure so I used the version from next-20141121. The driver-core tree gained conflicts against the tegra and v4l-dvb trees. The staging tree gained conflicts against the v4l-dvb tree. The char-misc tree gained a conflict against the arm tree. The akpm-current tree gained a conflict against the ftrace tree. Non-merge commits (relative to Linus' tree): 8073 7869 files changed, 295401 insertions(+), 203599 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 229 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 Merging ftrace/for-next (204153212493 Merge branch 'trace/rfc/seq-buf' into trace/for-next) Merging rcu/rcu/next (9ea6c5885681 Merge branches 'torture.2014.11.03a', 'cpu.2014.11.03a', 'doc.2014.11.13a', 'fixes.2014.11.13a', 'signal.2014.10.29a' and 'rt.2014.10.29a' into HEAD) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (1d7fe1d1fb18 KVM: x86: support XSAVES usage in the host) $ git reset --hard HEAD^ Merging next-20141121 version of kvm Merging kvm-arm/next (f62c95fd4041 Merge tag 'kvm-s390-next-20141028' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvm-ppc/kvm-ppc-next (8d0eff638564 KVM: PPC: Pass enum to kvmppc_get_last_inst) Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) Merging xen-tip/linux-next (689562c293a6 swiotlb-xen: remove BUG_ON in xen_bus_to_phys) Merging percpu/for-next (bfaa047a9415 Merge branch 'for-3.18-fixes' into for-next) Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()) Merging drivers-x86/for-next (e403d4742a6e hp_accel: Add support for HP ZBook 15) Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) Merging regmap/for-next (a63b87838a59 Merge remote-tracking branches 'regmap/topic/ac97' and 'regmap/topic/headers' into regmap-next) Merging hsi/for-next (d95dc9e38810 HSI: nokia-modem: fix error handling of irq_of_parse_and_map) Merging leds/for-next (7a8685accb95 leds: lp8860: Introduce TI lp8860 4 channel LED driver) Merging ipmi/for-next (2666ea7056e6 Change ACPI IPMI support to "default y") CONFLICT (content): Merge conflict in arch/powerpc/platforms/powernv/opal-wrappers.S CONFLICT (content): Merge conflict in arch/powerpc/include/asm/opal.h Merging driver-core/driver-core-next (6386a15c445c Revert "core: platform: add warning if driver has no owner") CONFLICT (content): Merge conflict in sound/soc/intel/sst-haswell-pcm.c CONFLICT (modify/delete): drivers/staging/media/omap24xx/omap24xxcam.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of
linux-next: Tree for Nov 24
Hi all, Unfortunately, I lost most of the log today ... sorry about that. Changes since 20141121: The sunxi tree gained a conflict against the arm-soc tree. The v4l-dvb tree gained a conflict againt the arm-soc tree. The omap_dss2 tree still had its build failure for which I applied a patch. The i2c tree gained a build failure for which I reverted a commit. The iommu tree gained a conflict against the tegra tree. The tip tree gained a conflict against the pci tree. The ftrace tree lost its build failure. The kvm tree gained a build failure so I used the version from next-20141121. The driver-core tree gained conflicts against the tegra and v4l-dvb trees. The staging tree gained conflicts against the v4l-dvb tree. The char-misc tree gained a conflict against the arm tree. The akpm-current tree gained a conflict against the ftrace tree. Non-merge commits (relative to Linus' tree): 8073 7869 files changed, 295401 insertions(+), 203599 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 229 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 Merging ftrace/for-next (204153212493 Merge branch 'trace/rfc/seq-buf' into trace/for-next) Merging rcu/rcu/next (9ea6c5885681 Merge branches 'torture.2014.11.03a', 'cpu.2014.11.03a', 'doc.2014.11.13a', 'fixes.2014.11.13a', 'signal.2014.10.29a' and 'rt.2014.10.29a' into HEAD) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (1d7fe1d1fb18 KVM: x86: support XSAVES usage in the host) $ git reset --hard HEAD^ Merging next-20141121 version of kvm Merging kvm-arm/next (f62c95fd4041 Merge tag 'kvm-s390-next-20141028' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvm-ppc/kvm-ppc-next (8d0eff638564 KVM: PPC: Pass enum to kvmppc_get_last_inst) Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) Merging xen-tip/linux-next (689562c293a6 swiotlb-xen: remove BUG_ON in xen_bus_to_phys) Merging percpu/for-next (bfaa047a9415 Merge branch 'for-3.18-fixes' into for-next) Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()) Merging drivers-x86/for-next (e403d4742a6e hp_accel: Add support for HP ZBook 15) Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) Merging regmap/for-next (a63b87838a59 Merge remote-tracking branches 'regmap/topic/ac97' and 'regmap/topic/headers' into regmap-next) Merging hsi/for-next (d95dc9e38810 HSI: nokia-modem: fix error handling of irq_of_parse_and_map) Merging leds/for-next (7a8685accb95 leds: lp8860: Introduce TI lp8860 4 channel LED driver) Merging ipmi/for-next (2666ea7056e6 Change ACPI IPMI support to default y) CONFLICT (content): Merge conflict in arch/powerpc/platforms/powernv/opal-wrappers.S CONFLICT (content): Merge conflict in arch/powerpc/include/asm/opal.h Merging driver-core/driver-core-next (6386a15c445c Revert core: platform: add warning if driver has no owner) CONFLICT (content): Merge conflict in sound/soc/intel/sst-haswell-pcm.c CONFLICT (modify/delete): drivers/staging/media/omap24xx/omap24xxcam.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of