Re: linux-next: Tree for Aug 8
Hi Masahiro, On Fri, 9 Aug 2019 13:44:19 +0900 Masahiro Yamada wrote: > > Stephen, could you revert this commit for today's linux-next ? Sorry, I discovered your email too late :-( -- Cheers, Stephen Rothwell pgpsF4ld4i1FG.pgp Description: OpenPGP digital signature
Re: linux-next: Tree for Aug 8
Hi Heiko, Stephen, On Fri, Aug 9, 2019 at 7:53 AM Heiko Carstens wrote: > > On Thu, Aug 08, 2019 at 06:17:39PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20190807: > > > > I reverted a commit from the kbuild-current tree by request. > > Hello Masahiro, > > it looks like there is (another?) bug in kbuild. With your patch > > commit 421a15c167b2d1f43f287da5b75ef2704650640b (refs/bisect/bad) > Author: Masahiro Yamada > Date: Fri Jul 26 11:17:47 2019 +0900 > > kbuild: clean-up subdir-ym computation > > The intermediate variables __subdir-{y,m} are unneeded. > > Signed-off-by: Masahiro Yamada > > the file modules.builtin starts to miss a lot of entries when building > the kernel tree. Reverting that patch on top of linux-next 20190808 > restores the old behaviour. > > This is the diff I get without and with the above commit (s390 with > defconfig): > > --- modules.builtin.ok 2019-08-09 00:39:58.148624485 +0200 > +++ modules.builtin 2019-08-09 00:40:07.878637541 +0200 You are right. This commit is bad. Stephen, could you revert this commit for today's linux-next ? BTW, I had dropped this commit from my branch (with another reason), but I forgot to push it to the public place... -- Best Regards Masahiro Yamada
Re: linux-next: Tree for Aug 8
On Thu, Aug 08, 2019 at 06:17:39PM +1000, Stephen Rothwell wrote: > Hi all, > > Changes since 20190807: > > I reverted a commit from the kbuild-current tree by request. Hello Masahiro, it looks like there is (another?) bug in kbuild. With your patch commit 421a15c167b2d1f43f287da5b75ef2704650640b (refs/bisect/bad) Author: Masahiro Yamada Date: Fri Jul 26 11:17:47 2019 +0900 kbuild: clean-up subdir-ym computation The intermediate variables __subdir-{y,m} are unneeded. Signed-off-by: Masahiro Yamada the file modules.builtin starts to miss a lot of entries when building the kernel tree. Reverting that patch on top of linux-next 20190808 restores the old behaviour. This is the diff I get without and with the above commit (s390 with defconfig): --- modules.builtin.ok 2019-08-09 00:39:58.148624485 +0200 +++ modules.builtin 2019-08-09 00:40:07.878637541 +0200 @@ -1,5 +1,3 @@ -arch/s390/crypto/crc32-vx_s390.ko -arch/s390/net/pnet.ko kernel/configs.ko mm/zpool.ko fs/binfmt_script.ko @@ -46,67 +44,19 @@ crypto/jitterentropy_rng.ko crypto/ghash-generic.ko crypto/xor.ko -crypto/asymmetric_keys/public_key.ko -crypto/asymmetric_keys/x509_key_parser.ko -crypto/asymmetric_keys/pkcs7_message.ko block/mq-deadline.ko block/kyber-iosched.ko block/bfq.ko -drivers/base/firmware_loader/firmware_class.ko -drivers/block/brd.ko -drivers/block/virtio_blk.ko -drivers/char/virtio_console.ko -drivers/char/tpm/tpm.ko drivers/connector/cn.ko drivers/dax/dax.ko -drivers/gpu/drm/drm_kms_helper.ko -drivers/gpu/drm/drm.ko -drivers/gpu/drm/drm_panel_orientation_quirks.ko -drivers/gpu/drm/ttm/ttm.ko -drivers/gpu/drm/virtio/virtio-gpu.ko -drivers/i2c/i2c-core.ko -drivers/i2c/algos/i2c-algo-bit.ko drivers/input/input-core.ko drivers/input/evdev.ko -drivers/md/md-mod.ko -drivers/scsi/scsi_mod.ko -drivers/scsi/scsi_transport_fc.ko -drivers/scsi/sd_mod.ko -drivers/scsi/sg.ko -drivers/video/fbdev/core/fb.ko -drivers/video/fbdev/core/cfbfillrect.ko -drivers/video/fbdev/core/cfbcopyarea.ko -drivers/video/fbdev/core/cfbimgblt.ko -drivers/video/fbdev/core/sysfillrect.ko -drivers/video/fbdev/core/syscopyarea.ko -drivers/video/fbdev/core/sysimgblt.ko -drivers/video/fbdev/core/fb_sys_fops.ko drivers/virtio/virtio.ko drivers/virtio/virtio_ring.ko drivers/virtio/virtio_input.ko -drivers/watchdog/watchdog.ko -drivers/s390/block/dasd_mod.ko -drivers/s390/block/dasd_diag_mod.ko -drivers/s390/block/dasd_eckd_mod.ko -drivers/s390/block/dasd_fba_mod.ko -drivers/s390/char/raw3270.ko -drivers/s390/char/tty3270.ko -drivers/s390/char/fs3270.ko -drivers/s390/cio/chsc_sch.ko -drivers/s390/cio/ccwgroup.ko -drivers/s390/cio/qdio.ko -drivers/s390/net/qeth.ko -drivers/s390/net/qeth_l2.ko -drivers/s390/net/qeth_l3.ko -drivers/s390/scsi/zfcp.ko net/dns_resolver/dns_resolver.ko -net/ipv4/tcp_cubic.ko -net/ipv6/ipv6.ko -net/ipv6/inet6_hashtables.ko net/iucv/iucv.ko net/packet/af_packet.ko -net/sched/cls_cgroup.ko -net/unix/unix.ko lib/bitrev.ko lib/crc16.ko lib/crc-t10dif.ko @@ -117,7 +67,6 @@ lib/digsig.ko lib/asn1_decoder.ko lib/oid_registry.ko -lib/crypto/libaes.ko lib/fonts/font.ko lib/lz4/lz4_decompress.ko lib/lzo/lzo_compress.ko
linux-next: Tree for Aug 8
Hi all, Changes since 20190807: I reverted a commit from the kbuild-current tree by request. The dma-mapping-fixes tree gained a build failure for which I reverted the merge of that tree. The bpf-next tree gained a conflict against Linus' tree. The crypto tree still had its build failure for which I applied a patch. The btrfs-kdave tree gained conflicts against the btrfs-fixes tree. The tip tree gained a build failure for which I reverted a commit. Non-merge commits (relative to Linus' tree): 4583 4982 files changed, 271243 insertions(+), 122708 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 304 trees (counting Linus' and 74 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 (33920f1ec5bf Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging fixes/master (609488bc979f Linux 5.3-rc2) Merging kbuild-current/fixes (c4b230ac34ce kbuild: show hint if subdir-y/m is used to visit module Makefile) Merging arc-current/for-curr (e86d94fdda8e ARC: unwind: Mark expected switch fall-throughs) Merging arm-current/fixes (c5d0e49e8d8f ARM: 8867/1: vdso: pass --be8 to linker if necessary) Merging arm-soc-fixes/arm/fixes (7bd9d465140a Merge tag 'imx-fixes-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes) Merging arm64-fixes/for-next/fixes (d8bb6718c4db arm64: Make debug exception handlers visible from RCU) Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire) Merging powerpc-fixes/fixes (d7e23b887f67 powerpc/kasan: fix early boot failure on PPC32) Merging s390-fixes/fixes (24350fdadbde s390: put _stext and _etext into .text section) Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (33920f1ec5bf Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf/master (f1fc7249dddc selftests/bpf: tests for jmp to 1st insn) Merging ipsec/master (22d6552f827e xfrm interface: fix management of phydev) Merging netfilter/master (589b474a4b7c netfilter: nf_flow_table: fix offload for flows that are subject to xfrm) Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes') Merging wireless-drivers/master (1f6607250331 iwlwifi: dbg_ini: fix compile time assert build errors) Merging mac80211/master (d8a1de3d5bb8 isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack) Merging rdma-fixes/for-rc (e21a712a9685 Linux 5.3-rc3) Merging sound-current/for-linus (c02f77d32d2c ALSA: hda - Workaround for crackled sound on AMD controller (1022:1457)) Merging sound-asoc-fixes/for-linus (5090b65e6dc1 Merge branch 'asoc-5.3' into asoc-linus) Merging regmap-fixes/for-linus (609488bc979f Linux 5.3-rc2) Merging regulator-fixes/for-linus (0151f77cffe3 Merge branch 'regulator-5.3' into regulator-linus) Merging spi-fixes/for-linus (30743331d109 Merge branch 'spi-5.3' into spi-linus) Merging pci-current/for-linus (5f9e832c1370 Linus 5.3-rc1) Merging driver-core.current/driver-core-linus (cc798c83898e kernfs: fix memleak in kernel_ops_readdir()) Merging tty.current/tty-linus (81eaadcae81b kgdboc: disable the console lock when in kgdb) Merging
linux-next: Tree for Aug 8
Hi all, Changes since 20180807: The vfs tree still had its build failure but today I applied a suggested patch and I have still disabled CONFIG_SAMPLE_STATX. The kvm tree gained a semantic conflict against the tip tree (actually yesterday) for which I applied a merge fix patch. Non-merge commits (relative to Linus' tree): 11342 10339 files changed, 488780 insertions(+), 202892 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 (1236568ee3cb Merge tag 'gpio-v4.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging kbuild-current/fixes (9d3cce1e8b85 Linux 4.18-rc5) Merging arc-current/for-curr (7945121f56a2 ARC: [plat-axs*]: Enable SWAP) 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 (b12c8a70643f m68k: Set default dma mask for platform devices) 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 (37436d9c0e8f tipc: fix an interrupt unsafe locking scenario) Merging bpf/master (74682128c6e4 bpf: btf: Change tools/lib/bpf/btf to LGPL) Merging ipsec/master (25432eba9cd8 openvswitch: meter: Fix setting meter id for new entries) Merging netfilter/master (16e98cec49a4 ipvs: don't show negative times in ip_vs_conn) Merging ipvs/master (16e98cec49a4 ipvs: don't show negative times in ip_vs_conn) Merging wireless-drivers/master (299b6365a3b7 brcmfmac: fix regression in parsing NVRAM for multiple devices) Merging mac80211/master (e31f6456c01c cfg80211: never ignore user regulatory hint) Merging rdma-fixes/for-rc (addb8a6559f0 RDMA/uverbs: Expand primary and alt AV port checks) Merging sound-current/for-linus (627661ced824 ALSA: dice: fix wrong copy to rx parameters for Alesis iO26) Merging sound-asoc-fixes/for-linus (6dfefdfcf59d Merge branch 'asoc-4.18' into asoc-linus) Merging regmap-fixes/for-linus (d72e90f33aa4 Linux 4.18-rc6) Merging regulator-fixes/for-linus (50f6ab5ed897 Merge branch 'regulator-4.18' into regulator-linus) Merging spi-fixes/for-linus (a5e97ad82ebf 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: chipidea: Always build ULPI code) Merging phy/fixes (ad5003300b07 phy: mapphone-mdm6600: Fix wrong enum used for status lines)
linux-next: Tree for Aug 8
Hi all, Changes since 20180807: The vfs tree still had its build failure but today I applied a suggested patch and I have still disabled CONFIG_SAMPLE_STATX. The kvm tree gained a semantic conflict against the tip tree (actually yesterday) for which I applied a merge fix patch. Non-merge commits (relative to Linus' tree): 11342 10339 files changed, 488780 insertions(+), 202892 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 (1236568ee3cb Merge tag 'gpio-v4.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging kbuild-current/fixes (9d3cce1e8b85 Linux 4.18-rc5) Merging arc-current/for-curr (7945121f56a2 ARC: [plat-axs*]: Enable SWAP) 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 (b12c8a70643f m68k: Set default dma mask for platform devices) 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 (37436d9c0e8f tipc: fix an interrupt unsafe locking scenario) Merging bpf/master (74682128c6e4 bpf: btf: Change tools/lib/bpf/btf to LGPL) Merging ipsec/master (25432eba9cd8 openvswitch: meter: Fix setting meter id for new entries) Merging netfilter/master (16e98cec49a4 ipvs: don't show negative times in ip_vs_conn) Merging ipvs/master (16e98cec49a4 ipvs: don't show negative times in ip_vs_conn) Merging wireless-drivers/master (299b6365a3b7 brcmfmac: fix regression in parsing NVRAM for multiple devices) Merging mac80211/master (e31f6456c01c cfg80211: never ignore user regulatory hint) Merging rdma-fixes/for-rc (addb8a6559f0 RDMA/uverbs: Expand primary and alt AV port checks) Merging sound-current/for-linus (627661ced824 ALSA: dice: fix wrong copy to rx parameters for Alesis iO26) Merging sound-asoc-fixes/for-linus (6dfefdfcf59d Merge branch 'asoc-4.18' into asoc-linus) Merging regmap-fixes/for-linus (d72e90f33aa4 Linux 4.18-rc6) Merging regulator-fixes/for-linus (50f6ab5ed897 Merge branch 'regulator-4.18' into regulator-linus) Merging spi-fixes/for-linus (a5e97ad82ebf 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: chipidea: Always build ULPI code) Merging phy/fixes (ad5003300b07 phy: mapphone-mdm6600: Fix wrong enum used for status lines)
linux-next: Tree for Aug 8
Hi all, Changes since 20170807: The rdma tree gained a conflict against Linus' tree. I again reverted a commit from the staging tree that was causing overnight build failures. The userns tree gained a conflict against the mips tree. Non-merge commits (relative to Linus' tree): 4689 4882 files changed, 180132 insertions(+), 101872 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 267 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 (aae4e7a8bc44 Linux 4.13-rc4) Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry) Merging kbuild-current/fixes (ad8181060788 kconfig: fix sparse warnings in nconfig) Merging arc-current/for-curr (b5ddb6d54729 ARCv2: PAE40: set MSB even if !CONFIG_ARC_HAS_PAE40 but PAE exists in SoC) Merging arm-current/fixes (ce184a0dee92 ARM: 8687/1: signal: Fix unparseable iwmmxt_sigframe in uc_regspace[]) 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 (3db40c312c2c powerpc/64: Fix __check_irq_replay missing decrementer interrupt) Merging sparc/master (0a23ea65ce9f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (eb2a6b800c2d qed: Fix a memory allocation failure test in 'qed_mcp_cmd_init()') Merging ipsec/master (7bab09631c2a xfrm: policy: check policy direction value) 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 (368bd88ebb64 Merge tag 'iwlwifi-for-kalle-2017-08-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES) Merging sound-current/for-linus (5ef26e966d3f Merge tag 'asoc-fix-v4.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (8466489ef5ba xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue) Merging driver-core.current/driver-core-linus (5771a8c08880 Linux v4.13-rc1) Merging tty.current/tty-linus (9527b82ae3af Revert "serial: Delete dead code for CIR serial ports") Merging usb.current/usb-linus (8cc34c8d6113 Merge tag 'usb-serial-4.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) 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 (cef988642cda staging: comedi: comedi_fops: do not call blocking ops when !TASK_RUNNING) Merging char-misc.current/char-misc-linus (520eccdfe187 Linux 4.13-rc2) Merging input-current/for-linus (293b915fd9be Input:
linux-next: Tree for Aug 8
Hi all, Changes since 20170807: The rdma tree gained a conflict against Linus' tree. I again reverted a commit from the staging tree that was causing overnight build failures. The userns tree gained a conflict against the mips tree. Non-merge commits (relative to Linus' tree): 4689 4882 files changed, 180132 insertions(+), 101872 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 267 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 (aae4e7a8bc44 Linux 4.13-rc4) Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry) Merging kbuild-current/fixes (ad8181060788 kconfig: fix sparse warnings in nconfig) Merging arc-current/for-curr (b5ddb6d54729 ARCv2: PAE40: set MSB even if !CONFIG_ARC_HAS_PAE40 but PAE exists in SoC) Merging arm-current/fixes (ce184a0dee92 ARM: 8687/1: signal: Fix unparseable iwmmxt_sigframe in uc_regspace[]) 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 (3db40c312c2c powerpc/64: Fix __check_irq_replay missing decrementer interrupt) Merging sparc/master (0a23ea65ce9f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (eb2a6b800c2d qed: Fix a memory allocation failure test in 'qed_mcp_cmd_init()') Merging ipsec/master (7bab09631c2a xfrm: policy: check policy direction value) 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 (368bd88ebb64 Merge tag 'iwlwifi-for-kalle-2017-08-02' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES) Merging sound-current/for-linus (5ef26e966d3f Merge tag 'asoc-fix-v4.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (8466489ef5ba xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue) Merging driver-core.current/driver-core-linus (5771a8c08880 Linux v4.13-rc1) Merging tty.current/tty-linus (9527b82ae3af Revert "serial: Delete dead code for CIR serial ports") Merging usb.current/usb-linus (8cc34c8d6113 Merge tag 'usb-serial-4.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) 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 (cef988642cda staging: comedi: comedi_fops: do not call blocking ops when !TASK_RUNNING) Merging char-misc.current/char-misc-linus (520eccdfe187 Linux 4.13-rc2) Merging input-current/for-linus (293b915fd9be Input:
Re: linux-next: Tree for Aug 8
Hi Andrew, On Mon, 8 Aug 2016 13:51:22 +1000 Andrew Donnellanwrote: > > On 08/08/16 13:17, Stephen Rothwell wrote: > > Please do not add material destined for v4.9 to your linux-next included > > branches until after v4.8-rc1 has been released. > > Which has now happened :) Yes, I will remove the above message tomorrow. -- Cheers, Stephen Rothwell
Re: linux-next: Tree for Aug 8
Hi Andrew, On Mon, 8 Aug 2016 13:51:22 +1000 Andrew Donnellan wrote: > > On 08/08/16 13:17, Stephen Rothwell wrote: > > Please do not add material destined for v4.9 to your linux-next included > > branches until after v4.8-rc1 has been released. > > Which has now happened :) Yes, I will remove the above message tomorrow. -- Cheers, Stephen Rothwell
Re: linux-next: Tree for Aug 8
On 08/08/16 13:17, Stephen Rothwell wrote: Please do not add material destined for v4.9 to your linux-next included branches until after v4.8-rc1 has been released. Which has now happened :) -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnel...@au1.ibm.com IBM Australia Limited
Re: linux-next: Tree for Aug 8
On 08/08/16 13:17, Stephen Rothwell wrote: Please do not add material destined for v4.9 to your linux-next included branches until after v4.8-rc1 has been released. Which has now happened :) -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnel...@au1.ibm.com IBM Australia Limited
linux-next: Tree for Aug 8
Hi all, Please do not add material destined for v4.9 to your linux-next included branches until after v4.8-rc1 has been released. Changes since 20160805: Linus' tree gained a build failure for which I disabled a new driver. The sound-asoc tree gained a build failure so I used the version from next-20160805. Non-merge commits (relative to Linus' tree): 585 589 files changed, 41794 insertions(+), 3853 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 (52ddb7e9dd73 Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux) Merging fixes/master (77a87824ed67 clocksource/drivers/clps_711x: fixup for "ARM: clps711x:) Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled) Merging arm-current/fixes (f6492164ecb1 ARM: 8577/1: Fix Cortex-A15 798181 errata initialization) Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging powerpc-fixes/fixes (bad60e6f259a Merge tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) 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 (c518189567ea net: macb: Correct CAPS mask) Merging ipsec/master (6916fb3b10b3 xfrm: Ignore socket policies when rebuilding hash tables) Merging netfilter/master (43dcff349f09 net: qlcnic: avoid superfluous assignement) Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes') Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) Merging mac80211/master (2439ca040209 mac80211: Add ieee80211_hw pointer to get_expected_throughput) Merging sound-current/for-linus (59ec4b57bcae ALSA: hda - Fix headset mic detection problem for two dell machines) Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code) Merging driver-core.current/driver-core-linus (523d939ef98f Linux 4.7) Merging tty.current/tty-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) Merging usb.current/usb-linus (0cbbc422d566 Merge tag 'xfs-rmap-for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs) Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5) Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) Merging staging.current/staging-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) Merging char-misc.current/char-misc-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) Merging input-current/for-linus (22fe874f3803 Input: silead - remove some dead code) Merging crypto-current/master (8cf740ae85df crypto: marvell - Don't copy IV vectors from the _process op for ciphers) 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
linux-next: Tree for Aug 8
Hi all, Please do not add material destined for v4.9 to your linux-next included branches until after v4.8-rc1 has been released. Changes since 20160805: Linus' tree gained a build failure for which I disabled a new driver. The sound-asoc tree gained a build failure so I used the version from next-20160805. Non-merge commits (relative to Linus' tree): 585 589 files changed, 41794 insertions(+), 3853 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 (52ddb7e9dd73 Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux) Merging fixes/master (77a87824ed67 clocksource/drivers/clps_711x: fixup for "ARM: clps711x:) Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled) Merging arm-current/fixes (f6492164ecb1 ARM: 8577/1: Fix Cortex-A15 798181 errata initialization) Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging powerpc-fixes/fixes (bad60e6f259a Merge tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) 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 (c518189567ea net: macb: Correct CAPS mask) Merging ipsec/master (6916fb3b10b3 xfrm: Ignore socket policies when rebuilding hash tables) Merging netfilter/master (43dcff349f09 net: qlcnic: avoid superfluous assignement) Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes') Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) Merging mac80211/master (2439ca040209 mac80211: Add ieee80211_hw pointer to get_expected_throughput) Merging sound-current/for-linus (59ec4b57bcae ALSA: hda - Fix headset mic detection problem for two dell machines) Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code) Merging driver-core.current/driver-core-linus (523d939ef98f Linux 4.7) Merging tty.current/tty-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) Merging usb.current/usb-linus (0cbbc422d566 Merge tag 'xfs-rmap-for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs) Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5) Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) Merging staging.current/staging-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) Merging char-misc.current/char-misc-linus (0e06f5c0deee Merge branch 'akpm' (patches from Andrew)) Merging input-current/for-linus (22fe874f3803 Input: silead - remove some dead code) Merging crypto-current/master (8cf740ae85df crypto: marvell - Don't copy IV vectors from the _process op for ciphers) 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
linux-next: Tree for Aug 8
Hi all, Please do not add code intended for v3.18 until after v3.17-rc1 is released. Changes since 20140807: Removed tree: hch-vfs The ext3 tree gained a build failure so I used the version from next-20140807. The modules tree lost its build failure. The mmc-uh tree still had its build failure so I used the version from next-20140725. The akpm-current tree gained a conflict against Linus' tree. The akpm tree gained a conflict against the vfs tree. Non-merge commits (relative to Linus' tree): 3552 3126 files changed, 129224 insertions(+), 82722 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 220 trees (counting Linus' and 30 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (66bb0aa07797 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) Merging fixes/master (1795cd9b3a91 Linux 3.16-rc5) Merging kbuild-current/rc-fixes (dd5a6752ae7d firmware: Create directories for external firmware) Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) Merging arm-current/fixes (6bf755db4d5e ARM: 8124/1: don't enter kgdb when userspace executes a kgdb break instruction) Merging m68k-current/for-linus (9117710a5997 m68k/sun3: Remove define statement no longer needed) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (08a9c3c9afcf MIPS: OCTEON: make get_system_type() thread-safe) Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) Merging sparc/master (caa9199b0efd sparc: Hook up seccomp and getrandom system calls.) Merging net/master (a1f7d81b735c net: ucc_geth: Don't use the MAC as PHY without a fixed link) Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs) Merging sound-current/for-linus (875f0dd79987 ALSA: hda - Fix parsing of CMI codec) Merging pci-current/for-linus (bf177a1eb6d1 MAINTAINERS: Update mx6 PCI driver maintainer's email) Merging wireless/master (c01fac1c77a0 ath9k: fix aggregation session lockup) Merging driver-core.current/driver-core-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) Merging tty.current/tty-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) Merging usb.current/usb-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) Merging usb-gadget-fixes/fixes (a8a85b01d185 usb: musb/cppi41: call musb_ep_select() before accessing an endpoint's CSR) CONFLICT (content): Merge conflict in drivers/usb/musb/musb_host.c Merging usb-serial-fixes/usb-linus (19583ca584d6 Linux 3.16) Merging staging.current/staging-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) Merging char-misc.current/char-misc-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) Merging input-current/for-linus (5e2aa2ed08e2 Merge branch 'next' into for-linus) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (ce5481d01f67 crypto: drbg - fix failure of generating multiple of 2**16 bytes) Merging ide/master (a53dae49b2fe ide: use module_platform_driver()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (5a12a597a862 arm: Add devicetree fixup machine function) Merging rr-fixes/fixes (79465d2fd48e module: remove
linux-next: Tree for Aug 8
Hi all, Please do not add code intended for v3.18 until after v3.17-rc1 is released. Changes since 20140807: Removed tree: hch-vfs The ext3 tree gained a build failure so I used the version from next-20140807. The modules tree lost its build failure. The mmc-uh tree still had its build failure so I used the version from next-20140725. The akpm-current tree gained a conflict against Linus' tree. The akpm tree gained a conflict against the vfs tree. Non-merge commits (relative to Linus' tree): 3552 3126 files changed, 129224 insertions(+), 82722 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 220 trees (counting Linus' and 30 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (66bb0aa07797 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) Merging fixes/master (1795cd9b3a91 Linux 3.16-rc5) Merging kbuild-current/rc-fixes (dd5a6752ae7d firmware: Create directories for external firmware) Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) Merging arm-current/fixes (6bf755db4d5e ARM: 8124/1: don't enter kgdb when userspace executes a kgdb break instruction) Merging m68k-current/for-linus (9117710a5997 m68k/sun3: Remove define statement no longer needed) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (08a9c3c9afcf MIPS: OCTEON: make get_system_type() thread-safe) Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) Merging sparc/master (caa9199b0efd sparc: Hook up seccomp and getrandom system calls.) Merging net/master (a1f7d81b735c net: ucc_geth: Don't use the MAC as PHY without a fixed link) Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs) Merging sound-current/for-linus (875f0dd79987 ALSA: hda - Fix parsing of CMI codec) Merging pci-current/for-linus (bf177a1eb6d1 MAINTAINERS: Update mx6 PCI driver maintainer's email) Merging wireless/master (c01fac1c77a0 ath9k: fix aggregation session lockup) Merging driver-core.current/driver-core-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) Merging tty.current/tty-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) Merging usb.current/usb-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) Merging usb-gadget-fixes/fixes (a8a85b01d185 usb: musb/cppi41: call musb_ep_select() before accessing an endpoint's CSR) CONFLICT (content): Merge conflict in drivers/usb/musb/musb_host.c Merging usb-serial-fixes/usb-linus (19583ca584d6 Linux 3.16) Merging staging.current/staging-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) Merging char-misc.current/char-misc-linus (c489d98c8c81 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) Merging input-current/for-linus (5e2aa2ed08e2 Merge branch 'next' into for-linus) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding discard stripe) Merging crypto-current/master (ce5481d01f67 crypto: drbg - fix failure of generating multiple of 2**16 bytes) Merging ide/master (a53dae49b2fe ide: use module_platform_driver()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (5a12a597a862 arm: Add devicetree fixup machine function) Merging rr-fixes/fixes (79465d2fd48e module: remove
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On Mon, Aug 12, 2013 at 7:18 AM, Jason Cooper wrote: > On Sat, Aug 10, 2013 at 08:01:49AM -0600, Bjorn Helgaas wrote: >> On Fri, Aug 9, 2013 at 12:50 PM, Jason Cooper wrote: >> > Randy, >> > >> > On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: >> >> On 08/09/13 07:59, Jason Cooper wrote: >> >> > Randy, >> >> > >> >> > On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: >> >> >> On 08/08/13 00:08, Stephen Rothwell wrote: >> >> >>> Hi all, >> >> >>> >> >> >>> Changes since 20130807: >> >> >>> >> >> >> >> >> >> on i386 and x86_64: >> >> >> when CONFIG_PCI_MSI is not enabled: >> >> >> >> >> >> There are many of these errors: >> >> >> include/linux/msi.h:65:6: error: expected identifier or '(' before >> >> >> 'void' >> >> >> include/linux/msi.h:65:6: error: expected ')' before numeric constant >> >> >> >> >> >> because arch/x86/include/asm/pci.h defines: >> >> >> #define default_teardown_msi_irqs NULL >> >> > >> >> > Do you have an example config you used? >> >> >> >> Sure, attached. (or I have 14 of them) >> > >> > Thanks, I was able to reproduce the error. I'm not real familiar with >> > this area of the code, but the relief is it doesn't appear to be caused >> > by the mvebu changes (well, relief for us ;-) ). >> > >> > At any rate, give this a spin and see if it works for you >> > >> > If it's acceptable, I'll do an official patch for Bjorn. >> > >> > thx, >> > >> > Jason. >> > >> > -->8-- >> > diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h >> > index d9e9e6c..6169414 100644 >> > --- a/arch/x86/include/asm/pci.h >> > +++ b/arch/x86/include/asm/pci.h >> > @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int >> > irq); >> > #else >> > #define native_setup_msi_irqs NULL >> > #define native_teardown_msi_irqNULL >> > -#define default_teardown_msi_irqs NULL >> > -#define default_restore_msi_irqs NULL >> > +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } >> > +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } >> >> I don't really like this solution of putting the empty implementation >> in the header file, because then a weak body is generated in the >> object of every source file that includes the header. >> >> default_teardown_msi_irqs() and default_restore_msi_irqs() seem like >> fairly internal MSI functions, so I wonder why we need them defined at >> all when CONFIG_PCI_MSI=n. It seems like any uses of them should be >> in code that's only compiled when CONFIG_PCI_MSI=y. But I haven't >> reproduced the problem and investigated yet. > > I first tried commenting out the definitions after reproducing the > problem. It also failed miserably. > > Please take a look at Thomas' latest MSI patch series, > > [PATCHv9 01/10] PCI: use weak functions for MSI arch-specific functions > > I think his solution is much nicer than mine. OK, I'll assume I don't need to do anything until I hear otherwise. Bjorn -- 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 8 (not CONFIG_PCI_MSI conflict)
On Sat, Aug 10, 2013 at 08:01:49AM -0600, Bjorn Helgaas wrote: > On Fri, Aug 9, 2013 at 12:50 PM, Jason Cooper wrote: > > Randy, > > > > On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: > >> On 08/09/13 07:59, Jason Cooper wrote: > >> > Randy, > >> > > >> > On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: > >> >> On 08/08/13 00:08, Stephen Rothwell wrote: > >> >>> Hi all, > >> >>> > >> >>> Changes since 20130807: > >> >>> > >> >> > >> >> on i386 and x86_64: > >> >> when CONFIG_PCI_MSI is not enabled: > >> >> > >> >> There are many of these errors: > >> >> include/linux/msi.h:65:6: error: expected identifier or '(' before > >> >> 'void' > >> >> include/linux/msi.h:65:6: error: expected ')' before numeric constant > >> >> > >> >> because arch/x86/include/asm/pci.h defines: > >> >> #define default_teardown_msi_irqs NULL > >> > > >> > Do you have an example config you used? > >> > >> Sure, attached. (or I have 14 of them) > > > > Thanks, I was able to reproduce the error. I'm not real familiar with > > this area of the code, but the relief is it doesn't appear to be caused > > by the mvebu changes (well, relief for us ;-) ). > > > > At any rate, give this a spin and see if it works for you > > > > If it's acceptable, I'll do an official patch for Bjorn. > > > > thx, > > > > Jason. > > > > -->8-- > > diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h > > index d9e9e6c..6169414 100644 > > --- a/arch/x86/include/asm/pci.h > > +++ b/arch/x86/include/asm/pci.h > > @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int > > irq); > > #else > > #define native_setup_msi_irqs NULL > > #define native_teardown_msi_irqNULL > > -#define default_teardown_msi_irqs NULL > > -#define default_restore_msi_irqs NULL > > +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } > > +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } > > I don't really like this solution of putting the empty implementation > in the header file, because then a weak body is generated in the > object of every source file that includes the header. > > default_teardown_msi_irqs() and default_restore_msi_irqs() seem like > fairly internal MSI functions, so I wonder why we need them defined at > all when CONFIG_PCI_MSI=n. It seems like any uses of them should be > in code that's only compiled when CONFIG_PCI_MSI=y. But I haven't > reproduced the problem and investigated yet. I first tried commenting out the definitions after reproducing the problem. It also failed miserably. Please take a look at Thomas' latest MSI patch series, [PATCHv9 01/10] PCI: use weak functions for MSI arch-specific functions I think his solution is much nicer than mine. thx, Jason. -- 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 8 (not CONFIG_PCI_MSI conflict)
On Sat, Aug 10, 2013 at 08:01:49AM -0600, Bjorn Helgaas wrote: On Fri, Aug 9, 2013 at 12:50 PM, Jason Cooper ja...@lakedaemon.net wrote: Randy, On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: On 08/09/13 07:59, Jason Cooper wrote: Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks, I was able to reproduce the error. I'm not real familiar with this area of the code, but the relief is it doesn't appear to be caused by the mvebu changes (well, relief for us ;-) ). At any rate, give this a spin and see if it works for you If it's acceptable, I'll do an official patch for Bjorn. thx, Jason. --8-- diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e9e6c..6169414 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #else #define native_setup_msi_irqs NULL #define native_teardown_msi_irqNULL -#define default_teardown_msi_irqs NULL -#define default_restore_msi_irqs NULL +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } I don't really like this solution of putting the empty implementation in the header file, because then a weak body is generated in the object of every source file that includes the header. default_teardown_msi_irqs() and default_restore_msi_irqs() seem like fairly internal MSI functions, so I wonder why we need them defined at all when CONFIG_PCI_MSI=n. It seems like any uses of them should be in code that's only compiled when CONFIG_PCI_MSI=y. But I haven't reproduced the problem and investigated yet. I first tried commenting out the definitions after reproducing the problem. It also failed miserably. Please take a look at Thomas' latest MSI patch series, [PATCHv9 01/10] PCI: use weak functions for MSI arch-specific functions I think his solution is much nicer than mine. thx, Jason. -- 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 8 (not CONFIG_PCI_MSI conflict)
On Mon, Aug 12, 2013 at 7:18 AM, Jason Cooper ja...@lakedaemon.net wrote: On Sat, Aug 10, 2013 at 08:01:49AM -0600, Bjorn Helgaas wrote: On Fri, Aug 9, 2013 at 12:50 PM, Jason Cooper ja...@lakedaemon.net wrote: Randy, On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: On 08/09/13 07:59, Jason Cooper wrote: Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks, I was able to reproduce the error. I'm not real familiar with this area of the code, but the relief is it doesn't appear to be caused by the mvebu changes (well, relief for us ;-) ). At any rate, give this a spin and see if it works for you If it's acceptable, I'll do an official patch for Bjorn. thx, Jason. --8-- diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e9e6c..6169414 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #else #define native_setup_msi_irqs NULL #define native_teardown_msi_irqNULL -#define default_teardown_msi_irqs NULL -#define default_restore_msi_irqs NULL +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } I don't really like this solution of putting the empty implementation in the header file, because then a weak body is generated in the object of every source file that includes the header. default_teardown_msi_irqs() and default_restore_msi_irqs() seem like fairly internal MSI functions, so I wonder why we need them defined at all when CONFIG_PCI_MSI=n. It seems like any uses of them should be in code that's only compiled when CONFIG_PCI_MSI=y. But I haven't reproduced the problem and investigated yet. I first tried commenting out the definitions after reproducing the problem. It also failed miserably. Please take a look at Thomas' latest MSI patch series, [PATCHv9 01/10] PCI: use weak functions for MSI arch-specific functions I think his solution is much nicer than mine. OK, I'll assume I don't need to do anything until I hear otherwise. Bjorn -- 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 8 (not CONFIG_PCI_MSI conflict)
On Fri, Aug 9, 2013 at 12:50 PM, Jason Cooper wrote: > Randy, > > On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: >> On 08/09/13 07:59, Jason Cooper wrote: >> > Randy, >> > >> > On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: >> >> On 08/08/13 00:08, Stephen Rothwell wrote: >> >>> Hi all, >> >>> >> >>> Changes since 20130807: >> >>> >> >> >> >> on i386 and x86_64: >> >> when CONFIG_PCI_MSI is not enabled: >> >> >> >> There are many of these errors: >> >> include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' >> >> include/linux/msi.h:65:6: error: expected ')' before numeric constant >> >> >> >> because arch/x86/include/asm/pci.h defines: >> >> #define default_teardown_msi_irqs NULL >> > >> > Do you have an example config you used? >> >> Sure, attached. (or I have 14 of them) > > Thanks, I was able to reproduce the error. I'm not real familiar with > this area of the code, but the relief is it doesn't appear to be caused > by the mvebu changes (well, relief for us ;-) ). > > At any rate, give this a spin and see if it works for you > > If it's acceptable, I'll do an official patch for Bjorn. > > thx, > > Jason. > > -->8-- > diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h > index d9e9e6c..6169414 100644 > --- a/arch/x86/include/asm/pci.h > +++ b/arch/x86/include/asm/pci.h > @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int > irq); > #else > #define native_setup_msi_irqs NULL > #define native_teardown_msi_irqNULL > -#define default_teardown_msi_irqs NULL > -#define default_restore_msi_irqs NULL > +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } > +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } I don't really like this solution of putting the empty implementation in the header file, because then a weak body is generated in the object of every source file that includes the header. default_teardown_msi_irqs() and default_restore_msi_irqs() seem like fairly internal MSI functions, so I wonder why we need them defined at all when CONFIG_PCI_MSI=n. It seems like any uses of them should be in code that's only compiled when CONFIG_PCI_MSI=y. But I haven't reproduced the problem and investigated yet. > #endif > > #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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 8 (not CONFIG_PCI_MSI conflict)
On Fri, Aug 9, 2013 at 12:50 PM, Jason Cooper ja...@lakedaemon.net wrote: Randy, On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: On 08/09/13 07:59, Jason Cooper wrote: Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks, I was able to reproduce the error. I'm not real familiar with this area of the code, but the relief is it doesn't appear to be caused by the mvebu changes (well, relief for us ;-) ). At any rate, give this a spin and see if it works for you If it's acceptable, I'll do an official patch for Bjorn. thx, Jason. --8-- diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e9e6c..6169414 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #else #define native_setup_msi_irqs NULL #define native_teardown_msi_irqNULL -#define default_teardown_msi_irqs NULL -#define default_restore_msi_irqs NULL +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } I don't really like this solution of putting the empty implementation in the header file, because then a weak body is generated in the object of every source file that includes the header. default_teardown_msi_irqs() and default_restore_msi_irqs() seem like fairly internal MSI functions, so I wonder why we need them defined at all when CONFIG_PCI_MSI=n. It seems like any uses of them should be in code that's only compiled when CONFIG_PCI_MSI=y. But I haven't reproduced the problem and investigated yet. #endif #define PCI_DMA_BUS_IS_PHYS (dma_ops-is_phys) -- To unsubscribe from this list: send the line unsubscribe linux-pci in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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 8 (not CONFIG_PCI_MSI conflict)
On 08/09/13 11:50, Jason Cooper wrote: > Randy, > > On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: >> On 08/09/13 07:59, Jason Cooper wrote: >>> Randy, >>> >>> On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: > Hi all, > > Changes since 20130807: > on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL >>> >>> Do you have an example config you used? >> >> Sure, attached. (or I have 14 of them) > > Thanks, I was able to reproduce the error. I'm not real familiar with > this area of the code, but the relief is it doesn't appear to be caused > by the mvebu changes (well, relief for us ;-) ). > > At any rate, give this a spin and see if it works for you > > If it's acceptable, I'll do an official patch for Bjorn. Works for me -- tested with PCI_MSI enabled & disabled. Thanks. Acked-by: Randy Dunlap > thx, > > Jason. > > -->8-- > diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h > index d9e9e6c..6169414 100644 > --- a/arch/x86/include/asm/pci.h > +++ b/arch/x86/include/asm/pci.h > @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int > irq); > #else > #define native_setup_msi_irqsNULL > #define native_teardown_msi_irq NULL > -#define default_teardown_msi_irqsNULL > -#define default_restore_msi_irqs NULL > +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } > +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } > #endif > > #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) > -- -- ~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 8 (not CONFIG_PCI_MSI conflict)
Randy, On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: > On 08/09/13 07:59, Jason Cooper wrote: > > Randy, > > > > On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: > >> On 08/08/13 00:08, Stephen Rothwell wrote: > >>> Hi all, > >>> > >>> Changes since 20130807: > >>> > >> > >> on i386 and x86_64: > >> when CONFIG_PCI_MSI is not enabled: > >> > >> There are many of these errors: > >> include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' > >> include/linux/msi.h:65:6: error: expected ')' before numeric constant > >> > >> because arch/x86/include/asm/pci.h defines: > >> #define default_teardown_msi_irqs NULL > > > > Do you have an example config you used? > > Sure, attached. (or I have 14 of them) Thanks, I was able to reproduce the error. I'm not real familiar with this area of the code, but the relief is it doesn't appear to be caused by the mvebu changes (well, relief for us ;-) ). At any rate, give this a spin and see if it works for you If it's acceptable, I'll do an official patch for Bjorn. thx, Jason. -->8-- diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e9e6c..6169414 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #else #define native_setup_msi_irqs NULL #define native_teardown_msi_irqNULL -#define default_teardown_msi_irqs NULL -#define default_restore_msi_irqs NULL +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } #endif #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys) -- 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 8 (not CONFIG_PCI_MSI conflict)
On 08/09/13 07:59, Jason Cooper wrote: > Randy, > > On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: >> On 08/08/13 00:08, Stephen Rothwell wrote: >>> Hi all, >>> >>> Changes since 20130807: >>> >> >> on i386 and x86_64: >> when CONFIG_PCI_MSI is not enabled: >> >> There are many of these errors: >> include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' >> include/linux/msi.h:65:6: error: expected ')' before numeric constant >> >> because arch/x86/include/asm/pci.h defines: >> #define default_teardown_msi_irqsNULL > > Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks. -- ~Randy # # Automatically generated file; DO NOT EDIT. # Linux/x86_64 3.11.0-rc4 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_CPU_AUTOPROBE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ZONE_DMA32=y CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_COMPILE_TEST=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZ4=y # CONFIG_KERNEL_GZIP is not set CONFIG_KERNEL_BZIP2=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set CONFIG_DEFAULT_HOSTNAME="(none)" # CONFIG_SYSVIPC is not set # CONFIG_POSIX_MQUEUE is not set # CONFIG_FHANDLE is not set CONFIG_AUDIT=y # CONFIG_AUDITSYSCALL is not set CONFIG_AUDIT_LOGINUID_IMMUTABLE=y CONFIG_HAVE_GENERIC_HARDIRQS=y # # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y # # Timers subsystem # CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ_COMMON=y # CONFIG_HZ_PERIODIC is not set CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ=y # CONFIG_HIGH_RES_TIMERS is not set # # CPU/Task time and stats accounting # CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_TASKSTATS=y # CONFIG_TASK_DELAY_ACCT is not set CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y # # RCU Subsystem # CONFIG_TINY_RCU=y # CONFIG_PREEMPT_RCU is not set CONFIG_RCU_STALL_COMMON=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y CONFIG_CGROUPS=y CONFIG_CGROUP_DEBUG=y # CONFIG_CGROUP_FREEZER is not set # CONFIG_CGROUP_DEVICE is not set CONFIG_CPUSETS=y # CONFIG_PROC_PID_CPUSET is not set # CONFIG_CGROUP_CPUACCT is not set # CONFIG_RESOURCE_COUNTERS is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y # CONFIG_RT_GROUP_SCHED is not set # CONFIG_CHECKPOINT_RESTORE is not set # CONFIG_NAMESPACES is not set CONFIG_UIDGID_CONVERTED=y CONFIG_UIDGID_STRICT_TYPE_CHECKS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set CONFIG_RD_LZMA=y # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set CONFIG_RD_LZ4=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_ANON_INODES=y CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y # CONFIG_UID16 is not set CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: > On 08/08/13 00:08, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20130807: > > > > on i386 and x86_64: > when CONFIG_PCI_MSI is not enabled: > > There are many of these errors: > include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' > include/linux/msi.h:65:6: error: expected ')' before numeric constant > > because arch/x86/include/asm/pci.h defines: > #define default_teardown_msi_irqs NULL Do you have an example config you used? thx, Jason. -- 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 8 (not CONFIG_PCI_MSI conflict)
Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Do you have an example config you used? thx, Jason. -- 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 8 (not CONFIG_PCI_MSI conflict)
On 08/09/13 07:59, Jason Cooper wrote: Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqsNULL Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks. -- ~Randy # # Automatically generated file; DO NOT EDIT. # Linux/x86_64 3.11.0-rc4 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT=elf64-x86-64 CONFIG_ARCH_DEFCONFIG=arch/x86/configs/x86_64_defconfig CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_CPU_AUTOPROBE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ZONE_DMA32=y CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_HWEIGHT_CFLAGS=-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11 CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_DEFCONFIG_LIST=/lib/modules/$UNAME_RELEASE/.config CONFIG_CONSTRUCTORS=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y # # General setup # CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE= CONFIG_COMPILE_TEST=y CONFIG_LOCALVERSION= # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZ4=y # CONFIG_KERNEL_GZIP is not set CONFIG_KERNEL_BZIP2=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set CONFIG_DEFAULT_HOSTNAME=(none) # CONFIG_SYSVIPC is not set # CONFIG_POSIX_MQUEUE is not set # CONFIG_FHANDLE is not set CONFIG_AUDIT=y # CONFIG_AUDITSYSCALL is not set CONFIG_AUDIT_LOGINUID_IMMUTABLE=y CONFIG_HAVE_GENERIC_HARDIRQS=y # # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y # # Timers subsystem # CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ_COMMON=y # CONFIG_HZ_PERIODIC is not set CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ=y # CONFIG_HIGH_RES_TIMERS is not set # # CPU/Task time and stats accounting # CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set # CONFIG_IRQ_TIME_ACCOUNTING is not set # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_TASKSTATS=y # CONFIG_TASK_DELAY_ACCT is not set CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y # # RCU Subsystem # CONFIG_TINY_RCU=y # CONFIG_PREEMPT_RCU is not set CONFIG_RCU_STALL_COMMON=y # CONFIG_TREE_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y CONFIG_CGROUPS=y CONFIG_CGROUP_DEBUG=y # CONFIG_CGROUP_FREEZER is not set # CONFIG_CGROUP_DEVICE is not set CONFIG_CPUSETS=y # CONFIG_PROC_PID_CPUSET is not set # CONFIG_CGROUP_CPUACCT is not set # CONFIG_RESOURCE_COUNTERS is not set CONFIG_CGROUP_PERF=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y # CONFIG_RT_GROUP_SCHED is not set # CONFIG_CHECKPOINT_RESTORE is not set # CONFIG_NAMESPACES is not set CONFIG_UIDGID_CONVERTED=y CONFIG_UIDGID_STRICT_TYPE_CHECKS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE= # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set CONFIG_RD_LZMA=y # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set CONFIG_RD_LZ4=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_ANON_INODES=y CONFIG_HAVE_UID16=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_EXPERT=y # CONFIG_UID16 is not set CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y CONFIG_PRINTK=y # CONFIG_BUG is not set CONFIG_ELF_CORE=y
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
Randy, On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: On 08/09/13 07:59, Jason Cooper wrote: Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks, I was able to reproduce the error. I'm not real familiar with this area of the code, but the relief is it doesn't appear to be caused by the mvebu changes (well, relief for us ;-) ). At any rate, give this a spin and see if it works for you If it's acceptable, I'll do an official patch for Bjorn. thx, Jason. --8-- diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e9e6c..6169414 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #else #define native_setup_msi_irqs NULL #define native_teardown_msi_irqNULL -#define default_teardown_msi_irqs NULL -#define default_restore_msi_irqs NULL +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } #endif #define PCI_DMA_BUS_IS_PHYS (dma_ops-is_phys) -- 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 8 (not CONFIG_PCI_MSI conflict)
On 08/09/13 11:50, Jason Cooper wrote: Randy, On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote: On 08/09/13 07:59, Jason Cooper wrote: Randy, On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Do you have an example config you used? Sure, attached. (or I have 14 of them) Thanks, I was able to reproduce the error. I'm not real familiar with this area of the code, but the relief is it doesn't appear to be caused by the mvebu changes (well, relief for us ;-) ). At any rate, give this a spin and see if it works for you If it's acceptable, I'll do an official patch for Bjorn. Works for me -- tested with PCI_MSI enabled disabled. Thanks. Acked-by: Randy Dunlap rdun...@infradead.org thx, Jason. --8-- diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index d9e9e6c..6169414 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); #else #define native_setup_msi_irqsNULL #define native_teardown_msi_irq NULL -#define default_teardown_msi_irqsNULL -#define default_restore_msi_irqs NULL +void __weak default_teardown_msi_irqs(struct pci_dev *dev) { } +void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { } #endif #define PCI_DMA_BUS_IS_PHYS (dma_ops-is_phys) -- -- ~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 8 (not CONFIG_PCI_MSI conflict)
On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: > On 08/08/13 00:08, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20130807: > > > > on i386 and x86_64: > when CONFIG_PCI_MSI is not enabled: > > There are many of these errors: > include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' > include/linux/msi.h:65:6: error: expected ')' before numeric constant > > because arch/x86/include/asm/pci.h defines: > #define default_teardown_msi_irqs NULL Grrr. That's us (mvebu tree) I've forwarded this to Thomas, the author of the patch. Hopefully we'll have this worked out soon. Thanks for testing, Jason. -- 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 8 (not CONFIG_PCI_MSI conflict)
On 08/08/13 00:08, Stephen Rothwell wrote: > Hi all, > > Changes since 20130807: > on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL -- ~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 8
Hi all, Changes since 20130807: The mvebu tree lost its build failure and gained a conflict against the i2c tree. The renesas tree gained a conflict against the leds tree. I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 222 trees (counting Linus' and 30 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (b7bc9e7 Merge tag 'trace-fixes-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging fixes/master (b3a3a9c Merge tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1) Merging arc-current/for-curr (c095ba7 Linux 3.11-rc4) Merging arm-current/fixes (e35ac62 Merge branch 'security-fixes' into fixes) Merging m68k-current/for-linus (ad81f05 Linux 3.11-rc1) Merging metag-fixes/fixes (dfe248b MAINTAINERS: add linux-metag mailing list) Merging powerpc-merge/merge (fe956a1 powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31)) Merging sparc/master (1c2696c sparc64: Fix ITLB handler of null page) Merging net/master (3e3be27 ipv6: don't stop backtracking in fib6_lookup_1 if subtree does not match) Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling) Merging sound-current/for-linus (ddb6b5a ALSA: 6fire: fix DMA issues with URB transfer_buffer usage) Merging pci-current/for-linus (36dd1f3 PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge) Merging wireless/master (5a6e0cf cw1200: Fix spurious BUG_ON() trigger when starting AP mode.) Merging driver-core.current/driver-core-linus (5ae90d8 Linux 3.11-rc3) Merging tty.current/tty-linus (c095ba7 Linux 3.11-rc4) Merging usb.current/usb-linus (444ce9d MAINTAINERS: Add separate section for USB NETWORKING DRIVERS) Merging staging.current/staging-linus (cefe8a3 Merge tag 'iio-fixes-for-3.11b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging char-misc.current/char-misc-linus (5ae90d8 Linux 3.11-rc3) Merging input-current/for-linus (88ce3c3 Merge branch 'next' into for-linus) Merging md-current/for-linus (f94c0b6 md/raid5: fix interaction of 'replace' and 'recovery'.) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (e70308e Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework") Merging ide/master (6d128e1 Revert "Makefile: Fix install error with make -j option") Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) Merging devicetree-current/devicetree/merge (cf9e236 of/irq: init struct resource to 0 in of_irq_to_resource()) Merging rr-fixes/fixes (aa52aee virtio-scsi: Fix virtqueue affinity setup) Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata) Merging vfio-fixes/for-linus (d24cdbf vfio-pci: Avoid deadlock on remove) Merging drm-intel-fixes/drm-intel-fixes (3f57757 drm/i915: do not disable backlight on vgaswitcheroo switch off) Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for
linux-next: Tree for Aug 8
Hi all, Changes since 20130807: The mvebu tree lost its build failure and gained a conflict against the i2c tree. The renesas tree gained a conflict against the leds tree. I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use git pull to do so as that will try to merge the new linux-next release with the old one. You should use git fetch as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 222 trees (counting Linus' and 30 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (b7bc9e7 Merge tag 'trace-fixes-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging fixes/master (b3a3a9c Merge tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1) Merging arc-current/for-curr (c095ba7 Linux 3.11-rc4) Merging arm-current/fixes (e35ac62 Merge branch 'security-fixes' into fixes) Merging m68k-current/for-linus (ad81f05 Linux 3.11-rc1) Merging metag-fixes/fixes (dfe248b MAINTAINERS: add linux-metag mailing list) Merging powerpc-merge/merge (fe956a1 powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31)) Merging sparc/master (1c2696c sparc64: Fix ITLB handler of null page) Merging net/master (3e3be27 ipv6: don't stop backtracking in fib6_lookup_1 if subtree does not match) Merging ipsec/master (01cb71d net_sched: restore overhead xxx handling) Merging sound-current/for-linus (ddb6b5a ALSA: 6fire: fix DMA issues with URB transfer_buffer usage) Merging pci-current/for-linus (36dd1f3 PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge) Merging wireless/master (5a6e0cf cw1200: Fix spurious BUG_ON() trigger when starting AP mode.) Merging driver-core.current/driver-core-linus (5ae90d8 Linux 3.11-rc3) Merging tty.current/tty-linus (c095ba7 Linux 3.11-rc4) Merging usb.current/usb-linus (444ce9d MAINTAINERS: Add separate section for USB NETWORKING DRIVERS) Merging staging.current/staging-linus (cefe8a3 Merge tag 'iio-fixes-for-3.11b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging char-misc.current/char-misc-linus (5ae90d8 Linux 3.11-rc3) Merging input-current/for-linus (88ce3c3 Merge branch 'next' into for-linus) Merging md-current/for-linus (f94c0b6 md/raid5: fix interaction of 'replace' and 'recovery'.) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (e70308e Revert crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework) Merging ide/master (6d128e1 Revert Makefile: Fix install error with make -j option) Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) Merging devicetree-current/devicetree/merge (cf9e236 of/irq: init struct resource to 0 in of_irq_to_resource()) Merging rr-fixes/fixes (aa52aee virtio-scsi: Fix virtqueue affinity setup) Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata) Merging vfio-fixes/for-linus (d24cdbf vfio-pci: Avoid deadlock on remove) Merging drm-intel-fixes/drm-intel-fixes (3f57757 drm/i915: do not disable backlight on vgaswitcheroo switch off) Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) Merging
Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL -- ~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 8 (not CONFIG_PCI_MSI conflict)
On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote: On 08/08/13 00:08, Stephen Rothwell wrote: Hi all, Changes since 20130807: on i386 and x86_64: when CONFIG_PCI_MSI is not enabled: There are many of these errors: include/linux/msi.h:65:6: error: expected identifier or '(' before 'void' include/linux/msi.h:65:6: error: expected ')' before numeric constant because arch/x86/include/asm/pci.h defines: #define default_teardown_msi_irqs NULL Grrr. That's us (mvebu tree) I've forwarded this to Thomas, the author of the patch. Hopefully we'll have this worked out soon. Thanks for testing, Jason. -- 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/