* mmotm 2016-01-22-16-43 uploaded
From: akpm @ 2016-01-23 0:44 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-01-22-16-43 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.4:
(patches marked "*" will be included in linux-next)
origin.patch
* dax-fix-null-pointer-dereference-in-__dax_dbg.patch
* dax-fix-conversion-of-holes-to-pmds.patch
* pmem-add-wb_cache_pmem-to-the-pmem-api.patch
* dax-support-dirty-dax-entries-in-radix-tree.patch
* mm-add-find_get_entries_tag.patch
* dax-add-support-for-fsync-sync.patch
* ext2-call-dax_pfn_mkwrite-for-dax-fsync-msync.patch
* ext4-call-dax_pfn_mkwrite-for-dax-fsync-msync.patch
* xfs-call-dax_pfn_mkwrite-for-dax-fsync-msync.patch
* dax-never-rely-on-bhb_dev-being-set-by-get_block.patch
* tree-wide-use-kvfree-than-conditional-kfree-vfree.patch
* maintainers-return-arch-sh-to-maintained-state-with-new-maintainers.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
arm-mm-do-not-use-virt_to_idmap-for-nommu-systems.patch
* thp-make-split_queue-per-node.patch
* thp-change-deferred_split_count-to-return-number-of-thp-in-queue.patch
* thp-change-deferred_split_count-to-return-number-of-thp-in-queue-fix.patch
* thp-limit-number-of-object-to-scan-on-deferred_split_scan.patch
* lib-test-string_helpersc-fix-and-improve-string_get_size-tests.patch
* phys_to_pfn_t-use-phys_addr_t.patch
* ocfs2-cluster-fix-memory-leak-in-o2hb_region_release.patch
* vmstat-remove-bug_on-from-vmstat_update.patch
* proc-revert-proc-pid-maps-annotation.patch
* proc-fix-missing-reference-of-mm.patch
* kallsyms-add-support-for-relative-offsets-in-kallsyms-address-table.patch
* kallsyms-add-support-for-relative-offsets-in-kallsyms-address-table-fix.patch
* fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch
* ocfs2-add-ocfs2_write_type_t-type-to-identify-the-caller-of-write.patch
* ocfs2-use-c_new-to-indicate-newly-allocated-extents.patch
* ocfs2-test-target-page-before-change-it.patch
* ocfs2-do-not-change-i_size-in-write_end-for-direct-io.patch
* ocfs2-return-the-physical-address-in-ocfs2_write_cluster.patch
* ocfs2-record-unwritten-extents-when-populate-write-desc.patch
* ocfs2-fix-sparse-file-data-ordering-issue-in-direct-io.patch
* ocfs2-code-clean-up-for-direct-io.patch
* ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue.patch
* ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
* ocfs2-take-ip_alloc_sem-in-ocfs2_dio_get_block-ocfs2_dio_end_io_write.patch
* ocfs2-fix-disk-file-size-and-memory-file-size-mismatch.patch
* ocfs2-fix-a-deadlock-issue-in-ocfs2_dio_end_io_write.patch
* ocfs2-dlm-fix-race-between-convert-and-recovery.patch
* ocfs2-dlm-fix-race-between-convert-and-recovery-v2.patch
* ocfs2-dlm-fix-race-between-convert-and-recovery-v3.patch
* ocfs2-dlm-fix-bug-in-dlm_move_lockres_to_recovery_list.patch
* ocfs2-extend-transaction-for-ocfs2_remove_rightmost_path-and-ocfs2_update_edge_lengths-before-to-avoid-inconsistency-between-inode-and-et.patch
* extend-enough-credits-for-freeing-one-truncate-record-while-replaying-truncate-records.patch
* ocfs2-avoid-occurring-deadlock-by-changing-ocfs2_wq-from-global-to-local.patch
* ocfs2-solve-a-problem-of-crossing-the-boundary-in-updating-backups.patch
* ocfs2-export-ocfs2_kset-for-online-file-check.patch
* ocfs2-sysfile-interfaces-for-online-file-check.patch
* ocfs2-create-remove-sysfile-for-online-file-check.patch
* ocfs2-check-fix-inode-block-for-online-file-check.patch
* ocfs2-add-feature-document-for-online-file-check.patch
* ocfs2-o2hb-add-negotiate-timer.patch
* ocfs2-o2hb-add-nego_timeout-message.patch
* ocfs2-o2hb-add-negotiate_approve-message.patch
* ocfs2-o2hb-add-some-user-debug-log.patch
* ocfs2-o2hb-dont-negotiate-if-last-hb-fail.patch
* ocfs2-o2hb-fix-hb-hung-time.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
mm.patch
* fs-mpagec-mpage_readpages-use-lru_to_page-helper.patch
* mm-page_allocc-calculate-zone_start_pfn-at-zone_spanned_pages_in_node.patch
* mm-page_allocc-introduce-kernelcore=mirror-option.patch
* mm-page_allocc-introduce-kernelcore=mirror-option-fix.patch
* mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-3.patch
* mm-make-optimistic-check-for-swapin-readahead.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-3.patch
* mm-oom-rework-oom-detection.patch
* mm-oom-rework-oom-detection-checkpatch-fixes.patch
* mm-throttle-on-io-only-when-there-are-too-many-dirty-and-writeback-pages.patch
* mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations.patch
* mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
* sched-add-schedule_timeout_idle.patch
* mm-oom-introduce-oom-reaper.patch
* mm-oom-introduce-oom-reaper-v4.patch
* oom-reaper-handle-anonymous-mlocked-pages.patch
* oom-clear-tif_memdie-after-oom_reaper-managed-to-unmap-the-address-space.patch
* mm-oom_killc-dont-skip-pf_exiting-tasks-when-searching-for-a-victim.patch
* mm-memblock-if-nr_new-is-0-just-return.patch
* kernel-hung_taskc-use-timeout-diff-when-timeout-is-updated.patch
* printk-nmi-generic-solution-for-safe-printk-in-nmi.patch
* printk-nmi-use-irq-work-only-when-ready.patch
* printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context.patch
* printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable.patch
* mm-utilc-add-kstrimdup.patch
* lib-add-crc64-ecma-module.patch
* kexec-introduce-a-protection-mechanism-for-the-crashkernel-reserved-memory.patch
* kexec-provide-arch_kexec_protectunprotect_crashkres.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-msgc-msgsnd-use-freezable-blocking-call.patch
* msgrcv-use-freezable-blocking-call.patch
linux-next.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* include-linux-huge_mmh-pmd_trans_huge_lock-returns-a-spinlock_t.patch
* lib-string_helpers-export-string_units_210-for-others.patch
* lib-string_helpers-fix-indentation-in-few-places.patch
* x86-efi-print-size-and-base-in-binary-units-in-efi_print_memmap.patch
* x86-efi-use-proper-units-in-efi_find_mirror.patch
mm-add-strictlimit-knob-v2.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* linux-next: manual merge of the mips tree with Linus' tree
From: Stephen Rothwell @ 2016-01-24 22:25 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-next, linux-kernel, Dan Williams, James Hogan
Hi Ralf,
Today's linux-next merge of the mips tree got conflicts in:
arch/mips/kvm/tlb.c
between commit:
ba049e93aef7 ("kvm: rename pfn_t to kvm_pfn_t")
from Linus' tree and commit:
cb1b447f0c36 ("MIPS: KVM: Convert EXPORT_SYMBOL to _GPL")
from the mips tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/mips/kvm/tlb.c
index 570479c03bdc,0939b1d6f910..000000000000
--- a/arch/mips/kvm/tlb.c
+++ b/arch/mips/kvm/tlb.c
@@@ -35,17 -35,17 +35,17 @@@
#define PRIx64 "llx"
atomic_t kvm_mips_instance;
- EXPORT_SYMBOL(kvm_mips_instance);
+ EXPORT_SYMBOL_GPL(kvm_mips_instance);
/* These function pointers are initialized once the KVM module is loaded */
-pfn_t (*kvm_mips_gfn_to_pfn)(struct kvm *kvm, gfn_t gfn);
+kvm_pfn_t (*kvm_mips_gfn_to_pfn)(struct kvm *kvm, gfn_t gfn);
- EXPORT_SYMBOL(kvm_mips_gfn_to_pfn);
+ EXPORT_SYMBOL_GPL(kvm_mips_gfn_to_pfn);
-void (*kvm_mips_release_pfn_clean)(pfn_t pfn);
+void (*kvm_mips_release_pfn_clean)(kvm_pfn_t pfn);
- EXPORT_SYMBOL(kvm_mips_release_pfn_clean);
+ EXPORT_SYMBOL_GPL(kvm_mips_release_pfn_clean);
-bool (*kvm_mips_is_error_pfn)(pfn_t pfn);
+bool (*kvm_mips_is_error_pfn)(kvm_pfn_t pfn);
- EXPORT_SYMBOL(kvm_mips_is_error_pfn);
+ EXPORT_SYMBOL_GPL(kvm_mips_is_error_pfn);
uint32_t kvm_mips_get_kernel_asid(struct kvm_vcpu *vcpu)
{
^ permalink raw reply
* linux-next: Tree for Jan 25
From: Stephen Rothwell @ 2016-01-25 1:32 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Please do not add any material for v4.6 to your linux-next included
branches until after v4.5-rc1 is released.
Changes since 20160122:
The mips tree gained a conflict against Linus' tree.
The aio tree still had a build failure so I used the version from
next-20160111.
Non-merge commits (relative to Linus' tree): 638
657 files changed, 28039 insertions(+), 4132 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf. After the
final fixups (if any), I do an x86_64 modules_install followed by builds
for powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc and
sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 238 trees (counting Linus' and 36 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (587198ba5206 vmstat: Remove BUG_ON from vmstat_update)
Merging fixes/master (bbca0fcb7b5b next: suppress the building of all the sound codecs on PPC for now)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm-current/fixes (34bfbae33ae8 ARM: 8475/1: SWP emulation: Restore original *data when failed)
Merging m68k-current/for-linus (eb37bc3f85b6 m68k: Provide __phys_to_pfn() and __pfn_to_phys())
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (0e2bce741154 powerpc: Remove newly added extra definition of pmd_dirty)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (1a40b95374f6 sparc: Fix system call tracing register handling.)
Merging net/master (4877be9019ba net: sock: remove dead cgroup methods from struct proto)
Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
Merging ipvs/master (8e662164abb4 netfilter: nfnetlink_queue: avoid harmless unnitialized variable warnings)
Merging wireless-drivers/master (e0045bf80f62 brcmfmac: fix sdio sg table alloc crash)
Merging mac80211/master (da629cf111a2 mac80211: Don't buffer non-bufferable MMPDUs)
Merging sound-current/for-linus (40ed9444cd24 ALSA: timer: Introduce disconnect op to snd_timer_instance)
Merging pci-current/for-linus (5c3b99d05752 PCI: dra7xx: Mark driver as broken)
Merging driver-core.current/driver-core-linus (587198ba5206 vmstat: Remove BUG_ON from vmstat_update)
Merging tty.current/tty-linus (ece6267878ae Merge tag 'clk-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux)
Merging usb.current/usb-linus (587198ba5206 vmstat: Remove BUG_ON from vmstat_update)
Merging usb-gadget-fixes/fixes (7d32cdef5356 usb: musb: fail with error when no DMA controller set)
Merging usb-serial-fixes/usb-linus (f7d7f59ab124 USB: cp210x: add ID for ELV Marble Sound Board 1)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference)
Merging staging.current/staging-linus (f744c423cacf Merge tag 'iio-fixes-for-4.4c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (587198ba5206 vmstat: Remove BUG_ON from vmstat_update)
Merging input-current/for-linus (b26a95d43519 Merge branch 'next' into for-linus)
Merging crypto-current/master (202736d99b7f crypto: algif_skcipher - sendmsg SG marking is off by one)
Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr())
Merging vfio-fixes/for-linus (ae5515d66362 Revert: "vfio: Include No-IOMMU mode")
Merging kselftest-fixes/fixes (2ce47b44b25d selftests/seccomp: Get page size from sysconf)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (afd2ff9b7e1b Linux 4.4)
Merging asm-generic/master (040b323b5012 ARM: asm/div64.h: adjust to generic codde)
Merging arc/for-next (cbfe74a753e8 ARCv2: STAR 9000950267: Handle return from intr to Delay Slot #2)
Merging arm/for-next (4ba1a28869c7 Merge branch 'amba-pl011' into for-next)
CONFLICT (content): Merge conflict in drivers/tty/serial/amba-pl011.c
Merging arm-perf/for-next/perf (8fcf04067cb5 Revert "arm64: kernel: enforce pmuserenr_el0 initialization and restore")
Merging arm-soc/for-next (ce504c3d4750 ARM: SoC: document merges)
Merging at91/at91-next (78aea3b45f31 ARM: dts: at91: sama5d4_xplained: properly mux phy interrupt)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (53b6084357a4 ARM: bcm2835: Add the auxiliary clocks to the device tree.)
Merging bcm2835-soc/bcm2835-soc-next (5234c34e4cd7 ARM: bcm2835: Add Kconfig support for bcm2836)
Merging bcm2835-drivers/bcm2835-drivers-next (a09cd356586d ARM: bcm2835: add rpi power domain driver)
Merging bcm2835-defconfig/bcm2835-defconfig-next (b63074fccbeb ARM: bcm2835: enable auxiliary spi driver in defconfig)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (c6abe665c94f Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next)
Merging mvebu/for-next (64c3c928aef2 Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (95c5bf2f0552 Merge branch 'omap-for-v4.4/fixes' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging qcom/for-next (e654927c5ff7 ARM: qcom: Drop ARCH_MSM* configs)
Merging renesas/next (ce0061dcb735 Merge branch 'heads/fixes-for-v4.5' into next)
Merging rockchip/for-next (755651cf0f31 Merge tag 'v4.4-rc5' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1)
Merging samsung-krzk/for-next (94c286811b3b Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (97dd53d76893 Merge branches 'sunxi/clocks-for-4.5' and 'sunxi/dt-for-4.5' into sunxi/for-next)
Merging tegra/for-next (92b100361a4e Merge branch for-4.5/defconfig into for-next)
Merging arm64/for-next/core (2a803c4db615 arm64: head.S: use memset to clear BSS)
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (2f1b0077a960 h8300: System call entry enable interrupt.)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (eb37bc3f85b6 m68k: Provide __phys_to_pfn() and __pfn_to_phys())
Merging m68knommu/for-next (4693c2493a9b m68k: coldfire/gpio: Be sure to clamp return value)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls)
Merging mips/mips-for-linux-next (07d17f09691e Merge branch '4.4-fixes' into mips-for-linux-next)
CONFLICT (content): Merge conflict in arch/mips/kvm/tlb.c
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
Merging powerpc/next (be6bfc29bc75 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (9cb1ccecb69d s390: remove all usages of PSW_ADDR_INSN)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (00d27c6336b0 numa: remove stale node_has_online_mem() define)
Merging uml/linux-next (3e46b2537632 um: Use race-free temporary file creation)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (bb2f3486041a Merge tag 'xtensa-for-next-20160111' of git://github.com/jcmvbkbc/linux-xtensa)
Merging btrfs/next (988f1f576d4f Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5)
Merging ceph/master (7e01726a6853 libceph: remove outdated comment)
Merging cifs/for-next (01b9b0b28626 cifs_dbg() outputs an uninitialized buffer in cifs_readdir())
Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (bb00c898ad1c udf: Check output buffer length when converting name to CS0)
Merging ext4/dev (68ce7bfcd995 fs: clean up the flags definition in uapi/linux/fs.h)
Merging f2fs/dev (7fdec82af6a9 Merge tag 'xfs-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
Merging gfs2/for-next (7508abc4bdac GFS2: Check if iopen is held when deleting inode)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (6d45c042f35e Merge branch 'bugfixes')
Merging nfsd/nfsd-next (ee2bf98bbe90 NFSv4: fix getacl ERANGE for some ACL buffer sizes)
Merging orangefs/for-next (115b93a8595c orangefs: clean up op_alloc())
Applying: orangfs: update for follow_link to get_link change
Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN)
Merging xfs/for-next (ee3804d9f94c Merge branch 'xfs-misc-fixes-for-4.5-3' into for-next)
Merging file-locks/linux-next (b4d629a39e10 locks: rename __posix_lock_file to posix_lock_inode)
Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
Merging pci/next (9662e32c810a Merge branch 'pci/trivial' into next)
Merging hid/for-next (a0ac0e1c8d8c Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (4c7916427953 Merge branch 'i2c/for-4.5' into i2c/for-next)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
Merging jdelvare-hwmon/master (ef0303d2bba0 hwmon: (emc2103) Fix typo in MODULE_PARM_DESC)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (91918d13eb17 hwmon: (nct6683) Add basic support for NCT6683 on Mitac boards)
Merging v4l-dvb/master (e9605e755025 Merge branch 'topic/media-controller' into to_next)
Merging kbuild/for-next (9ab3e1d71e55 Merge branch 'kbuild/misc' into kbuild/for-next)
CONFLICT (content): Merge conflict in Makefile
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (44858e07ff87 Merge branch 'for-4.5' into for-next)
Merging pm/linux-next (cba77f5318f3 Merge branch 'acpi-hotplug' into linux-next)
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (98d94507e10c Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next)
Merging thermal-soc/next (ce0265dd6f8e thermal: trip_point_temp_store() calls thermal_zone_device_update())
Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery)
Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE)
Merging slave-dma/next (16e209d48fd3 Merge branch 'for-4.5' into next)
Merging net-next/master (7a26019fdecd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (4c50a8ce2b63 netfilter: ipvs: avoid unused variable warning)
Merging wireless-drivers-next/master (42e0ed0d454c brcmfmac: Do not handle link downs for ibss.)
Merging bluetooth/master (95422a2b7e36 Bluetooth: ath3k: Fixed a blank line after declaration issue)
Merging mac80211-next/master (6f6239808cdf mac80211_hwsim: remove shadowing variable)
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
Merging rdma/for-next (34356f64ac0d IB/mlx5: Unify CQ create flags check)
Merging mtd/master (9146cbd52b11 mtd: jz4780_nand: replace if/else blocks with switch/case)
Merging l2-mtd/master (f9bdbd6c46c8 mtd: nuc900_nand: read correct SMISR register)
Merging crypto/master (48d627648141 crypto: hifn_795x, picoxcell - use ablkcipher_request_cast)
Merging drm/drm-next (1df59b8497f4 Merge tag 'drm-intel-next-fixes-2016-01-14' of git://anongit.freedesktop.org/drm-intel into drm-next)
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (48ea1e32c39d drm/i915/gen9: Set PIN_ZONE_4G end to 4GB - 1 page)
Merging drm-tegra/drm/tegra/for-next (ad906599c191 drm/tegra: Advertise DRIVER_ATOMIC)
Merging drm-misc/topic/drm-misc (70c0616d5a84 drm/fb_cma_helper: remove duplicate const from drm_fb_cma_alloc)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON())
Merging hdlcd/for-upstream/hdlcd (40eb4e27aa20 arm64: Juno: Add HDLCD support to the Juno boards.)
Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code)
Merging sound/for-next (40ed9444cd24 ALSA: timer: Introduce disconnect op to snd_timer_instance)
Merging sound-asoc/for-next (c7f747d28c4a Merge remote-tracking branches 'asoc/fix/rt286', 'asoc/fix/rt5659', 'asoc/fix/wm5110' and 'asoc/fix/wm8960' into asoc-linus)
Merging modules/modules-next (b3212ec77dd1 module: keep percpu symbols in module's symtab)
CONFLICT (content): Merge conflict in arch/x86/kernel/livepatch.c
Merging input/next (809d9516da73 Input: gpio-keys - allow disabling individual buttons in DT)
Merging block/for-next (bb1192dd3fad Merge branch 'for-4.5/drivers' into for-next)
Merging device-mapper/for-next (385277bfb57f dm snapshot: fix hung bios when copy error occurs)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (2a321acd2187 Merge branch 'fixes' into next)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (1501efadc524 md/raid: only permit hot-add of compatible integrity profiles)
Merging mfd/for-mfd-next (9fb41166076b mfd: davinci_voicecodec: Remove pointless 'out of memory' error message)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (265b60497a57 power: bq27xxx_battery: Fix bq27541 AveragePower register address)
Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
Merging regulator/for-next (bd5e0c40ace2 Merge remote-tracking branch 'regulator/fix/da9210' into regulator-linus)
Merging security/next (607259e17b37 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into ra-next)
Merging integrity/next (1d6d167c2efc KEYS: refcount bug fix)
Merging selinux/next (76319946f321 selinux: rate-limit netlink message warnings in selinux_nlmsg_perm())
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (ac36856fe432 watchdog: asm9260: remove __init and __exit annotations)
Merging iommu/next (32704253dc00 Merge branches 's390', 'arm/renesas', 'arm/msm', 'arm/shmobile', 'arm/smmu', 'x86/amd' and 'x86/vt-d' into next)
Merging dwmw2-iommu/master (fda3bec12d09 iommu/vt-d: Fix 64-bit accesses to 32-bit DMAR_GSTS_REG)
Merging vfio/next (d4f50ee2f5b4 vfio/iommu_type1: make use of info.flags)
Merging jc_docs/docs-next (ec3fc58b1e7a thermal: add description for integral_cutoff unit)
Merging trivial/for-next (bcf4299e6215 floppy: make local variable non-static)
Merging audit/next (cb74ed278f80 audit: always enable syscall auditing when supported and audit is enabled)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (183223770ae8 drivers/of: Export OF changeset functions)
Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure)
Merging spi/for-next (8b63bb7dec60 Merge remote-tracking branches 'spi/fix/fsl-espi', 'spi/fix/imx' and 'spi/fix/loopback' into spi-linus)
Merging tip/auto-latest (f249f40fd783 Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite)
CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (1cac5503fbf7 EDAC, i5100: Use to_delayed_work())
Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (b7522056ec1a ftrace: Remove unused nr_trampolines var)
Merging rcu/rcu/next (984cf355aeaa sysrq: Fix warning in sysrq generated crash.)
Merging kvm/linux-next (171b5682aa85 Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD)
Merging kvm-arm/next (c7da6fa43cb1 arm/arm64: KVM: Detect vGIC presence at runtime)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b4d7f161feb3 KVM: PPC: Fix ONE_REG AltiVec support)
Merging kvms390/next (c6e5f166373a KVM: s390: implement the RI support of guest)
Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (6201171e3b2c workqueue: simplify the apply_workqueue_attrs_locked())
Merging drivers-x86/for-next (6b31de3e6985 ideapad-laptop: Add Lenovo Yoga 700 to no_hw_rfkill dmi list)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (09d3ffbd636f Merge remote-tracking branch 'regmap/fix/raw' into regmap-linus)
Merging hsi/for-next (525e1abc6b5a HSI: omap_ssi_port: fix handling of_get_named_gpio result)
Merging leds/for-next (522f17e1214c leds: add HAS_IOMEM dependency to LEDS_BCM6328/LEDS_BCM6358)
Merging ipmi/for-next (30f05309bde4 Merge tag 'pm+acpi-4.5-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging driver-core/driver-core-next (587198ba5206 vmstat: Remove BUG_ON from vmstat_update)
Merging tty/tty-next (ece6267878ae Merge tag 'clk-for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux)
Merging usb/usb-next (587198ba5206 vmstat: Remove BUG_ON from vmstat_update)
Merging usb-gadget/next (5072cfc40a80 usb: dwc3: of-simple: fix build warning on !PM)
Merging usb-serial/usb-next (6ff9d2761b86 USB: mxu11x0: drop redundant function name from error messages)
Merging usb-chipidea-next/ci-for-usb-next (d0c40d9fda12 usb: chipidea: debug: use list_for_each_entry)
Merging staging/staging-next (587198ba5206 vmstat: Remove BUG_ON from vmstat_update)
Merging char-misc/char-misc-next (587198ba5206 vmstat: Remove BUG_ON from vmstat_update)
Merging extcon/extcon-next (f78bf950aec3 extcon: arizona: Use DAPM mutex helper functions)
Merging cgroup/for-next (8bb5ef79bc0f cgroup: make sure a parent css isn't freed before its children)
Merging scsi/for-next (4d45033f31a0 Merge branch 'misc' into for-next)
Merging target-updates/for-next (fab683eb12e7 scsi: qla2xxxx: avoid type mismatch in comparison)
Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
Merging pinctrl/for-next (14da0a91bf4a pinctrl: mediatek: Modify pinctrl bindings for mt2701)
Merging vhost/linux-next (caefbcbee973 x86: add cc clobber for addl)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (c474e348778b gpio: generic: make bgpio_pdata always visible)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (ff01c944cfa9 pwm: Mark all devices as "might sleep")
Merging dma-buf/for-next (168309855a7d Linux 4.4-rc8)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (3da834e3e5a4 clk: remove duplicated COMMON_CLK_NXP record from clk/Kconfig)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (fb2e69217129 aio: Fix compile error due to unexpected use of cmpxchg())
$ git reset --hard HEAD^
Merging next-20160111 version of aio
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (1b1fe542b6f0 selftests: firmware: add empty string and async tests)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops)
Merging livepatching/for-next (03f726f415f5 Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging coresight/next (b23d8dc4ecdf coresight: Fix a typo in Kconfig)
Merging rtc/rtc-next (df986964c27c rtc: ds1305: use to_spi_device and kobj_to_dev)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (8b63b6bfc1a5 Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm)
Merging akpm-current/current (079cf7296215 ipc/msg.c: use freezable blocking call)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: include/linux/huge_mm.h: pmd_trans_huge_lock() returns a spinlock_t *
Applying: lib/string_helpers: export string_units_{2,10} for others
Applying: lib/string_helpers: fix indentation in few places
Applying: x86/efi: print size and base in binary units in efi_print_memmap
Applying: x86/efi: use proper units in efi_find_mirror()
Merging akpm/master (10ac964c5f6d x86/efi: use proper units in efi_find_mirror())
^ permalink raw reply
* Re: linux-next: Tree for Jan 25
From: Stephen Rothwell @ 2016-01-25 2:11 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
In-Reply-To: <20160125123248.0dc51ccc@canb.auug.org.au>
Hi all,
On Mon, 25 Jan 2016 12:32:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Please do not add any material for v4.6 to your linux-next included
> branches until after v4.5-rc1 is released.
It has been pointed out that this is no longer relevant.
> Changes since 20160122:
Also, I forgot to mention that my fixes tree contains this:
next: suppress the building of all the sound codecs on PPC for now
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* next-20160125 build: 0 failures 7 warnings (next-20160125)
From: Build bot for Mark Brown @ 2016-01-25 5:16 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160125
Git describe: next-20160125
Commit: e216cada8e Add linux-next specific files for 20160125
Build Time: 73 min 56 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 7
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
6 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 7
7 <stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
4 ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
1 ../net/bluetooth/mgmt.c:5493:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../net/bluetooth/mgmt.c:5493:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../net/bluetooth/mgmt.c:5493:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../net/bluetooth/mgmt.c:5493:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
x86_64-defconfig
^ permalink raw reply
* Re: linux-next: manual merge of the mips tree with Linus' tree
From: Ralf Baechle @ 2016-01-25 7:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Dan Williams, James Hogan
In-Reply-To: <20160125092510.50a6fb35@canb.auug.org.au>
On Mon, Jan 25, 2016 at 09:25:10AM +1100, Stephen Rothwell wrote:
>
> Today's linux-next merge of the mips tree got conflicts in:
>
> arch/mips/kvm/tlb.c
>
> between commit:
>
> ba049e93aef7 ("kvm: rename pfn_t to kvm_pfn_t")
>
> from Linus' tree and commit:
>
> cb1b447f0c36 ("MIPS: KVM: Convert EXPORT_SYMBOL to _GPL")
>
> from the mips tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Linus has pulled so I'm reseting my branch for you back to v4.5-rc1.
Thanks,
Ralf
^ permalink raw reply
* Re: linux-next: Tree for Jan 25
From: Stephen Rothwell @ 2016-01-25 8:50 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
In-Reply-To: <20160125131141.41364cf5@canb.auug.org.au>
Hi all,
On Mon, 25 Jan 2016 13:11:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 25 Jan 2016 12:32:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Please do not add any material for v4.6 to your linux-next included
> > branches until after v4.5-rc1 is released.
>
> It has been pointed out that this is no longer relevant.
>
> > Changes since 20160122:
>
> Also, I forgot to mention that my fixes tree contains this:
>
> next: suppress the building of all the sound codecs on PPC for now
Also, there will be no linux-next release tomorrow.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Takashi Iwai @ 2016-01-25 9:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Sudip Mukherjee, Vinod Koul, Andrew Morton,
linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <20160122134045.438cd9d9@canb.auug.org.au>
On Fri, 22 Jan 2016 03:40:45 +0100,
Stephen Rothwell wrote:
>
> Hi all,
>
> On Fri, 22 Jan 2016 11:24:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Thu, 21 Jan 2016 07:38:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > On Wed, 20 Jan 2016 15:09:47 +0100 Takashi Iwai <tiwai@suse.de> wrote:
> > > >
> > > > On Sat, 16 Jan 2016 09:51:29 +0100,
> > > > Takashi Iwai wrote:
> > > > >
> > > > > There are a few ways to fix this, but all are not comfortable.
> > > > >
> > > > > A. Disable compress API for powerpc.
> > >
> > > This also affects alpha, mips and (maybe) sparc.
> >
> > This was exposed on PowerPC by commit bf76f73c5f65 ("powerpc: enable
> > UBSAN support") which is in Linus' tree as of this morning. The only
> > relevant change that made was in the compiler flags (I tested this by
> > building the file without that commit but with these new compiler flags:
> >
> > -fsanitize=shift -fsanitize=integer-divide-by-zero
> > -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null
> > -fsanitize=signed-integer-overflow -fsanitize=bounds
> > -fsanitize=object-size -fsanitize=returns-nonnull-attribute
> > -fsanitize=bool -fsanitize=enum -fsanitize=alignment
> >
> > The preprocessed file is the same in both cases, but with these flags
> > the compiler errors.
>
> So for now I have suppressed the error using the following patch (which
> I will keep in my fixes tree until some other fix is applied):
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 22 Jan 2016 13:24:57 +1100
> Subject: [PATCH] next: suppress the building of all the sound codecs on PPC
> for now
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> sound/soc/codecs/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> index 50693c867e71..ee5f36b9c787 100644
> --- a/sound/soc/codecs/Kconfig
> +++ b/sound/soc/codecs/Kconfig
> @@ -13,6 +13,7 @@ menu "CODEC drivers"
> config SND_SOC_ALL_CODECS
> tristate "Build all ASoC CODEC drivers"
> depends on COMPILE_TEST
> + depends on !PPC
> select SND_SOC_88PM860X if MFD_88PM860X
> select SND_SOC_L3
> select SND_SOC_AB8500_CODEC if ABX500_CORE
Suppressing this whole is an overreaction, IMO. It should suffice
just to disable compile-testing Intel driver.
How about the patch below?
thanks,
Takashi
-- 8< --
From: Takashi Iwai <tiwai@suse.de>
Subject: [PATCH] ASoC: intel: suppress compile-test with PowerPC
Since some ioctl in compress offload API is broken for PPC (the struct
size overflows), now we get actually the build error.
Until we get the proper solution (e.g. alternative ioctl), let's
disable the build of Intel ASoC driver that is the only driver who
enables SND_SOC_COMPRESS (and eventually SND_COMPRESS_OFFLOAD) in the
mainline tree.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/intel/Kconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
index 803f95e40679..d854cd66e090 100644
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
@@ -31,6 +31,8 @@ config SND_SOC_INTEL_SST
tristate
select SND_SOC_INTEL_SST_ACPI if ACPI
depends on (X86 || COMPILE_TEST)
+ # FIXME: a part of compress API is broken for PPC
+ depends on !PPC
config SND_SOC_INTEL_SST_ACPI
tristate
--
2.7.0
^ permalink raw reply related
* Re: linux-next: build failure after merge of the akpm tree
From: Michael Ellerman @ 2016-01-25 9:40 UTC (permalink / raw)
To: Takashi Iwai, Stephen Rothwell
Cc: Mark Brown, Sudip Mukherjee, Vinod Koul, Andrew Morton,
linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <s5h60yiatwt.wl-tiwai@suse.de>
On Mon, 2016-01-25 at 10:29 +0100, Takashi Iwai wrote:
> On Fri, 22 Jan 2016 03:40:45 +0100, Stephen Rothwell wrote:
> > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> > index 50693c867e71..ee5f36b9c787 100644
> > --- a/sound/soc/codecs/Kconfig
> > +++ b/sound/soc/codecs/Kconfig
> > @@ -13,6 +13,7 @@ menu "CODEC drivers"
> > config SND_SOC_ALL_CODECS
> > tristate "Build all ASoC CODEC drivers"
> > depends on COMPILE_TEST
> > + depends on !PPC
> > select SND_SOC_88PM860X if MFD_88PM860X
> > select SND_SOC_L3
> > select SND_SOC_AB8500_CODEC if ABX500_CORE
>
> Suppressing this whole is an overreaction, IMO. It should suffice
> just to disable compile-testing Intel driver.
> How about the patch below?
>
>
> thanks,
>
> Takashi
>
> -- 8< --
> From: Takashi Iwai <tiwai@suse.de>
> Subject: [PATCH] ASoC: intel: suppress compile-test with PowerPC
>
> Since some ioctl in compress offload API is broken for PPC (the struct
> size overflows), now we get actually the build error.
>
> Until we get the proper solution (e.g. alternative ioctl), let's
> disable the build of Intel ASoC driver that is the only driver who
> enables SND_SOC_COMPRESS (and eventually SND_COMPRESS_OFFLOAD) in the
> mainline tree.
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> sound/soc/intel/Kconfig | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> index 803f95e40679..d854cd66e090 100644
> --- a/sound/soc/intel/Kconfig
> +++ b/sound/soc/intel/Kconfig
> @@ -31,6 +31,8 @@ config SND_SOC_INTEL_SST
> tristate
> select SND_SOC_INTEL_SST_ACPI if ACPI
> depends on (X86 || COMPILE_TEST)
> + # FIXME: a part of compress API is broken for PPC
> + depends on !PPC
>
> config SND_SOC_INTEL_SST_ACPI
> tristate
That's fine by me.
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
Though it looks like alpha and mips would also be broken, but perhaps they
can't build that code for some other reason.
arch/alpha/include/uapi/asm/ioctl.h:#define _IOC_SIZEBITS 13
arch/mips/include/uapi/asm/ioctl.h:#define _IOC_SIZEBITS 13
cheers
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Takashi Iwai @ 2016-01-25 10:19 UTC (permalink / raw)
To: Michael Ellerman
Cc: Stephen Rothwell, Mark Brown, Sudip Mukherjee, Vinod Koul,
Andrew Morton, linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <1453714814.12213.4.camel@ellerman.id.au>
On Mon, 25 Jan 2016 10:40:14 +0100,
Michael Ellerman wrote:
>
> On Mon, 2016-01-25 at 10:29 +0100, Takashi Iwai wrote:
> > On Fri, 22 Jan 2016 03:40:45 +0100, Stephen Rothwell wrote:
> > > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> > > index 50693c867e71..ee5f36b9c787 100644
> > > --- a/sound/soc/codecs/Kconfig
> > > +++ b/sound/soc/codecs/Kconfig
> > > @@ -13,6 +13,7 @@ menu "CODEC drivers"
> > > config SND_SOC_ALL_CODECS
> > > tristate "Build all ASoC CODEC drivers"
> > > depends on COMPILE_TEST
> > > + depends on !PPC
> > > select SND_SOC_88PM860X if MFD_88PM860X
> > > select SND_SOC_L3
> > > select SND_SOC_AB8500_CODEC if ABX500_CORE
> >
> > Suppressing this whole is an overreaction, IMO. It should suffice
> > just to disable compile-testing Intel driver.
> > How about the patch below?
> >
> >
> > thanks,
> >
> > Takashi
> >
> > -- 8< --
> > From: Takashi Iwai <tiwai@suse.de>
> > Subject: [PATCH] ASoC: intel: suppress compile-test with PowerPC
> >
> > Since some ioctl in compress offload API is broken for PPC (the struct
> > size overflows), now we get actually the build error.
> >
> > Until we get the proper solution (e.g. alternative ioctl), let's
> > disable the build of Intel ASoC driver that is the only driver who
> > enables SND_SOC_COMPRESS (and eventually SND_COMPRESS_OFFLOAD) in the
> > mainline tree.
> >
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > ---
> > sound/soc/intel/Kconfig | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> > index 803f95e40679..d854cd66e090 100644
> > --- a/sound/soc/intel/Kconfig
> > +++ b/sound/soc/intel/Kconfig
> > @@ -31,6 +31,8 @@ config SND_SOC_INTEL_SST
> > tristate
> > select SND_SOC_INTEL_SST_ACPI if ACPI
> > depends on (X86 || COMPILE_TEST)
> > + # FIXME: a part of compress API is broken for PPC
> > + depends on !PPC
> >
> > config SND_SOC_INTEL_SST_ACPI
> > tristate
>
>
> That's fine by me.
>
> Acked-by: Michael Ellerman <mpe@ellerman.id.au>
>
>
> Though it looks like alpha and mips would also be broken, but perhaps they
> can't build that code for some other reason.
>
> arch/alpha/include/uapi/asm/ioctl.h:#define _IOC_SIZEBITS 13
> arch/mips/include/uapi/asm/ioctl.h:#define _IOC_SIZEBITS 13
OK, I'll resubmit the patch including these other archs.
thanks,
Takashi
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Vinod Koul @ 2016-01-25 10:41 UTC (permalink / raw)
To: Takashi Iwai
Cc: Stephen Rothwell, Mark Brown, Sudip Mukherjee, Andrew Morton,
linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <s5h60yiatwt.wl-tiwai@suse.de>
On Mon, Jan 25, 2016 at 10:29:54AM +0100, Takashi Iwai wrote:
> On Fri, 22 Jan 2016 03:40:45 +0100,
> Stephen Rothwell wrote:
> >
> > Hi all,
> >
> > On Fri, 22 Jan 2016 11:24:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > On Thu, 21 Jan 2016 07:38:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > On Wed, 20 Jan 2016 15:09:47 +0100 Takashi Iwai <tiwai@suse.de> wrote:
> > > > >
> > > > > On Sat, 16 Jan 2016 09:51:29 +0100,
> > > > > Takashi Iwai wrote:
> > > > > >
> > > > > > There are a few ways to fix this, but all are not comfortable.
> > > > > >
> > > > > > A. Disable compress API for powerpc.
> > > >
> > > > This also affects alpha, mips and (maybe) sparc.
> > >
> > > This was exposed on PowerPC by commit bf76f73c5f65 ("powerpc: enable
> > > UBSAN support") which is in Linus' tree as of this morning. The only
> > > relevant change that made was in the compiler flags (I tested this by
> > > building the file without that commit but with these new compiler flags:
> > >
> > > -fsanitize=shift -fsanitize=integer-divide-by-zero
> > > -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null
> > > -fsanitize=signed-integer-overflow -fsanitize=bounds
> > > -fsanitize=object-size -fsanitize=returns-nonnull-attribute
> > > -fsanitize=bool -fsanitize=enum -fsanitize=alignment
> > >
> > > The preprocessed file is the same in both cases, but with these flags
> > > the compiler errors.
> >
> > So for now I have suppressed the error using the following patch (which
> > I will keep in my fixes tree until some other fix is applied):
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 22 Jan 2016 13:24:57 +1100
> > Subject: [PATCH] next: suppress the building of all the sound codecs on PPC
> > for now
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > sound/soc/codecs/Kconfig | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> > index 50693c867e71..ee5f36b9c787 100644
> > --- a/sound/soc/codecs/Kconfig
> > +++ b/sound/soc/codecs/Kconfig
> > @@ -13,6 +13,7 @@ menu "CODEC drivers"
> > config SND_SOC_ALL_CODECS
> > tristate "Build all ASoC CODEC drivers"
> > depends on COMPILE_TEST
> > + depends on !PPC
> > select SND_SOC_88PM860X if MFD_88PM860X
> > select SND_SOC_L3
> > select SND_SOC_AB8500_CODEC if ABX500_CORE
>
> Suppressing this whole is an overreaction, IMO. It should suffice
> just to disable compile-testing Intel driver.
> How about the patch below?
Takashi,
This wont fix it as we have WM driver using this as well. SND_SOC_WM_ADSP
uses SND_SOC_COMPRESS.
So the better fix would be to do so in either SND_SOC_COMPRESS or even
better in SND_COMPRESS_OFFLOAD..
I think this has been exposed by WM driver as Intel driver depends on X86 so
compress core wouldn't be compiled as none of the drivers select this :)
--
Thanks
~Vinod
>
>
> thanks,
>
> Takashi
>
> -- 8< --
> From: Takashi Iwai <tiwai@suse.de>
> Subject: [PATCH] ASoC: intel: suppress compile-test with PowerPC
>
> Since some ioctl in compress offload API is broken for PPC (the struct
> size overflows), now we get actually the build error.
>
> Until we get the proper solution (e.g. alternative ioctl), let's
> disable the build of Intel ASoC driver that is the only driver who
> enables SND_SOC_COMPRESS (and eventually SND_COMPRESS_OFFLOAD) in the
> mainline tree.
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> sound/soc/intel/Kconfig | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> index 803f95e40679..d854cd66e090 100644
> --- a/sound/soc/intel/Kconfig
> +++ b/sound/soc/intel/Kconfig
> @@ -31,6 +31,8 @@ config SND_SOC_INTEL_SST
> tristate
> select SND_SOC_INTEL_SST_ACPI if ACPI
> depends on (X86 || COMPILE_TEST)
> + # FIXME: a part of compress API is broken for PPC
> + depends on !PPC
>
> config SND_SOC_INTEL_SST_ACPI
> tristate
> --
> 2.7.0
>
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Takashi Iwai @ 2016-01-25 10:42 UTC (permalink / raw)
To: Vinod Koul
Cc: Stephen Rothwell, Mark Brown, Sudip Mukherjee, Andrew Morton,
linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <20160125104112.GF11130@localhost>
On Mon, 25 Jan 2016 11:41:12 +0100,
Vinod Koul wrote:
>
> On Mon, Jan 25, 2016 at 10:29:54AM +0100, Takashi Iwai wrote:
> > On Fri, 22 Jan 2016 03:40:45 +0100,
> > Stephen Rothwell wrote:
> > >
> > > Hi all,
> > >
> > > On Fri, 22 Jan 2016 11:24:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > On Thu, 21 Jan 2016 07:38:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > > >
> > > > > On Wed, 20 Jan 2016 15:09:47 +0100 Takashi Iwai <tiwai@suse.de> wrote:
> > > > > >
> > > > > > On Sat, 16 Jan 2016 09:51:29 +0100,
> > > > > > Takashi Iwai wrote:
> > > > > > >
> > > > > > > There are a few ways to fix this, but all are not comfortable.
> > > > > > >
> > > > > > > A. Disable compress API for powerpc.
> > > > >
> > > > > This also affects alpha, mips and (maybe) sparc.
> > > >
> > > > This was exposed on PowerPC by commit bf76f73c5f65 ("powerpc: enable
> > > > UBSAN support") which is in Linus' tree as of this morning. The only
> > > > relevant change that made was in the compiler flags (I tested this by
> > > > building the file without that commit but with these new compiler flags:
> > > >
> > > > -fsanitize=shift -fsanitize=integer-divide-by-zero
> > > > -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null
> > > > -fsanitize=signed-integer-overflow -fsanitize=bounds
> > > > -fsanitize=object-size -fsanitize=returns-nonnull-attribute
> > > > -fsanitize=bool -fsanitize=enum -fsanitize=alignment
> > > >
> > > > The preprocessed file is the same in both cases, but with these flags
> > > > the compiler errors.
> > >
> > > So for now I have suppressed the error using the following patch (which
> > > I will keep in my fixes tree until some other fix is applied):
> > >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Fri, 22 Jan 2016 13:24:57 +1100
> > > Subject: [PATCH] next: suppress the building of all the sound codecs on PPC
> > > for now
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > > sound/soc/codecs/Kconfig | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> > > index 50693c867e71..ee5f36b9c787 100644
> > > --- a/sound/soc/codecs/Kconfig
> > > +++ b/sound/soc/codecs/Kconfig
> > > @@ -13,6 +13,7 @@ menu "CODEC drivers"
> > > config SND_SOC_ALL_CODECS
> > > tristate "Build all ASoC CODEC drivers"
> > > depends on COMPILE_TEST
> > > + depends on !PPC
> > > select SND_SOC_88PM860X if MFD_88PM860X
> > > select SND_SOC_L3
> > > select SND_SOC_AB8500_CODEC if ABX500_CORE
> >
> > Suppressing this whole is an overreaction, IMO. It should suffice
> > just to disable compile-testing Intel driver.
> > How about the patch below?
>
> Takashi,
>
> This wont fix it as we have WM driver using this as well. SND_SOC_WM_ADSP
> uses SND_SOC_COMPRESS.
Yes, but SND_SOC_WM_ADSP isn't selected at all in the mainline, so
my patch should work actually alone.
> So the better fix would be to do so in either SND_SOC_COMPRESS or even
> better in SND_COMPRESS_OFFLOAD..
No, it won't work because it's reverse-selected. You can't put
depends there. It's a known limitation of the current Kconfig stuff.
Takashi
> I think this has been exposed by WM driver as Intel driver depends on X86 so
> compress core wouldn't be compiled as none of the drivers select this :)
>
> --
> Thanks
> ~Vinod
> >
> >
> > thanks,
> >
> > Takashi
> >
> > -- 8< --
> > From: Takashi Iwai <tiwai@suse.de>
> > Subject: [PATCH] ASoC: intel: suppress compile-test with PowerPC
> >
> > Since some ioctl in compress offload API is broken for PPC (the struct
> > size overflows), now we get actually the build error.
> >
> > Until we get the proper solution (e.g. alternative ioctl), let's
> > disable the build of Intel ASoC driver that is the only driver who
> > enables SND_SOC_COMPRESS (and eventually SND_COMPRESS_OFFLOAD) in the
> > mainline tree.
> >
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > ---
> > sound/soc/intel/Kconfig | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> > index 803f95e40679..d854cd66e090 100644
> > --- a/sound/soc/intel/Kconfig
> > +++ b/sound/soc/intel/Kconfig
> > @@ -31,6 +31,8 @@ config SND_SOC_INTEL_SST
> > tristate
> > select SND_SOC_INTEL_SST_ACPI if ACPI
> > depends on (X86 || COMPILE_TEST)
> > + # FIXME: a part of compress API is broken for PPC
> > + depends on !PPC
> >
> > config SND_SOC_INTEL_SST_ACPI
> > tristate
> > --
> > 2.7.0
> >
>
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Sudip Mukherjee @ 2016-01-25 10:45 UTC (permalink / raw)
To: Takashi Iwai
Cc: Stephen Rothwell, Mark Brown, Vinod Koul, Andrew Morton,
linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <s5h60yiatwt.wl-tiwai@suse.de>
On Mon, Jan 25, 2016 at 10:29:54AM +0100, Takashi Iwai wrote:
> On Fri, 22 Jan 2016 03:40:45 +0100,
> Stephen Rothwell wrote:
> >
> > Hi all,
> >
> > On Fri, 22 Jan 2016 11:24:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > On Thu, 21 Jan 2016 07:38:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > On Wed, 20 Jan 2016 15:09:47 +0100 Takashi Iwai <tiwai@suse.de> wrote:
> > > > >
> > > > > On Sat, 16 Jan 2016 09:51:29 +0100,
> > > > > Takashi Iwai wrote:
> > > > > >
> > > > > > There are a few ways to fix this, but all are not comfortable.
> > > > > >
> > > > > > A. Disable compress API for powerpc.
> > > >
> > > > This also affects alpha, mips and (maybe) sparc.
> > >
> > > This was exposed on PowerPC by commit bf76f73c5f65 ("powerpc: enable
> > > UBSAN support") which is in Linus' tree as of this morning. The only
> > > relevant change that made was in the compiler flags (I tested this by
> > > building the file without that commit but with these new compiler flags:
> > >
> > > -fsanitize=shift -fsanitize=integer-divide-by-zero
> > > -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null
> > > -fsanitize=signed-integer-overflow -fsanitize=bounds
> > > -fsanitize=object-size -fsanitize=returns-nonnull-attribute
> > > -fsanitize=bool -fsanitize=enum -fsanitize=alignment
> > >
> > > The preprocessed file is the same in both cases, but with these flags
> > > the compiler errors.
> >
> > So for now I have suppressed the error using the following patch (which
> > I will keep in my fixes tree until some other fix is applied):
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 22 Jan 2016 13:24:57 +1100
> > Subject: [PATCH] next: suppress the building of all the sound codecs on PPC
> > for now
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > sound/soc/codecs/Kconfig | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> > index 50693c867e71..ee5f36b9c787 100644
> > --- a/sound/soc/codecs/Kconfig
> > +++ b/sound/soc/codecs/Kconfig
> > @@ -13,6 +13,7 @@ menu "CODEC drivers"
> > config SND_SOC_ALL_CODECS
> > tristate "Build all ASoC CODEC drivers"
> > depends on COMPILE_TEST
> > + depends on !PPC
> > select SND_SOC_88PM860X if MFD_88PM860X
> > select SND_SOC_L3
> > select SND_SOC_AB8500_CODEC if ABX500_CORE
>
> Suppressing this whole is an overreaction, IMO. It should suffice
> just to disable compile-testing Intel driver.
> How about the patch below?
>
>
> thanks,
>
> Takashi
>
> -- 8< --
> From: Takashi Iwai <tiwai@suse.de>
> Subject: [PATCH] ASoC: intel: suppress compile-test with PowerPC
>
> Since some ioctl in compress offload API is broken for PPC (the struct
> size overflows), now we get actually the build error.
>
> Until we get the proper solution (e.g. alternative ioctl), let's
> disable the build of Intel ASoC driver that is the only driver who
> enables SND_SOC_COMPRESS (and eventually SND_COMPRESS_OFFLOAD) in the
> mainline tree.
Sorry, but this does not fix the build failure.
I can still see SND_COMPRESS_OFFLOAD=m in .config and the build fails.
But the following does fix it for powerpc:
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 7ea66ee..b92d286 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -31,6 +31,7 @@ config SND_SOC_GENERIC_DMAENGINE_PCM
config SND_SOC_COMPRESS
bool
+ depends on !PPC
select SND_COMPRESS_OFFLOAD
config SND_SOC_TOPOLOGY
--
I will just check with alpha and see if that is also affected.
regards
sudip
^ permalink raw reply related
* Re: linux-next: build failure after merge of the akpm tree
From: Takashi Iwai @ 2016-01-25 11:03 UTC (permalink / raw)
To: Sudip Mukherjee
Cc: Stephen Rothwell, Mark Brown, Vinod Koul, Andrew Morton,
linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <20160125104555.GA16749@sudip-pc>
On Mon, 25 Jan 2016 11:45:56 +0100,
Sudip Mukherjee wrote:
>
> On Mon, Jan 25, 2016 at 10:29:54AM +0100, Takashi Iwai wrote:
> > On Fri, 22 Jan 2016 03:40:45 +0100,
> > Stephen Rothwell wrote:
> > >
> > > Hi all,
> > >
> > > On Fri, 22 Jan 2016 11:24:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > On Thu, 21 Jan 2016 07:38:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > > >
> > > > > On Wed, 20 Jan 2016 15:09:47 +0100 Takashi Iwai <tiwai@suse.de> wrote:
> > > > > >
> > > > > > On Sat, 16 Jan 2016 09:51:29 +0100,
> > > > > > Takashi Iwai wrote:
> > > > > > >
> > > > > > > There are a few ways to fix this, but all are not comfortable.
> > > > > > >
> > > > > > > A. Disable compress API for powerpc.
> > > > >
> > > > > This also affects alpha, mips and (maybe) sparc.
> > > >
> > > > This was exposed on PowerPC by commit bf76f73c5f65 ("powerpc: enable
> > > > UBSAN support") which is in Linus' tree as of this morning. The only
> > > > relevant change that made was in the compiler flags (I tested this by
> > > > building the file without that commit but with these new compiler flags:
> > > >
> > > > -fsanitize=shift -fsanitize=integer-divide-by-zero
> > > > -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null
> > > > -fsanitize=signed-integer-overflow -fsanitize=bounds
> > > > -fsanitize=object-size -fsanitize=returns-nonnull-attribute
> > > > -fsanitize=bool -fsanitize=enum -fsanitize=alignment
> > > >
> > > > The preprocessed file is the same in both cases, but with these flags
> > > > the compiler errors.
> > >
> > > So for now I have suppressed the error using the following patch (which
> > > I will keep in my fixes tree until some other fix is applied):
> > >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Fri, 22 Jan 2016 13:24:57 +1100
> > > Subject: [PATCH] next: suppress the building of all the sound codecs on PPC
> > > for now
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > > sound/soc/codecs/Kconfig | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> > > index 50693c867e71..ee5f36b9c787 100644
> > > --- a/sound/soc/codecs/Kconfig
> > > +++ b/sound/soc/codecs/Kconfig
> > > @@ -13,6 +13,7 @@ menu "CODEC drivers"
> > > config SND_SOC_ALL_CODECS
> > > tristate "Build all ASoC CODEC drivers"
> > > depends on COMPILE_TEST
> > > + depends on !PPC
> > > select SND_SOC_88PM860X if MFD_88PM860X
> > > select SND_SOC_L3
> > > select SND_SOC_AB8500_CODEC if ABX500_CORE
> >
> > Suppressing this whole is an overreaction, IMO. It should suffice
> > just to disable compile-testing Intel driver.
> > How about the patch below?
> >
> >
> > thanks,
> >
> > Takashi
> >
> > -- 8< --
> > From: Takashi Iwai <tiwai@suse.de>
> > Subject: [PATCH] ASoC: intel: suppress compile-test with PowerPC
> >
> > Since some ioctl in compress offload API is broken for PPC (the struct
> > size overflows), now we get actually the build error.
> >
> > Until we get the proper solution (e.g. alternative ioctl), let's
> > disable the build of Intel ASoC driver that is the only driver who
> > enables SND_SOC_COMPRESS (and eventually SND_COMPRESS_OFFLOAD) in the
> > mainline tree.
>
> Sorry, but this does not fix the build failure.
> I can still see SND_COMPRESS_OFFLOAD=m in .config and the build fails.
Who sets this config? SND_COMPRESS_OFFLOAD has no prompt, so this
should be default off.
> But the following does fix it for powerpc:
>
> diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
> index 7ea66ee..b92d286 100644
> --- a/sound/soc/Kconfig
> +++ b/sound/soc/Kconfig
> @@ -31,6 +31,7 @@ config SND_SOC_GENERIC_DMAENGINE_PCM
>
> config SND_SOC_COMPRESS
> bool
> + depends on !PPC
> select SND_COMPRESS_OFFLOAD
>
> config SND_SOC_TOPOLOGY
It has a reverse-selection, and the reverse-selection ignores Depends,
AFAIK. If that long-standing problem were already fixed, it's
great...
Takashi
>
> --
>
> I will just check with alpha and see if that is also affected.
>
> regards
> sudip
>
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Sudip Mukherjee @ 2016-01-25 11:18 UTC (permalink / raw)
To: Takashi Iwai
Cc: Stephen Rothwell, Mark Brown, Vinod Koul, Andrew Morton,
linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <s5hsi1lapk5.wl-tiwai@suse.de>
On Mon, Jan 25, 2016 at 12:03:54PM +0100, Takashi Iwai wrote:
> On Mon, 25 Jan 2016 11:45:56 +0100,
> Sudip Mukherjee wrote:
> >
> > On Mon, Jan 25, 2016 at 10:29:54AM +0100, Takashi Iwai wrote:
> > > On Fri, 22 Jan 2016 03:40:45 +0100,
> > > Stephen Rothwell wrote:
> > > >
> > > > Hi all,
> > > >
<snip>
> > > >
> > > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > Date: Fri, 22 Jan 2016 13:24:57 +1100
> > > > Subject: [PATCH] next: suppress the building of all the sound codecs on PPC
> > > > for now
> > > >
> > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > ---
> > > > sound/soc/codecs/Kconfig | 1 +
> > > > 1 file changed, 1 insertion(+)
> > > >
> > > > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> > > > index 50693c867e71..ee5f36b9c787 100644
> > > > --- a/sound/soc/codecs/Kconfig
> > > > +++ b/sound/soc/codecs/Kconfig
> > > > @@ -13,6 +13,7 @@ menu "CODEC drivers"
> > > > config SND_SOC_ALL_CODECS
> > > > tristate "Build all ASoC CODEC drivers"
> > > > depends on COMPILE_TEST
> > > > + depends on !PPC
> > > > select SND_SOC_88PM860X if MFD_88PM860X
> > > > select SND_SOC_L3
> > > > select SND_SOC_AB8500_CODEC if ABX500_CORE
> > >
> > > Suppressing this whole is an overreaction, IMO. It should suffice
> > > just to disable compile-testing Intel driver.
> > > How about the patch below?
> > >
> > >
> > > thanks,
> > >
> > > Takashi
> > >
> > > -- 8< --
> > > From: Takashi Iwai <tiwai@suse.de>
> > > Subject: [PATCH] ASoC: intel: suppress compile-test with PowerPC
> > >
> > > Since some ioctl in compress offload API is broken for PPC (the struct
> > > size overflows), now we get actually the build error.
> > >
> > > Until we get the proper solution (e.g. alternative ioctl), let's
> > > disable the build of Intel ASoC driver that is the only driver who
> > > enables SND_SOC_COMPRESS (and eventually SND_COMPRESS_OFFLOAD) in the
> > > mainline tree.
> >
> > Sorry, but this does not fix the build failure.
> > I can still see SND_COMPRESS_OFFLOAD=m in .config and the build fails.
>
> Who sets this config? SND_COMPRESS_OFFLOAD has no prompt, so this
> should be default off.
I think when we are doing allmodconfig SND_SOC_COMPRESS will be selected
which in turn will select SND_COMPRESS_OFFLOAD as SND_SOC_COMPRESS
depends only on SND_SOC.
And alpha is not affected. It builds fine.
regards
sudip
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Mark Brown @ 2016-01-25 11:41 UTC (permalink / raw)
To: Takashi Iwai
Cc: Stephen Rothwell, Sudip Mukherjee, Vinod Koul, Andrew Morton,
linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <s5h60yiatwt.wl-tiwai@suse.de>
[-- Attachment #1: Type: text/plain, Size: 1338 bytes --]
On Mon, Jan 25, 2016 at 10:29:54AM +0100, Takashi Iwai wrote:
> Stephen Rothwell wrote:
> > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> > index 50693c867e71..ee5f36b9c787 100644
> > --- a/sound/soc/codecs/Kconfig
> > +++ b/sound/soc/codecs/Kconfig
> > @@ -13,6 +13,7 @@ menu "CODEC drivers"
> > config SND_SOC_ALL_CODECS
> > tristate "Build all ASoC CODEC drivers"
> > depends on COMPILE_TEST
> > + depends on !PPC
> > select SND_SOC_88PM860X if MFD_88PM860X
> > select SND_SOC_L3
> > select SND_SOC_AB8500_CODEC if ABX500_CORE
> Suppressing this whole is an overreaction, IMO. It should suffice
> just to disable compile-testing Intel driver.
Please send patches and reports to maintainers :( I agree that this is
an absurdly wide change.
> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> index 803f95e40679..d854cd66e090 100644
> --- a/sound/soc/intel/Kconfig
> +++ b/sound/soc/intel/Kconfig
> @@ -31,6 +31,8 @@ config SND_SOC_INTEL_SST
> tristate
> select SND_SOC_INTEL_SST_ACPI if ACPI
> depends on (X86 || COMPILE_TEST)
> + # FIXME: a part of compress API is broken for PPC
> + depends on !PPC
Why is an Intel CPU thing being enabled by SND_SOC_ALL_CODECS? I'm also
unclear why this will help when we're selecting in the drivers so their
dependencies will be ignored.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Takashi Iwai @ 2016-01-25 13:10 UTC (permalink / raw)
To: Mark Brown
Cc: Takashi Iwai, Stephen Rothwell, Sudip Mukherjee, Vinod Koul,
Andrew Morton, linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <20160125114150.GK6588@sirena.org.uk>
On Mon, 25 Jan 2016 12:41:50 +0100,
Mark Brown wrote:
>
> On Mon, Jan 25, 2016 at 10:29:54AM +0100, Takashi Iwai wrote:
> > Stephen Rothwell wrote:
>
> > > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> > > index 50693c867e71..ee5f36b9c787 100644
> > > --- a/sound/soc/codecs/Kconfig
> > > +++ b/sound/soc/codecs/Kconfig
> > > @@ -13,6 +13,7 @@ menu "CODEC drivers"
> > > config SND_SOC_ALL_CODECS
> > > tristate "Build all ASoC CODEC drivers"
> > > depends on COMPILE_TEST
> > > + depends on !PPC
> > > select SND_SOC_88PM860X if MFD_88PM860X
> > > select SND_SOC_L3
> > > select SND_SOC_AB8500_CODEC if ABX500_CORE
>
> > Suppressing this whole is an overreaction, IMO. It should suffice
> > just to disable compile-testing Intel driver.
>
> Please send patches and reports to maintainers :( I agree that this is
> an absurdly wide change.
>
> > diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> > index 803f95e40679..d854cd66e090 100644
> > --- a/sound/soc/intel/Kconfig
> > +++ b/sound/soc/intel/Kconfig
> > @@ -31,6 +31,8 @@ config SND_SOC_INTEL_SST
> > tristate
> > select SND_SOC_INTEL_SST_ACPI if ACPI
> > depends on (X86 || COMPILE_TEST)
> > + # FIXME: a part of compress API is broken for PPC
> > + depends on !PPC
>
> Why is an Intel CPU thing being enabled by SND_SOC_ALL_CODECS? I'm also
> unclear why this will help when we're selecting in the drivers so their
> dependencies will be ignored.
Yeah, obviously papering over a wrong place.
In anyway, thinking of this workaround again, I don't think it being
the best way. The easier and safer workaround is to just avoid the
corresponding ioctl being handled. The untested patch is attached
below.
thanks,
Takashi
-- 8< --
From: Takashi Iwai <tiwai@suse.de>
Subject: [PATCH] ALSA: compress: Disable GET_CODEC_CAPS ioctl for some
architectures
Some architectures like PowerPC can handle the maximum struct size in
an ioctl only up to 13 bits, and struct snd_compr_codec_caps used by
SNDRV_COMPRESS_GET_CODEC_CAPS ioctl overflows this limit. This
problem was revealed recently by a powerpc change, as it's now treated
as a fatal build error.
This patch is a workaround for that: for architectures with less than
14 bit ioctl struct size, get rid of the handling of the relevant
ioctl. We should provide an alternative equivalent ioctl code later,
but for now just paper over it. Luckily, the compress API hasn't been
used on such architectures, so the impact must be effectively zero.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/core/compress_offload.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index 18b8dc45bb8f..36b0083fd9f4 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -46,6 +46,13 @@
#include <sound/compress_offload.h>
#include <sound/compress_driver.h>
+/* FIXME: struct snd_compr_codec_caps overflows the ioctl bit size for some
+ * architectures, so we need to disable the relevant ioctls.
+ */
+#if _IOC_SIZEBITS < 13
+#define COMPR_CODEC_CAPS_OVERFLOW
+#endif
+
/* TODO:
* - add substream support for multiple devices in case of
* SND_DYNAMIC_MINORS is not used
@@ -440,6 +447,7 @@ out:
return retval;
}
+#ifndef COMPR_CODEC_CAPS_OVERFLOW
static int
snd_compr_get_codec_caps(struct snd_compr_stream *stream, unsigned long arg)
{
@@ -463,6 +471,7 @@ out:
kfree(caps);
return retval;
}
+#endif /* !COMPR_CODEC_CAPS_OVERFLOW */
/* revisit this with snd_pcm_preallocate_xxx */
static int snd_compr_allocate_buffer(struct snd_compr_stream *stream,
@@ -801,9 +810,11 @@ static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
case _IOC_NR(SNDRV_COMPRESS_GET_CAPS):
retval = snd_compr_get_caps(stream, arg);
break;
+#ifndef COMPR_CODEC_CAPS_OVERFLOW
case _IOC_NR(SNDRV_COMPRESS_GET_CODEC_CAPS):
retval = snd_compr_get_codec_caps(stream, arg);
break;
+#endif
case _IOC_NR(SNDRV_COMPRESS_SET_PARAMS):
retval = snd_compr_set_params(stream, arg);
break;
--
2.7.0
^ permalink raw reply related
* Re: linux-next: build failure after merge of the akpm tree
From: Takashi Iwai @ 2016-01-25 13:45 UTC (permalink / raw)
To: Mark Brown
Cc: Stephen Rothwell, Sudip Mukherjee, Vinod Koul, Andrew Morton,
linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <s5hmvrtajoy.wl-tiwai@suse.de>
On Mon, 25 Jan 2016 14:10:37 +0100,
Takashi Iwai wrote:
>
> On Mon, 25 Jan 2016 12:41:50 +0100,
> Mark Brown wrote:
> >
> > On Mon, Jan 25, 2016 at 10:29:54AM +0100, Takashi Iwai wrote:
> > > Stephen Rothwell wrote:
> >
> > > > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> > > > index 50693c867e71..ee5f36b9c787 100644
> > > > --- a/sound/soc/codecs/Kconfig
> > > > +++ b/sound/soc/codecs/Kconfig
> > > > @@ -13,6 +13,7 @@ menu "CODEC drivers"
> > > > config SND_SOC_ALL_CODECS
> > > > tristate "Build all ASoC CODEC drivers"
> > > > depends on COMPILE_TEST
> > > > + depends on !PPC
> > > > select SND_SOC_88PM860X if MFD_88PM860X
> > > > select SND_SOC_L3
> > > > select SND_SOC_AB8500_CODEC if ABX500_CORE
> >
> > > Suppressing this whole is an overreaction, IMO. It should suffice
> > > just to disable compile-testing Intel driver.
> >
> > Please send patches and reports to maintainers :( I agree that this is
> > an absurdly wide change.
> >
> > > diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> > > index 803f95e40679..d854cd66e090 100644
> > > --- a/sound/soc/intel/Kconfig
> > > +++ b/sound/soc/intel/Kconfig
> > > @@ -31,6 +31,8 @@ config SND_SOC_INTEL_SST
> > > tristate
> > > select SND_SOC_INTEL_SST_ACPI if ACPI
> > > depends on (X86 || COMPILE_TEST)
> > > + # FIXME: a part of compress API is broken for PPC
> > > + depends on !PPC
> >
> > Why is an Intel CPU thing being enabled by SND_SOC_ALL_CODECS? I'm also
> > unclear why this will help when we're selecting in the drivers so their
> > dependencies will be ignored.
>
> Yeah, obviously papering over a wrong place.
>
> In anyway, thinking of this workaround again, I don't think it being
> the best way. The easier and safer workaround is to just avoid the
> corresponding ioctl being handled. The untested patch is attached
> below.
>
>
> thanks,
>
> Takashi
>
> -- 8< --
> From: Takashi Iwai <tiwai@suse.de>
> Subject: [PATCH] ALSA: compress: Disable GET_CODEC_CAPS ioctl for some
> architectures
>
> Some architectures like PowerPC can handle the maximum struct size in
> an ioctl only up to 13 bits, and struct snd_compr_codec_caps used by
> SNDRV_COMPRESS_GET_CODEC_CAPS ioctl overflows this limit. This
> problem was revealed recently by a powerpc change, as it's now treated
> as a fatal build error.
>
> This patch is a workaround for that: for architectures with less than
> 14 bit ioctl struct size, get rid of the handling of the relevant
> ioctl. We should provide an alternative equivalent ioctl code later,
> but for now just paper over it. Luckily, the compress API hasn't been
> used on such architectures, so the impact must be effectively zero.
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> sound/core/compress_offload.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
> index 18b8dc45bb8f..36b0083fd9f4 100644
> --- a/sound/core/compress_offload.c
> +++ b/sound/core/compress_offload.c
> @@ -46,6 +46,13 @@
> #include <sound/compress_offload.h>
> #include <sound/compress_driver.h>
>
> +/* FIXME: struct snd_compr_codec_caps overflows the ioctl bit size for some
> + * architectures, so we need to disable the relevant ioctls.
> + */
> +#if _IOC_SIZEBITS < 13
Argh, a typo here. I forgot to refresh the patch, sorry.
Below is the revised one.
Takashi
-- 8< --
From: Takashi Iwai <tiwai@suse.de>
Subject: [PATCH v2] ALSA: compress: Disable GET_CODEC_CAPS ioctl for some
architectures
Some architectures like PowerPC can handle the maximum struct size in
an ioctl only up to 13 bits, and struct snd_compr_codec_caps used by
SNDRV_COMPRESS_GET_CODEC_CAPS ioctl overflows this limit. This
problem was revealed recently by a powerpc change, as it's now treated
as a fatal build error.
This patch is a workaround for that: for architectures with less than
14 bit ioctl struct size, get rid of the handling of the relevant
ioctl. We should provide an alternative equivalent ioctl code later,
but for now just paper over it. Luckily, the compress API hasn't been
used on such architectures, so the impact must be effectively zero.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/core/compress_offload.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index 18b8dc45bb8f..0609e618107a 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -46,6 +46,13 @@
#include <sound/compress_offload.h>
#include <sound/compress_driver.h>
+/* FIXME: struct snd_compr_codec_caps overflows the ioctl bit size for some
+ * architectures, so we need to disable the relevant ioctls.
+ */
+#if _IOC_SIZEBITS < 14
+#define COMPR_CODEC_CAPS_OVERFLOW
+#endif
+
/* TODO:
* - add substream support for multiple devices in case of
* SND_DYNAMIC_MINORS is not used
@@ -440,6 +447,7 @@ out:
return retval;
}
+#ifndef COMPR_CODEC_CAPS_OVERFLOW
static int
snd_compr_get_codec_caps(struct snd_compr_stream *stream, unsigned long arg)
{
@@ -463,6 +471,7 @@ out:
kfree(caps);
return retval;
}
+#endif /* !COMPR_CODEC_CAPS_OVERFLOW */
/* revisit this with snd_pcm_preallocate_xxx */
static int snd_compr_allocate_buffer(struct snd_compr_stream *stream,
@@ -801,9 +810,11 @@ static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
case _IOC_NR(SNDRV_COMPRESS_GET_CAPS):
retval = snd_compr_get_caps(stream, arg);
break;
+#ifndef COMPR_CODEC_CAPS_OVERFLOW
case _IOC_NR(SNDRV_COMPRESS_GET_CODEC_CAPS):
retval = snd_compr_get_codec_caps(stream, arg);
break;
+#endif
case _IOC_NR(SNDRV_COMPRESS_SET_PARAMS):
retval = snd_compr_set_params(stream, arg);
break;
--
2.7.0
^ permalink raw reply related
* Re: linux-next: build failure after merge of the akpm tree
From: Mark Brown @ 2016-01-25 13:55 UTC (permalink / raw)
To: Takashi Iwai
Cc: Stephen Rothwell, Sudip Mukherjee, Vinod Koul, Andrew Morton,
linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <s5hio2hai24.wl-tiwai@suse.de>
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
On Mon, Jan 25, 2016 at 02:45:55PM +0100, Takashi Iwai wrote:
> Argh, a typo here. I forgot to refresh the patch, sorry.
> Below is the revised one.
This makes sense to me.
Reviwed-by: Mark Brown <broonie@kernel.org>
though we will need to come up with an alternative solution for the
affected architectures if anyone ends up caring (MIPS or PowerPC might
possibly).
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Sudip Mukherjee @ 2016-01-25 14:02 UTC (permalink / raw)
To: Takashi Iwai
Cc: Mark Brown, Stephen Rothwell, Vinod Koul, Andrew Morton,
linux-next, linux-kernel, Pierre-Louis Bossart
In-Reply-To: <s5hio2hai24.wl-tiwai@suse.de>
On Mon, Jan 25, 2016 at 02:45:55PM +0100, Takashi Iwai wrote:
> On Mon, 25 Jan 2016 14:10:37 +0100,
> Takashi Iwai wrote:
> >
> > On Mon, 25 Jan 2016 12:41:50 +0100,
> > Mark Brown wrote:
> > >
> >
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > ---
> > sound/core/compress_offload.c | 11 +++++++++++
> > 1 file changed, 11 insertions(+)
> >
> > diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
> > index 18b8dc45bb8f..36b0083fd9f4 100644
> > --- a/sound/core/compress_offload.c
> > +++ b/sound/core/compress_offload.c
> > @@ -46,6 +46,13 @@
> > #include <sound/compress_offload.h>
> > #include <sound/compress_driver.h>
> >
> > +/* FIXME: struct snd_compr_codec_caps overflows the ioctl bit size for some
> > + * architectures, so we need to disable the relevant ioctls.
> > + */
> > +#if _IOC_SIZEBITS < 13
>
> Argh, a typo here. I forgot to refresh the patch, sorry.
>
> Below is the revised one.
powerpc allmodconfig builds properly now.
Acked-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
regards
sudip
^ permalink raw reply
* Add my git tree for linux-next
From: David Sterba @ 2016-01-25 18:24 UTC (permalink / raw)
To: sfr; +Cc: clm, linux-next, linux-btrfs
Hi,
please add my git tree to linux-next branches
git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next
It's not populated yet, I'm planning to add namely other developer
patchsets (targeting the next release cycle) as I'm able to review them.
I won't track all pending patchsets nor all single patches that go to
the mailinglist, due to time reasons.
Thanks.
^ permalink raw reply
* Re: Add my git tree for linux-next
From: Stephen Rothwell @ 2016-01-25 23:16 UTC (permalink / raw)
To: David Sterba; +Cc: clm, linux-next, linux-btrfs
In-Reply-To: <20160125182445.GA8567@twin.jikos.cz>
Hi David,
On Mon, 25 Jan 2016 19:24:45 +0100 David Sterba <dsterba@suse.cz> wrote:
>
> please add my git tree to linux-next branches
>
> git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next
>
> It's not populated yet, I'm planning to add namely other developer
> patchsets (targeting the next release cycle) as I'm able to review them.
> I won't track all pending patchsets nor all single patches that go to
> the mailinglist, due to time reasons.
What subsystem will these patches relate to? (just btrfs)? Will you be sending pull
requests? To whom? (Chris and Josef)? If so, how will this be
different to the current btrfs tree?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: Add my git tree for linux-next
From: Chris Mason @ 2016-01-26 0:59 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Sterba, linux-next, linux-btrfs
In-Reply-To: <20160126101616.682677d4@canb.auug.org.au>
On Tue, Jan 26, 2016 at 10:16:16AM +1100, Stephen Rothwell wrote:
> Hi David,
>
> On Mon, 25 Jan 2016 19:24:45 +0100 David Sterba <dsterba@suse.cz> wrote:
> >
> > please add my git tree to linux-next branches
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next
> >
> > It's not populated yet, I'm planning to add namely other developer
> > patchsets (targeting the next release cycle) as I'm able to review them.
> > I won't track all pending patchsets nor all single patches that go to
> > the mailinglist, due to time reasons.
>
> What subsystem will these patches relate to? (just btrfs)? Will you be sending pull
> requests? To whom? (Chris and Josef)? If so, how will this be
> different to the current btrfs tree?
Dave is one of the btrfs maintainers, and I frequently pull in his trees
directly for my pull requests to Linus. Getting them earlier exposure in
linux-next will definitely help.
If we ever share the pull-request duties to Linus, it'll also be important to
have Dave's trees in there.
-chris
^ permalink raw reply
* Re: Add my git tree for linux-next
From: Stephen Rothwell @ 2016-01-26 1:56 UTC (permalink / raw)
To: David Sterba; +Cc: clm, linux-next, linux-btrfs
In-Reply-To: <20160125182445.GA8567@twin.jikos.cz>
Hi David,
On Mon, 25 Jan 2016 19:24:45 +0100 David Sterba <dsterba@suse.cz> wrote:
>
> please add my git tree to linux-next branches
>
> git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-next
There is no for-next branch or tag in that tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Loans
From: Fidelity Loan @ 2016-01-25 15:03 UTC (permalink / raw)
To: Recipients
Loan Offer at 3%, Feel Free to REPLY back to us for more info.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox