linux-next: Tree for Aug 17
Hi all,
Changes since 20200814:
New tree: memblock-fixes
My fixes tree contains:
73c7adb54169 ("device_cgroup: Fix RCU list debugging warning")
Non-merge commits (relative to Linus' tree): 664
760 files changed, 22791 insertions(+), 6127 deletions(-)
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf. After
the final fixups (if any), I do an x86_64 modules_install followed by
builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit),
ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc
and sparc64 defconfig and htmldocs. And finally, a simple boot test
of the powerpc pseries_le_defconfig kernel in qemu (with and without
kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 328 trees (counting Linus' and 86 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 (9123e3a74ec7 Linux 5.9-rc1)
Merging fixes/master (73c7adb54169 device_cgroup: Fix RCU list debugging
warning)
Merging kbuild-current/fixes (06a81c1c7db9 Merge tag 'arm64-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
Merging arc-current/for-curr (11ba468877bb Linux 5.8-rc5)
Merging arm-current/fixes (5c6360ee4a0e ARM: 8988/1: mmu: fix crash in EFI
calls due to p4d typo in create_mapping_late())
Merging arm64-fixes/for-next/fixes (6a7389f0312f MAINTAINERS: Include drivers
subdirs for ARM PMU PROFILING AND DEBUGGING entry)
Merging arm-soc-fixes/arm/fixes (fe1d899f4212 ARM: dts: keystone-k2g-evm: fix
rgmii phy-mode for ksz9031 phy)
Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2)
Merging drivers-memory-fixes/fixes (b3a9e3b9622a Linux 5.8-rc1)
Merging m68k-current/for-linus (382f429bb559 m68k: defconfig: Update defconfigs
for v5.8-rc3)
Merging powerpc-fixes/fixes (6553fb799f60 powerpc/pkeys: Fix boot failures with
Nemo board (A-EON AmigaOne X1000))
Merging s390-fixes/fixes (00e4db51259a Merge tag 'perf-tools-2020-08-10' of
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro)
Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty
inodes after removing key)
Merging net/master (d0f5c7076e01 ipvlan: fix device features)
Merging bpf/master (4fccd2ff74fb selftests/bpf: Make test_varlen work with
32-bit user-space arch)
Merging ipsec/master (61ee4137b574 ip_vti: Fix unused variable warning)
Merging netfilter/master (5c04da55c754 netfilter: ebtables: reject bogus getopt
len value)
Merging ipvs/master (7c7ab580db49 net: Convert to use the fallthrough macro)
Merging wireless-drivers/master (1cfd3426ef98 ath10k: Fix NULL pointer
dereference in AHB device probe)
Merging mac80211/master (9643609423c7 Revert "ipv4: tunnel: fix compilation on
ARCH=um")
Merging rdma-fixes/for-rc (bcf876870b95 Linux 5.8)
Merging sound-current/for-linus (f5d0f820ff8a ALSA: isa: fix spelling mistakes
in the comments)
Merging sound-asoc-fixes/for-linus (933cc41085d5 Merge remote-tracking branch
'asoc/for-5.9' into asoc-linus)
Merging regmap-fixes/for-linus (2b0f61e27f75 Merge remote-tracking branch
'regmap/for-5.8' into regmap-linus)
Merging regulator-fixes/for-linus (75f4d068cb0d Merge remote-tracking branch
'regulator/for-5.9' into regulator-linus)
Merging spi-fixes/for-linus (3ea884314328 Merge remote-tracking branch
'spi/for-5.9' into spi-linus)
Merging pci-current/for-linus (b361663c5a40 PCI/ASPM: Disable ASPM on ASMedia
ASM1083/1085 PCIe-to-PCI bridge)
Merging driver-core.current/driver-core-linus (a1d21081a60d Merge
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging tty.current/tty-linus (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of
linux-next: Tree for Aug 17
Hi all, Please do not add any v4.20 material to your linux-next included branches until after v4.19-rc1 has been released. Changes since 20180816: The ipvs tree gained a conflict against the netfilter tree. The mfd tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 4723 4313 files changed, 184116 insertions(+), 82800 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 286 trees (counting Linus' and 65 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (5c60a7389d79 Merge tag 'for-linus-4.19-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux) Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging kbuild-current/fixes (70b20dd7f897 ALSA: update dell-wmi mic-mute registration to new world order) Merging arc-current/for-curr (fce0d0affdc5 ARC: cleanup show_faulting_vma()) Merging arm-current/fixes (afc9f65e01cd ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+) Merging arm64-fixes/for-next/fixes (c7513c2a2714 crypto/arm64: aes-ce-gcm - add missing kernel_neon_begin/end pair) Merging m68k-current/for-linus (71a896687b85 m68k/defconfig: Update defconfigs for v4.18-rc6) Merging powerpc-fixes/fixes (cca19f0b684f powerpc/64s/radix: Fix missing global invalidations when removing copro) Merging sparc/master (c1d61e7fe376 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 (54c73f865150 net/mlx5e: Delete unneeded function argument) Merging bpf/master (965931e3a803 bpf: fix a rcu usage warning in bpf_prog_array_copy_core()) Merging ipsec/master (25432eba9cd8 openvswitch: meter: Fix setting meter id for new entries) Merging netfilter/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set) Merging ipvs/master (16e98cec49a4 ipvs: don't show negative times in ip_vs_conn) CONFLICT (content): Merge conflict in net/netfilter/ipvs/ip_vs_conn.c Merging wireless-drivers/master (299b6365a3b7 brcmfmac: fix regression in parsing NVRAM for multiple devices) Merging mac80211/master (484004339d45 mac80211_hwsim: require at least one channel) Merging rdma-fixes/for-rc (addb8a6559f0 RDMA/uverbs: Expand primary and alt AV port checks) Merging sound-current/for-linus (82fd4b05d704 ALSA: seq: virmidi: Fix discarding the unsubscribed output) Merging sound-asoc-fixes/for-linus (ba095ffc9324 Merge branch 'asoc-4.18' into asoc-linus) Merging regmap-fixes/for-linus (94710cac0ef4 Linux 4.18) Merging regulator-fixes/for-linus (84d77c5ab32d Merge branch 'regulator-4.18' into regulator-linus) Merging spi-fixes/for-linus (8a7c14551b9b Merge branch 'spi-4.18' into spi-linus) Merging pci-current/for-linus (44bda4b7d26e PCI: Fix is_added/is_busmaster race condition) Merging driver-core.current/driver-core-linus (acb1872577b3 Linux 4.18-rc7) Merging tty.current/tty-linus (021c91791a5e Linux 4.18-rc3) Merging usb.current/usb-linus (acb1872577b3 Linux 4.18-rc7) Merging usb-gadget-fixes/fixes (acb1872577b3 Linux 4.18-rc7) Merging usb-serial-fixes/usb-linus (9d3cce1e8b85 Linux 4.18-rc5) Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb:
linux-next: Tree for Aug 17
Hi all, Please do not add any v4.20 material to your linux-next included branches until after v4.19-rc1 has been released. Changes since 20180816: The ipvs tree gained a conflict against the netfilter tree. The mfd tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 4723 4313 files changed, 184116 insertions(+), 82800 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 286 trees (counting Linus' and 65 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (5c60a7389d79 Merge tag 'for-linus-4.19-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux) Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging kbuild-current/fixes (70b20dd7f897 ALSA: update dell-wmi mic-mute registration to new world order) Merging arc-current/for-curr (fce0d0affdc5 ARC: cleanup show_faulting_vma()) Merging arm-current/fixes (afc9f65e01cd ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+) Merging arm64-fixes/for-next/fixes (c7513c2a2714 crypto/arm64: aes-ce-gcm - add missing kernel_neon_begin/end pair) Merging m68k-current/for-linus (71a896687b85 m68k/defconfig: Update defconfigs for v4.18-rc6) Merging powerpc-fixes/fixes (cca19f0b684f powerpc/64s/radix: Fix missing global invalidations when removing copro) Merging sparc/master (c1d61e7fe376 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 (54c73f865150 net/mlx5e: Delete unneeded function argument) Merging bpf/master (965931e3a803 bpf: fix a rcu usage warning in bpf_prog_array_copy_core()) Merging ipsec/master (25432eba9cd8 openvswitch: meter: Fix setting meter id for new entries) Merging netfilter/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set) Merging ipvs/master (16e98cec49a4 ipvs: don't show negative times in ip_vs_conn) CONFLICT (content): Merge conflict in net/netfilter/ipvs/ip_vs_conn.c Merging wireless-drivers/master (299b6365a3b7 brcmfmac: fix regression in parsing NVRAM for multiple devices) Merging mac80211/master (484004339d45 mac80211_hwsim: require at least one channel) Merging rdma-fixes/for-rc (addb8a6559f0 RDMA/uverbs: Expand primary and alt AV port checks) Merging sound-current/for-linus (82fd4b05d704 ALSA: seq: virmidi: Fix discarding the unsubscribed output) Merging sound-asoc-fixes/for-linus (ba095ffc9324 Merge branch 'asoc-4.18' into asoc-linus) Merging regmap-fixes/for-linus (94710cac0ef4 Linux 4.18) Merging regulator-fixes/for-linus (84d77c5ab32d Merge branch 'regulator-4.18' into regulator-linus) Merging spi-fixes/for-linus (8a7c14551b9b Merge branch 'spi-4.18' into spi-linus) Merging pci-current/for-linus (44bda4b7d26e PCI: Fix is_added/is_busmaster race condition) Merging driver-core.current/driver-core-linus (acb1872577b3 Linux 4.18-rc7) Merging tty.current/tty-linus (021c91791a5e Linux 4.18-rc3) Merging usb.current/usb-linus (acb1872577b3 Linux 4.18-rc7) Merging usb-gadget-fixes/fixes (acb1872577b3 Linux 4.18-rc7) Merging usb-serial-fixes/usb-linus (9d3cce1e8b85 Linux 4.18-rc5) Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb:
linux-next: Tree for Aug 17
Hi all, There will be no linux-next releases tomorrow or Monday. Changes since 20170816: The net-next tree still had its build failure for which I reverted a commit. The security tree gained a build failure so I used the version from next-20170816 for today. The spi tree gained a conflict against the pm tree. The xen-tip tree gained a conflict against the tip tree. Non-merge commits (relative to Linus' tree): 6450 6409 files changed, 250596 insertions(+), 129911 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig (with CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu. Below is a summary of the state of the merge. I am currently merging 268 trees (counting Linus' and 41 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 (510c8a899caf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry) Merging kbuild-current/fixes (4e433fc4d1a9 fixdep: trivial: typo fix and correction) Merging arc-current/for-curr (a8ec3ee861b6 arc: Mask individual IRQ lines during core INTC init) Merging arm-current/fixes (1abd35023763 ARM: align .data section) Merging m68k-current/for-linus (204a2be30a7a m68k: Remove ptrace_signal_deliver) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (96ea91e7b6ee powerpc/watchdog: add locking around init/exit functions) Merging sparc/master (6170a506899a sparc64: remove unnecessary log message) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (120e9dabaf55 dccp: defer ccid_hc_tx_delete() at dismantle time) Merging ipsec/master (4ff0308f06da esp: Fix error handling on layer 2 xmit.) Merging netfilter/master (9beceb54fa2c netfilter: x_tables: Fix use-after-free in ipt_do_table.) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (e9bf53ab1ee3 brcmfmac: feature check for multi-scheduled scan fails on bcm4343x devices) Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES) Merging sound-current/for-linus (a8e800fe0f68 ALSA: usb-audio: Apply sample rate quirk to Sennheiser headset) Merging pci-current/for-linus (8466489ef5ba xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue) Merging driver-core.current/driver-core-linus (ef954844c7ac Linux 4.13-rc5) Merging tty.current/tty-linus (ef954844c7ac Linux 4.13-rc5) Merging usb.current/usb-linus (ef954844c7ac Linux 4.13-rc5) Merging usb-gadget-fixes/fixes (b7d44c36a6f6 usb: renesas_usbhs: gadget: fix unused-but-set-variable warning) Merging usb-serial-fixes/usb-linus (fd1b8668af59 USB: serial: option: add D-Link DWM-222 device ID) Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) Merging phy/fixes (5771a8c08880 Linux v4.13-rc1) Merging staging.current/staging-linus (47f078339be9 Revert "staging: fsl-mc: be consistent when checking strcmp() return") Merging char-misc.current/char-misc-linus (ef954844c7ac Linux 4.13-rc5) Merging input-current/for-linus (76988690402d Input: elan_i2c - Add antoher Lenovo ACPI ID for upcoming Lenovo NB) Merging crypto-current/master (8861249c740f crypto: x86/sha1 - Fix reads beyond the number of blocks
linux-next: Tree for Aug 17
Hi all, There will be no linux-next releases tomorrow or Monday. Changes since 20170816: The net-next tree still had its build failure for which I reverted a commit. The security tree gained a build failure so I used the version from next-20170816 for today. The spi tree gained a conflict against the pm tree. The xen-tip tree gained a conflict against the tip tree. Non-merge commits (relative to Linus' tree): 6450 6409 files changed, 250596 insertions(+), 129911 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig (with CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu. Below is a summary of the state of the merge. I am currently merging 268 trees (counting Linus' and 41 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 (510c8a899caf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry) Merging kbuild-current/fixes (4e433fc4d1a9 fixdep: trivial: typo fix and correction) Merging arc-current/for-curr (a8ec3ee861b6 arc: Mask individual IRQ lines during core INTC init) Merging arm-current/fixes (1abd35023763 ARM: align .data section) Merging m68k-current/for-linus (204a2be30a7a m68k: Remove ptrace_signal_deliver) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (96ea91e7b6ee powerpc/watchdog: add locking around init/exit functions) Merging sparc/master (6170a506899a sparc64: remove unnecessary log message) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (120e9dabaf55 dccp: defer ccid_hc_tx_delete() at dismantle time) Merging ipsec/master (4ff0308f06da esp: Fix error handling on layer 2 xmit.) Merging netfilter/master (9beceb54fa2c netfilter: x_tables: Fix use-after-free in ipt_do_table.) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (e9bf53ab1ee3 brcmfmac: feature check for multi-scheduled scan fails on bcm4343x devices) Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES) Merging sound-current/for-linus (a8e800fe0f68 ALSA: usb-audio: Apply sample rate quirk to Sennheiser headset) Merging pci-current/for-linus (8466489ef5ba xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue) Merging driver-core.current/driver-core-linus (ef954844c7ac Linux 4.13-rc5) Merging tty.current/tty-linus (ef954844c7ac Linux 4.13-rc5) Merging usb.current/usb-linus (ef954844c7ac Linux 4.13-rc5) Merging usb-gadget-fixes/fixes (b7d44c36a6f6 usb: renesas_usbhs: gadget: fix unused-but-set-variable warning) Merging usb-serial-fixes/usb-linus (fd1b8668af59 USB: serial: option: add D-Link DWM-222 device ID) Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) Merging phy/fixes (5771a8c08880 Linux v4.13-rc1) Merging staging.current/staging-linus (47f078339be9 Revert "staging: fsl-mc: be consistent when checking strcmp() return") Merging char-misc.current/char-misc-linus (ef954844c7ac Linux 4.13-rc5) Merging input-current/for-linus (76988690402d Input: elan_i2c - Add antoher Lenovo ACPI ID for upcoming Lenovo NB) Merging crypto-current/master (8861249c740f crypto: x86/sha1 - Fix reads beyond the number of blocks
linux-next: Tree for Aug 17
Hi all, Changes since 20160816: The net-next tree gained a conflict against the net tree. The kbuild tree gained build warnings for PowerPC, so I reverted a commit. Non-merge commits (relative to Linus' tree): 2406 2530 files changed, 99359 insertions(+), 40525 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig (with CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig (this fails its final link) and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 241 trees (counting Linus' and 35 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (3ec60b92d3ba Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging fixes/master (d3396e1e4ec4 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured) Merging arc-current/for-curr (b854f5e83bb2 ARC: Support syscall ABI v4) Merging arm-current/fixes (87eed3c74d7c ARM: fix address limit restoration for undefined instructions) Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) Merging metag-fixes/fixes (97b1d23f7bcb metag: Drop show_mem() from mem_init()) Merging powerpc-fixes/fixes (ca49e64f0cb1 selftests/powerpc: Specify we expect to build with std=gnu99) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled) Merging net/master (a1560dd7a47f Merge branch 'mediatek-fixes') Merging ipsec/master (1625f4529957 net/xfrm_input: fix possible NULL deref of tunnel.ip6->parms.i_key) Merging netfilter/master (4b5b9ba553f9 openvswitch: do not ignore netdev errors when creating tunnel vports) Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes') Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) Merging mac80211/master (4d0bd46a4d55 Revert "wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel") Merging sound-current/for-linus (a52ff34e5ec6 ALSA: hda - Manage power well properly for resume) Merging pci-current/for-linus (a855d4d8e71f PCI: Call pci_intx() when using legacy interrupts in pci_alloc_irq_vectors()) Merging driver-core.current/driver-core-linus (694d0d0bb203 Linux 4.8-rc2) Merging tty.current/tty-linus (29b4817d4018 Linux 4.8-rc1) Merging usb.current/usb-linus (f1f6d9a8b540 xhci: don't dereference a xhci member after removing xhci) Merging usb-gadget-fixes/fixes (a0ad85ae866f usb: dwc3: gadget: stop processing on HWO set) Merging usb-serial-fixes/usb-linus (3b7c7e52efda USB: serial: mos7840: fix non-atomic allocation in write path) Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) Merging staging.current/staging-linus (99f1c013194e staging/lustre/llite: Close atomic_open race with several openers) Merging char-misc.current/char-misc-linus (83cf8df2d4fa drivers/iio/light/Kconfig: SENSORS_BH1780 cleanup) Merging input-current/for-linus (22fe874f3803 Input: silead - remove some dead code) Merging crypto-current/master (e67479b13ede crypto: sha512-mb - fix ctx pointer) Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit) Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup
linux-next: Tree for Aug 17
Hi all, Changes since 20160816: The net-next tree gained a conflict against the net tree. The kbuild tree gained build warnings for PowerPC, so I reverted a commit. Non-merge commits (relative to Linus' tree): 2406 2530 files changed, 99359 insertions(+), 40525 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig (with CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig (this fails its final link) and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 241 trees (counting Linus' and 35 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (3ec60b92d3ba Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging fixes/master (d3396e1e4ec4 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured) Merging arc-current/for-curr (b854f5e83bb2 ARC: Support syscall ABI v4) Merging arm-current/fixes (87eed3c74d7c ARM: fix address limit restoration for undefined instructions) Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) Merging metag-fixes/fixes (97b1d23f7bcb metag: Drop show_mem() from mem_init()) Merging powerpc-fixes/fixes (ca49e64f0cb1 selftests/powerpc: Specify we expect to build with std=gnu99) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled) Merging net/master (a1560dd7a47f Merge branch 'mediatek-fixes') Merging ipsec/master (1625f4529957 net/xfrm_input: fix possible NULL deref of tunnel.ip6->parms.i_key) Merging netfilter/master (4b5b9ba553f9 openvswitch: do not ignore netdev errors when creating tunnel vports) Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes') Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) Merging mac80211/master (4d0bd46a4d55 Revert "wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel") Merging sound-current/for-linus (a52ff34e5ec6 ALSA: hda - Manage power well properly for resume) Merging pci-current/for-linus (a855d4d8e71f PCI: Call pci_intx() when using legacy interrupts in pci_alloc_irq_vectors()) Merging driver-core.current/driver-core-linus (694d0d0bb203 Linux 4.8-rc2) Merging tty.current/tty-linus (29b4817d4018 Linux 4.8-rc1) Merging usb.current/usb-linus (f1f6d9a8b540 xhci: don't dereference a xhci member after removing xhci) Merging usb-gadget-fixes/fixes (a0ad85ae866f usb: dwc3: gadget: stop processing on HWO set) Merging usb-serial-fixes/usb-linus (3b7c7e52efda USB: serial: mos7840: fix non-atomic allocation in write path) Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) Merging staging.current/staging-linus (99f1c013194e staging/lustre/llite: Close atomic_open race with several openers) Merging char-misc.current/char-misc-linus (83cf8df2d4fa drivers/iio/light/Kconfig: SENSORS_BH1780 cleanup) Merging input-current/for-linus (22fe874f3803 Input: silead - remove some dead code) Merging crypto-current/master (e67479b13ede crypto: sha512-mb - fix ctx pointer) Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit) Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup
Re: linux-next: Tree for Aug 17 (staging/hfi1)
Hi Mike, On Tue, 18 Aug 2015 14:24:32 + "Marciniszyn, Mike" wrote: > > > A: these and other similar errors: > > > > In file included from ../drivers/staging/hfi1/chip.c:61:0: > > ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_LINKVERBâ: > > ../drivers/staging/hfi1/trace.h:1357:20: error: function > > â__hfi1_trace_LINKVERBâ can never be inlined because it uses variable > > argument lists static inline void __hfi1_trace_##fn(const char *func, char > > *fmt, ...) \ > > > > This was corrected with > https://www.mail-archive.com/linux-rdma@vger.kernel.org/msg27221.html, which > I think Doug has picked up. > > Doug, Randy, Stephen how do we want to handle fixing drivers/staging/hfi1 via > the staging list vs. the linux-rdma list? Since the problem was only introduced in the rdma tree (and the trace.h file only exists there), it needs to be fixed there. -- Cheers, Stephen Rothwells...@canb.auug.org.au -- 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 Aug 17 (staging/hfi1)
> A: these and other similar errors: > > In file included from ../drivers/staging/hfi1/chip.c:61:0: > ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_LINKVERBâ: > ../drivers/staging/hfi1/trace.h:1357:20: error: function > â__hfi1_trace_LINKVERBâ can never be inlined because it uses variable > argument lists static inline void __hfi1_trace_##fn(const char *func, char > *fmt, ...) \ > This was corrected with https://www.mail-archive.com/linux-rdma@vger.kernel.org/msg27221.html, which I think Doug has picked up. Doug, Randy, Stephen how do we want to handle fixing drivers/staging/hfi1 via the staging list vs. the linux-rdma list? > B: When CONFIG_PCI is not enabled, lots of these errors: > The driver used to get a gift from the drivers/infiniband/hw/Kconfig, which has the required PCI dependency. The infiniband dependency is also similarly missing and was resolved via the following temporary patch: https://www.mail-archive.com/linux-rdma@vger.kernel.org/msg26989.html This one also needs to be similarly added for that 0-day build issue. I have submitted to both lists https://www.mail-archive.com/linux-rdma@vger.kernel.org/msg27299.html assuming the above one as a dependency. > In file included from ../drivers/staging/hfi1/chip.c:60:0: > ../drivers/staging/hfi1/hfi.h:508:20: error: field âmsixâ has incomplete > type > struct msix_entry msix; >^ > > ../drivers/staging/hfi1/chip.c: In function âdisable_intxâ: > ../drivers/staging/hfi1/chip.c:8667:2: error: implicit declaration of function > âpci_intxâ [-Werror=implicit-function-declaration] > pci_intx(pdev, 0); > ^ > > so the driver should depend on PCI or maybe even PCI_MSI. > > C. Please provide some contact info, e.g. in a TODO file or the MAINTAINERS > file. > I have submitted https://www.mail-archive.com/linux-rdma@vger.kernel.org/msg27298.html to both lists to add a maintainer. Mike
Re: linux-next: Tree for Aug 17 (staging/hfi1)
Hi Mike, On Tue, 18 Aug 2015 14:24:32 + Marciniszyn, Mike mike.marcinis...@intel.com wrote: A: these and other similar errors: In file included from ../drivers/staging/hfi1/chip.c:61:0: ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_LINKVERBâ: ../drivers/staging/hfi1/trace.h:1357:20: error: function â__hfi1_trace_LINKVERBâ can never be inlined because it uses variable argument lists static inline void __hfi1_trace_##fn(const char *func, char *fmt, ...) \ This was corrected with https://www.mail-archive.com/linux-rdma@vger.kernel.org/msg27221.html, which I think Doug has picked up. Doug, Randy, Stephen how do we want to handle fixing drivers/staging/hfi1 via the staging list vs. the linux-rdma list? Since the problem was only introduced in the rdma tree (and the trace.h file only exists there), it needs to be fixed there. -- Cheers, Stephen Rothwells...@canb.auug.org.au -- 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 Aug 17 (staging/hfi1)
A: these and other similar errors: In file included from ../drivers/staging/hfi1/chip.c:61:0: ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_LINKVERBâ: ../drivers/staging/hfi1/trace.h:1357:20: error: function â__hfi1_trace_LINKVERBâ can never be inlined because it uses variable argument lists static inline void __hfi1_trace_##fn(const char *func, char *fmt, ...) \ This was corrected with https://www.mail-archive.com/linux-rdma@vger.kernel.org/msg27221.html, which I think Doug has picked up. Doug, Randy, Stephen how do we want to handle fixing drivers/staging/hfi1 via the staging list vs. the linux-rdma list? B: When CONFIG_PCI is not enabled, lots of these errors: The driver used to get a gift from the drivers/infiniband/hw/Kconfig, which has the required PCI dependency. The infiniband dependency is also similarly missing and was resolved via the following temporary patch: https://www.mail-archive.com/linux-rdma@vger.kernel.org/msg26989.html This one also needs to be similarly added for that 0-day build issue. I have submitted to both lists https://www.mail-archive.com/linux-rdma@vger.kernel.org/msg27299.html assuming the above one as a dependency. In file included from ../drivers/staging/hfi1/chip.c:60:0: ../drivers/staging/hfi1/hfi.h:508:20: error: field âmsixâ has incomplete type struct msix_entry msix; ^ ../drivers/staging/hfi1/chip.c: In function âdisable_intxâ: ../drivers/staging/hfi1/chip.c:8667:2: error: implicit declaration of function âpci_intxâ [-Werror=implicit-function-declaration] pci_intx(pdev, 0); ^ so the driver should depend on PCI or maybe even PCI_MSI. C. Please provide some contact info, e.g. in a TODO file or the MAINTAINERS file. I have submitted https://www.mail-archive.com/linux-rdma@vger.kernel.org/msg27298.html to both lists to add a maintainer. Mike
Re: linux-next: Tree for Aug 17 (staging/hfi1)
On 08/17/15 03:55, Stephen Rothwell wrote: > Hi all, > > Changes since 20150813: > Several items: A: these and other similar errors: In file included from ../drivers/staging/hfi1/chip.c:61:0: ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_LINKVERBâ: ../drivers/staging/hfi1/trace.h:1357:20: error: function â__hfi1_trace_LINKVERBâ can never be inlined because it uses variable argument lists static inline void __hfi1_trace_##fn(const char *func, char *fmt, ...) \ ^ ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_CNTRâ: ../drivers/staging/hfi1/trace.h:1357:20: error: function â__hfi1_trace_CNTRâ can never be inlined because it uses variable argument lists static inline void __hfi1_trace_##fn(const char *func, char *fmt, ...) \ ^ ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_DC8051â: ../drivers/staging/hfi1/trace.h:1357:20: error: function â__hfi1_trace_DC8051â can never be inlined because it uses variable argument lists static inline void __hfi1_trace_##fn(const char *func, char *fmt, ...) \ ^ ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_RCVCTRLâ: ../drivers/staging/hfi1/trace.h:1357:20: error: function â__hfi1_trace_RCVCTRLâ can never be inlined because it uses variable argument lists static inline void __hfi1_trace_##fn(const char *func, char *fmt, ...) \ ^ ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_TIDâ: ../drivers/staging/hfi1/trace.h:1357:20: error: function â__hfi1_trace_TIDâ can never be inlined because it uses variable argument lists static inline void __hfi1_trace_##fn(const char *func, char *fmt, ...) \ ^ B: When CONFIG_PCI is not enabled, lots of these errors: In file included from ../drivers/staging/hfi1/chip.c:60:0: ../drivers/staging/hfi1/hfi.h:508:20: error: field âmsixâ has incomplete type struct msix_entry msix; ^ ../drivers/staging/hfi1/chip.c: In function âdisable_intxâ: ../drivers/staging/hfi1/chip.c:8667:2: error: implicit declaration of function âpci_intxâ [-Werror=implicit-function-declaration] pci_intx(pdev, 0); ^ so the driver should depend on PCI or maybe even PCI_MSI. C. Please provide some contact info, e.g. in a TODO file or the MAINTAINERS file. -- ~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 Aug 17 (mshyperv.c)
> -Original Message- > From: Randy Dunlap [mailto:rdun...@infradead.org] > Sent: Monday, August 17, 2015 10:35 AM > To: Stephen Rothwell ; linux-n...@vger.kernel.org > Cc: linux-kernel@vger.kernel.org; de...@driverdev.osuosl.org; KY Srinivasan > ; Haiyang Zhang > Subject: Re: linux-next: Tree for Aug 17 (mshyperv.c) > > On 08/17/15 03:55, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20150813: > > > > on i386 (for several days now): > > when CONFIG_KEXEC is not enabled: > > > arch/x86/built-in.o: In function `hv_machine_crash_shutdown': > mshyperv.c:(.text+0x2d9d4): undefined reference to > `native_machine_crash_shutdown' Vitaly has submitted a patch to fix this. K. Y > > > > -- > ~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 Aug 17 (mshyperv.c)
On 08/17/15 03:55, Stephen Rothwell wrote: > Hi all, > > Changes since 20150813: > on i386 (for several days now): when CONFIG_KEXEC is not enabled: arch/x86/built-in.o: In function `hv_machine_crash_shutdown': mshyperv.c:(.text+0x2d9d4): undefined reference to `native_machine_crash_shutdown' -- ~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 Aug 17
Hi all, Changes since 20150813: Dropped tree: drm-exynos The pci tree gained a conflict against the arm-soc tree. The v4l-dvb tree still had its build failure so I used the version from next-20150810. The pm tree gained a conflict against the samsung tree. The thermal-soc tree gained a conflict against the arm tree. The drm tree gained conflicts against the drm-intel-fixes tree. The drm-panel tree gained a conflict against the tegra tree. The drm-exynos tree gained a build failure so I dropped it for today. The block tree gained a conflict against Linus' tree. The md tree gained conflicts against the block tree. The security tree gained a build failure that was fixed by installing libssl-dev. The tip tree gained a conflict against Linus' tree. The staging tree gained conflicts against the rdma tree. The akpm-current tree still had its build failure for which I reverted 2 commits. Non-merge commits (relative to Linus' tree): 7694 6937 files changed, 400211 insertions(+), 162615 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 224 trees (counting Linus' and 33 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 (8916e0b03ec3 Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) Merging arm-current/fixes (09edea4f8fde ARM: 8410/1: VDSO: fix coarse clock monotonicity regression) Merging m68k-current/for-linus (1214c525484c m68k: Use for_each_sg()) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-fixes/fixes (f7644cbfcdf0 Linux 4.2-rc6) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave) Merging net/master (83fccfc3940c inet: fix potential deadlock in reqsk_queue_unlink()) Merging ipsec/master (158cd4af8ded packet: missing dev_put() in packet_do_bind()) Merging sound-current/for-linus (7ccb0a9917a5 ALSA: hda - Fix the white noise on Dell laptop) Merging pci-current/for-linus (c9ddbac9c891 PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition) Merging wireless-drivers/master (741e3b9902d1 rtlwifi: rtl8723be: Add module parameter for MSI interrupts) Merging driver-core.current/driver-core-linus (cbfe8fa6cd67 Linux 4.2-rc4) Merging tty.current/tty-linus (cbfe8fa6cd67 Linux 4.2-rc4) Merging usb.current/usb-linus (f7644cbfcdf0 Linux 4.2-rc6) Merging usb-gadget-fixes/fixes (c93e64e91248 usb: udc: core: add device_del() call to error pathway) Merging usb-serial-fixes/usb-linus (74472233233f USB: sierra: add 1199:68AB device ID) Merging staging.current/staging-linus (f7644cbfcdf0 Linux 4.2-rc6) Merging char-misc.current/char-misc-linus (f7644cbfcdf0 Linux 4.2-rc6) Merging input-current/for-linus (6b30c73e9f37 Input: elantech - add special check for fw_version 0x470f01 touchpad) Merging crypto-current/master (b310c178e6d8 crypto: caam - fix memory corruption in ahash_final_ctx) Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) Merging devicetree-current/devicetree/merge (f76502aa9140
linux-next: Tree for Aug 17
Hi all, Changes since 20150813: Dropped tree: drm-exynos The pci tree gained a conflict against the arm-soc tree. The v4l-dvb tree still had its build failure so I used the version from next-20150810. The pm tree gained a conflict against the samsung tree. The thermal-soc tree gained a conflict against the arm tree. The drm tree gained conflicts against the drm-intel-fixes tree. The drm-panel tree gained a conflict against the tegra tree. The drm-exynos tree gained a build failure so I dropped it for today. The block tree gained a conflict against Linus' tree. The md tree gained conflicts against the block tree. The security tree gained a build failure that was fixed by installing libssl-dev. The tip tree gained a conflict against Linus' tree. The staging tree gained conflicts against the rdma tree. The akpm-current tree still had its build failure for which I reverted 2 commits. Non-merge commits (relative to Linus' tree): 7694 6937 files changed, 400211 insertions(+), 162615 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use git pull to do so as that will try to merge the new linux-next release with the old one. You should use git fetch and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 224 trees (counting Linus' and 33 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 (8916e0b03ec3 Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) Merging arm-current/fixes (09edea4f8fde ARM: 8410/1: VDSO: fix coarse clock monotonicity regression) Merging m68k-current/for-linus (1214c525484c m68k: Use for_each_sg()) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-fixes/fixes (f7644cbfcdf0 Linux 4.2-rc6) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave) Merging net/master (83fccfc3940c inet: fix potential deadlock in reqsk_queue_unlink()) Merging ipsec/master (158cd4af8ded packet: missing dev_put() in packet_do_bind()) Merging sound-current/for-linus (7ccb0a9917a5 ALSA: hda - Fix the white noise on Dell laptop) Merging pci-current/for-linus (c9ddbac9c891 PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition) Merging wireless-drivers/master (741e3b9902d1 rtlwifi: rtl8723be: Add module parameter for MSI interrupts) Merging driver-core.current/driver-core-linus (cbfe8fa6cd67 Linux 4.2-rc4) Merging tty.current/tty-linus (cbfe8fa6cd67 Linux 4.2-rc4) Merging usb.current/usb-linus (f7644cbfcdf0 Linux 4.2-rc6) Merging usb-gadget-fixes/fixes (c93e64e91248 usb: udc: core: add device_del() call to error pathway) Merging usb-serial-fixes/usb-linus (74472233233f USB: sierra: add 1199:68AB device ID) Merging staging.current/staging-linus (f7644cbfcdf0 Linux 4.2-rc6) Merging char-misc.current/char-misc-linus (f7644cbfcdf0 Linux 4.2-rc6) Merging input-current/for-linus (6b30c73e9f37 Input: elantech - add special check for fw_version 0x470f01 touchpad) Merging crypto-current/master (b310c178e6d8 crypto: caam - fix memory corruption in ahash_final_ctx) Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) Merging devicetree-current/devicetree/merge (f76502aa9140
Re: linux-next: Tree for Aug 17 (staging/hfi1)
On 08/17/15 03:55, Stephen Rothwell wrote: Hi all, Changes since 20150813: Several items: A: these and other similar errors: In file included from ../drivers/staging/hfi1/chip.c:61:0: ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_LINKVERBâ: ../drivers/staging/hfi1/trace.h:1357:20: error: function â__hfi1_trace_LINKVERBâ can never be inlined because it uses variable argument lists static inline void __hfi1_trace_##fn(const char *func, char *fmt, ...) \ ^ ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_CNTRâ: ../drivers/staging/hfi1/trace.h:1357:20: error: function â__hfi1_trace_CNTRâ can never be inlined because it uses variable argument lists static inline void __hfi1_trace_##fn(const char *func, char *fmt, ...) \ ^ ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_DC8051â: ../drivers/staging/hfi1/trace.h:1357:20: error: function â__hfi1_trace_DC8051â can never be inlined because it uses variable argument lists static inline void __hfi1_trace_##fn(const char *func, char *fmt, ...) \ ^ ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_RCVCTRLâ: ../drivers/staging/hfi1/trace.h:1357:20: error: function â__hfi1_trace_RCVCTRLâ can never be inlined because it uses variable argument lists static inline void __hfi1_trace_##fn(const char *func, char *fmt, ...) \ ^ ../drivers/staging/hfi1/chip.c: In function â__hfi1_trace_TIDâ: ../drivers/staging/hfi1/trace.h:1357:20: error: function â__hfi1_trace_TIDâ can never be inlined because it uses variable argument lists static inline void __hfi1_trace_##fn(const char *func, char *fmt, ...) \ ^ B: When CONFIG_PCI is not enabled, lots of these errors: In file included from ../drivers/staging/hfi1/chip.c:60:0: ../drivers/staging/hfi1/hfi.h:508:20: error: field âmsixâ has incomplete type struct msix_entry msix; ^ ../drivers/staging/hfi1/chip.c: In function âdisable_intxâ: ../drivers/staging/hfi1/chip.c:8667:2: error: implicit declaration of function âpci_intxâ [-Werror=implicit-function-declaration] pci_intx(pdev, 0); ^ so the driver should depend on PCI or maybe even PCI_MSI. C. Please provide some contact info, e.g. in a TODO file or the MAINTAINERS file. -- ~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 Aug 17 (mshyperv.c)
On 08/17/15 03:55, Stephen Rothwell wrote: Hi all, Changes since 20150813: on i386 (for several days now): when CONFIG_KEXEC is not enabled: arch/x86/built-in.o: In function `hv_machine_crash_shutdown': mshyperv.c:(.text+0x2d9d4): undefined reference to `native_machine_crash_shutdown' -- ~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 Aug 17 (mshyperv.c)
-Original Message- From: Randy Dunlap [mailto:rdun...@infradead.org] Sent: Monday, August 17, 2015 10:35 AM To: Stephen Rothwell s...@canb.auug.org.au; linux-n...@vger.kernel.org Cc: linux-kernel@vger.kernel.org; de...@driverdev.osuosl.org; KY Srinivasan k...@microsoft.com; Haiyang Zhang haiya...@microsoft.com Subject: Re: linux-next: Tree for Aug 17 (mshyperv.c) On 08/17/15 03:55, Stephen Rothwell wrote: Hi all, Changes since 20150813: on i386 (for several days now): when CONFIG_KEXEC is not enabled: arch/x86/built-in.o: In function `hv_machine_crash_shutdown': mshyperv.c:(.text+0x2d9d4): undefined reference to `native_machine_crash_shutdown' Vitaly has submitted a patch to fix this. K. Y -- ~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 Aug 17
Hi all, Changes since 20120816: The v4l-dvb tree gained a build failure so I used the version from next-20120816. The infiniband tree lost its build failure. The regulator tree lost its build failure. The hid tree lost its build failure. The tip tree still has its build failure so I used the version from next-20120814. The driver-core tree gained a build failure so I used the version from next-20120816. I have still reverted 3 commits from the signal tree at the request of the arm maintainer. The akpm tree gained a conflict against the slab tree and lost a patch that turned up elsewhere. 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 195 trees (counting Linus' and 26 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 (d987569 Linux 3.6-rc2) Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc) Merging kbuild-current/rc-fixes (f8f5701 Linux 3.5-rc1) Merging arm-current/fixes (8986873 ARM: 7490/1: Drop duplicate select for GENERIC_IRQ_PROBE) Merging m68k-current/for-linus (9e2760d m68k: Make sys_atomic_cmpxchg_32 work on classic m68k) Merging powerpc-merge/merge (ad36cb0 powerpc/kvm/book3s_32: Fix MTMSR_EERI macro) Merging sparc/master (2a95e37 scripts/decodecode: Fixup trapping instruction marker) Merging net/master (476ad15 net: netprio: fix cgrp create and write priomap race) Merging sound-current/for-linus (5e68fb3 ALSA: hda - Don't send invalid volume knob command on IDT 92hd75bxx) Merging pci-current/for-linus (9f6445a Merge branch 'pci/rafael-3.6-fixes' into for-linus) Merging wireless/master (7dd6753 ath5k: fix spin_lock_irqsave/spin_lock_bh nesting in mesh) Merging driver-core.current/driver-core-linus (7b7e995 extcon: extcon_gpio: Replace gpio_request_one by devm_gpio_request_one) Merging tty.current/tty-linus (38f8eef pmac_zilog,kdb: Fix console poll hook to return instead of loop) Merging usb.current/usb-linus (731879f USB: qcserial: fix port handling on Gobi 1K and 2K+) Merging staging.current/staging-linus (3a491ae Merge tag 'v3.6-rc1-iio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging char-misc.current/char-misc-linus (f3261df 1-Wire: Add support for the maxim ds1825 temperature sensor) Merging input-current/for-linus (cf45b5a Merge branch 'next' into for-linus) Merging md-current/for-linus (58e94ae md/raid1: close some possible races on write errors during resync) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (76f16f8 crypto: hifn_795x - fix 64bit division and undefined __divdi3 on 32bit archs) Merging ide/master (39a50b4 Merge branch 'hfsplus') Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting) Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args) Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module
linux-next: Tree for Aug 17
Hi all, Changes since 20120816: The v4l-dvb tree gained a build failure so I used the version from next-20120816. The infiniband tree lost its build failure. The regulator tree lost its build failure. The hid tree lost its build failure. The tip tree still has its build failure so I used the version from next-20120814. The driver-core tree gained a build failure so I used the version from next-20120816. I have still reverted 3 commits from the signal tree at the request of the arm maintainer. The akpm tree gained a conflict against the slab tree and lost a patch that turned up elsewhere. 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 195 trees (counting Linus' and 26 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 (d987569 Linux 3.6-rc2) Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc) Merging kbuild-current/rc-fixes (f8f5701 Linux 3.5-rc1) Merging arm-current/fixes (8986873 ARM: 7490/1: Drop duplicate select for GENERIC_IRQ_PROBE) Merging m68k-current/for-linus (9e2760d m68k: Make sys_atomic_cmpxchg_32 work on classic m68k) Merging powerpc-merge/merge (ad36cb0 powerpc/kvm/book3s_32: Fix MTMSR_EERI macro) Merging sparc/master (2a95e37 scripts/decodecode: Fixup trapping instruction marker) Merging net/master (476ad15 net: netprio: fix cgrp create and write priomap race) Merging sound-current/for-linus (5e68fb3 ALSA: hda - Don't send invalid volume knob command on IDT 92hd75bxx) Merging pci-current/for-linus (9f6445a Merge branch 'pci/rafael-3.6-fixes' into for-linus) Merging wireless/master (7dd6753 ath5k: fix spin_lock_irqsave/spin_lock_bh nesting in mesh) Merging driver-core.current/driver-core-linus (7b7e995 extcon: extcon_gpio: Replace gpio_request_one by devm_gpio_request_one) Merging tty.current/tty-linus (38f8eef pmac_zilog,kdb: Fix console poll hook to return instead of loop) Merging usb.current/usb-linus (731879f USB: qcserial: fix port handling on Gobi 1K and 2K+) Merging staging.current/staging-linus (3a491ae Merge tag 'v3.6-rc1-iio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging char-misc.current/char-misc-linus (f3261df 1-Wire: Add support for the maxim ds1825 temperature sensor) Merging input-current/for-linus (cf45b5a Merge branch 'next' into for-linus) Merging md-current/for-linus (58e94ae md/raid1: close some possible races on write errors during resync) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (76f16f8 crypto: hifn_795x - fix 64bit division and undefined __divdi3 on 32bit archs) Merging ide/master (39a50b4 Merge branch 'hfsplus') Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting) Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args) Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading
