David S. Miller
6ea09d8a09
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next ...
John W. Linville says:
====================
Please pull this batch of updates for the 3.14 stream...
For the Bluetooth bits, Gustavo says:
"This is the first batch of patches intended for 3.14. There is
nothing big here. Most of the code are refactors, clean up, small
fixes, plus some new device id support."
And...
"More patches to 3.14. Here we have the support for Low Energy
Connection Oriented Channels (LE CoC). Basically, as the name says,
this adds supports for connection oriented channels in the same way
we already have them for BR/EDR connections so profiles/protocols
that work on top of BR/EDR can now work on LE plus a plenty of new
possibilities for LE."
For the ath10k bits, Kalle says:
"Janusz and Marek implemented DFS support to ath10k, but the code is
not enabled yet due to missing cfg80211/mac80211 patches (it will be
enabled in the next pull request). Michal did some device reset fixes
and made it possible for ath10k to share an interrupt with another
device. And lots of smaller fixes from different people."
For the iwlwifi bits, Emmanuel says:
"I have here a big rework of the rate control by Eyal. This is obviously
the biggest part of this batch.
I also have enhancement of protection flags by Avri and a few bits for
WoWLAN by Eliad and Luca. Johannes cleans up the debugfs plus a few
fixes. I provided a few things for Bluetooth coexistence.
Besides this we have an implementation for low priority scan."
Along with all that, there are big batches of updates to mwifiex and
ath9k, Jeff Kirsher's FSF address fix patches, and a handful of other
bits here and there.
Please let me know if there are problems!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-17 15:08:17 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
fsl /bestcomm
gpiolib: use dedicated flags for GPIO properties
2013-11-25 09:03:12 +01:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-11-18 15:50:07 -08:00
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 08:51:29 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
net/mlx4_en: Datapath structures are allocated per NUMA node
2013-11-07 19:22:48 -05:00
mlx5: Use enum to indicate adapter page size
2013-11-08 14:43:01 -08:00
mmc: core: Add MMC_CAP_RUNTIME_RESUME to resume at runtime_resume
2013-10-30 20:28:43 -04:00
mtd: nand_bbt: kill NAND_BBT_SCANALLPAGES
2013-11-06 23:33:14 -08:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2013-11-04 19:46:58 -05:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-12-13 13:14:28 -05:00
power_supply: Add support for bq24735 charger
2013-10-25 15:56:51 -07:00
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
2013-10-24 11:11:39 +01:00
Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move
2013-11-06 07:50:37 +01:00
Merge remote-tracking branch 'spi/topic/wr' into spi-next
2013-10-25 09:51:41 +01:00
SUNRPC: Add a helper to switch the transport of an rpc_clnt
2013-10-28 15:21:32 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-11-13 17:40:34 +09:00
ACPI: Provide acpi_dev_name accessor for struct acpi_device device name
2013-11-14 23:20:45 +01:00
gpiolib / ACPI: allow passing GPIOF_ACTIVE_LOW for GpioInt resources
2013-10-19 23:32:14 +02:00
... and kill anon_inode_getfile_private()
2013-11-09 00:16:28 -05:00
libata: Add some missing command descriptions
2013-10-27 08:40:39 -04:00
ath9k: Use a separate TX gain table for WZR-HP-G450H
2013-12-09 15:37:58 -05:00
tty/serial: at91: add a fallback option to determine uart/usart property
2013-10-17 13:31:19 -07:00
audit: call audit_bprm() only once to add AUDIT_EXECVE information
2013-11-05 11:15:03 -05:00
bdi: test bdi_init failure
2013-11-08 08:59:44 -07:00
Merge branch 'akpm' (patches from Andrew Morton)
2013-11-13 15:45:43 +09:00
Merge branch 'blk-mq/core' into for-3.13/core
2013-11-08 09:08:12 -07:00
ACPI and power management updates for 3.13-rc1
2013-11-14 13:41:48 +09:00
blk-mq: fix for flush deadlock
2013-10-28 13:33:58 -06:00
blk-mq: new multi-queue block IO queueing mechanism
2013-10-25 11:56:00 +01:00
blk-mq: ensure that we set REQ_IO_STAT so diskstats work
2013-11-19 09:25:07 -07:00
kernel: trace: blktrace: remove redundent memcpy() in compat_blk_trace_setup()
2013-11-08 09:04:30 -07:00
cmdline-parser: fix build
2013-11-15 09:32:23 +09:00
Merge branch 'akpm' (patches from Andrew Morton)
2013-11-13 15:45:43 +09:00
sched: remove INIT_COMPLETION
2013-11-15 09:32:21 +09:00
constify do_coredump() argument
2013-11-09 00:16:29 -05:00
ACPI, APEI, CPER: Add UEFI 2.4 support for memory error
2013-10-23 10:10:20 -07:00
ACPI and power management updates for 3.13-rc1
2013-11-14 13:41:48 +09:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-11-15 14:19:54 +09:00
cpuidle: remove cpuidle_unregister_governor()
2013-10-30 01:21:24 +01:00
cpuset: Fix potential deadlock w/ set_mems_allowed
2013-11-06 12:40:27 +01:00
lib: crc32: add functionality to combine two crc32{, c}s in GF(2)
2013-11-03 23:04:56 -05:00
VFS: Put a small type field into struct dentry::d_flags
2013-11-09 00:16:30 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node
2013-11-14 23:14:43 +01:00
ARM: 7795/1: mm: dma-mapping: Add dma_max_pfn(dev) helper function
2013-10-31 14:49:24 +00:00
Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine
2013-11-16 12:02:36 +05:30
DMI: Parse memory device (type 17) in SMBIOS
2013-10-23 10:10:12 -07:00
EDAC, GHES: Update ghes error record info
2013-10-23 10:11:00 -07:00
switch elf_coredump_extra_notes_write() to dump_emit()
2013-11-09 00:16:24 -05:00
switch elf_core_write_extra_data() to dump_emit()
2013-11-09 00:16:23 -05:00
etherdevice: Optimize a few is_<foo>_ether_addr functions
2013-12-09 20:58:11 -05:00
asmlinkage, module: Make ksymtab and kcrctab symbols and __this_module __visible
2013-10-29 09:43:37 +10:30
framebuffer: Add fb_<level> convenience logging macros
2013-10-29 12:53:04 +02:00
consolidate simple ->d_delete() instances
2013-11-15 22:04:17 -05:00
tracing: Make register/unregister_ftrace_command __init
2013-11-05 17:43:40 -05:00
ftrace, perf: Avoid infinite event generation loop
2013-11-19 16:57:40 +01:00
lib/genalloc: add a helper function for DMA buffer allocation
2013-11-13 12:09:22 +09:00
genetlink: make multicast groups const, prevent abuse
2013-11-19 16:39:06 -05:00
GPIO bulk changes for the v3.13 development cycle
2013-11-12 15:50:46 +09:00
lib: introduce arch optimized hash library
2013-12-17 14:27:17 -05:00
iio: hid_Sensors: fix crash during trigger unregister
2013-11-02 19:07:06 +00:00
gpu: host1x: Add syncpoint base support
2013-10-31 09:55:48 +01:00
mm, thp: move ptl taking inside page_check_address_pmd()
2013-11-15 09:32:14 +09:00
mm: hugetlbfs: fix hugetlbfs optimization
2013-11-21 16:42:27 -08:00
mac80211: enable easier manipulation of VHT beamforming caps
2013-11-25 20:52:01 +01:00
macvlan: Remove custom recieve and forward handlers
2013-12-12 13:38:39 -05:00
vlan: Implement vlan_dev_get_egress_qos_mask as an inline.
2013-11-11 00:42:07 -05:00
ipv4: fix wildcard search with inet_confirm_addr()
2013-12-11 14:47:40 -05:00
init.h: document the existence of __initconst
2013-11-13 12:09:26 +09:00
seqcount: Add lockdep functionality to seqcount/seqlock structures
2013-11-06 12:40:26 +01:00
revert "softirq: Add support for triggering softirq work on softirqs"
2013-11-15 09:32:22 +09:00
ipc, msg: forbid negative values for "msg{max,mnb,mni}"
2013-11-03 10:53:11 -08:00
ipv6: remove rcv_tclass of ipv6_pinfo
2013-12-09 21:03:49 -05:00
genirq: Prevent spurious detection for unconditionally polled interrupts
2013-11-13 16:03:02 +01:00
genirq: Correct fuzzy and fragile IRQ_RETVAL() definition
2013-11-19 19:06:41 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-11-13 17:40:34 +09:00
static_key: WARN on usage before jump_label_init was called
2013-10-19 19:45:35 -04:00
tools/vm/page-types.c: support KPF_SOFTDIRTY bit
2013-11-13 12:09:07 +09:00
tracing: Remove unused function ftrace_off_permanent()
2013-11-06 15:26:55 -05:00
kfifo API type safety
2013-11-15 09:32:23 +09:00
Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue
2013-11-04 10:20:57 +02:00
no need to keep brlock macros anymore...
2013-11-09 00:16:21 -05:00
list: introduce list_last_entry(), use list_{first,last}_entry()
2013-11-13 12:09:24 +09:00
llists: move llist_reverse_order from raid5 to llist.c
2013-11-15 09:32:22 +09:00
seqcount: Add lockdep functionality to seqcount/seqlock structures
2013-11-06 12:40:26 +01:00
lockref: use BLOATED_SPINLOCKS to avoid explicit config dependencies
2013-11-15 09:32:20 +09:00
mm/memblock.c: introduce bottom-up allocation mode
2013-11-13 12:09:08 +09:00
mm/sparsemem: use PAGES_PER_SECTION to remove redundant nr_pages parameter
2013-11-13 12:09:06 +09:00
mm, mempolicy: make mpol_to_str robust and always succeed
2013-11-13 12:09:05 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
2013-11-13 15:27:00 +09:00
Revert "mm: create a separate slab for page->ptl allocation"
2013-11-20 14:41:47 -08:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2013-11-22 08:10:34 -08:00
mm: factor commit limit calculation
2013-11-13 12:09:11 +09:00
RCU'd vfsmounts
2013-11-09 00:16:19 -05:00
ipc, msg: fix message length check for negative values
2013-11-13 12:09:36 +09:00
PCI: Fix whitespace, capitalization, and spelling errors
2013-11-14 11:28:18 -07:00
locking/doc: Update references to kernel/mutex.c
2013-11-11 12:41:33 +01:00
RCU'd vfsmounts
2013-11-09 00:16:19 -05:00
net: rework recvmsg handler msg_name and msg_namelen logic
2013-11-20 21:52:30 -05:00
net: Add layer 2 hardware acceleration operations for macvlan devices
2013-11-07 19:11:41 -05:00
bonding: create bond_first_slave_rcu()
2013-12-14 01:58:02 -05:00
netpoll: fix rx_hook() interface by passing the skb
2013-10-25 19:26:58 -04:00
Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux
2013-11-16 12:04:02 -08:00
NFS: cache parsed auth_info in nfs_server
2013-10-28 15:37:43 -04:00
NFS: add support for multiple sec= mount options
2013-10-28 15:38:02 -04:00
DeviceTree updates for 3.13. This is a bit larger pull request than
2013-11-12 16:52:17 +09:00
gpiolib: include gpio/consumer.h in of_gpio.h for desc_to_gpio()
2013-10-29 18:26:14 -07:00
dt/irq: add empty of_irq_count for !OF_IRQ
2013-11-08 10:47:28 -06:00
of_mtd: Add no-op stubs to support CONFIG_OF=n
2013-10-27 16:26:58 -07:00
of/irq: Create of_irq_parse_and_map_pci() to consolidate arch code.
2013-10-24 11:50:36 +01:00
mm: add a helper function to check may oom condition
2013-11-13 12:09:04 +09:00
padata: make the sequence counter an atomic_t
2013-10-30 12:02:58 +08:00
ACPI: Eliminate the DEVICE_ACPI_HANDLE() macro
2013-11-14 23:17:21 +01:00
PCI / tg3: Give up chip reset and carrier loss handling if PCI device is not present
2013-12-02 16:01:49 -05:00
PCI: Fix whitespace, capitalization, and spelling errors
2013-11-14 11:28:18 -07:00
PCI: Fix whitespace, capitalization, and spelling errors
2013-11-14 11:28:18 -07:00
Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2013-11-13 15:17:16 +09:00
percpu_ida: add an API to return free tags
2013-10-25 11:56:00 +01:00
net: phy: provide phy_resume/phy_suspend helpers
2013-12-17 14:42:44 -05:00
pid_namespace: make freeing struct pid_namespace rcu-delayed
2013-10-24 23:43:29 -04:00
PM / OPP: rename header to linux/pm_opp.h
2013-10-25 22:33:23 +02:00
preempt: Make PREEMPT_ACTIVE generic
2013-11-13 20:21:47 +01:00
printk: pr_debug_ratelimited: check state first to reduce "callbacks suppressed" messages
2013-10-29 16:50:52 -07:00
random32: upgrade taus88 generator to taus113 from errata paper
2013-11-11 14:32:15 -05:00
rbtree: fix rbtree_postorder_for_each_entry_safe() iterator
2013-11-13 12:09:33 +09:00
Merge remote-tracking branch 'regmap/topic/spmi' into regmap-next
2013-10-28 13:01:35 -07:00
net: fix rtnl notification in atomic context
2013-10-25 19:03:45 -04:00
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-12-02 10:13:44 -08:00
sctp: Fix FSF address in file headers
2013-12-06 12:37:56 -05:00
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next
2013-10-22 22:26:41 +11:00
seq_file: introduce seq_setwidth() and seq_pad()
2013-11-15 09:32:20 +09:00
take read_seqbegin_or_lock() and friends to seqlock.h
2013-11-15 22:04:17 -05:00
intel_mid: Move platform device setups to their own platform_<device>.* files
2013-10-17 16:41:50 -07:00
net: dev: move inline skb_needs_linearize helper to header
2013-12-09 20:23:33 -05:00
slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings
2013-11-24 11:01:16 -08:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2013-11-22 08:10:34 -08:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2013-11-22 08:10:34 -08:00
kernel-provide-a-__smp_call_function_single-stub-for-config_smp-fix
2013-11-15 09:32:22 +09:00
srcu: API for barrier after srcu read unlock
2013-11-06 09:32:09 +02:00
mm, hugetlb: convert hugetlbfs to use split pmd lock
2013-11-15 09:32:14 +09:00
This batch of changes is mostly clean ups and small bug fixes.
2013-11-16 12:23:18 -08:00
ARM: tegra: Provide dummy powergate implementation
2013-11-25 13:34:51 -08:00
ftrace, perf: Avoid infinite event generation loop
2013-11-19 16:57:40 +01:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-11-12 10:20:12 +09:00
net: Explicitly initialize u64_stats_sync structures for lockdep
2013-11-06 12:40:25 +01:00
uprobes: Export write_opcode() as uprobe_write_opcode()
2013-11-06 20:00:09 +01:00
virtio_ring: add new function virtqueue_is_broken()
2013-10-29 11:28:17 +10:30
virtio_ring: change host notification API
2013-10-29 11:28:11 +10:30
mm: numa: return the number of base pages altered by protection changes
2013-11-13 12:09:11 +09:00
wait: add wait_event_cmd()
2013-11-14 15:16:16 +11:00
writeback: do not sync data dirtied after sync start
2013-11-13 12:09:07 +09:00
yam: integer underflow in yam_ioctl()
2013-10-17 15:53:09 -04:00
