* Re: linux-next: manual merge of the block tree with the f2fs tree
From: Stephen Rothwell @ 2016-06-09 3:34 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, Jaegeuk Kim
In-Reply-To: <20160609132609.449a7d23@canb.auug.org.au>
Hi all,
On Thu, 9 Jun 2016 13:26:09 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the block tree got conflicts in:
>
> fs/f2fs/data.c
> fs/f2fs/segment.c
>
> between commits:
>
> 0a87f664d1ad ("f2fs: detect congestion of flush command issues")
> 19a5f5e2ef37 ("f2fs: drop any block plugging")
>
> from the f2fs tree and commits:
>
> 4e49ea4a3d27 ("block/fs/drivers: remove rw argument from submit_bio")
> 04d328defd06 ("f2fs: use bio op accessors")
>
> from the block tree.
Can someone give me a good address for Mike Christie, please - the
address in those block tree commits (Mike Christie
<mchristi@redhat.com>) fails.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the block tree with the f2fs tree
From: Stephen Rothwell @ 2016-06-09 3:26 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, Mike Christie, Jaegeuk Kim
Hi Jens,
Today's linux-next merge of the block tree got conflicts in:
fs/f2fs/data.c
fs/f2fs/segment.c
between commits:
0a87f664d1ad ("f2fs: detect congestion of flush command issues")
19a5f5e2ef37 ("f2fs: drop any block plugging")
from the f2fs tree and commits:
4e49ea4a3d27 ("block/fs/drivers: remove rw argument from submit_bio")
04d328defd06 ("f2fs: use bio op accessors")
from the block tree.
I fixed it up (I hope - 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
23caf71be6500030d4601082e2a6e72d8716573b
diff --cc fs/f2fs/data.c
index 607ef4397330,8769e8349dff..5b3404bb3fb6
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@@ -97,15 -97,11 +97,15 @@@ static struct bio *__bio_alloc(struct f
return bio;
}
- static inline void __submit_bio(struct f2fs_sb_info *sbi, int rw,
- struct bio *bio, enum page_type type)
-static inline void __submit_bio(struct f2fs_sb_info *sbi, struct bio *bio)
++static inline void __submit_bio(struct f2fs_sb_info *sbi, struct bio *bio,
++ enum page_type type)
{
- if (!is_read_io(rw)) {
- if (!is_read_io(bio_op(bio)))
++ if (!is_read_io(bio_op(bio))) {
atomic_inc(&sbi->nr_wb_bios);
+ if (current->plug && (type == DATA || type == NODE))
+ blk_finish_plug(current->plug);
+ }
- submit_bio(rw, bio);
+ submit_bio(bio);
}
static void __submit_merged_bio(struct f2fs_bio_info *io)
@@@ -120,7 -116,9 +120,9 @@@
else
trace_f2fs_submit_write_bio(io->sbi->sb, fio, io->bio);
- __submit_bio(io->sbi, fio->rw, io->bio, fio->type);
+ bio_set_op_attrs(io->bio, fio->op, fio->op_flags);
+
- __submit_bio(io->sbi, io->bio);
++ __submit_bio(io->sbi, io->bio, fio->type);
io->bio = NULL;
}
@@@ -237,8 -237,10 +241,10 @@@ int f2fs_submit_page_bio(struct f2fs_io
bio_put(bio);
return -EFAULT;
}
+ bio->bi_rw = fio->op_flags;
+ bio_set_op_attrs(bio, fio->op, fio->op_flags);
- __submit_bio(fio->sbi, fio->rw, bio, fio->type);
- __submit_bio(fio->sbi, bio);
++ __submit_bio(fio->sbi, bio, fio->type);
return 0;
}
@@@ -1043,7 -1057,7 +1050,7 @@@ got_it
*/
if (bio && (last_block_in_bio != block_nr - 1)) {
submit_and_realloc:
- __submit_bio(F2FS_I_SB(inode), READ, bio, DATA);
- __submit_bio(F2FS_I_SB(inode), bio);
++ __submit_bio(F2FS_I_SB(inode), bio, DATA);
bio = NULL;
}
if (bio == NULL) {
@@@ -1086,7 -1101,7 +1094,7 @@@ set_error_page
goto next_page;
confused:
if (bio) {
- __submit_bio(F2FS_I_SB(inode), READ, bio, DATA);
- __submit_bio(F2FS_I_SB(inode), bio);
++ __submit_bio(F2FS_I_SB(inode), bio, DATA);
bio = NULL;
}
unlock_page(page);
@@@ -1096,7 -1111,7 +1104,7 @@@ next_page
}
BUG_ON(pages && !list_empty(pages));
if (bio)
- __submit_bio(F2FS_I_SB(inode), READ, bio, DATA);
- __submit_bio(F2FS_I_SB(inode), bio);
++ __submit_bio(F2FS_I_SB(inode), bio, DATA);
return 0;
}
diff --cc fs/f2fs/segment.c
index 9ff4e3062777,4c2d1fa1e0e2..99aba0047ee7
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@@ -437,10 -439,9 +439,11 @@@ int f2fs_issue_flush(struct f2fs_sb_inf
struct bio *bio = f2fs_bio_alloc(0);
int ret;
+ atomic_inc(&fcc->submit_flush);
bio->bi_bdev = sbi->sb->s_bdev;
- ret = submit_bio_wait(WRITE_FLUSH, bio);
+ bio_set_op_attrs(bio, REQ_OP_WRITE, WRITE_FLUSH);
+ ret = submit_bio_wait(bio);
+ atomic_dec(&fcc->submit_flush);
bio_put(bio);
return ret;
}
^ permalink raw reply
* Re: linux-next: build warnings after merge of the kbuild tree
From: Kees Cook @ 2016-06-09 2:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Michal Marek, Linux-Next, LKML, Emese Revfy
In-Reply-To: <20160609122258.1c2068f0@canb.auug.org.au>
On Wed, Jun 8, 2016 at 7:22 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Michal,
>
> After merging the kbuild tree, today's linux-next build (x86_64
> allmodconfig) produced these warnings:
>
> Cyclomatic Complexity 1 scripts/mod/devicetable-offsets.c:main
> Cyclomatic Complexity 1 kernel/bounds.c:foo
> Cyclomatic Complexity 1 arch/x86/kernel/asm-offsets_64.c:main
> Cyclomatic Complexity 1 arch/x86/kernel/asm-offsets.c:common
> Cyclomatic Complexity 5 arch/x86/ia32/audit.c:ia32_classify_syscall
>
> and so on (many, many of these - about 635,000 :-()
Congratulations on having the gcc plugin development headers
successfully installed! ;)
> Introduced (presumably) by commits
>
> 6b90bd4ba40b ("GCC plugin infrastructure")
> 0dae776c6bf3 ("Add Cyclomatic complexity GCC plugin")
>
> I have disabled CONFIG_GCC_PLUGIN_CYC_COMPLEXITY (by making it depend
> on CONFIG_BROKEN) until it is not enabled by default.
Ah, yes, that should default to off. We'll get a fix landed ASAP.
-Kees
--
Kees Cook
Chrome OS & Brillo Security
^ permalink raw reply
* linux-next: build warnings after merge of the kbuild tree
From: Stephen Rothwell @ 2016-06-09 2:22 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-next, linux-kernel, Emese Revfy, Kees Cook
Hi Michal,
After merging the kbuild tree, today's linux-next build (x86_64
allmodconfig) produced these warnings:
Cyclomatic Complexity 1 scripts/mod/devicetable-offsets.c:main
Cyclomatic Complexity 1 kernel/bounds.c:foo
Cyclomatic Complexity 1 arch/x86/kernel/asm-offsets_64.c:main
Cyclomatic Complexity 1 arch/x86/kernel/asm-offsets.c:common
Cyclomatic Complexity 5 arch/x86/ia32/audit.c:ia32_classify_syscall
and so on (many, many of these - about 635,000 :-()
Introduced (presumably) by commits
6b90bd4ba40b ("GCC plugin infrastructure")
0dae776c6bf3 ("Add Cyclomatic complexity GCC plugin")
I have disabled CONFIG_GCC_PLUGIN_CYC_COMPLEXITY (by making it depend
on CONFIG_BROKEN) until it is not enabled by default.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warning after merge of the slave-dma tree
From: Stephen Rothwell @ 2016-06-09 1:18 UTC (permalink / raw)
To: Vinod Koul; +Cc: linux-next, linux-kernel, Kedareswara rao Appana
Hi Vinod,
After merging the slave-dma tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:
drivers/dma/xilinx/xilinx_vdma.c: In function 'xilinx_dma_prep_dma_cyclic':
drivers/dma/xilinx/xilinx_vdma.c:1808:23: warning: 'segment' may be used uninitialized in this function [-Wmaybe-uninitialized]
segment->hw.control |= XILINX_DMA_BD_SOP;
Introduced by commit
92d794dfb699 ("dmaengine: vdma: Add support for cyclic dma mode")
I am not sure if this is tecnically a problem, but gcc certainly cannot
tell.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: [PATCH] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: Julian Calaby @ 2016-06-09 0:05 UTC (permalink / raw)
To: Prasun Maiti
Cc: Valo, Kalle, Linux Kernel, ath6kl@lists.infradead.org, Linux Next,
Linux Wireless
In-Reply-To: <CAEO8o4kD7MU09o+xOwPLn-PAgcuMExQ0MbNWgqv0fOs61rG8Xw@mail.gmail.com>
Hi Prasun,
On Thu, Jun 9, 2016 at 1:20 AM, Prasun Maiti <prasunmaiti87@gmail.com> wrote:
> I am not sure it works fine. Like ath6kl driver send another cmd to
> firmare, I have just filled up the cmd buffer with "tx_ant", and
> "rx_ant" values, then use "ath6kl_wmi_cmd_send()" api to send the cmd
> buffer to firmware.
> I have resend the patch as there are some errors in the previous patch.
> Let me know if any modifications are needed?
Let me ask the question in another way: how do you know that the
command WMI_SET_ANTENNA_CMDID exists, has that number, takes arguments
in that format and works?
Thanks,
Julian Calaby
> On Wed, Jun 8, 2016 at 8:16 PM, Valo, Kalle <kvalo@qca.qualcomm.com> wrote:
>> Prasun Maiti <prasunmaiti87@gmail.com> writes:
>>
>>> No. I did not any test for that case.
>>> This driver create a new wiphy for use with cfg80211 through
>>> "wiphy_new_nm" api, but in this api, I found that more warnings for
>>> inconsistent ops are added there. e.g; "WARN_ON(ops->set_antenna &&
>>> !ops->get_antenna);"
>>> So, warning comes during creation of a new wiphy. That's why It is needed.
>>
>> I'm confused. Are you really saying that you added a new firmware
>> command (WMI_SET_ANTENNA_CMDID) to ath6kl but you didn't test it in any
>> way? How do you know that it works then?
>>
>> --
>> Kalle Valo
>
>
>
> --
> Thanks,
> Prasun
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
^ permalink raw reply
* mmotm 2016-06-08-15-25 uploaded
From: akpm @ 2016-06-08 22:25 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-08-15-25 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
* selftests-vm-compaction_test-fix-write-to-restore-nr_hugepages.patch
* tmpfs-dont-undo-fallocate-past-its-last-page.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.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-reorganize-slab-freelist-randomization-fix.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-use-crypto-api-to-check-alg-availability-v3.patch
* zram-cosmetic-cleanup-documentation.patch
* zram-delete-custom-lzo-lz4.patch
* zram-delete-custom-lzo-lz4-v3.patch
* zram-add-more-compression-algorithms.patch
* zram-add-more-compression-algorithms-v3.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
* zsmalloc-use-obj_tag_bit-for-bit-shifter.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-change-the-interface-for-__tlb_remove_page-v3.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
* mm-add-nr_zsmalloc-to-vmstat-fix-2.patch
* include-linux-memblockh-clean-up-code-for-several-trivial-details.patch
* mm-oom_reaper-make-sure-that-mmput_async-is-called-only-when-memory-was-reaped.patch
* mm-memcg-use-consistent-gfp-flags-during-readahead.patch
* mm-memcg-use-consistent-gfp-flags-during-readahead-checkpatch-fixes.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
* thp-mlock-update-unevictable-lrutxt.patch
* mm-do-not-pass-mm_struct-into-handle_mm_fault.patch
* mm-introduce-fault_env.patch
* mm-postpone-page-table-allocation-until-we-have-page-to-map.patch
* rmap-support-file-thp.patch
* mm-introduce-do_set_pmd.patch
* thp-vmstats-add-counters-for-huge-file-pages.patch
* thp-support-file-pages-in-zap_huge_pmd.patch
* thp-handle-file-pages-in-split_huge_pmd.patch
* thp-handle-file-cow-faults.patch
* thp-skip-file-huge-pmd-on-copy_huge_pmd.patch
* thp-prepare-change_huge_pmd-for-file-thp.patch
* thp-run-vma_adjust_trans_huge-outside-i_mmap_rwsem.patch
* thp-file-pages-support-for-split_huge_page.patch
* thp-mlock-do-not-mlock-pte-mapped-file-huge-pages.patch
* vmscan-split-file-huge-pages-before-paging-them-out.patch
* page-flags-relax-policy-for-pg_mappedtodisk-and-pg_reclaim.patch
* radix-tree-implement-radix_tree_maybe_preload_order.patch
* filemap-prepare-find-and-delete-operations-for-huge-pages.patch
* truncate-handle-file-thp.patch
* mm-rmap-account-shmem-thp-pages.patch
* shmem-prepare-huge=-mount-option-and-sysfs-knob.patch
* shmem-get_unmapped_area-align-huge-page.patch
* shmem-add-huge-pages-support.patch
* shmem-thp-respect-madv_nohugepage-for-file-mappings.patch
* thp-extract-khugepaged-from-mm-huge_memoryc.patch
* thp-extract-khugepaged-from-mm-huge_memoryc-fix.patch
* thp-extract-khugepaged-from-mm-huge_memoryc-fix-2.patch
* khugepaged-move-up_readmmap_sem-out-of-khugepaged_alloc_page.patch
* shmem-make-shmem_inode_info-lock-irq-safe.patch
* khugepaged-add-support-of-collapse-for-tmpfs-shmem-pages.patch
* thp-introduce-config_transparent_huge_pagecache.patch
* shmem-split-huge-pages-beyond-i_size-under-memory-pressure.patch
* thp-update-documentation-vm-transhugefilesystems-proctxt.patch
* mm-zsmalloc-add-trace-events-for-zs_compact.patch
* mm-kasan-switch-slub-to-stackdepot-enable-memory-quarantine-for-slub.patch
* mm-kasan-switch-slub-to-stackdepot-enable-memory-quarantine-for-slub-fix.patch
* mm-kasan-switch-slub-to-stackdepot-enable-memory-quarantine-for-slub-fix-fix.patch
* proc_oom_score-remove-tasklist_lock-and-pid_alive.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-iommu-helper-skip-to-next-segment.patch
* bitmap-bitmap_equal-memcmp-optimization.patch
* bitmap-bitmap_equal-memcmp-optimization-fix.patch
* lib-add-crc64-ecma-module.patch
* firmware-consolidate-kmap-read-write-logic.patch
* firmware-provide-infrastructure-to-make-fw-caching-optional.patch
* firmware-support-loading-into-a-pre-allocated-buffer.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
* cpumask-fix-code-comment.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
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* fpga-zynq-fpga-fix-build-failure.patch
* tree-wide-replace-config_enabled-with-is_enabled.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
^ permalink raw reply
* Re: [PATCH] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: Ben Greear @ 2016-06-08 16:10 UTC (permalink / raw)
To: Prasun Maiti
Cc: Valo, Kalle, Linux Next,
ath6kl-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Linux Wireless, Linux Kernel
In-Reply-To: <CAEO8o4=a54o0qvQ7ynQW=tJ95OY0_BiNYPP-5uj5jozDLQCp4Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
On 06/08/2016 08:56 AM, Prasun Maiti wrote:
> Please help me how to test this one?? It will be great to me if you help me.
I do not have time or interest, sorry. You basically need access to
firmware source to do any useful development on this driver in my opinion,
and I do not have access to that source.
Why are you so concerned about the warning anyway?
Thanks,
Ben
>
> On Wed, Jun 8, 2016 at 9:21 PM, Ben Greear <greearb-my8/4N5VtI7c+919tysfdA@public.gmane.org> wrote:
>> On 06/08/2016 08:46 AM, Prasun Maiti wrote:
>>>
>>> Please tell me if I mention that this code is untested in commit log,
>>> then could you check the code kindly and also help me to fix this type
>>> of warning?
>>
>>
>> In my experience, ath6kl has very fragile and buggy firmware, so I would
>> not add any new API to it unless you have tested this thoroughly.
>>
>> Thanks,
>> Ben
>>
>>>
>>> On Wed, Jun 8, 2016 at 9:00 PM, Valo, Kalle <kvalo-A+ZNKFmMK5xy9aJCnZT0Uw@public.gmane.org>
>>> wrote:
>>>>
>>>> Prasun Maiti <prasunmaiti87-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:
>>>>
>>>>> I am not sure it works fine. Like ath6kl driver send another cmd to
>>>>> firmare, I have just filled up the cmd buffer with "tx_ant", and
>>>>> "rx_ant" values, then use "ath6kl_wmi_cmd_send()" api to send the cmd
>>>>> buffer to firmware. I have resend the patch as there are some errors
>>>>> in the previous patch. Let me know if any modifications are needed?
>>>>
>>>>
>>>> I don't take untested code. In some special cases it might be ok to send
>>>> untested code but even then it needs to be clearly stated in the commit
>>>> log that it's untested.
>>>>
>>>> Please resend once you have tested this, I'm dropping this now.
>>>>
>>>> --
>>>> Kalle Valo
>>>
>>>
>>>
>>>
>>
>>
>> --
>> Ben Greear <greearb-my8/4N5VtI7c+919tysfdA@public.gmane.org>
>> Candela Technologies Inc http://www.candelatech.com
>>
>
>
>
--
Ben Greear <greearb-my8/4N5VtI7c+919tysfdA@public.gmane.org>
Candela Technologies Inc http://www.candelatech.com
--
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] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: Prasun Maiti @ 2016-06-08 15:56 UTC (permalink / raw)
To: Ben Greear
Cc: Valo, Kalle, Linux Next, ath6kl@lists.infradead.org,
Linux Wireless, Linux Kernel
In-Reply-To: <57583EFC.3070901@candelatech.com>
Please help me how to test this one?? It will be great to me if you help me.
On Wed, Jun 8, 2016 at 9:21 PM, Ben Greear <greearb@candelatech.com> wrote:
> On 06/08/2016 08:46 AM, Prasun Maiti wrote:
>>
>> Please tell me if I mention that this code is untested in commit log,
>> then could you check the code kindly and also help me to fix this type
>> of warning?
>
>
> In my experience, ath6kl has very fragile and buggy firmware, so I would
> not add any new API to it unless you have tested this thoroughly.
>
> Thanks,
> Ben
>
>>
>> On Wed, Jun 8, 2016 at 9:00 PM, Valo, Kalle <kvalo@qca.qualcomm.com>
>> wrote:
>>>
>>> Prasun Maiti <prasunmaiti87@gmail.com> writes:
>>>
>>>> I am not sure it works fine. Like ath6kl driver send another cmd to
>>>> firmare, I have just filled up the cmd buffer with "tx_ant", and
>>>> "rx_ant" values, then use "ath6kl_wmi_cmd_send()" api to send the cmd
>>>> buffer to firmware. I have resend the patch as there are some errors
>>>> in the previous patch. Let me know if any modifications are needed?
>>>
>>>
>>> I don't take untested code. In some special cases it might be ok to send
>>> untested code but even then it needs to be clearly stated in the commit
>>> log that it's untested.
>>>
>>> Please resend once you have tested this, I'm dropping this now.
>>>
>>> --
>>> Kalle Valo
>>
>>
>>
>>
>
>
> --
> Ben Greear <greearb@candelatech.com>
> Candela Technologies Inc http://www.candelatech.com
>
--
Thanks,
Prasun
^ permalink raw reply
* Re: [PATCH] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: Ben Greear @ 2016-06-08 15:51 UTC (permalink / raw)
To: Prasun Maiti, Valo, Kalle
Cc: Linux Next, ath6kl@lists.infradead.org, Linux Wireless,
Linux Kernel
In-Reply-To: <CAEO8o4=XEr4DQC3bqAXGE01s5WC+kuZ3PqoJFtuSCE52RNyDzA@mail.gmail.com>
On 06/08/2016 08:46 AM, Prasun Maiti wrote:
> Please tell me if I mention that this code is untested in commit log,
> then could you check the code kindly and also help me to fix this type
> of warning?
In my experience, ath6kl has very fragile and buggy firmware, so I would
not add any new API to it unless you have tested this thoroughly.
Thanks,
Ben
>
> On Wed, Jun 8, 2016 at 9:00 PM, Valo, Kalle <kvalo@qca.qualcomm.com> wrote:
>> Prasun Maiti <prasunmaiti87@gmail.com> writes:
>>
>>> I am not sure it works fine. Like ath6kl driver send another cmd to
>>> firmare, I have just filled up the cmd buffer with "tx_ant", and
>>> "rx_ant" values, then use "ath6kl_wmi_cmd_send()" api to send the cmd
>>> buffer to firmware. I have resend the patch as there are some errors
>>> in the previous patch. Let me know if any modifications are needed?
>>
>> I don't take untested code. In some special cases it might be ok to send
>> untested code but even then it needs to be clearly stated in the commit
>> log that it's untested.
>>
>> Please resend once you have tested this, I'm dropping this now.
>>
>> --
>> Kalle Valo
>
>
>
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply
* Re: [PATCH] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: Prasun Maiti @ 2016-06-08 15:46 UTC (permalink / raw)
To: Valo, Kalle
Cc: Linux Kernel, ath6kl@lists.infradead.org, Linux Next,
Linux Wireless
In-Reply-To: <87d1nrk89v.fsf@kamboji.qca.qualcomm.com>
Please tell me if I mention that this code is untested in commit log,
then could you check the code kindly and also help me to fix this type
of warning?
On Wed, Jun 8, 2016 at 9:00 PM, Valo, Kalle <kvalo@qca.qualcomm.com> wrote:
> Prasun Maiti <prasunmaiti87@gmail.com> writes:
>
>> I am not sure it works fine. Like ath6kl driver send another cmd to
>> firmare, I have just filled up the cmd buffer with "tx_ant", and
>> "rx_ant" values, then use "ath6kl_wmi_cmd_send()" api to send the cmd
>> buffer to firmware. I have resend the patch as there are some errors
>> in the previous patch. Let me know if any modifications are needed?
>
> I don't take untested code. In some special cases it might be ok to send
> untested code but even then it needs to be clearly stated in the commit
> log that it's untested.
>
> Please resend once you have tested this, I'm dropping this now.
>
> --
> Kalle Valo
--
Thanks,
Prasun
^ permalink raw reply
* Re: [PATCH] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: Valo, Kalle @ 2016-06-08 15:30 UTC (permalink / raw)
To: Prasun Maiti
Cc: Linux Kernel, ath6kl@lists.infradead.org, Linux Next,
Linux Wireless
In-Reply-To: <CAEO8o4kD7MU09o+xOwPLn-PAgcuMExQ0MbNWgqv0fOs61rG8Xw@mail.gmail.com>
Prasun Maiti <prasunmaiti87@gmail.com> writes:
> I am not sure it works fine. Like ath6kl driver send another cmd to
> firmare, I have just filled up the cmd buffer with "tx_ant", and
> "rx_ant" values, then use "ath6kl_wmi_cmd_send()" api to send the cmd
> buffer to firmware. I have resend the patch as there are some errors
> in the previous patch. Let me know if any modifications are needed?
I don't take untested code. In some special cases it might be ok to send
untested code but even then it needs to be clearly stated in the commit
log that it's untested.
Please resend once you have tested this, I'm dropping this now.
--
Kalle Valo
^ permalink raw reply
* Re: [PATCH] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: Prasun Maiti @ 2016-06-08 15:20 UTC (permalink / raw)
To: Valo, Kalle
Cc: Linux Kernel, ath6kl@lists.infradead.org, Linux Next,
Linux Wireless
In-Reply-To: <87porrkaax.fsf@kamboji.qca.qualcomm.com>
I am not sure it works fine. Like ath6kl driver send another cmd to
firmare, I have just filled up the cmd buffer with "tx_ant", and
"rx_ant" values, then use "ath6kl_wmi_cmd_send()" api to send the cmd
buffer to firmware.
I have resend the patch as there are some errors in the previous patch.
Let me know if any modifications are needed?
On Wed, Jun 8, 2016 at 8:16 PM, Valo, Kalle <kvalo@qca.qualcomm.com> wrote:
> Prasun Maiti <prasunmaiti87@gmail.com> writes:
>
>> No. I did not any test for that case.
>> This driver create a new wiphy for use with cfg80211 through
>> "wiphy_new_nm" api, but in this api, I found that more warnings for
>> inconsistent ops are added there. e.g; "WARN_ON(ops->set_antenna &&
>> !ops->get_antenna);"
>> So, warning comes during creation of a new wiphy. That's why It is needed.
>
> I'm confused. Are you really saying that you added a new firmware
> command (WMI_SET_ANTENNA_CMDID) to ath6kl but you didn't test it in any
> way? How do you know that it works then?
>
> --
> Kalle Valo
--
Thanks,
Prasun
^ permalink raw reply
* [PATCH] Add .set_antenna callback in ath6kl driver to fix wireless core warns
From: Prasun Maiti @ 2016-06-08 15:09 UTC (permalink / raw)
To: Linux Kernel, Kalle Valo
Cc: ath6kl@lists.infradead.org, Linux Next, Linux Wireless,
Prasun Maiti
In-Reply-To: <87wplzkbd9.fsf@kamboji.qca.qualcomm.com>
Since add more warnings for inconsistent ops in cfg80211, the wireless
core warns if a driver implements a cfg80211 callback but doesn't
implements the inverse operation. The ath6kl driver implements a cfg80211
.get_antenna operation handler but doesn't have the inverse .set_antenna
callback. So, it makes warning.
To remove this warning, add .set_antenna callback in ath6kl driver and
also send a cmd to firmware with it's values.
Signed-off-by: Prasun Maiti <prasunmaiti87@gmail.com>
---
drivers/net/wireless/ath/ath6kl/cfg80211.c | 24 ++++++++++++++++++++++++
drivers/net/wireless/ath/ath6kl/wmi.c | 18 ++++++++++++++++++
drivers/net/wireless/ath/ath6kl/wmi.h | 6 ++++++
3 files changed, 48 insertions(+)
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 4e11ba0..0d51228 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -3231,6 +3231,29 @@ static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
wait, buf, len, no_cck);
}
+static int ath6kl_set_antenna(struct wiphy *wiphy,
+ u32 tx_ant, u32 rx_ant)
+{
+ struct ath6kl *ar = wiphy_priv(wiphy);
+ struct ath6kl_vif *vif = NULL;
+
+ vif = ath6kl_vif_first(ar);
+ if (!vif)
+ return -EIO;
+
+ if (!ath6kl_cfg80211_ready(vif))
+ return -EIO;
+
+ if (!tx_ant || !rx_ant)
+ return -EINVAL;
+
+ ar->hw.tx_ant = tx_ant;
+ ar->hw.rx_ant = rx_ant;
+
+ return ath6kl_wmi_set_antenna(ar->wmi, vif->fw_vif_idx,
+ tx_ant, rx_ant);
+}
+
static int ath6kl_get_antenna(struct wiphy *wiphy,
u32 *tx_ant, u32 *rx_ant)
{
@@ -3456,6 +3479,7 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = {
.cancel_remain_on_channel = ath6kl_cancel_remain_on_channel,
.mgmt_tx = ath6kl_mgmt_tx,
.mgmt_frame_register = ath6kl_mgmt_frame_register,
+ .set_antenna = ath6kl_set_antenna,
.get_antenna = ath6kl_get_antenna,
.sched_scan_start = ath6kl_cfg80211_sscan_start,
.sched_scan_stop = ath6kl_cfg80211_sscan_stop,
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 631c3a0..3a7b5e9 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -1605,6 +1605,24 @@ static int ath6kl_wmi_txe_notify_event_rx(struct wmi *wmi, u8 *datap, int len,
return 0;
}
+int ath6kl_wmi_set_antenna(struct wmi *wmi, u8 idx,
+ u32 tx_ant, u32 rx_ant)
+{
+ struct sk_buff *skb;
+ struct wmi_set_antenna_cmd *cmd;
+
+ skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));
+ if (!skb)
+ return -ENOMEM;
+
+ cmd = (struct wmi_set_antenna_cmd *) skb->data;
+ cmd->tx_ant = cpu_to_le32(tx_ant);
+ cmd->rx_ant = cpu_to_le32(rx_ant);
+
+ return ath6kl_wmi_cmd_send(wmi, idx, skb, WMI_SET_ANTENNA_CMDID,
+ NO_SYNC_WMIFLAG);
+}
+
int ath6kl_wmi_set_txe_notify(struct wmi *wmi, u8 idx,
u32 rate, u32 pkts, u32 intvl)
{
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
index 3af464a..f2e65b3 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -642,6 +642,7 @@ enum wmi_cmd_id {
WMI_SET_RECOVERY_TEST_PARAMETER_CMDID, /*0xf094*/
WMI_ENABLE_SCHED_SCAN_CMDID,
+ WMI_SET_ANTENNA_CMDID,
};
enum wmi_mgmt_frame_type {
@@ -2312,6 +2313,11 @@ struct wmi_ap_set_apsd_cmd {
u8 enable;
} __packed;
+struct wmi_set_antenna_cmd {
+ __le32 tx_ant;
+ __le32 rx_ant;
+} __packed;
+
enum wmi_ap_apsd_buffered_traffic_flags {
WMI_AP_APSD_NO_DELIVERY_FRAMES = 0x1,
};
--
1.9.1
^ permalink raw reply related
* Re: [PATCH] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: Valo, Kalle @ 2016-06-08 14:46 UTC (permalink / raw)
To: Prasun Maiti
Cc: Linux Kernel,
ath6kl-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Linux Next, Linux Wireless
In-Reply-To: <CAEO8o4=DnEfXQAnAOxugC9TngbhvgV9DXz0HOVHNLk0B2fAXQA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
Prasun Maiti <prasunmaiti87-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:
> No. I did not any test for that case.
> This driver create a new wiphy for use with cfg80211 through
> "wiphy_new_nm" api, but in this api, I found that more warnings for
> inconsistent ops are added there. e.g; "WARN_ON(ops->set_antenna &&
> !ops->get_antenna);"
> So, warning comes during creation of a new wiphy. That's why It is needed.
I'm confused. Are you really saying that you added a new firmware
command (WMI_SET_ANTENNA_CMDID) to ath6kl but you didn't test it in any
way? How do you know that it works then?
--
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] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: kbuild test robot @ 2016-06-08 14:21 UTC (permalink / raw)
To: Prasun Maiti
Cc: kbuild-all, Linux Kernel, Kalle Valo, ath6kl@lists.infradead.org,
Linux Next, Linux Wireless, Linux Kernel
In-Reply-To: <1465388474-20503-1-git-send-email-prasunmaiti87@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2356 bytes --]
Hi,
[auto build test WARNING on ath6kl/ath-next]
[also build test WARNING on v4.7-rc2 next-20160608]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Prasun-Maiti/Add-set_antenna-callback-in-ath6kl-driver-to-remove-wireless-core-warns/20160608-202420
base: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git ath-next
config: m68k-allmodconfig (attached as .config)
compiler: m68k-linux-gcc (GCC) 4.9.0
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=m68k
All warnings (new ones prefixed by >>):
drivers/net/wireless/ath/ath6kl/wmi.c: In function 'ath6kl_wmi_set_antenna':
>> drivers/net/wireless/ath/ath6kl/wmi.c:1618:6: warning: assignment from incompatible pointer type
cmd = (struct wmi_set_antenna_cmd *) skb->data;
^
drivers/net/wireless/ath/ath6kl/wmi.c:1619:5: error: 'struct wmi_txe_notify_cmd' has no member named 'tx_ant'
cmd->tx_ant = cpu_to_le32(tx_ant);
^
drivers/net/wireless/ath/ath6kl/wmi.c:1620:5: error: 'struct wmi_txe_notify_cmd' has no member named 'rx_ant'
cmd->rx_ant = cpu_to_le32(rx_ant);
^
vim +1618 drivers/net/wireless/ath/ath6kl/wmi.c
1602 cfg80211_cqm_txe_notify(vif->ndev, vif->bssid, pkts,
1603 rate, vif->txe_intvl, GFP_KERNEL);
1604
1605 return 0;
1606 }
1607
1608 int ath6kl_wmi_set_antenna(struct wmi *wmi, u8 idx,
1609 u32 tx_ant, u32 rx_ant)
1610 {
1611 struct sk_buff *skb;
1612 struct wmi_txe_notify_cmd *cmd;
1613
1614 skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));
1615 if (!skb)
1616 return -ENOMEM;
1617
> 1618 cmd = (struct wmi_set_antenna_cmd *) skb->data;
1619 cmd->tx_ant = cpu_to_le32(tx_ant);
1620 cmd->rx_ant = cpu_to_le32(rx_ant);
1621
1622 return ath6kl_wmi_cmd_send(wmi, idx, skb, WMI_SET_ANTENNA_CMDID,
1623 NO_SYNC_WMIFLAG);
1624 }
1625
1626 int ath6kl_wmi_set_txe_notify(struct wmi *wmi, u8 idx,
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 36082 bytes --]
^ permalink raw reply
* Re: [PATCH] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: Prasun Maiti @ 2016-06-08 14:35 UTC (permalink / raw)
To: Valo, Kalle
Cc: Linux Kernel, ath6kl@lists.infradead.org, Linux Next,
Linux Wireless, Linux Kernel
In-Reply-To: <87wplzkbd9.fsf@kamboji.qca.qualcomm.com>
No. I did not any test for that case.
This driver create a new wiphy for use with cfg80211 through
"wiphy_new_nm" api, but in this api, I found that more warnings for
inconsistent ops are added there. e.g; "WARN_ON(ops->set_antenna &&
!ops->get_antenna);"
So, warning comes during creation of a new wiphy. That's why It is needed.
On Wed, Jun 8, 2016 at 7:53 PM, Valo, Kalle <kvalo@qca.qualcomm.com> wrote:
> Prasun Maiti <prasunmaiti87@gmail.com> writes:
>
>> Since add more warnings for inconsistent ops in cfg80211, the wireless
>> core warns if a driver implements a cfg80211 callback but doesn't
>> implements the inverse operation. The ath6kl driver implements a cfg80211
>> .get_antenna operation handler but doesn't have the inverse .set_antenna
>> callback. So, it makes warning.
>>
>> To remove this warning, add .set_antenna callback in ath6kl driver and
>> also send a cmd to firmware with it's values.
>>
>> Signed-off-by: Prasun Maiti <prasunmaiti87@gmail.com>
>
> Did you test this? What hardware and firmware version?
>
> --
> Kalle Valo
--
Thanks,
Prasun
^ permalink raw reply
* Re: [PATCH] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: Valo, Kalle @ 2016-06-08 14:23 UTC (permalink / raw)
To: Prasun Maiti
Cc: Linux Kernel,
ath6kl-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Linux Next, Linux Wireless, Linux Kernel
In-Reply-To: <1465388474-20503-1-git-send-email-prasunmaiti87-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Prasun Maiti <prasunmaiti87-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:
> Since add more warnings for inconsistent ops in cfg80211, the wireless
> core warns if a driver implements a cfg80211 callback but doesn't
> implements the inverse operation. The ath6kl driver implements a cfg80211
> .get_antenna operation handler but doesn't have the inverse .set_antenna
> callback. So, it makes warning.
>
> To remove this warning, add .set_antenna callback in ath6kl driver and
> also send a cmd to firmware with it's values.
>
> Signed-off-by: Prasun Maiti <prasunmaiti87-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Did you test this? What hardware and firmware version?
--
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
* [PATCH] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: Prasun Maiti @ 2016-06-08 12:21 UTC (permalink / raw)
To: Linux Kernel, Kalle Valo
Cc: ath6kl@lists.infradead.org, Linux Next, Linux Wireless,
Linux Kernel
Since add more warnings for inconsistent ops in cfg80211, the wireless
core warns if a driver implements a cfg80211 callback but doesn't
implements the inverse operation. The ath6kl driver implements a cfg80211
.get_antenna operation handler but doesn't have the inverse .set_antenna
callback. So, it makes warning.
To remove this warning, add .set_antenna callback in ath6kl driver and
also send a cmd to firmware with it's values.
Signed-off-by: Prasun Maiti <prasunmaiti87@gmail.com>
---
drivers/net/wireless/ath/ath6kl/cfg80211.c | 24 ++++++++++++++++++++++++
drivers/net/wireless/ath/ath6kl/wmi.c | 18 ++++++++++++++++++
drivers/net/wireless/ath/ath6kl/wmi.h | 6 ++++++
3 files changed, 48 insertions(+)
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 4e11ba0..0d51228 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -3231,6 +3231,29 @@ static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
wait, buf, len, no_cck);
}
+static int ath6kl_set_antenna(struct wiphy *wiphy,
+ u32 tx_ant, u32 rx_ant)
+{
+ struct ath6kl *ar = wiphy_priv(wiphy);
+ struct ath6kl_vif *vif = NULL;
+
+ vif = ath6kl_vif_first(ar);
+ if (!vif)
+ return -EIO;
+
+ if (!ath6kl_cfg80211_ready(vif))
+ return -EIO;
+
+ if (!tx_ant || !rx_ant)
+ return -EINVAL;
+
+ ar->hw.tx_ant = tx_ant;
+ ar->hw.rx_ant = rx_ant;
+
+ return ath6kl_wmi_set_antenna(ar->wmi, vif->fw_vif_idx,
+ tx_ant, rx_ant);
+}
+
static int ath6kl_get_antenna(struct wiphy *wiphy,
u32 *tx_ant, u32 *rx_ant)
{
@@ -3456,6 +3479,7 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = {
.cancel_remain_on_channel = ath6kl_cancel_remain_on_channel,
.mgmt_tx = ath6kl_mgmt_tx,
.mgmt_frame_register = ath6kl_mgmt_frame_register,
+ .set_antenna = ath6kl_set_antenna,
.get_antenna = ath6kl_get_antenna,
.sched_scan_start = ath6kl_cfg80211_sscan_start,
.sched_scan_stop = ath6kl_cfg80211_sscan_stop,
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 631c3a0..300ccc6 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -1605,6 +1605,24 @@ static int ath6kl_wmi_txe_notify_event_rx(struct wmi *wmi, u8 *datap, int len,
return 0;
}
+int ath6kl_wmi_set_antenna(struct wmi *wmi, u8 idx,
+ u32 tx_ant, u32 rx_ant)
+{
+ struct sk_buff *skb;
+ struct wmi_txe_notify_cmd *cmd;
+
+ skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));
+ if (!skb)
+ return -ENOMEM;
+
+ cmd = (struct wmi_set_antenna_cmd *) skb->data;
+ cmd->tx_ant = cpu_to_le32(tx_ant);
+ cmd->rx_ant = cpu_to_le32(rx_ant);
+
+ return ath6kl_wmi_cmd_send(wmi, idx, skb, WMI_SET_ANTENNA_CMDID,
+ NO_SYNC_WMIFLAG);
+}
+
int ath6kl_wmi_set_txe_notify(struct wmi *wmi, u8 idx,
u32 rate, u32 pkts, u32 intvl)
{
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
index 3af464a..f2e65b3 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -642,6 +642,7 @@ enum wmi_cmd_id {
WMI_SET_RECOVERY_TEST_PARAMETER_CMDID, /*0xf094*/
WMI_ENABLE_SCHED_SCAN_CMDID,
+ WMI_SET_ANTENNA_CMDID,
};
enum wmi_mgmt_frame_type {
@@ -2312,6 +2313,11 @@ struct wmi_ap_set_apsd_cmd {
u8 enable;
} __packed;
+struct wmi_set_antenna_cmd {
+ __le32 tx_ant;
+ __le32 rx_ant;
+} __packed;
+
enum wmi_ap_apsd_buffered_traffic_flags {
WMI_AP_APSD_NO_DELIVERY_FRAMES = 0x1,
};
--
1.9.1
^ permalink raw reply related
* Re: [PATCH] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: kbuild test robot @ 2016-06-08 12:19 UTC (permalink / raw)
To: Prasun Maiti
Cc: kbuild-all, Linux Kernel, Rusty Russell, Linux Next,
Linux Wireless, Linux Kernel
In-Reply-To: <1465383067-19612-1-git-send-email-prasunmaiti87@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2190 bytes --]
Hi,
[auto build test ERROR on ath6kl/ath-next]
[also build test ERROR on v4.7-rc2 next-20160608]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Prasun-Maiti/Add-set_antenna-callback-in-ath6kl-driver-to-remove-wireless-core-warns/20160608-191104
base: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git ath-next
config: x86_64-randconfig-i0-201623 (attached as .config)
compiler: gcc-6 (Debian 6.1.1-1) 6.1.1 20160430
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All errors (new ones prefixed by >>):
drivers/net/wireless/ath/ath6kl/cfg80211.c: In function 'ath6kl_set_antenna':
>> drivers/net/wireless/ath/ath6kl/cfg80211.c:3253:9: error: implicit declaration of function 'ath6kl_wmi_set_antenna' [-Werror=implicit-function-declaration]
return ath6kl_wmi_set_antenna(ar->wmi, vif->fw_vif_idx,
^~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
--
drivers/net/wireless/ath/ath6kl/wmi.c: In function 'ath6kl_wmi_set_antenna':
>> drivers/net/wireless/ath/ath6kl/wmi.c:1618:6: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types]
cmd = (struct wmi_set_antenna_cmd *) skb->data;
^
>> drivers/net/wireless/ath/ath6kl/wmi.c:1619:5: error: 'struct wmi_txe_notify_cmd' has no member named 'tx_ant'
cmd->tx_ant = cpu_to_le32(tx_ant);
^~
>> drivers/net/wireless/ath/ath6kl/wmi.c:1620:5: error: 'struct wmi_txe_notify_cmd' has no member named 'rx_ant'
cmd->rx_ant = cpu_to_le32(rx_ant);
^~
cc1: some warnings being treated as errors
vim +/ath6kl_wmi_set_antenna +3253 drivers/net/wireless/ath/ath6kl/cfg80211.c
3247 if (!tx_ant || !rx_ant)
3248 return -EINVAL;
3249
3250 ar->hw.tx_ant = tx_ant;
3251 ar->hw.rx_ant = rx_ant;
3252
> 3253 return ath6kl_wmi_set_antenna(ar->wmi, vif->fw_vif_idx,
3254 tx_ant, rx_ant);
3255 }
3256
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 23153 bytes --]
^ permalink raw reply
* next-20160608 build: 1 failures 8 warnings (next-20160608)
From: Build bot for Mark Brown @ 2016-06-08 11:28 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160608
Git describe: next-20160608
Commit: df091b3313 Add linux-next specific files for 20160608
Build Time: 158 min 40 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 8
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):
2 warnings 0 mismatches : arm64-allmodconfig
72 warnings 0 mismatches : arm-allmodconfig
3 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
3 ../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
Warnings Summary: 8
66 ../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
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, 2 warnings, 0 section mismatches
Warnings:
../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, 3 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
-------------------------------------------------------------------------------
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
* [PATCH] Add .set_antenna callback in ath6kl driver to remove wireless core warns
From: Prasun Maiti @ 2016-06-08 10:51 UTC (permalink / raw)
To: Linux Kernel, Rusty Russell; +Cc: Linux Next, Linux Wireless, Linux Kernel
Since add more warnings for inconsistent ops in cfg80211, the wireless
core warns if a driver implements a cfg80211 callback but doesn't
implements the inverse operation. The ath6kl driver implements a cfg80211
.get_antenna operation handler but doesn't have the inverse .set_antenna
callback. So, it makes warning.
To remove this warning, add .set_antenna callback in ath6kl driver and
also send a cmd to firmware with it's values.
Signed-off-by: Prasun Maiti <prasunmaiti87@gmail.com>
---
drivers/net/wireless/ath/ath6kl/cfg80211.c | 24 ++++++++++++++++++++++++
drivers/net/wireless/ath/ath6kl/wmi.c | 18 ++++++++++++++++++
drivers/net/wireless/ath/ath6kl/wmi.h | 6 ++++++
3 files changed, 48 insertions(+)
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 4e11ba0..0d51228 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -3231,6 +3231,29 @@ static int ath6kl_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
wait, buf, len, no_cck);
}
+static int ath6kl_set_antenna(struct wiphy *wiphy,
+ u32 tx_ant, u32 rx_ant)
+{
+ struct ath6kl *ar = wiphy_priv(wiphy);
+ struct ath6kl_vif *vif = NULL;
+
+ vif = ath6kl_vif_first(ar);
+ if (!vif)
+ return -EIO;
+
+ if (!ath6kl_cfg80211_ready(vif))
+ return -EIO;
+
+ if (!tx_ant || !rx_ant)
+ return -EINVAL;
+
+ ar->hw.tx_ant = tx_ant;
+ ar->hw.rx_ant = rx_ant;
+
+ return ath6kl_wmi_set_antenna(ar->wmi, vif->fw_vif_idx,
+ tx_ant, rx_ant);
+}
+
static int ath6kl_get_antenna(struct wiphy *wiphy,
u32 *tx_ant, u32 *rx_ant)
{
@@ -3456,6 +3479,7 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = {
.cancel_remain_on_channel = ath6kl_cancel_remain_on_channel,
.mgmt_tx = ath6kl_mgmt_tx,
.mgmt_frame_register = ath6kl_mgmt_frame_register,
+ .set_antenna = ath6kl_set_antenna,
.get_antenna = ath6kl_get_antenna,
.sched_scan_start = ath6kl_cfg80211_sscan_start,
.sched_scan_stop = ath6kl_cfg80211_sscan_stop,
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 631c3a0..300ccc6 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -1605,6 +1605,24 @@ static int ath6kl_wmi_txe_notify_event_rx(struct wmi *wmi, u8 *datap, int len,
return 0;
}
+int ath6kl_wmi_set_antenna(struct wmi *wmi, u8 idx,
+ u32 tx_ant, u32 rx_ant)
+{
+ struct sk_buff *skb;
+ struct wmi_txe_notify_cmd *cmd;
+
+ skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));
+ if (!skb)
+ return -ENOMEM;
+
+ cmd = (struct wmi_set_antenna_cmd *) skb->data;
+ cmd->tx_ant = cpu_to_le32(tx_ant);
+ cmd->rx_ant = cpu_to_le32(rx_ant);
+
+ return ath6kl_wmi_cmd_send(wmi, idx, skb, WMI_SET_ANTENNA_CMDID,
+ NO_SYNC_WMIFLAG);
+}
+
int ath6kl_wmi_set_txe_notify(struct wmi *wmi, u8 idx,
u32 rate, u32 pkts, u32 intvl)
{
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
index 3af464a..f2e65b3 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -642,6 +642,7 @@ enum wmi_cmd_id {
WMI_SET_RECOVERY_TEST_PARAMETER_CMDID, /*0xf094*/
WMI_ENABLE_SCHED_SCAN_CMDID,
+ WMI_SET_ANTENNA_CMDID,
};
enum wmi_mgmt_frame_type {
@@ -2312,6 +2313,11 @@ struct wmi_ap_set_apsd_cmd {
u8 enable;
} __packed;
+struct wmi_set_antenna_cmd {
+ __le32 tx_ant;
+ __le32 rx_ant;
+} __packed;
+
enum wmi_ap_apsd_buffered_traffic_flags {
WMI_AP_APSD_NO_DELIVERY_FRAMES = 0x1,
};
--
1.9.1
^ permalink raw reply related
* Re: [linux-next: Tree for Jun 1] __khugepaged_exit rwsem_down_write_failed lockup
From: Vlastimil Babka @ 2016-06-08 8:19 UTC (permalink / raw)
To: Andrea Arcangeli, Michal Hocko
Cc: Sergey Senozhatsky, Sergey Senozhatsky, Andrew Morton,
Kirill A. Shutemov, Stephen Rothwell, linux-mm, linux-next,
linux-kernel, Hugh Dickins
In-Reply-To: <20160603151001.GG29930@redhat.com>
On 06/03/2016 05:10 PM, Andrea Arcangeli wrote:
> Hello Michal,
>
> CC'ed Hugh,
>
> On Fri, Jun 03, 2016 at 04:46:00PM +0200, Michal Hocko wrote:
>> What do you think about the external dependencies mentioned above. Do
>> you think this is a sufficient argument wrt. occasional higher
>> latencies?
>
> It's a tradeoff and both latencies would be short and uncommon so it's
> hard to tell.
Shouldn't it be possible to do a mmput() before the hugepage allocation,
and then again mmget_not_zero()? That way it's no longer a tradeoff?
> There's also mmput_async for paths that may care about mmput
> latencies. Exit itself cannot use it, it's mostly for people taking
> the mm_users pin that may not want to wait for mmput to run. It also
> shouldn't happen that often, it's a slow path.
>
> The whole model inherited from KSM is to deliberately depend only on
> the mmap_sem + test_exit + mm_count, and never on mm_users, which to
> me in principle doesn't sound bad. I consider KSM version a
> "finegrined" implementation but I never thought it would be a problem
> to wait a bit in exit() in case the slow path hits. I thought it was
> more of a problem if exit() runs, the parent then start a new task but
> the memory wasn't freed yet.
>
> So I would suggest Hugh to share his view on the down_write/up_write
> that may temporarily block mmput (until the next test_exit bailout
> point) vs higher latency in reaching exit_mmap for a real exit(2) that
> would happen with the proposed change.
>
> Thanks!
> Andrea
>
> --
> 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>
>
--
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: Tree for Jun 8
From: Stephen Rothwell @ 2016-06-08 4:57 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
News: there will be no linux-next releases on Friday or Monday, so the
release following tomorrow's will be next-20160614.
Changes since 20160607:
Removed tree: drm-vc4 (merged into the bcm2835 tree)
Dropped tree: amlogic (build failure)
My fixes tree contains:
of: silence warnings due to max() usage
The amlogic tree still had its build failure so I dropped it for today.
The net-next tree gained a conflict against the net tree.
The clockevents tree still had its build failure so I used the version
from next-20160606.
I applied a supplied merge fix for a semantic conlict between the s390
and kvms390 trees.
Non-merge commits (relative to Linus' tree): 1881
1809 files changed, 74075 insertions(+), 32709 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 232 trees (counting Linus' and 34 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 (43c082e72745 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
Merging fixes/master (b31033aacbd0 of: silence warnings due to max() usage)
Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables)
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 (8a934efe9434 powerpc/pseries: Fix PCI config address for DDW)
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 (a03e6fe56971 act_police: fix a crash during removal)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (3ec10d3a2ba5 ipvs: update real-server binding of outgoing connections in SIP-pe)
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 (f90d83b30170 ALSA: hda - Fix headset mic detection problem for Dell machine)
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 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 (af8c34ce6ae3 Linux 4.7-rc2)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (86ffae62aff9 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/for-next (c40921768f5f Merge branch anholt/bcm2835-dt-64-next into for-next)
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 (1a65133b27b8 Merge branch 'heads/rcar-sysc-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 (23492c8d690b Merge branch 'fixes-dt' 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 (af8c34ce6ae3 Linux 4.7-rc2)
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 (847e858f3d0e SSB: Change bare unsigned to unsigned int to suit coding style)
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 (73be43b48fec s390/time: add leap seconds to initial system time)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (9fbd49cff0f0 tile: allow disabling CONFIG_EARLY_PRINTK)
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 (77bddea4cbbd Merge branch 'for-next-next-4.7-20160606' into for-next-20160606)
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 (6510690149a9 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 (9037766900ff Merge branch 'for-4.8/i2c-hid' 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 (be77ec684f3d Merge branch 'patchwork' into to_next)
Merging pm/linux-next (21dda9ff0f38 Merge branch 'acpi-ec' 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 (34fe76abbea5 Merge branch 'net-sched-fast-stats')
CONFLICT (content): Merge conflict in net/sched/act_police.c
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (ed7cbbce5448 udp: Resolve NULL pointer dereference over flow-based vxlan device)
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 (61c78eea9516 IB/IPoIB: Don't update neigh validity for unresolved entries)
Merging rdma-leon/rdma-next (af8c34ce6ae3 Linux 4.7-rc2)
Merging rdma-leon-test/testing/rdma-next (af8c34ce6ae3 Linux 4.7-rc2)
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 (5c72ae1dbb53 mtd: nand: sunxi: update DT bindings)
Merging crypto/master (63dac35b58f4 arm64: dts: ls1043a: add crypto node)
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 (a4015f9a9c3c drm/i915: only disable memory self-refresh on GMCH)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (e83950816367 drm/dsi: Implement set tear scanline)
CONFLICT (content): Merge conflict in Documentation/DocBook/device-drivers.tmpl
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 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 (43aa56d95d2c ALSA: sh: aica: Remove deprecated create_workqueue)
Merging sound-asoc/for-next (86bb716e9d4d Merge remote-tracking branches 'asoc/topic/simple', '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 (29565b2a733e 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 (b28173343703 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 (e9f5a58b63ab Merge remote-tracking branch 'regulator/topic/pwm' into regulator-next)
Merging security/next (40d273782ff1 security: tomoyo: simplify the gc kthread creation)
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 (0e0e36774081 netlabel: add address family checks to netlbl_{sock,req}_delattr())
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/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 (15d7d53f701f Merge branch 'clockevents/clksrc-of-ret-4' into clockevents/next)
CONFLICT (content): Merge conflict in drivers/clocksource/arm_arch_timer.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
$ git reset --hard HEAD^
Merging next-20160606 version of clockevents
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 (13d4a7b72182 documentation: Clarify limited control-dependency scope)
Merging kvm/linux-next (dca4d728773a kvm/x86: remove unnecessary header file inclusion)
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 (27eacde43674 s390/sclp: detect storage-key facility)
Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c
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 (139ab4d4e68b tools/virtio: add noring tool)
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 (c361db5c2c64 x86: include linux/ratelimit.h in nmi.c)
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 (03f593f55ad6 ipc/msg.c: use freezable blocking call)
$ 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 (df48fedbb93a drivers/fpga/Kconfig: fix build failure)
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-06-08 1:17 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, WANG Cong, Jamal Hadi Salim
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/act_police.c
between commit:
53eb440f4ada ("net sched actions: introduce timestamp for firsttime use")
from the net tree and commit:
a03e6fe56971 ("act_police: fix a crash during removal")
from the net-next tree.
I fixed it up (I think that the firstuse zero initialisation has become
redundant, so I just removed it) 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
^ 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