* Re: linux-next: Tree for Jun 6 (scsi_debug.c)
From: Randy Dunlap @ 2016-06-07 3:10 UTC (permalink / raw)
To: Stephen Rothwell, linux-next; +Cc: linux-kernel, linux-scsi
In-Reply-To: <20160606142058.44b82e38@canb.auug.org.au>
On 06/05/16 21:20, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20160603:
on x86_64:
ERROR: "ip_compute_csum" [drivers/scsi/scsi_debug.ko] undefined!
CONFIG_GENERIC_CSUM doesn't seem to exist for x86, so lib/checksum.o is not built.
--
~Randy
^ permalink raw reply
* linux-next: manual merge of the clockevents tree with Linus' tree
From: Stephen Rothwell @ 2016-06-07 3:03 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: linux-next, linux-kernel, Julien Grall, Christoffer Dall
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
drivers/clocksource/arm_arch_timer.c
between commit:
d9b5e41591ca ("clocksource: arm_arch_timer: Extend arch_timer_kvm_info to get the virtual IRQ")
from Linus' tree and commit:
e6f3cf51efde ("clocksource/drivers/arm_arch_timer: Convert init function to return error")
from the clockevents tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/clocksource/arm_arch_timer.c
index 4814446a0024,51042ed0d9ab..000000000000
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@@ -743,13 -743,14 +744,18 @@@ static int __init arch_timer_init(void
}
}
- arch_timer_register();
- arch_timer_common_init();
+ ret = arch_timer_register();
+ if (ret)
+ return ret;
+
- return arch_timer_common_init();
++ ret = arch_timer_common_init();
+
+ arch_timer_kvm_info.virtual_irq = arch_timer_ppi[VIRT_PPI];
++
++ return ret;
}
- static void __init arch_timer_of_init(struct device_node *np)
+ static int __init arch_timer_of_init(struct device_node *np)
{
int i;
^ permalink raw reply
* linux-next: manual merge of the clockevents tree with the arm-soc tree
From: Stephen Rothwell @ 2016-06-07 2:56 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: linux-next, linux-kernel, Linus Walleij
Hi Daniel,
Today's linux-next merge of the clockevents tree got conflicts in:
arch/arm/Kconfig
arch/arm/mach-mxs/Kconfig
between commit:
5c34a4e89c74 ("ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB")
from the arm-soc tree and commits:
db01e25865a3 ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option")
b37b0e101e59 ("clocksource/drivers/mxs: Add the COMPILE_TEST option")
from the clockevents tree.
Please keep select lines ordered if they appear to be already.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/Kconfig
index a0af11b90236,0c1f5468a8e7..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -354,8 -354,8 +354,8 @@@ config ARM_SINGLE_ARMV7
config ARCH_CLPS711X
bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
- select ARCH_REQUIRE_GPIOLIB
select AUTO_ZRELADDR
- select CLKSRC_MMIO
++ select CLPS711X_TIMER
select COMMON_CLK
select CPU_ARM720T
select GENERIC_CLOCKEVENTS
diff --cc arch/arm/mach-mxs/Kconfig
index 5d9e5fce7937,68a3a9ec605d..000000000000
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@@ -15,8 -15,8 +15,8 @@@ config SOC_IMX2
config ARCH_MXS
bool "Freescale MXS (i.MX23, i.MX28) support"
depends on ARCH_MULTI_V5
- select CLKSRC_MMIO
- select ARCH_REQUIRE_GPIOLIB
+ select GPIOLIB
+ select MXS_TIMER
select PINCTRL
select SOC_BUS
select SOC_IMX23
^ permalink raw reply
* linux-next: manual merge of the drm-misc tree with Linus' tree
From: Stephen Rothwell @ 2016-06-07 1:32 UTC (permalink / raw)
To: Daniel Vetter, intel-gfx, dri-devel
Cc: linux-next, Gustavo Padovan, linux-kernel, Sumit Semwal
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
Documentation/DocBook/device-drivers.tmpl
between commit:
eae1760fc838 ("doc: update/fixup dma-buf related DocBook")
from Linus' tree and commit:
ddac4b5a6c08 ("Documentation: add fence-array to kernel DocBook")
from the drm-misc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/DocBook/device-drivers.tmpl
index 8c68768ebee5,5744ec7d2d30..000000000000
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@@ -128,44 -128,18 +128,46 @@@ X!Edrivers/base/interface.
!Edrivers/base/platform.c
!Edrivers/base/bus.c
</sect1>
- <sect1><title>Device Drivers DMA Management</title>
+ <sect1>
+ <title>Buffer Sharing and Synchronization</title>
+ <para>
+ The dma-buf subsystem provides the framework for sharing buffers
+ for hardware (DMA) access across multiple device drivers and
+ subsystems, and for synchronizing asynchronous hardware access.
+ </para>
+ <para>
+ This is used, for example, by drm "prime" multi-GPU support, but
+ is of course not limited to GPU use cases.
+ </para>
+ <para>
+ The three main components of this are: (1) dma-buf, representing
+ a sg_table and exposed to userspace as a file descriptor to allow
+ passing between devices, (2) fence, which provides a mechanism
+ to signal when one device as finished access, and (3) reservation,
+ which manages the shared or exclusive fence(s) associated with
+ the buffer.
+ </para>
+ <sect2><title>dma-buf</title>
!Edrivers/dma-buf/dma-buf.c
+!Iinclude/linux/dma-buf.h
+ </sect2>
+ <sect2><title>reservation</title>
+!Pdrivers/dma-buf/reservation.c Reservation Object Overview
+!Edrivers/dma-buf/reservation.c
+!Iinclude/linux/reservation.h
+ </sect2>
+ <sect2><title>fence</title>
!Edrivers/dma-buf/fence.c
-!Edrivers/dma-buf/seqno-fence.c
-!Edrivers/dma-buf/fence-array.c
!Iinclude/linux/fence.h
+!Edrivers/dma-buf/seqno-fence.c
!Iinclude/linux/seqno-fence.h
++!Edrivers/dma-buf/fence-array.c
+ !Iinclude/linux/fence-array.h
-!Edrivers/dma-buf/reservation.c
-!Iinclude/linux/reservation.h
!Edrivers/dma-buf/sync_file.c
!Iinclude/linux/sync_file.h
+ </sect2>
+ </sect1>
+ <sect1><title>Device Drivers DMA Management</title>
!Edrivers/base/dma-coherent.c
!Edrivers/base/dma-mapping.c
</sect1>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply
* mmotm 2016-06-06-16-15 uploaded
From: akpm @ 2016-06-06 23:16 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-06-06-16-15 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.7-rc2:
(patches marked "*" will be included in linux-next)
origin.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
* tree-wide-get-rid-of-__gfp_repeat-for-order-0-allocations-part-i.patch
* x86-get-rid-of-superfluous-__gfp_repeat.patch
* x86-efi-get-rid-of-superfluous-__gfp_repeat.patch
* arm-get-rid-of-superfluous-__gfp_repeat.patch
* arm64-get-rid-of-superfluous-__gfp_repeat.patch
* arc-get-rid-of-superfluous-__gfp_repeat.patch
* mips-get-rid-of-superfluous-__gfp_repeat.patch
* nios2-get-rid-of-superfluous-__gfp_repeat.patch
* parisc-get-rid-of-superfluous-__gfp_repeat.patch
* score-get-rid-of-superfluous-__gfp_repeat.patch
* powerpc-get-rid-of-superfluous-__gfp_repeat.patch
* sparc-get-rid-of-superfluous-__gfp_repeat.patch
* s390-get-rid-of-superfluous-__gfp_repeat.patch
* sh-get-rid-of-superfluous-__gfp_repeat.patch
* tile-get-rid-of-superfluous-__gfp_repeat.patch
* unicore32-get-rid-of-superfluous-__gfp_repeat.patch
* jbd2-get-rid-of-superfluous-__gfp_repeat.patch
* mm-hugetlb-fix-huge-page-reserve-accounting-for-private-mappings.patch
* kasan-change-memory-hot-add-error-messages-to-info-messages.patch
* mmoom_reaper-dont-call-mmput_async-without-atomic_inc_not_zero.patch
* revert-mm-memcontrol-fix-possible-css-ref-leak-on-oom.patch
* thp-broken-page-count-after-commit-aa88b68c.patch
* relay-fix-potential-memory-leak.patch
* mm-introduce-dedicated-wq_mem_reclaim-workqueue-to-do-lru_add_drain_all.patch
* mm-do-not-discard-partial-pages-with-posix_fadv_dontneed.patch
* oom_reaper-avoid-pointless-atomic_inc_not_zero-usage.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* tile-early_printko-is-always-required.patch
* fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch
* ocfs2-fix-a-redundant-re-initialization.patch
* ocfs2-insure-dlm-lockspace-is-created-by-kernel-module.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
mm.patch
* mm-reorganize-slab-freelist-randomization.patch
* mm-slub-freelist-randomization.patch
* mm-memcontrol-remove-the-useless-parameter-for-mc_handle_swap_pte.patch
* mm-init-fix-zone-boundary-creation.patch
* memory-hotplug-add-move_pfn_range.patch
* memory-hotplug-more-general-validation-of-zone-during-online.patch
* memory-hotplug-use-zone_can_shift-for-sysfs-valid_zones-attribute.patch
* mm-zap-zone_oom_locked.patch
* mm-oom-add-memcg-to-oom_control.patch
* mm-debug-add-vm_warn-which-maps-to-warn.patch
* powerpc-mm-check-for-irq-disabled-only-if-debug_vm-is-enabled.patch
* zram-rename-zstrm-find-release-functions.patch
* zram-switch-to-crypto-compress-api.patch
* zram-use-crypto-api-to-check-alg-availability.patch
* zram-cosmetic-cleanup-documentation.patch
* zram-delete-custom-lzo-lz4.patch
* zram-add-more-compression-algorithms.patch
* zram-drop-gfp_t-from-zcomp_strm_alloc.patch
* mm-use-put_page-to-free-page-instead-of-putback_lru_page.patch
* mm-migrate-support-non-lru-movable-page-migration.patch
* mm-balloon-use-general-non-lru-movable-page-feature.patch
* zsmalloc-keep-max_object-in-size_class.patch
* zsmalloc-use-bit_spin_lock.patch
* zsmalloc-use-accessor.patch
* zsmalloc-factor-page-chain-functionality-out.patch
* zsmalloc-introduce-zspage-structure.patch
* zsmalloc-separate-free_zspage-from-putback_zspage.patch
* zsmalloc-use-freeobj-for-index.patch
* zsmalloc-page-migration-support.patch
* zsmalloc-page-migration-support-fix.patch
* zram-use-__gfp_movable-for-memory-allocation.patch
* mm-compaction-split-freepages-without-holding-the-zone-lock.patch
* mm-page_owner-initialize-page-owner-without-holding-the-zone-lock.patch
* mm-page_owner-copy-last_migrate_reason-in-copy_page_owner.patch
* mm-page_owner-introduce-split_page_owner-and-replace-manual-handling.patch
* tools-vm-page_owner-increase-temporary-buffer-size.patch
* mm-page_owner-use-stackdepot-to-store-stacktrace.patch
* mm-page_owner-use-stackdepot-to-store-stacktrace-fix.patch
* mm-page_alloc-introduce-post-allocation-processing-on-page-allocator.patch
* mm-thp-check-pmd_trans_unstable-after-split_huge_pmd.patch
* mm-hugetlb-simplify-hugetlb-unmap.patch
* mm-change-the-interface-for-__tlb_remove_page.patch
* mm-mmu_gather-track-page-size-with-mmu-gather-and-force-flush-if-page-size-change.patch
* mm-remove-pointless-struct-in-struct-page-definition.patch
* mm-clean-up-non-standard-page-_mapcount-users.patch
* mm-memcontrol-cleanup-kmem-charge-functions.patch
* mm-charge-uncharge-kmemcg-from-generic-page-allocator-paths.patch
* mm-memcontrol-teach-uncharge_list-to-deal-with-kmem-pages.patch
* arch-x86-charge-page-tables-to-kmemcg.patch
* pipe-account-to-kmemcg.patch
* af_unix-charge-buffers-to-kmemcg.patch
* mmoom-remove-unused-argument-from-oom_scan_process_thread.patch
* mm-frontswap-convert-frontswap_enabled-to-static-key.patch
* mm-frontswap-convert-frontswap_enabled-to-static-key-checkpatch-fixes.patch
* mm-add-nr_zsmalloc-to-vmstat.patch
* mm-add-nr_zsmalloc-to-vmstat-fix.patch
* include-linux-memblockh-clean-up-code-for-several-trivial-details.patch
* mm-memblock-if-nr_new-is-0-just-return.patch
* mm-make-optimistic-check-for-swapin-readahead.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-2.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-3.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-vmstat-calculate-particular-vm-event.patch
* mm-thp-avoid-unnecessary-swapin-in-khugepaged.patch
* mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
* mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix-2.patch
* mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem.patch
* mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix.patch
* mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix-2.patch
* mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix-2-fix.patch
* khugepaged-simplify-khugepaged-vs-__mmput.patch
* memstick-dont-allocate-unused-major-for-ms_block.patch
* nvme-dont-allocate-unused-nvme_major.patch
* nvme-dont-allocate-unused-nvme_major-fix.patch
* jump_label-remove-bugh-atomich-dependencies-for-have_jump_label.patch
* powerpc-add-explicit-include-asm-asm-compath-for-jump-label.patch
* s390-add-explicit-linux-stringifyh-for-jump-label.patch
* dynamic_debug-add-jump-label-support.patch
* lib-switch-config_printk_time-to-int.patch
* printk-allow-different-timestamps-for-printktime.patch
* lib-add-crc64-ecma-module.patch
* samples-kprobe-convert-the-printk-to-pr_info-pr_err.patch
* samples-jprobe-convert-the-printk-to-pr_info-pr_err.patch
* samples-kretprobe-convert-the-printk-to-pr_info-pr_err.patch
* samples-kretprobe-fix-the-wrong-type.patch
* fs-befs-move-useless-assignment.patch
* fs-befs-check-silent-flag-before-logging-errors.patch
* fs-befs-remove-useless-pr_err.patch
* fs-befs-remove-useless-befs_error.patch
* fs-befs-remove-useless-pr_err-in-befs_init_inodecache.patch
* nilfs2-hide-function-name-argument-from-nilfs_error.patch
* nilfs2-add-nilfs_msg-message-interface.patch
* nilfs2-embed-a-back-pointer-to-super-block-instance-in-nilfs-object.patch
* nilfs2-reduce-bare-use-of-printk-with-nilfs_msg.patch
* nilfs2-replace-nilfs_warning-with-nilfs_msg.patch
* nilfs2-emit-error-message-when-i-o-error-is-detected.patch
* nilfs2-do-not-use-yield.patch
* nilfs2-refactor-parser-of-snapshot-mount-option.patch
* reiserfs-fix-new_insert_key-may-be-used-uninitialized.patch
* kexec-return-error-number-directly.patch
* arm-kdump-advertise-boot-aliased-crash-kernel-resource.patch
* arm-kexec-advertise-location-of-bootable-ram.patch
* kexec-dont-invoke-oom-killer-for-control-page-allocation.patch
* kexec-ensure-user-memory-sizes-do-not-wrap.patch
* kexec-ensure-user-memory-sizes-do-not-wrap-fix.patch
* kdump-arrange-for-paddr_vmcoreinfo_note-to-return-phys_addr_t.patch
* kexec-allow-architectures-to-override-boot-mapping.patch
* kexec-allow-architectures-to-override-boot-mapping-fix.patch
* arm-keystone-dts-add-psci-command-definition.patch
* arm-kexec-fix-kexec-for-keystone-2.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* futex-fix-shared-futex-operations-on-nommu.patch
* dma-mapping-constify-attrs-passed-to-dma_get_attr.patch
* arm-dma-mapping-constify-attrs-passed-to-internal-functions.patch
* arm64-dma-mapping-constify-attrs-passed-to-internal-functions.patch
* w1-remove-need-for-ida-and-use-platform_devid_auto.patch
* w1-add-helper-macro-module_w1_family.patch
* kcov-allow-more-fine-grained-coverage-instrumentation.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
* mm-make-optimistic-check-for-swapin-readahead-fix.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* fpga-zynq-fpga-fix-build-failure.patch
mm-add-strictlimit-knob-v2.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
* Re: linux-next: build failure after merge of the akpm-current tree
From: Andrew Morton @ 2016-06-06 20:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Russell King
In-Reply-To: <20160606140327.09e40ec6@canb.auug.org.au>
On Mon, 6 Jun 2016 14:03:27 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> In file included from include/linux/crash_dump.h:5:0,
> from arch/powerpc/kernel/crash_dump.c:14:
> include/linux/kexec.h:358:9: note: previous implicit declaration of 'phys_to_virt' was here
> return phys_to_virt(boot_phys_to_phys(entry));
> ^
>
> Caused by commit
>
> 4382eb9055be ("kexec: allow architectures to override boot mapping")
>
> Architecture seem to define phys_to_virt() in either asm/io.h or
> asm/memory.h or asm/virtconvert.h or asm/page*.h ... or asm-generic/io.h.
> :-(
>
> I have reverted that commit for today (and commit c9aaeae038fa ("ARM:
> kexec: fix kexec for Keystone 2")).
Let's see how this gets along.
From: Andrew Morton <akpm@linux-foundation.org>
Subject: kexec-allow-architectures-to-override-boot-mapping-fix
kexec.h needs asm/io.h for phys_to_virt()
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
--- a/include/linux/kexec.h~kexec-allow-architectures-to-override-boot-mapping-fix
+++ a/include/linux/kexec.h
@@ -14,6 +14,8 @@
#if !defined(__ASSEMBLY__)
+#include <asm/io.h>
+
#include <uapi/linux/kexec.h>
#ifdef CONFIG_KEXEC_CORE
^ permalink raw reply
* Re: linux-next: error fetching the c6x tree
From: Mark Salter @ 2016-06-06 20:09 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20160606001849.7b5577e9@canb.auug.org.au>
On Mon, 2016-06-06 at 00:18 +1000, Stephen Rothwell wrote:
> Hi Mark,
>
> Fetching the c6x tree has produced this error for the past few days:
>
> fatal: Could not read from remote repository.
>
> Please make sure you have the correct access rights
> and the repository exists.
>
Thanks. TI is investigating...
^ permalink raw reply
* Re: [PATCH] mm, thp: fix locking inconsistency in collapse_huge_page
From: Vlastimil Babka @ 2016-06-06 13:05 UTC (permalink / raw)
To: Ebru Akagunduz, akpm
Cc: sergey.senozhatsky.work, mhocko, kirill.shutemov, sfr, linux-mm,
linux-next, linux-kernel, riel, aarcange
In-Reply-To: <1464956884-4644-1-git-send-email-ebru.akagunduz@gmail.com>
On 06/03/2016 02:28 PM, Ebru Akagunduz wrote:
> After creating revalidate vma function, locking inconsistency occured
> due to directing the code path to wrong label. This patch directs
> to correct label and fix the inconsistency.
>
> Related commit that caused inconsistency:
> http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=da4360877094368f6dfe75bbe804b0f0a5d575b0
>
> Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
I think this does fix the inconsistency, thanks.
But looking at collapse_huge_page() as of latest -next, I wonder if
there's another problem:
pmd = mm_find_pmd(mm, address);
...
up_read(&mm->mmap_sem);
down_write(&mm->mmap_sem);
hugepage_vma_revalidate(mm, address);
...
pte = pte_offset_map(pmd, address);
What guarantees that 'pmd' is still valid?
Vlastimil
--
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
* Re: [linux-next: Tree for Jun 1] __khugepaged_exit rwsem_down_write_failed lockup
From: Michal Hocko @ 2016-06-06 8:39 UTC (permalink / raw)
To: Sergey Senozhatsky
Cc: Sergey Senozhatsky, Andrea Arcangeli, Andrew Morton,
Vlastimil Babka, Kirill A. Shutemov, Stephen Rothwell, linux-mm,
linux-next, linux-kernel
In-Reply-To: <20160604075114.GA21108@swordfish>
On Sat 04-06-16 16:51:14, Sergey Senozhatsky wrote:
> Hello,
>
> On (06/03/16 15:49), Michal Hocko wrote:
> > __khugepaged_exit is called during the final __mmput and it employs a
> > complex synchronization dances to make sure it doesn't race with the
> > khugepaged which might be scanning this mm at the same time. This is
> > all caused by the fact that khugepaged doesn't pin mm_users. Things
> > would simplify considerably if we simply check the mm at
> > khugepaged_scan_mm_slot and if mm_users was already 0 then we know it
> > is dead and we can unhash the mm_slot and move on to another one. This
> > will also guarantee that __khugepaged_exit cannot race with khugepaged
> > and so we can free up the slot if it is still hashed.
> >
> > Signed-off-by: Michal Hocko <mhocko@suse.com>
>
> with this patch and
> http://ozlabs.org/~akpm/mmotm/broken-out/mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix-2.patch
>
> I saw no problems during my tests (well, may be didn't test hard
> enough).
Thanks for the testing!
--
Michal Hocko
SUSE Labs
--
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
* next-20160606 build: 1 failures 9 warnings (next-20160606)
From: Build bot for Mark Brown @ 2016-06-06 7:14 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160606
Git describe: next-20160606
Commit: 93114d94ec Add linux-next specific files for 20160606
Build Time: 78 min 4 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 9
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm64-allmodconfig
72 warnings 0 mismatches : arm-allmodconfig
4 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
3 ../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
Warnings Summary: 9
66 ../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
2 ../include/linux/err.h:21:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
2 ../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
2 ../include/linux/compaction.h:242:54: warning: 'struct node' declared inside parameter list
2 ../include/linux/compaction.h:237:51: warning: its scope is only this definition or declaration, which is probably not what you want
2 ../include/linux/compaction.h:237:51: warning: 'struct node' declared inside parameter list
1 ../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:123:6: warning: unused variable 'r' [-Wunused-variable]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1170:6: warning: unused variable 'r' [-Wunused-variable]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../include/linux/err.h:21:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 3 errors, 72 warnings, 0 section mismatches
Errors:
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
Warnings:
../include/linux/compaction.h:237:51: warning: 'struct node' declared inside parameter list
../include/linux/compaction.h:237:51: warning: its scope is only this definition or declaration, which is probably not what you want
../include/linux/compaction.h:242:54: warning: 'struct node' declared inside parameter list
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../drivers/gpu/drm/omapdrm/dss/dsi.c:1170:6: warning: unused variable 'r' [-Wunused-variable]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:123:6: warning: unused variable 'r' [-Wunused-variable]
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
../include/linux/compaction.h:237:51: warning: 'struct node' declared inside parameter list
../include/linux/compaction.h:237:51: warning: its scope is only this definition or declaration, which is probably not what you want
../include/linux/compaction.h:242:54: warning: 'struct node' declared inside parameter list
../include/linux/err.h:21:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
^ permalink raw reply
* linux-next: Tree for Jun 6
From: Stephen Rothwell @ 2016-06-06 4:20 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160603:
New tree: amlogic
Dropped tree: amlogic (build failure)
My fixes tree contains:
of: silence warnings due to max() usage
The amlogic tree gained a build failure so I dropped it for today.
The samsung-krzk tree gained a conflict against the arm-soc tree.
The akpm-current tree gained a build failure for which I reverted
2 commits.
Non-merge commits (relative to Linus' tree): 1713
1616 files changed, 67681 insertions(+), 31198 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 238 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (af8c34ce6ae3 Linux 4.7-rc2)
Merging fixes/master (b31033aacbd0 of: silence warnings due to max() usage)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (ed6aefed726a Revert "ARCv2: spinlock/rwlock/atomics: Delayed retry of failed SCOND with exponential backoff")
Merging arm-current/fixes (e2dfb4b88014 ARM: fix PTRACE_SETVFPREGS on SMP systems)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (7cc851039d64 powerpc/pseries: Add POWER8NVL support to ibm,client-architecture-support call)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (4ef36e156670 Merge tag 'wireless-drivers-for-davem-2016-06-04' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-drivers/master (182fd9eecb28 MAINTAINERS: Add file patterns for wireless device tree bindings)
Merging mac80211/master (6fe04128f158 mac80211: fix fast_tx header alignment)
Merging sound-current/for-linus (0358ccc8ffd8 ALSA: uapi: Add three missing header files to Kbuild file)
Merging pci-current/for-linus (1a695a905c18 Linux 4.7-rc1)
Merging driver-core.current/driver-core-linus (1a695a905c18 Linux 4.7-rc1)
Merging tty.current/tty-linus (1a695a905c18 Linux 4.7-rc1)
Merging usb.current/usb-linus (7b2c17f82954 usb: musb: Stop bulk endpoint while queue is rotated)
Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command)
Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even more ZTE device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (1a695a905c18 Linux 4.7-rc1)
Merging char-misc.current/char-misc-linus (1a695a905c18 Linux 4.7-rc1)
Merging input-current/for-linus (540c26087bfb Input: xpad - fix rumble on Xbox One controllers with 2015 firmware)
Merging crypto-current/master (ab6a11a7c8ef crypto: ccp - Fix AES XTS error for request sizes above 4096)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read)
Merging kselftest-fixes/fixes (1a77e2bd8c89 kselftests: timers: Add set-tz test case)
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 (1a695a905c18 Linux 4.7-rc1)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (ed6aefed726a Revert "ARCv2: spinlock/rwlock/atomics: Delayed retry of failed SCOND with exponential backoff")
Merging arm/for-next (9d1f948e6285 Merge branches 'component', 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (813f80af1dc9 ARM: SoC: Document merges)
Merging amlogic/for-next (71e9a3a9b76a Merge branches 'amlogic/v4.7/soc' and 'amlogic/v4.7/dt' into amlogic/v4.7/integ)
$ git reset --hard HEAD^
Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (6a93792774fc ARM: bcm2835: dt: Add the ethernet to the device trees)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (1a695a905c18 Linux 4.7-rc1)
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 (63b44471754b Merge branch 'imx/defconfig64' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (5c66191b5c76 Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (eb8e0105700b firmware: qcom_scm: Make core clock optional)
Merging renesas/next (1df83bd17bee Merge branches 'heads/arm64-dt-for-v4.8', 'heads/dt-for-v4.8', 'heads/soc-for-v4.8' and 'heads/sh-drivers-for-v4.8' into next)
Merging rockchip/for-next (5e46e8d66d01 Merge branch 'v4.7-clk/fixes' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (ed636c9d24af Merge branch 'for-v4.8/dts-exynos5410-odroid-xu' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next)
Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
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 (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (1a695a905c18 Linux 4.7-rc1)
Merging metag/for-next (592ddeeff8cb metag: Fix typos)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (b02b1fbdd338 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging powerpc/next (138a076496e6 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 (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (962e89b4443d s390/kexec: fix crash on resize of reserved memory)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (bdf03e59f8c1 Fix typo)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7)
Merging btrfs-kdave/for-next (012a38ea4b0f Merge branch 'for-next-next-4.7-20160601' into for-next-20160601)
Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache)
Merging cifs/for-next (3bdc426e2497 cifs: dynamic allocation of ntlmssp blob)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (b9d8905e4a75 reiserfs: check kstrdup failure)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
Merging f2fs/dev (120212ac703c f2fs: control not to exceed # of cached nat entries)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS)
Merging gfs2/for-next (29567292c0b5 Merge tag 'for-linus-4.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (af8c34ce6ae3 Linux 4.7-rc2)
Merging nfsd/nfsd-next (9e62f931dd07 rpc: share one xps between all backchannels)
Merging orangefs/for-next (2dcd0af568b0 Linux 4.6)
Merging overlayfs/overlayfs-next (7d43ba76af20 ovl: store ovl_entry in inode->i_private for all inodes)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1112018cefc5 ubifs: ubifs_dump_inode: Fix dumping field bulk_read)
Merging xfs/for-next (26f1fe858f27 xfs: reduce lock hold times in buffer writeback)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (1eb82bc8e712 Merge branch 'for-linus' into for-next)
Merging pci/next (1a695a905c18 Linux 4.7-rc1)
Merging pstore/for-next/pstore (cae7316708c4 efi-pstore: implement efivars_pstore_exit())
Merging hid/for-next (6712bcbbbebf Merge branch 'for-4.8/uhid-offload-hid-device-add' into for-next)
Merging i2c/i2c/for-next (1a695a905c18 Linux 4.7-rc1)
Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (0ca457698824 hwmon: add support for Sensirion SHT3x sensors)
Merging v4l-dvb/master (73dfb701d254 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (63b8c854fc8e Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (546afd1a3678 Merge branches 'for-rc' and 'thermal-sysfs-locking' into next)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c
CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (4f0382030b6d Merge branch 'topic/sh' into next)
Merging net-next/master (b1c6a3a46b8b Merge branch 'hns-acpi')
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (698e2a8dca98 ipvs: make drop_entry protection effective for SIP-pe)
Merging wireless-drivers-next/master (47ce90f9f08a mwifiex: fix typo)
Merging bluetooth/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging mac80211-next/master (019ae3a91881 cfg80211: Advertise extended capabilities per interface type to userspace)
Merging rdma/for-next (7a226f9c32b0 staging/rdma: Remove the entire rdma subdirectory of staging)
Merging rdma-leon/rdma-next (1a695a905c18 Linux 4.7-rc1)
Merging rdma-leon-test/testing/rdma-next (cb5cd4f9a546 Merge branches 'topic/net-mlx5', 'topic/fixes-ib' and 'topic/fixes-ib-mlx5' into testing/rdma-next)
Merging mtd/master (becc7ae544c6 MAINTAINERS: Add file patterns for mtd device tree bindings)
Merging l2-mtd/master (95193796256c mtd: m25p80: read in spi_max_transfer_size chunks)
Merging nand/nand/next (decba6d47869 mtd: brcmnand: Add v7.2 controller support)
Merging crypto/master (0a7f330c12f2 crypto: sha1-mb - stylistic cleanup)
Merging drm/drm-next (66fd7a66e8b9 Merge branch 'drm-intel-next' of git://anongit.freedesktop.org/drm-intel into drm-next)
Merging drm-panel/drm/panel/for-next (227e4f4079e1 drm/panel: simple: Add support for TPK U.S.A. LLC Fusion 7" and 10.1" panels)
Merging drm-intel/for-linux-next (1750d59dfa3c drm/i915: Update DRIVER_DATE to 20160606)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (da5335b8bd4a drm/doc: Switch to sphinx/rst fixed-width quoting)
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 (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs)
Merging drm-vc4/drm-vc4-next (1a4a4affa058 drm/vc4: clean up error exit path on failed dpi_connector allocation)
Merging sunxi/sunxi/for-next (30ce0df9ee51 Merge branches 'sunxi/defconfig-for-4.8', 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.8' into sunxi/for-next)
Merging kbuild/for-next (0c644e04ad1b Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (545c89f17046 Merge remote-tracking branches 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next)
Merging sound/for-next (1524c7191be2 ALSA: adlib: Utilize the module_isa_driver macro)
Merging sound-asoc/for-next (d46ff8618129 Merge remote-tracking branches 'asoc/topic/tas571x', 'asoc/topic/tlv320aic31xx' and 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (1afca2b66aac Input: add Pegasus Notetaker tablet driver)
Merging block/for-next (661806a31989 Merge branch 'for-4.7/core' into for-next)
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (b8ef07be98b4 dm mpath: add optional "queue_mode" feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (ba965b4ebd31 mmc: tmio: make a cast explicit)
Merging md/for-next (db76767213be md: simplify the code with md_kick_rdev_from_array)
Merging mfd/for-mfd-next (b52207ef4ea5 mfd: hi655x: Add MFD driver for hi655x)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (037fcf86edc7 Merge remote-tracking branch 'regulator/topic/pwm' into regulator-next)
Merging security/next (b937190c40de LSM: LoadPin: provide enablement CONFIG)
Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record)
Merging selinux/next (7ea59202db8d selinux: Only apply bounds checking to source types)
Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression)
Merging watchdog/master (1a695a905c18 Linux 4.7-rc1)
Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next)
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (f70552809419 vfio_pci: Test for extended capabilities if config space > 256 bytes)
Merging jc_docs/docs-next (f3e6a55c3653 Documentation: dmaengine: fix typo for device_resume)
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (2b4c7afe79a8 audit: fixup: log on errors from filter user rules)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (f83803305b00 of: add vendor prefix for UniWest)
CONFLICT (content): Merge conflict in drivers/of/of_reserved_mem.c
Merging mailbox/mailbox-for-next (c430cf376fee mailbox: Fix devm_ioremap_resource error detection code)
Merging spi/for-next (e767713092de Merge remote-tracking branches 'spi/topic/maintainers', 'spi/topic/orion', 'spi/topic/pxa2xx' and 'spi/topic/rockchip' into spi-next)
Merging tip/auto-latest (f69d12a8cfff Merge branch 'locking/core')
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (665f05e0b836 EDAC, sb_edac: Readd accidentally dropped Broadwell-D support)
Merging irqchip/irqchip/for-next (d7e3528eed85 irqchip: bcm2835: Avoid arch/arm-specific handle_IRQ)
Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID)
Merging rcu/rcu/next (13ee0de9cd24 rcu: sysctl: Panic on RCU Stall)
Merging kvm/linux-next (4340fa55298d Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts)
Merging kvms390/next (d01b83d6d981 KVM: s390: turn on tx even without ctx)
Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration)
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next)
Merging drivers-x86/for-next (b740d2e9233c platform/x86: Add PMC Driver for Intel Core SoC)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (b32bd7e7d5c1 hsi: use kmemdup)
Merging leds/for-next (cc671d40dfe9 leds: handle suspend/resume in heartbeat trigger)
Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately)
Merging driver-core/driver-core-next (1a695a905c18 Linux 4.7-rc1)
Merging tty/tty-next (1a695a905c18 Linux 4.7-rc1)
Merging usb/usb-next (1a695a905c18 Linux 4.7-rc1)
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (b923c6c62981 USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support)
Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM)
Merging staging/staging-next (1a695a905c18 Linux 4.7-rc1)
Merging char-misc/char-misc-next (1a695a905c18 Linux 4.7-rc1)
Merging extcon/extcon-next (eb8652bd8d84 extcon: arizona: Update binding docs to mention new defines for GPSW)
Merging cgroup/for-next (332d8a2fd141 cgroup: set css->id to -1 during init)
Merging scsi/for-next (6b3bacc9a328 Merge branch 'fixes' into for-next)
Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (5219d6530ef0 ata: Use IS_ENABLED() instead of checking for built-in or module)
Merging pinctrl/for-next (a02fcf38ade9 Merge branch 'devel' into for-next)
Merging vhost/linux-next (bb991288728e ringtest: pass buf != NULL)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (da5cb422f15d Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (63e213fc63c0 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (18c588786c08 Merge branch 'for-4.7/pwm-atomic' into for-next)
Merging dma-buf/for-next (b02da6f82361 dma-buf: use vma_pages())
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (72ad679aa718 clk: nxp: Select MFD_SYSCON for creg driver)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1a695a905c18 Linux 4.7-rc1)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (c568ba901f27 coresight: Handle build path error)
Merging rtc/rtc-next (06776c89214a rtc: add support for Maxim max6916)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (4b05911e85be ipc/msg.c: use freezable blocking call)
Applying: Revert "ARM: kexec: fix kexec for Keystone 2"
Applying: Revert "kexec: allow architectures to override boot mapping"
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: make optimistic check for swapin readahead fix
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: drivers/fpga/Kconfig: fix build failure
Merging akpm/master (c03b64029351 drivers/fpga/Kconfig: fix build failure)
^ permalink raw reply
* linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-06-06 4:03 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Russell King
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
include/linux/kexec.h: In function 'boot_phys_to_virt':
include/linux/kexec.h:358:9: error: implicit declaration of function 'phys_to_virt' [-Werror=implicit-function-declaration]
return phys_to_virt(boot_phys_to_phys(entry));
^
include/linux/kexec.h:358:9: error: return makes pointer from integer without a cast [-Werror=int-conversion]
In file included from arch/powerpc/platforms/cell/ras.c:22:0:
arch/powerpc/include/asm/io.h: At top level:
arch/powerpc/include/asm/io.h:801:22: error: conflicting types for 'phys_to_virt'
static inline void * phys_to_virt(unsigned long address)
^
In file included from arch/powerpc/platforms/cell/ras.c:17:0:
include/linux/kexec.h:358:9: note: previous implicit declaration of 'phys_to_virt' was here
return phys_to_virt(boot_phys_to_phys(entry));
^
In file included from kernel/ksysfs.c:16:0:
include/linux/kexec.h: In function 'boot_phys_to_virt':
include/linux/kexec.h:358:9: error: implicit declaration of function 'phys_to_virt' [-Werror=implicit-function-declaration]
return phys_to_virt(boot_phys_to_phys(entry));
^
include/linux/kexec.h:358:9: warning: return makes pointer from integer without a cast [-Wint-conversion]
In file included from include/linux/crash_dump.h:5:0,
from arch/powerpc/kernel/crash_dump.c:14:
include/linux/kexec.h: In function 'boot_phys_to_virt':
include/linux/kexec.h:358:9: error: implicit declaration of function 'phys_to_virt' [-Werror=implicit-function-declaration]
return phys_to_virt(boot_phys_to_phys(entry));
^
include/linux/kexec.h:358:9: error: return makes pointer from integer without a cast [-Werror=int-conversion]
In file included from include/linux/io.h:25:0,
from arch/powerpc/kernel/crash_dump.c:15:
arch/powerpc/include/asm/io.h: At top level:
arch/powerpc/include/asm/io.h:801:22: error: conflicting types for 'phys_to_virt'
static inline void * phys_to_virt(unsigned long address)
^
In file included from include/linux/crash_dump.h:5:0,
from arch/powerpc/kernel/crash_dump.c:14:
include/linux/kexec.h:358:9: note: previous implicit declaration of 'phys_to_virt' was here
return phys_to_virt(boot_phys_to_phys(entry));
^
Caused by commit
4382eb9055be ("kexec: allow architectures to override boot mapping")
Architecture seem to define phys_to_virt() in either asm/io.h or
asm/memory.h or asm/virtconvert.h or asm/page*.h ... or asm-generic/io.h.
:-(
I have reverted that commit for today (and commit c9aaeae038fa ("ARM:
kexec: fix kexec for Keystone 2")).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the amlogic tree
From: Stephen Rothwell @ 2016-06-06 4:02 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-next, lkml, Neil Armstrong, Philipp Zabel
In-Reply-To: <CAOi56cVQPutG1ZBw16=HWBAVdbV+i2VL4vDRdc_23qVT+MEL+A@mail.gmail.com>
Hi Kevin,
On Sun, 5 Jun 2016 20:40:28 -0700 Kevin Hilman <khilman@baylibre.com> wrote:
>
> Not forgotten, but merged through Philip's reset tree, which I thought
> was already in linux-next. Sorry about that.
It may well be, but we dislike implicit dependencies between trees ...
it makes the merge order matter :-( What you should have is a common
non-rebasing branch that both trees merge.
It also means that your for-next branch, on its own, will get this
build failure as well ...
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the amlogic tree
From: Kevin Hilman @ 2016-06-06 3:40 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, lkml, Neil Armstrong, Philipp Zabel
In-Reply-To: <20160606095559.67cf4f00@canb.auug.org.au>
Hi Stephen,
On Sun, Jun 5, 2016 at 4:55 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kevin,
>
> After merging the amlogic tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from arch/arm/boot/dts/meson8b-mxq.dts:48:0:
> arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory
> In file included from arch/arm/boot/dts/meson8b-odroidc1.dts:48:0:
> arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory
>
> Caused by commit
>
> bf205ad75a17 ("ARM: dts: amlogic: Enable Reset Controller on Meson8b platforms")
>
> I guess a file was forgotten.
Not forgotten, but merged through Philip's reset tree, which I thought
was already in linux-next. Sorry about that.
Kevin
^ permalink raw reply
* RE: ath9k gpio request
From: Pan, Miaoqing @ 2016-06-06 1:51 UTC (permalink / raw)
To: Kalle Valo
Cc: Sudip Mukherjee, Stephen Rothwell, ath9k-devel,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-wireless@vger.kernel.org, ath9k-devel@lists.ath9k.org,
netdev@vger.kernel.org, Miaoqing Pan
In-Reply-To: <87d1nxt3y9.fsf@kamboji.qca.qualcomm.com>
Got it, thanks. There is no difference of the changes for AR9462 which is the chip Sudip tested.
Thanks,
Miaoqing
-----Original Message-----
From: Kalle Valo [mailto:kvalo@codeaurora.org]
Sent: Saturday, June 04, 2016 10:38 PM
To: Pan, Miaoqing <miaoqing@qti.qualcomm.com>
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>; Stephen Rothwell <sfr@canb.auug.org.au>; ath9k-devel <ath9k-devel@qca.qualcomm.com>; linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; linux-wireless@vger.kernel.org; ath9k-devel@lists.ath9k.org; netdev@vger.kernel.org; Miaoqing Pan <miaoqing@codeaurora.org>
Subject: Re: ath9k gpio request
(Fixing top posting)
"Pan, Miaoqing" <miaoqing@qti.qualcomm.com> writes:
>>> --- a/drivers/net/wireless/ath/ath9k/reg.h
>>> +++ b/drivers/net/wireless/ath/ath9k/reg.h
>>> @@ -1122,8 +1122,8 @@ enum {
>>> #define AR9300_NUM_GPIO 16
>>> #define AR9330_NUM_GPIO 16
>>> #define AR9340_NUM_GPIO 23
>>> -#define AR9462_NUM_GPIO 10
>>> -#define AR9485_NUM_GPIO 12
>>> +#define AR9462_NUM_GPIO 14
>>> +#define AR9485_NUM_GPIO 11
>>> #define AR9531_NUM_GPIO 18
>>> #define AR9550_NUM_GPIO 24
>>> #define AR9561_NUM_GPIO 23
>>> @@ -1139,8 +1139,8 @@ enum {
>>> #define AR9300_GPIO_MASK 0x0000F4FF
>>> #define AR9330_GPIO_MASK 0x0000F4FF
>>> #define AR9340_GPIO_MASK 0x0000000F
>>> -#define AR9462_GPIO_MASK 0x000003FF
>>> -#define AR9485_GPIO_MASK 0x00000FFF
>>> +#define AR9462_GPIO_MASK 0x00003FFF
>>> +#define AR9485_GPIO_MASK 0x000007FF
>>> #define AR9531_GPIO_MASK 0x0000000F
>>> #define AR9550_GPIO_MASK 0x0000000F
>>> #define AR9561_GPIO_MASK 0x0000000F
>>
>> solves the problem.
>>
>> Tested-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
>
> Done, https://patchwork.kernel.org/patch/9151847/
But the patch 9151847 is different from what Sudip tested above? Why?
And if you modify something _after_ the reporter has tested the patch clearly document what you changed and why. I do not want find hidden changes like this, even more so when the patch is going to a 4.7-rc release.
Sudip, could you also test patch 9151847, please? You can download the patch from the patchwork link above.
^ permalink raw reply
* Re: linux-next: build warning after merge of the mmc-uh tree
From: Shawn Lin @ 2016-06-06 1:51 UTC (permalink / raw)
To: Stephen Rothwell, Ulf Hansson; +Cc: shawn.lin, linux-next, linux-kernel
In-Reply-To: <20160606113848.534cbdf7@canb.auug.org.au>
Hi Stephen,
On 2016/6/6 9:38, Stephen Rothwell wrote:
> Hi Ulf,
>
> After merging the mmc-uh tree, today's linux-next build (x86_64
> allmodconfig) produced this warning:
>
> In file included from include/linux/err.h:4:0,
> from drivers/mmc/core/mmc.c:13:
> drivers/mmc/core/mmc.c: In function 'mmc_select_hs400es':
> include/linux/err.h:21:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
> #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO)
> ^
> include/linux/compiler.h:170:42: note: in definition of macro 'unlikely'
> # define unlikely(x) __builtin_expect(!!(x), 0)
> ^
> drivers/mmc/core/mmc.c:1244:6: note: in expansion of macro 'IS_ERR_VALUE'
> if (IS_ERR_VALUE(err))
> ^
Yup, sorry for this noise. Arnd had removed a lot of IS_ERR_VALUE
abuses, but I forgot to amend this one.
Hi Ulf,
Should I come up with a new fix or you could manually amend it from
"IS_ERR_VALUE(err)" to "err < 0"? :)
>
> Introduced by commit
>
> 8141f0ace818 ("mmc: core: implement enhanced strobe support")
>
> I think error values now must be "long".
>
--
Best Regards
Shawn Lin
^ permalink raw reply
* linux-next: build warning after merge of the mmc-uh tree
From: Stephen Rothwell @ 2016-06-06 1:38 UTC (permalink / raw)
To: Ulf Hansson; +Cc: linux-next, linux-kernel, Shawn Lin
Hi Ulf,
After merging the mmc-uh tree, today's linux-next build (x86_64
allmodconfig) produced this warning:
In file included from include/linux/err.h:4:0,
from drivers/mmc/core/mmc.c:13:
drivers/mmc/core/mmc.c: In function 'mmc_select_hs400es':
include/linux/err.h:21:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
#define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO)
^
include/linux/compiler.h:170:42: note: in definition of macro 'unlikely'
# define unlikely(x) __builtin_expect(!!(x), 0)
^
drivers/mmc/core/mmc.c:1244:6: note: in expansion of macro 'IS_ERR_VALUE'
if (IS_ERR_VALUE(err))
^
Introduced by commit
8141f0ace818 ("mmc: core: implement enhanced strobe support")
I think error values now must be "long".
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the samsung-krzk tree with the arm-soc tree
From: Stephen Rothwell @ 2016-06-06 0:06 UTC (permalink / raw)
To: Krzysztof Kozlowski, Olof Johansson, Arnd Bergmann,
linux-arm-kernel
Cc: linux-next, linux-kernel, Linus Walleij
Hi Krzysztof,
Today's linux-next merge of the samsung-krzk tree got a conflict in:
arch/arm/mach-exynos/Kconfig
between commit:
5c34a4e89c74 ("ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB")
from the arm-soc tree and commit:
9479f7cc9187 ("soc: samsung: pm_domains: Enable COMPILE_TEST for build coverage")
from the samsung-krzk tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/mach-exynos/Kconfig
index ecf139f31c4c,3fa6e7b8c3fe..000000000000
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -18,7 -19,7 +18,8 @@@ menuconfig ARCH_EXYNO
select EXYNOS_THERMAL
select EXYNOS_PMU
select EXYNOS_SROM
+ select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
+ select GPIOLIB
select HAVE_ARM_SCU if SMP
select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG
^ permalink raw reply
* linux-next: build failure after merge of the amlogic tree
From: Stephen Rothwell @ 2016-06-05 23:55 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-next, linux-kernel, Neil Armstrong
Hi Kevin,
After merging the amlogic tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from arch/arm/boot/dts/meson8b-mxq.dts:48:0:
arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory
In file included from arch/arm/boot/dts/meson8b-odroidc1.dts:48:0:
arch/arm/boot/dts/meson8b.dtsi:49:53: fatal error: dt-bindings/reset/amlogic,meson8b-reset.h: No such file or directory
Caused by commit
bf205ad75a17 ("ARM: dts: amlogic: Enable Reset Controller on Meson8b platforms")
I guess a file was forgotten.
I have dorpped the amlogic tree for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: [PATCH v2 2/4] gpio: Allow PC/104 devices on X86_64
From: William Breathitt Gray @ 2016-06-05 20:03 UTC (permalink / raw)
To: Pavel Machek
Cc: gregkh, akpm, x86, linux-next, linux-gpio, linux-iio,
linux-kernel, linux-watchdog, Guenter Roeck, Linus Walleij
In-Reply-To: <20160605192424.GB20086@amd>
On Sun, Jun 05, 2016 at 09:24:24PM +0200, Pavel Machek wrote:
>On Sat 2016-06-04 07:12:21, William Breathitt Gray wrote:
>> I think I see the merit of a prompt for PC104 devices. I've encountered
>> a use case recently which I'm curious about in this scenario. Given the
>> compatibility with ISA, manufacturers may occasionally develop variants
>> of existing ISA devices by duplicating the firmware on a PC/104 form
>> factor.
>>
>> I'm working on an IIO DAC driver for the Measurement Computing CIO-DAC
>> family (CIO-DAC08, CIO-DAC16, and PC104-DAC06); while not a GPIO driver,
>> I believe it can serve as a decent example. Interestingly, while the
>> CIO-DAC08 and CIO-DAC16 are true ISA devices, the PC104-DAC06 is a
>> PC/104 variant compatible with the others in the family. The IIO DAC
>> driver works just as well with the PC104-DAC06, as it does with the true
>> ISA devices in the family.
>>
>> What would the Kconfig depends line look in this scenario? I imagine
>> simply "depends on PC104" would be inappropriate since there are a
>> number of true ISA devices supported by the driver, but "depends on
>> ISA_BUS_API || PC104" seems somewhat redundant when the PC104 Kconfig
>> option implies ISA_BUS_API. This situation isn't that much of an issue
>> overall, but I anticipate encountering it occassionally as I develop
>> future PC/104 drivers.
>
>ISA_BUS_API || PC104 sounds fine to me. But it seems probable to me
>that such devices will be connectable by PC104 and something else that
>is logically ISA but physically something else...?
>
>So in such case it would be logical to have driver depend on PC104 ||
>SOMETHING_ELSE. Of course, if some hardware is so common it is on many
>such buses, we can use ISA_BUS_API...
It does sound like it would be good to have a filter for drivers which
support only PC/104 device: a user would be able to conveniently filter
out PC/104 drivers, since most consumer systems do not feature a PC/104
bus even if they do possess an ISA bus. For drivers which support both
ISA and PC/104 devices, we could simply do as you suggest; but it's
likely that we will see fewer and fewer of these true ISA devices in the
future, which leaves the PC104 Kconfig option quite useful to implement.
William Breathitt Gray
^ permalink raw reply
* Re: [PATCH v2 2/4] gpio: Allow PC/104 devices on X86_64
From: Pavel Machek @ 2016-06-05 19:24 UTC (permalink / raw)
To: William Breathitt Gray
Cc: gregkh, akpm, x86, linux-next, linux-gpio, linux-iio,
linux-kernel, linux-watchdog, Guenter Roeck, Linus Walleij
In-Reply-To: <20160604111204.GA19180@sophia>
On Sat 2016-06-04 07:12:21, William Breathitt Gray wrote:
> On Sat, Jun 04, 2016 at 09:14:08AM +0200, Pavel Machek wrote:
> >On Fri 2016-06-03 17:12:44, William Breathitt Gray wrote:
> >> On Fri, Jun 03, 2016 at 10:57:03PM +0200, Pavel Machek wrote:
> >> >Should we do "depends on PC104" here, because that is what it really
> >> >means, and have PC104 enabled when ISA_BUS_API is enabled or something
> >> >like that?
> >>
> >> Since the functionality remains the same, I'm a bit indifferent to that
> >> change; as long as the driver builds for systems in which it's intended
> >> to be used, I'm satisfied.
> >>
> >> Differentiating between PC/104 and ISA may be a pointless endeavor
> >> though since both buses appear the same to software. But if it is better
> >> to differentiate between devices as such, then I see little harm in
> >> adding a PC104 Kconfig option which follows the ISA_BUS_API Kconfig
> >> option.
> >
> >Well, they are same to the software, but not at the hardware. If I
> >have a development board that has PC104 (but not isa), I'd like to see
> >prompts for PC104 extensions, not for isa. If PC105 comes out, still
> >ISA compatible, I will want to see prompts for PC104 boards or PC105
> >boards, but not neccessarily both...
>
> I think I see the merit of a prompt for PC104 devices. I've encountered
> a use case recently which I'm curious about in this scenario. Given the
> compatibility with ISA, manufacturers may occasionally develop variants
> of existing ISA devices by duplicating the firmware on a PC/104 form
> factor.
>
> I'm working on an IIO DAC driver for the Measurement Computing CIO-DAC
> family (CIO-DAC08, CIO-DAC16, and PC104-DAC06); while not a GPIO driver,
> I believe it can serve as a decent example. Interestingly, while the
> CIO-DAC08 and CIO-DAC16 are true ISA devices, the PC104-DAC06 is a
> PC/104 variant compatible with the others in the family. The IIO DAC
> driver works just as well with the PC104-DAC06, as it does with the true
> ISA devices in the family.
>
> What would the Kconfig depends line look in this scenario? I imagine
> simply "depends on PC104" would be inappropriate since there are a
> number of true ISA devices supported by the driver, but "depends on
> ISA_BUS_API || PC104" seems somewhat redundant when the PC104 Kconfig
> option implies ISA_BUS_API. This situation isn't that much of an issue
> overall, but I anticipate encountering it occassionally as I develop
> future PC/104 drivers.
ISA_BUS_API || PC104 sounds fine to me. But it seems probable to me
that such devices will be connectable by PC104 and something else that
is logically ISA but physically something else...?
So in such case it would be logical to have driver depend on PC104 ||
SOMETHING_ELSE. Of course, if some hardware is so common it is on many
such buses, we can use ISA_BUS_API...
Best regards,
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply
* Re: ath9k gpio request
From: Sudip Mukherjee @ 2016-06-05 17:40 UTC (permalink / raw)
To: Kalle Valo, Pan, Miaoqing
Cc: Stephen Rothwell, ath9k-devel, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org,
ath9k-devel@lists.ath9k.org, netdev@vger.kernel.org, Miaoqing Pan
In-Reply-To: <87d1nxt3y9.fsf@kamboji.qca.qualcomm.com>
On Saturday 04 June 2016 08:07 PM, Kalle Valo wrote:
> (Fixing top posting)
>
> "Pan, Miaoqing" <miaoqing@qti.qualcomm.com> writes:
>
>>>> --- a/drivers/net/wireless/ath/ath9k/reg.h
>>>> +++ b/drivers/net/wireless/ath/ath9k/reg.h
>>>> @@ -1122,8 +1122,8 @@ enum {
>>>> #define AR9300_NUM_GPIO 16
>>>> #define AR9330_NUM_GPIO 16
>>>> #define AR9340_NUM_GPIO 23
>>>> -#define AR9462_NUM_GPIO 10
>>>> -#define AR9485_NUM_GPIO 12
>>>> +#define AR9462_NUM_GPIO 14
>>>> +#define AR9485_NUM_GPIO 11
>>>> #define AR9531_NUM_GPIO 18
>>>> #define AR9550_NUM_GPIO 24
>>>> #define AR9561_NUM_GPIO 23
>>>> @@ -1139,8 +1139,8 @@ enum {
>>>> #define AR9300_GPIO_MASK 0x0000F4FF
>>>> #define AR9330_GPIO_MASK 0x0000F4FF
>>>> #define AR9340_GPIO_MASK 0x0000000F
>>>> -#define AR9462_GPIO_MASK 0x000003FF
>>>> -#define AR9485_GPIO_MASK 0x00000FFF
>>>> +#define AR9462_GPIO_MASK 0x00003FFF
>>>> +#define AR9485_GPIO_MASK 0x000007FF
>>>> #define AR9531_GPIO_MASK 0x0000000F
>>>> #define AR9550_GPIO_MASK 0x0000000F
>>>> #define AR9561_GPIO_MASK 0x0000000F
>>>
>>> solves the problem.
>>>
>>> Tested-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
>>
>> Done, https://patchwork.kernel.org/patch/9151847/
>
> But the patch 9151847 is different from what Sudip tested above? Why?
>
> And if you modify something _after_ the reporter has tested the patch
> clearly document what you changed and why. I do not want find hidden
> changes like this, even more so when the patch is going to a 4.7-rc
> release.
>
> Sudip, could you also test patch 9151847, please? You can download the
> patch from the patchwork link above.
This is also ok. Please add my
Tested-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
and maybe a Reported-by tag is also appropriate in this case.
Regards
Sudip
^ permalink raw reply
* linux-next: error fetching the c6x tree
From: Stephen Rothwell @ 2016-06-05 14:18 UTC (permalink / raw)
To: Mark Salter; +Cc: linux-next, linux-kernel
Hi Mark,
Fetching the c6x tree has produced this error for the past few days:
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: ath9k gpio request
From: Kalle Valo @ 2016-06-04 14:37 UTC (permalink / raw)
To: Pan, Miaoqing
Cc: Sudip Mukherjee, Stephen Rothwell, ath9k-devel,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-wireless@vger.kernel.org, ath9k-devel@lists.ath9k.org,
netdev@vger.kernel.org, Miaoqing Pan
In-Reply-To: <1464932944074.85131-Rm6X0d1/PG5y9aJCnZT0Uw@public.gmane.org>
(Fixing top posting)
"Pan, Miaoqing" <miaoqing-Rm6X0d1/PG5y9aJCnZT0Uw@public.gmane.org> writes:
>>> --- a/drivers/net/wireless/ath/ath9k/reg.h
>>> +++ b/drivers/net/wireless/ath/ath9k/reg.h
>>> @@ -1122,8 +1122,8 @@ enum {
>>> #define AR9300_NUM_GPIO 16
>>> #define AR9330_NUM_GPIO 16
>>> #define AR9340_NUM_GPIO 23
>>> -#define AR9462_NUM_GPIO 10
>>> -#define AR9485_NUM_GPIO 12
>>> +#define AR9462_NUM_GPIO 14
>>> +#define AR9485_NUM_GPIO 11
>>> #define AR9531_NUM_GPIO 18
>>> #define AR9550_NUM_GPIO 24
>>> #define AR9561_NUM_GPIO 23
>>> @@ -1139,8 +1139,8 @@ enum {
>>> #define AR9300_GPIO_MASK 0x0000F4FF
>>> #define AR9330_GPIO_MASK 0x0000F4FF
>>> #define AR9340_GPIO_MASK 0x0000000F
>>> -#define AR9462_GPIO_MASK 0x000003FF
>>> -#define AR9485_GPIO_MASK 0x00000FFF
>>> +#define AR9462_GPIO_MASK 0x00003FFF
>>> +#define AR9485_GPIO_MASK 0x000007FF
>>> #define AR9531_GPIO_MASK 0x0000000F
>>> #define AR9550_GPIO_MASK 0x0000000F
>>> #define AR9561_GPIO_MASK 0x0000000F
>>
>> solves the problem.
>>
>> Tested-by: Sudip Mukherjee <sudip.mukherjee-4yDnlxn2s6sWdaTGBSpHTA@public.gmane.org>
>
> Done, https://patchwork.kernel.org/patch/9151847/
But the patch 9151847 is different from what Sudip tested above? Why?
And if you modify something _after_ the reporter has tested the patch
clearly document what you changed and why. I do not want find hidden
changes like this, even more so when the patch is going to a 4.7-rc
release.
Sudip, could you also test patch 9151847, please? You can download the
patch from the patchwork link above.
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH v2 2/4] gpio: Allow PC/104 devices on X86_64
From: William Breathitt Gray @ 2016-06-04 11:12 UTC (permalink / raw)
To: Pavel Machek
Cc: gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r,
akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b, x86-DgEjT+Ai2ygdnm+yROfE0A,
linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-gpio-u79uwXL29TY76Z2rM5mHXA,
linux-iio-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA, Guenter Roeck,
Linus Walleij
In-Reply-To: <20160604071408.GA22045@amd>
On Sat, Jun 04, 2016 at 09:14:08AM +0200, Pavel Machek wrote:
>On Fri 2016-06-03 17:12:44, William Breathitt Gray wrote:
>> On Fri, Jun 03, 2016 at 10:57:03PM +0200, Pavel Machek wrote:
>> >Should we do "depends on PC104" here, because that is what it really
>> >means, and have PC104 enabled when ISA_BUS_API is enabled or something
>> >like that?
>>
>> Since the functionality remains the same, I'm a bit indifferent to that
>> change; as long as the driver builds for systems in which it's intended
>> to be used, I'm satisfied.
>>
>> Differentiating between PC/104 and ISA may be a pointless endeavor
>> though since both buses appear the same to software. But if it is better
>> to differentiate between devices as such, then I see little harm in
>> adding a PC104 Kconfig option which follows the ISA_BUS_API Kconfig
>> option.
>
>Well, they are same to the software, but not at the hardware. If I
>have a development board that has PC104 (but not isa), I'd like to see
>prompts for PC104 extensions, not for isa. If PC105 comes out, still
>ISA compatible, I will want to see prompts for PC104 boards or PC105
>boards, but not neccessarily both...
I think I see the merit of a prompt for PC104 devices. I've encountered
a use case recently which I'm curious about in this scenario. Given the
compatibility with ISA, manufacturers may occasionally develop variants
of existing ISA devices by duplicating the firmware on a PC/104 form
factor.
I'm working on an IIO DAC driver for the Measurement Computing CIO-DAC
family (CIO-DAC08, CIO-DAC16, and PC104-DAC06); while not a GPIO driver,
I believe it can serve as a decent example. Interestingly, while the
CIO-DAC08 and CIO-DAC16 are true ISA devices, the PC104-DAC06 is a
PC/104 variant compatible with the others in the family. The IIO DAC
driver works just as well with the PC104-DAC06, as it does with the true
ISA devices in the family.
What would the Kconfig depends line look in this scenario? I imagine
simply "depends on PC104" would be inappropriate since there are a
number of true ISA devices supported by the driver, but "depends on
ISA_BUS_API || PC104" seems somewhat redundant when the PC104 Kconfig
option implies ISA_BUS_API. This situation isn't that much of an issue
overall, but I anticipate encountering it occassionally as I develop
future PC/104 drivers.
William Breathitt Gray
^ 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