Re: linux-next: Tree for Aug 30
On 9/2/19 12:55 AM, Christoph Hellwig wrote: On Sun, Sep 01, 2019 at 11:22:26AM -0700, Guenter Roeck wrote: On Sat, Aug 31, 2019 at 12:36:13AM +1000, Stephen Rothwell wrote: Hi all, Changes since 20190829: The compiler-attributes tree gained a build failure for which I reverted a commit. The arm-soc tree gained a conflict against the arm tree. The csky tree gained a conflict against the dma-mapping tree. The fuse tree gained a conflict against the fsverity tree. The vfs tree gained conflicts against the fuse tree. The pci tree gained a build failure for which I revereted a commit. The net-next tree still had its build failure for which I applied a patch. It also gained a conflict against the net tree. The regulator tree still has its build failure for which I reverted a commit. The keys tree still has its build failure so I used the version from next-20190828. The driver-core tree lost its build failure. The staging tree got conflicts against the net-next and usb trees. The akpm-current tree gained a build failure due to an interaction with the hmm tree for which I applied a patch. Something in the fixup patch seems to be wrong. I get the following error with sh4 boot tests when booting from usb. sm501-usb sm501-usb: OHCI Unrecoverable Error, disabled sm501-usb sm501-usb: HC died; cleaning up Unfortunately, bisect doesn't help much (see below). Reverting the fixup patch as well as the offending patch (plus a context patch) alone does not help either. Further analysis shows that the problem exists since at least next-20190823. Another round of bisect on next-20190827 suggests another culprit (see second bisect below). Reverting all the offending patches doesn't help either, though, only result in a different error. usb 1-1: new full-speed USB device number 2 using sm501-usb sm501-usb sm501-usb: DMA map on device without dma_mask With that, I am giving up. Copying Christoph as he appears to be heavily involved in the patch series causing the problems. What was the last tree you tested that works perfectly? next-20190822 Guenter
Re: linux-next: Tree for Aug 30
On Sun, Sep 01, 2019 at 11:22:26AM -0700, Guenter Roeck wrote: > On Sat, Aug 31, 2019 at 12:36:13AM +1000, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20190829: > > > > The compiler-attributes tree gained a build failure for which I reverted > > a commit. > > > > The arm-soc tree gained a conflict against the arm tree. > > > > The csky tree gained a conflict against the dma-mapping tree. > > > > The fuse tree gained a conflict against the fsverity tree. > > > > The vfs tree gained conflicts against the fuse tree. > > > > The pci tree gained a build failure for which I revereted a commit. > > > > The net-next tree still had its build failure for which I applied a patch. > > It also gained a conflict against the net tree. > > > > The regulator tree still has its build failure for which I reverted > > a commit. > > > > The keys tree still has its build failure so I used the version from > > next-20190828. > > > > The driver-core tree lost its build failure. > > > > The staging tree got conflicts against the net-next and usb trees. > > > > The akpm-current tree gained a build failure due to an interaction with > > the hmm tree for which I applied a patch. > > > > Something in the fixup patch seems to be wrong. I get the following > error with sh4 boot tests when booting from usb. > > sm501-usb sm501-usb: OHCI Unrecoverable Error, disabled > sm501-usb sm501-usb: HC died; cleaning up > > Unfortunately, bisect doesn't help much (see below). Reverting the fixup > patch as well as the offending patch (plus a context patch) alone does > not help either. Further analysis shows that the problem exists since > at least next-20190823. Another round of bisect on next-20190827 suggests > another culprit (see second bisect below). Reverting all the offending > patches doesn't help either, though, only result in a different error. > > usb 1-1: new full-speed USB device number 2 using sm501-usb > sm501-usb sm501-usb: DMA map on device without dma_mask > > With that, I am giving up. Copying Christoph as he appears to be heavily > involved in the patch series causing the problems. What was the last tree you tested that works perfectly?
Re: linux-next: Tree for Aug 30
On Sat, Aug 31, 2019 at 12:36:13AM +1000, Stephen Rothwell wrote: > Hi all, > > Changes since 20190829: > > The compiler-attributes tree gained a build failure for which I reverted > a commit. > > The arm-soc tree gained a conflict against the arm tree. > > The csky tree gained a conflict against the dma-mapping tree. > > The fuse tree gained a conflict against the fsverity tree. > > The vfs tree gained conflicts against the fuse tree. > > The pci tree gained a build failure for which I revereted a commit. > > The net-next tree still had its build failure for which I applied a patch. > It also gained a conflict against the net tree. > > The regulator tree still has its build failure for which I reverted > a commit. > > The keys tree still has its build failure so I used the version from > next-20190828. > > The driver-core tree lost its build failure. > > The staging tree got conflicts against the net-next and usb trees. > > The akpm-current tree gained a build failure due to an interaction with > the hmm tree for which I applied a patch. > Something in the fixup patch seems to be wrong. I get the following error with sh4 boot tests when booting from usb. sm501-usb sm501-usb: OHCI Unrecoverable Error, disabled sm501-usb sm501-usb: HC died; cleaning up Unfortunately, bisect doesn't help much (see below). Reverting the fixup patch as well as the offending patch (plus a context patch) alone does not help either. Further analysis shows that the problem exists since at least next-20190823. Another round of bisect on next-20190827 suggests another culprit (see second bisect below). Reverting all the offending patches doesn't help either, though, only result in a different error. usb 1-1: new full-speed USB device number 2 using sm501-usb sm501-usb sm501-usb: DMA map on device without dma_mask With that, I am giving up. Copying Christoph as he appears to be heavily involved in the patch series causing the problems. Guenter --- bisect on next-20190330: # bad: [6d028043b55e54f48fbdf62ea8ce11a4ad830cac] Add linux-next specific files for 20190830 # good: [a55aa89aab90fae7c815b0551b07be37db359d76] Linux 5.3-rc6 git bisect start 'HEAD' 'v5.3-rc6' # good: [199d454c0775386a645dd9e80b486c346816762f] Merge remote-tracking branch 'crypto/master' git bisect good 199d454c0775386a645dd9e80b486c346816762f # good: [450fd5809930dfee10dbbf351cdb2148cd022b1c] Merge remote-tracking branch 'regulator/for-next' git bisect good 450fd5809930dfee10dbbf351cdb2148cd022b1c # good: [12b85c8517393b5466dff225a338fc7416150df0] Merge remote-tracking branch 'tty/tty-next' git bisect good 12b85c8517393b5466dff225a338fc7416150df0 # good: [ecda3e90e6357b15f3189ce00938ea5a20850b76] Merge remote-tracking branch 'scsi/for-next' git bisect good ecda3e90e6357b15f3189ce00938ea5a20850b76 # good: [4cb65f973115d07578f5b8f4492da7d8295effe2] Merge remote-tracking branch 'rtc/rtc-next' git bisect good 4cb65f973115d07578f5b8f4492da7d8295effe2 # good: [f3bf5fa4097e06b9cabb193599a012680380e52e] kernel/elfcore.c: include proper prototypes git bisect good f3bf5fa4097e06b9cabb193599a012680380e52e # good: [e58b341134ca751d9c12bacded12a8b4dd51368d] Merge remote-tracking branch 'hmm/hmm' git bisect good e58b341134ca751d9c12bacded12a8b4dd51368d # good: [405353faeb428dcf14f23707e039412f2defd042] cpumask: nicer for_each_cpumask_and() signature git bisect good 405353faeb428dcf14f23707e039412f2defd042 # skip: [14f4bec14a4bd5857ca9587221e30d5109157981] Merge branch 'akpm-current/current' git bisect skip 14f4bec14a4bd5857ca9587221e30d5109157981 # bad: [a6bbc27261e851e805f62775ac86fb7ef1fd29c5] mm: merge fix for "pagewalk: separate function pointers from iterator data" git bisect bad a6bbc27261e851e805f62775ac86fb7ef1fd29c5 # good: [ccfe491b3b2bf4a5a6d2b3faeee1197d36937b24] bug: clean up helper macros to remove __WARN_TAINT() git bisect good ccfe491b3b2bf4a5a6d2b3faeee1197d36937b24 # good: [97637fe0837ce1bb998be55588f20ae31e38b23e] ipc/msg.c: consolidate all xxxctl_down() functions git bisect good 97637fe0837ce1bb998be55588f20ae31e38b23e # good: [e58915179f3f4a839ea3b9aeae1c1e13e98e33b1] fpga: altera-cvp: Add Stratix10 (V2) Support git bisect good e58915179f3f4a839ea3b9aeae1c1e13e98e33b1 # good: [b75aecfbe531ca3e2af4a33e88bd27583e05852c] Merge remote-tracking branch 'fpga/for-next' git bisect good b75aecfbe531ca3e2af4a33e88bd27583e05852c # only skipped commits left to test # possible first bad commit: [a6bbc27261e851e805f62775ac86fb7ef1fd29c5] mm: merge fix for "pagewalk: separate function pointers from iterator data" # possible first bad commit: [14f4bec14a4bd5857ca9587221e30d5109157981] Merge branch 'akpm-current/current' --- bisect on next-20190827: # bad: [ed2393ca091048fa9711f4e8ab17ce52856e6412] Add linux-next specific files for 20190827 # good: [a55aa89aab90fae7c815b0551b07be37db359d76] Linux 5.3-rc6 git bisect start 'HEAD' 'v5.3-rc6' # good: [ddae8e3246a4d042a5b8e1f70fdfbd2d185175fc] Merge remote-tracking branch
Re: linux-next: Tree for Aug 30 (exfat)
On Fri, 30 Aug 2019 09:52:15 -0700, Randy Dunlap said: > on x86_64: > when CONFIG_VFAT_FS is not set/enabled: > > ../drivers/staging/exfat/exfat_super.c:46:41: error: > �CONFIG_FAT_DEFAULT_IOCHARSET� undeclared here (not in a function); did you > mean �CONFIG_EXFAT_DEFAULT_IOCHARSET�? Thanks. I'll fix this tonight pgpxe_9ABOc_H.pgp Description: PGP signature
Re: linux-next: Tree for Aug 30 (exfat)
On 8/30/19 7:36 AM, Stephen Rothwell wrote: > Hi all, > > Changes since 20190829: > on x86_64: when CONFIG_VFAT_FS is not set/enabled: ../drivers/staging/exfat/exfat_super.c:46:41: error: ‘CONFIG_FAT_DEFAULT_IOCHARSET’ undeclared here (not in a function); did you mean ‘CONFIG_EXFAT_DEFAULT_IOCHARSET’? static char exfat_default_iocharset[] = CONFIG_FAT_DEFAULT_IOCHARSET; ^~~~ CONFIG_EXFAT_DEFAULT_IOCHARSET -- ~Randy
linux-next: Tree for Aug 30
Hi all,
Changes since 20190829:
The compiler-attributes tree gained a build failure for which I reverted
a commit.
The arm-soc tree gained a conflict against the arm tree.
The csky tree gained a conflict against the dma-mapping tree.
The fuse tree gained a conflict against the fsverity tree.
The vfs tree gained conflicts against the fuse tree.
The pci tree gained a build failure for which I revereted a commit.
The net-next tree still had its build failure for which I applied a patch.
It also gained a conflict against the net tree.
The regulator tree still has its build failure for which I reverted
a commit.
The keys tree still has its build failure so I used the version from
next-20190828.
The driver-core tree lost its build failure.
The staging tree got conflicts against the net-next and usb trees.
The akpm-current tree gained a build failure due to an interaction with
the hmm tree for which I applied a patch.
Non-merge commits (relative to Linus' tree): 9466
9413 files changed, 555356 insertions(+), 261974 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 310 trees (counting Linus' and 77 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 (4a64489cf8e2 Merge tag 'Wimplicit-fallthrough-5.3-rc7'
of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux)
Merging fixes/master (609488bc979f Linux 5.3-rc2)
Merging kbuild-current/fixes (451577f3e3a9 Merge tag 'kbuild-fixes-v5.3-3' of
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging arc-current/for-curr (2f029413cbfb arc: prefer __section from
compiler_attributes.h)
Merging arm-current/fixes (5b3efa4f1479 ARM: 8901/1: add a criteria for
pfn_valid of arm)
Merging arm-soc-fixes/arm/fixes (7a6c9dbb36a4 soc: ixp4xx: Protect IXP4xx SoC
drivers by ARCH_IXP4XX || COMPILE_TEST)
Merging arm64-fixes/for-next/fixes (82e40f558de5 KVM: arm/arm64: vgic-v2:
Handle SGI bits in GICD_I{S,C}PENDR0 as WI)
Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select
ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire)
Merging powerpc-fixes/fixes (b9ee5e04fd77 powerpc/64e: Drop stale call to
smp_processor_id() which hangs SMP startup)
Merging s390-fixes/fixes (d45331b00ddb Linux 5.3-rc4)
Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (189308d5823a sky2: Disable MSI on yet another ASUS boards
(P6Xxxx))
Merging bpf/master (ede7c460b1da bpf: handle 32-bit zext during constant
blinding)
Merging ipsec/master (769a807d0b41 xfrm: policy: avoid warning splat when
merging nodes)
Merging netfilter/master (de20900fbe1c netfilter: nf_flow_table: clear skb
tstamp before xmit)
Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes')
Merging wireless-drivers/master (5a8c31aa6357 iwlwifi: pcie: fix recognition of
QuZ devices)
Merging mac80211/master (f8b43c5cf4b6 mac80211: Correctly set noencrypt for PAE
frames)
Merging rdma-fixes/for-rc (c536277e0db1 RDMA/siw: Fix 64/32bit pointer
inconsistency)
Merging sound-current/for-linus (333f31436d3d ALSA: hda - Fix potential endless
loop at applying quirks)
Merging sound-asoc-fixes/for-linus (f382a7452a99 Merge branch 'asoc-5.3' into
asoc-linus)
Merging
linux-next: Tree for Aug 30
Hi all, Changes since 20180829: New trees: soundwire and soundwire-fixes Dropped trees: xarray, ida (temporarily) The spi tree lost its build failure. Non-merge commits (relative to Linus' tree): 1087 1284 files changed, 44936 insertions(+), 12978 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 66 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 (3f16503b7d22 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal) 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 (ad1d69735878 Merge tag 'fuse-update-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse) Merging arc-current/for-curr (fce0d0affdc5 ARC: cleanup show_faulting_vma()) Merging arm-current/fixes (afc9f65e01cd ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+) Merging arm64-fixes/for-next/fixes (5ad356eabc47 arm64: mm: check for upper PAGE_SHIFT bits in pfn_valid()) Merging m68k-current/for-linus (71a896687b85 m68k/defconfig: Update defconfigs for v4.18-rc6) Merging powerpc-fixes/fixes (cca19f0b684f powerpc/64s/radix: Fix missing global invalidations when removing copro) Merging sparc/master (df2def49c57b Merge tag 'acpi-4.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (53ae914d898e net/rds: Use rdma_read_gids to get connection SGID/DGID in IPv6) Merging bpf/master (d65e6c80c6bb Merge branch 'bpf_msg_pull_data-fixes') Merging ipsec/master (25432eba9cd8 openvswitch: meter: Fix setting meter id for new entries) Merging netfilter/master (0434ccdcf883 netfilter: nf_tables: rework ct timeout set support) Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set) Merging wireless-drivers/master (53ae914d898e net/rds: Use rdma_read_gids to get connection SGID/DGID in IPv6) Merging mac80211/master (166ac9d55b0a mac80211: avoid kernel panic when building AMSDU from non-linear SKB) Merging rdma-fixes/for-rc (5b394b2ddf03 Linux 4.19-rc1) Merging sound-current/for-linus (8a328ac1f9eb ALSA: hda/realtek - Fix HP Headset Mic can't record) Merging sound-asoc-fixes/for-linus (c4305768a542 Merge branch 'asoc-4.19' into asoc-linus) Merging regmap-fixes/for-linus (5b394b2ddf03 Linux 4.19-rc1) Merging regulator-fixes/for-linus (823f18f8b860 regulator: bd71837: Disable voltage monitoring for LDO3/4) Merging spi-fixes/for-linus (9a92a569272a Merge branch 'spi-4.19' into spi-linus) Merging pci-current/for-linus (5b394b2ddf03 Linux 4.19-rc1) Merging driver-core.current/driver-core-linus (5b394b2ddf03 Linux 4.19-rc1) Merging tty.current/tty-linus (5b394b2ddf03 Linux 4.19-rc1) Merging usb.current/usb-linus (5b394b2ddf03 Linux 4.19-rc1) Merging usb-gadget-fixes/fixes (5b394b2ddf03 Linux 4.19-rc1) Merging usb-serial-fixes/usb-linus (5dfdd24eb3d3 USB: serial: ti_usb_3410_5052: fix array underflow in completion handler) 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
linux-next: Tree for Aug 30
Hi all, Changes since 20180829: New trees: soundwire and soundwire-fixes Dropped trees: xarray, ida (temporarily) The spi tree lost its build failure. Non-merge commits (relative to Linus' tree): 1087 1284 files changed, 44936 insertions(+), 12978 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 66 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 (3f16503b7d22 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal) 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 (ad1d69735878 Merge tag 'fuse-update-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse) Merging arc-current/for-curr (fce0d0affdc5 ARC: cleanup show_faulting_vma()) Merging arm-current/fixes (afc9f65e01cd ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+) Merging arm64-fixes/for-next/fixes (5ad356eabc47 arm64: mm: check for upper PAGE_SHIFT bits in pfn_valid()) Merging m68k-current/for-linus (71a896687b85 m68k/defconfig: Update defconfigs for v4.18-rc6) Merging powerpc-fixes/fixes (cca19f0b684f powerpc/64s/radix: Fix missing global invalidations when removing copro) Merging sparc/master (df2def49c57b Merge tag 'acpi-4.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (53ae914d898e net/rds: Use rdma_read_gids to get connection SGID/DGID in IPv6) Merging bpf/master (d65e6c80c6bb Merge branch 'bpf_msg_pull_data-fixes') Merging ipsec/master (25432eba9cd8 openvswitch: meter: Fix setting meter id for new entries) Merging netfilter/master (0434ccdcf883 netfilter: nf_tables: rework ct timeout set support) Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set) Merging wireless-drivers/master (53ae914d898e net/rds: Use rdma_read_gids to get connection SGID/DGID in IPv6) Merging mac80211/master (166ac9d55b0a mac80211: avoid kernel panic when building AMSDU from non-linear SKB) Merging rdma-fixes/for-rc (5b394b2ddf03 Linux 4.19-rc1) Merging sound-current/for-linus (8a328ac1f9eb ALSA: hda/realtek - Fix HP Headset Mic can't record) Merging sound-asoc-fixes/for-linus (c4305768a542 Merge branch 'asoc-4.19' into asoc-linus) Merging regmap-fixes/for-linus (5b394b2ddf03 Linux 4.19-rc1) Merging regulator-fixes/for-linus (823f18f8b860 regulator: bd71837: Disable voltage monitoring for LDO3/4) Merging spi-fixes/for-linus (9a92a569272a Merge branch 'spi-4.19' into spi-linus) Merging pci-current/for-linus (5b394b2ddf03 Linux 4.19-rc1) Merging driver-core.current/driver-core-linus (5b394b2ddf03 Linux 4.19-rc1) Merging tty.current/tty-linus (5b394b2ddf03 Linux 4.19-rc1) Merging usb.current/usb-linus (5b394b2ddf03 Linux 4.19-rc1) Merging usb-gadget-fixes/fixes (5b394b2ddf03 Linux 4.19-rc1) Merging usb-serial-fixes/usb-linus (5dfdd24eb3d3 USB: serial: ti_usb_3410_5052: fix array underflow in completion handler) 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
Re: linux-next: Tree for Aug 30 (nouveau)
On 08/30/13 12:59, Randy Dunlap wrote: > On 08/29/13 03:00, Stephen Rothwell wrote: >> Hi all, >> > > > on x86_64: > > ERROR: "nouveau_switcheroo_optimus_dsm" [drivers/gpu/drm/nouveau/nouveau.ko] > undefined! > > > Full randconfig file is attached. > > This build error still happens in linux-next of 20130906. -- ~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 30 (nouveau)
On 08/30/13 12:59, Randy Dunlap wrote: On 08/29/13 03:00, Stephen Rothwell wrote: Hi all, on x86_64: ERROR: nouveau_switcheroo_optimus_dsm [drivers/gpu/drm/nouveau/nouveau.ko] undefined! Full randconfig file is attached. This build error still happens in linux-next of 20130906. -- ~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 30 (brcmfmac)
On 08/31/13 20:40, Hauke Mehrtens wrote: On 08/31/2013 08:21 PM, Arend van Spriel wrote: On 08/31/13 19:37, Geert Uytterhoeven wrote: On Fri, Aug 30, 2013 at 11:12 PM, Randy Dunlap wrote: This bool kconfig symbol: config BRCMFMAC_SDIO bool "SDIO bus interface support for FullMAC driver" depends on MMC allows BRCMFMAC_SDIO to be y even when MMC=m. Is there a reasonable solution to this? Actually, BRCMFMAC should be built in same form as the MMC and/or USB, but only when BRCMFMAC_SDIO or BRCMFMAC_USB are selected. So valid combinations are: MMC=m, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y => BRCMFMAC=m MMC=m, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y => BRCMFMAC=m MMC=y, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y => BRCMFMAC=m MMC=m, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n => BRCMFMAC=m MMC=m, USB=y, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y => BRCMFMAC=m|y MMC=y, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n => BRCMFMAC=m|y MMC=y, USB=m, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y => BRCMFMAC=m MMC=y, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y => BRCMFMAC=m|y MMC=y, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n => BRCMFMAC=m|y MMC=y, USB=y, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y => BRCMFMAC=m|y Not sure how to express the above. This should be expressed with this Kconfig: config BRCMFMAC_USB bool "USB bus interface support for FullMAC driver" depends on (USB = y || USB = BRCMFMAC) depends on BRCMFMAC config BRCMFMAC_SDIO bool "SDIO bus interface support for FullMAC driver" depends on (MMC = y || MMC = BRCMFMAC) depends on BRCMFMAC select FW_LOADER I haven't tested it, but we had a similar problem in b43 and fixed it like this. Thanks, Hauke I will create a patch fixing this. Regards, Arend -- 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 30 (brcmfmac)
On 08/31/13 20:40, Hauke Mehrtens wrote: On 08/31/2013 08:21 PM, Arend van Spriel wrote: On 08/31/13 19:37, Geert Uytterhoeven wrote: On Fri, Aug 30, 2013 at 11:12 PM, Randy Dunlaprdun...@infradead.org wrote: This bool kconfig symbol: config BRCMFMAC_SDIO bool SDIO bus interface support for FullMAC driver depends on MMC allows BRCMFMAC_SDIO to be y even when MMC=m. Is there a reasonable solution to this? Actually, BRCMFMAC should be built in same form as the MMC and/or USB, but only when BRCMFMAC_SDIO or BRCMFMAC_USB are selected. So valid combinations are: MMC=m, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y = BRCMFMAC=m MMC=m, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y = BRCMFMAC=m MMC=y, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y = BRCMFMAC=m MMC=m, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n = BRCMFMAC=m MMC=m, USB=y, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y = BRCMFMAC=m|y MMC=y, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n = BRCMFMAC=m|y MMC=y, USB=m, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y = BRCMFMAC=m MMC=y, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y = BRCMFMAC=m|y MMC=y, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n = BRCMFMAC=m|y MMC=y, USB=y, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y = BRCMFMAC=m|y Not sure how to express the above. This should be expressed with this Kconfig: config BRCMFMAC_USB bool USB bus interface support for FullMAC driver depends on (USB = y || USB = BRCMFMAC) depends on BRCMFMAC config BRCMFMAC_SDIO bool SDIO bus interface support for FullMAC driver depends on (MMC = y || MMC = BRCMFMAC) depends on BRCMFMAC select FW_LOADER I haven't tested it, but we had a similar problem in b43 and fixed it like this. Thanks, Hauke I will create a patch fixing this. Regards, Arend -- 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 30 (brcmfmac)
On 08/31/2013 08:21 PM, Arend van Spriel wrote: > On 08/31/13 19:37, Geert Uytterhoeven wrote: >> On Fri, Aug 30, 2013 at 11:12 PM, Randy Dunlap >> wrote: >>> This bool kconfig symbol: >>> >>> config BRCMFMAC_SDIO >>> bool "SDIO bus interface support for FullMAC driver" >>> depends on MMC >>> >>> allows BRCMFMAC_SDIO to be y even when MMC=m. >>> >>> Is there a reasonable solution to this? > > Actually, BRCMFMAC should be built in same form as the MMC and/or USB, > but only when BRCMFMAC_SDIO or BRCMFMAC_USB are selected. > > So valid combinations are: > MMC=m, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y => BRCMFMAC=m > MMC=m, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y => BRCMFMAC=m > MMC=y, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y => BRCMFMAC=m > MMC=m, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n => BRCMFMAC=m > MMC=m, USB=y, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y => BRCMFMAC=m|y > MMC=y, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n => BRCMFMAC=m|y > MMC=y, USB=m, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y => BRCMFMAC=m > MMC=y, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y => BRCMFMAC=m|y > MMC=y, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n => BRCMFMAC=m|y > MMC=y, USB=y, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y => BRCMFMAC=m|y > > Not sure how to express the above. This should be expressed with this Kconfig: config BRCMFMAC_USB bool "USB bus interface support for FullMAC driver" depends on (USB = y || USB = BRCMFMAC) depends on BRCMFMAC config BRCMFMAC_SDIO bool "SDIO bus interface support for FullMAC driver" depends on (MMC = y || MMC = BRCMFMAC) depends on BRCMFMAC select FW_LOADER I haven't tested it, but we had a similar problem in b43 and fixed it like this. Hauke -- 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 30 (brcmfmac)
On 08/31/13 19:37, Geert Uytterhoeven wrote:
On Fri, Aug 30, 2013 at 11:12 PM, Randy Dunlap wrote:
This bool kconfig symbol:
config BRCMFMAC_SDIO
bool "SDIO bus interface support for FullMAC driver"
depends on MMC
allows BRCMFMAC_SDIO to be y even when MMC=m.
Is there a reasonable solution to this?
Actually, BRCMFMAC should be built in same form as the MMC and/or USB,
but only when BRCMFMAC_SDIO or BRCMFMAC_USB are selected.
So valid combinations are:
MMC=m, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y => BRCMFMAC=m
MMC=m, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y => BRCMFMAC=m
MMC=y, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y => BRCMFMAC=m
MMC=m, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n => BRCMFMAC=m
MMC=m, USB=y, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y => BRCMFMAC=m|y
MMC=y, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n => BRCMFMAC=m|y
MMC=y, USB=m, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y => BRCMFMAC=m
MMC=y, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y => BRCMFMAC=m|y
MMC=y, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n => BRCMFMAC=m|y
MMC=y, USB=y, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y => BRCMFMAC=m|y
Not sure how to express the above.
Gr. AvS
In order of preference:
1. Make it tristate
2. depends on MMC=y
However, the first solution cannot be used as there are several
"#ifdef CONFIG_BRCMFMAC_SDIO" in the code itself.
Note that there's a similar issue with BRCMFMAC_USB and USB.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
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 30 (brcmfmac)
On Fri, Aug 30, 2013 at 11:12 PM, Randy Dunlap wrote:
> This bool kconfig symbol:
>
> config BRCMFMAC_SDIO
> bool "SDIO bus interface support for FullMAC driver"
> depends on MMC
>
> allows BRCMFMAC_SDIO to be y even when MMC=m.
>
> Is there a reasonable solution to this?
In order of preference:
1. Make it tristate
2. depends on MMC=y
However, the first solution cannot be used as there are several
"#ifdef CONFIG_BRCMFMAC_SDIO" in the code itself.
Note that there's a similar issue with BRCMFMAC_USB and USB.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
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 30 (brcmfmac)
On Fri, Aug 30, 2013 at 11:12 PM, Randy Dunlap rdun...@infradead.org wrote:
This bool kconfig symbol:
config BRCMFMAC_SDIO
bool SDIO bus interface support for FullMAC driver
depends on MMC
allows BRCMFMAC_SDIO to be y even when MMC=m.
Is there a reasonable solution to this?
In order of preference:
1. Make it tristate
2. depends on MMC=y
However, the first solution cannot be used as there are several
#ifdef CONFIG_BRCMFMAC_SDIO in the code itself.
Note that there's a similar issue with BRCMFMAC_USB and USB.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
-- Linus Torvalds
--
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 30 (brcmfmac)
On 08/31/13 19:37, Geert Uytterhoeven wrote:
On Fri, Aug 30, 2013 at 11:12 PM, Randy Dunlaprdun...@infradead.org wrote:
This bool kconfig symbol:
config BRCMFMAC_SDIO
bool SDIO bus interface support for FullMAC driver
depends on MMC
allows BRCMFMAC_SDIO to be y even when MMC=m.
Is there a reasonable solution to this?
Actually, BRCMFMAC should be built in same form as the MMC and/or USB,
but only when BRCMFMAC_SDIO or BRCMFMAC_USB are selected.
So valid combinations are:
MMC=m, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y = BRCMFMAC=m
MMC=m, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y = BRCMFMAC=m
MMC=y, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y = BRCMFMAC=m
MMC=m, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n = BRCMFMAC=m
MMC=m, USB=y, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y = BRCMFMAC=m|y
MMC=y, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n = BRCMFMAC=m|y
MMC=y, USB=m, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y = BRCMFMAC=m
MMC=y, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y = BRCMFMAC=m|y
MMC=y, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n = BRCMFMAC=m|y
MMC=y, USB=y, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y = BRCMFMAC=m|y
Not sure how to express the above.
Gr. AvS
In order of preference:
1. Make it tristate
2. depends on MMC=y
However, the first solution cannot be used as there are several
#ifdef CONFIG_BRCMFMAC_SDIO in the code itself.
Note that there's a similar issue with BRCMFMAC_USB and USB.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
-- Linus Torvalds
--
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 30 (brcmfmac)
On 08/31/2013 08:21 PM, Arend van Spriel wrote: On 08/31/13 19:37, Geert Uytterhoeven wrote: On Fri, Aug 30, 2013 at 11:12 PM, Randy Dunlaprdun...@infradead.org wrote: This bool kconfig symbol: config BRCMFMAC_SDIO bool SDIO bus interface support for FullMAC driver depends on MMC allows BRCMFMAC_SDIO to be y even when MMC=m. Is there a reasonable solution to this? Actually, BRCMFMAC should be built in same form as the MMC and/or USB, but only when BRCMFMAC_SDIO or BRCMFMAC_USB are selected. So valid combinations are: MMC=m, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y = BRCMFMAC=m MMC=m, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y = BRCMFMAC=m MMC=y, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y = BRCMFMAC=m MMC=m, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n = BRCMFMAC=m MMC=m, USB=y, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y = BRCMFMAC=m|y MMC=y, USB=m, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n = BRCMFMAC=m|y MMC=y, USB=m, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y = BRCMFMAC=m MMC=y, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=y = BRCMFMAC=m|y MMC=y, USB=y, BRCMFMAC_SDIO=y, BRCMFMAC_USB=n = BRCMFMAC=m|y MMC=y, USB=y, BRCMFMAC_SDIO=n, BRCMFMAC_USB=y = BRCMFMAC=m|y Not sure how to express the above. This should be expressed with this Kconfig: config BRCMFMAC_USB bool USB bus interface support for FullMAC driver depends on (USB = y || USB = BRCMFMAC) depends on BRCMFMAC config BRCMFMAC_SDIO bool SDIO bus interface support for FullMAC driver depends on (MMC = y || MMC = BRCMFMAC) depends on BRCMFMAC select FW_LOADER I haven't tested it, but we had a similar problem in b43 and fixed it like this. Hauke -- 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 30
Hi all, Sorry for the late announcement - I wrote a draft and then forgot to send it. Changes since 20130829: The sound tree gained a conflict against the drm tree. The driver-core tree gained a conflict against the pm tree. The dma-mapping tree gained a conflict against the kvm-ppc tree. The aio tree gained a build failure for which I applied a merge fix patch. The akpm-current tree gained a build failure for which I reverted a commit. The akpm tree gained a conflict against Linus' tree. I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 221 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 (c95389b Merge branch 'akpm' (patches from Andrew Morton)) Merging fixes/master (fa8218d Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap) Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1) Merging arc-current/for-curr (c095ba7 Linux 3.11-rc4) Merging arm-current/fixes (e1f0203 Merge branch 'security-fixes' into fixes) Merging m68k-current/for-linus (ea077b1 m68k: Truncate base in do_div()) Merging metag-fixes/fixes (3b2f64d Linux 3.11-rc2) Merging powerpc-merge/merge (d220980 powerpc/hvsi: Increase handshake timeout from 200ms to 400ms.) Merging sparc/master (63d4996 sparc64: Fix off by one in trampoline TLB mapping installation loop.) Merging net/master (79f9ab7 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec) Merging ipsec/master (302a50b xfrm: Fix potential null pointer dereference in xdst_queue_output) Merging sound-current/for-linus (fb61549 ALSA: opti9xx: Fix conflicting driver object name) Merging pci-current/for-linus (36dd1f3 PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge) Merging wireless/master (19c3616 ath9k: Enable PLL fix only for AR9340/AR9330) 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 (d347404 USB: OHCI: fix build error related to ohci_suspend/resume) Merging staging.current/staging-linus (d8dfad3 Linux 3.11-rc7) Merging char-misc.current/char-misc-linus (b36f4be Linux 3.11-rc6) Merging input-current/for-linus (fa46c79 Input: i8042 - disable the driver on ARC platforms) 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 (6c2580c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32) Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work
Re: linux-next: Tree for Aug 30 (brcmfmac)
On 08/29/13 03:00, Stephen Rothwell wrote: > Hi all, > on x86_64: when CONFIG_MMC=m CONFIG_BRCMUTIL=y CONFIG_BRCMFMAC=y CONFIG_BRCMFMAC_SDIO=y This bool kconfig symbol: config BRCMFMAC_SDIO bool "SDIO bus interface support for FullMAC driver" depends on MMC allows BRCMFMAC_SDIO to be y even when MMC=m. Is there a reasonable solution to this? This causes many build errors: drivers/built-in.o: In function `brcmf_sdio_assert_info': dhd_sdio.c:(.text+0x39609b): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x3960d9): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdio_readframes': dhd_sdio.c:(.text+0x396a62): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x396a9b): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x396ae6): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x396b1b): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x396bd9): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x396c03): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x396f76): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x396fcc): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x397115): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x3972d0): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x397632): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x397699): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x39770b): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x397731): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x397796): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x3977b6): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x3977ff): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x3978b6): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x397940): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x397963): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x3979c1): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x397a90): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x397ab7): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_txpkt.constprop.16': dhd_sdio.c:(.text+0x3981d7): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x398213): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x3985d6): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_release': dhd_sdio.c:(.text+0x398a5e): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x398a85): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_probe': (.text+0x398d04): undefined reference to `sdio_claim_host' drivers/built-in.o: In function `brcmf_sdbrcm_probe': (.text+0x398d3c): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_probe': (.text+0x398e91): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_probe': (.text+0x399087): undefined reference to `sdio_claim_host' drivers/built-in.o: In function `brcmf_sdbrcm_probe': (.text+0x3990d0): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdio_readshared': dhd_sdio.c:(.text+0x39953c): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x39956e): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_bus_txctl': dhd_sdio.c:(.text+0x399c14): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x399c2d): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x399cac): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x399cf0): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x399ec8): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x399efe): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x399ff4): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_bus_stop': dhd_sdio.c:(.text+0x39a0cb): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x39a179): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdio_dataworker': dhd_sdio.c:(.text+0x39a281): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x39a2f1): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x39a852): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x39a86d): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x39aa08): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x39aa4a): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x39aaa1): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x39aac1): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_bus_init':
Re: linux-next: Tree for Aug 30 (brcmfmac)
On 08/29/13 03:00, Stephen Rothwell wrote: Hi all, on x86_64: when CONFIG_MMC=m CONFIG_BRCMUTIL=y CONFIG_BRCMFMAC=y CONFIG_BRCMFMAC_SDIO=y This bool kconfig symbol: config BRCMFMAC_SDIO bool SDIO bus interface support for FullMAC driver depends on MMC allows BRCMFMAC_SDIO to be y even when MMC=m. Is there a reasonable solution to this? This causes many build errors: drivers/built-in.o: In function `brcmf_sdio_assert_info': dhd_sdio.c:(.text+0x39609b): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x3960d9): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdio_readframes': dhd_sdio.c:(.text+0x396a62): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x396a9b): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x396ae6): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x396b1b): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x396bd9): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x396c03): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x396f76): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x396fcc): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x397115): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x3972d0): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x397632): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x397699): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x39770b): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x397731): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x397796): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x3977b6): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x3977ff): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x3978b6): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x397940): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x397963): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x3979c1): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x397a90): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x397ab7): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_txpkt.constprop.16': dhd_sdio.c:(.text+0x3981d7): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x398213): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x3985d6): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_release': dhd_sdio.c:(.text+0x398a5e): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x398a85): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_probe': (.text+0x398d04): undefined reference to `sdio_claim_host' drivers/built-in.o: In function `brcmf_sdbrcm_probe': (.text+0x398d3c): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_probe': (.text+0x398e91): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_probe': (.text+0x399087): undefined reference to `sdio_claim_host' drivers/built-in.o: In function `brcmf_sdbrcm_probe': (.text+0x3990d0): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdio_readshared': dhd_sdio.c:(.text+0x39953c): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x39956e): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_bus_txctl': dhd_sdio.c:(.text+0x399c14): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x399c2d): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x399cac): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x399cf0): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x399ec8): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x399efe): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x399ff4): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_bus_stop': dhd_sdio.c:(.text+0x39a0cb): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x39a179): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdio_dataworker': dhd_sdio.c:(.text+0x39a281): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x39a2f1): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x39a852): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x39a86d): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x39aa08): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x39aa4a): undefined reference to `sdio_release_host' dhd_sdio.c:(.text+0x39aaa1): undefined reference to `sdio_claim_host' dhd_sdio.c:(.text+0x39aac1): undefined reference to `sdio_release_host' drivers/built-in.o: In function `brcmf_sdbrcm_bus_init':
linux-next: Tree for Aug 30
Hi all, Sorry for the late announcement - I wrote a draft and then forgot to send it. Changes since 20130829: The sound tree gained a conflict against the drm tree. The driver-core tree gained a conflict against the pm tree. The dma-mapping tree gained a conflict against the kvm-ppc tree. The aio tree gained a build failure for which I applied a merge fix patch. The akpm-current tree gained a build failure for which I reverted a commit. The akpm tree gained a conflict against Linus' tree. I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use git pull to do so as that will try to merge the new linux-next release with the old one. You should use git fetch as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 221 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 (c95389b Merge branch 'akpm' (patches from Andrew Morton)) Merging fixes/master (fa8218d Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap) Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1) Merging arc-current/for-curr (c095ba7 Linux 3.11-rc4) Merging arm-current/fixes (e1f0203 Merge branch 'security-fixes' into fixes) Merging m68k-current/for-linus (ea077b1 m68k: Truncate base in do_div()) Merging metag-fixes/fixes (3b2f64d Linux 3.11-rc2) Merging powerpc-merge/merge (d220980 powerpc/hvsi: Increase handshake timeout from 200ms to 400ms.) Merging sparc/master (63d4996 sparc64: Fix off by one in trampoline TLB mapping installation loop.) Merging net/master (79f9ab7 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec) Merging ipsec/master (302a50b xfrm: Fix potential null pointer dereference in xdst_queue_output) Merging sound-current/for-linus (fb61549 ALSA: opti9xx: Fix conflicting driver object name) Merging pci-current/for-linus (36dd1f3 PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge) Merging wireless/master (19c3616 ath9k: Enable PLL fix only for AR9340/AR9330) 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 (d347404 USB: OHCI: fix build error related to ohci_suspend/resume) Merging staging.current/staging-linus (d8dfad3 Linux 3.11-rc7) Merging char-misc.current/char-misc-linus (b36f4be Linux 3.11-rc6) Merging input-current/for-linus (fa46c79 Input: i8042 - disable the driver on ARC platforms) 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 (6c2580c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32) Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work
