Linus Torvalds
f6a0d9d585
Staging tree fixes for 3.11-rc2 ...
Here are a few iio driver fixes for 3.11-rc2. They are still spread
across drivers/iio and drivers/staging/iio so they are coming in through
this tree.
I've also removed the drivers/staging/csr/ driver as the developers who
originally sent it to me have moved on to other companies, and CSR still
will not send us the specs for the device, making the driver pretty much
obsolete and impossible to fix up. Deleting it now prevents people from
sending in lots of tiny codingsyle fixes that will never go anywhere.
It also helps to offset the large lustre filesystem merge that happened
in 3.11-rc1 in the overall 3.11.0 diffstat. :)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
iEYEABECAAYFAlHq64AACgkQMUfUDdst+ynysQCgwUM8pbZ7iJGDJAW2TahKwVie
f5MAnRR8DokyE7iWwXDEx5UYVPerMrpq
=9ORA
-----END PGP SIGNATURE-----
Merge tag 'staging-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree fixes from Greg KH:
"Here are a few iio driver fixes for 3.11-rc2. They are still spread
across drivers/iio and drivers/staging/iio so they are coming in
through this tree.
I've also removed the drivers/staging/csr/ driver as the developers
who originally sent it to me have moved on to other companies, and CSR
still will not send us the specs for the device, making the driver
pretty much obsolete and impossible to fix up. Deleting it now
prevents people from sending in lots of tiny codingsyle fixes that
will never go anywhere.
It also helps to offset the large lustre filesystem merge that
happened in 3.11-rc1 in the overall 3.11.0 diffstat. :)"
* tag 'staging-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: csr: remove driver
iio: lps331ap: Fix wrong in_pressure_scale output value
iio staging: fix lis3l02dq, read error handling
staging:iio:ad7291: add missing .driver_module to struct iio_info
iio: ti_am335x_adc: add missing .driver_module to struct iio_info
iio: mxs-lradc: Remove useless check in read_raw
iio: mxs-lradc: Fix misuse of iio->trig
iio: inkern: fix iio_convert_raw_to_processed_unlocked
iio: Fix iio_channel_has_info
iio:trigger: device_unregister->device_del to avoid double free
iio: dac: ad7303: fix error return code in ad7303_probe()
2013-07-20 15:42:38 -07:00
dmaengine: PL08x: Avoid collisions with get_signal() macro
2013-07-05 11:40:47 +05:30
bcma: add support for BCM43142
2013-06-27 13:42:16 -04:00
ARM: imx: flexcan: Remove platform file
2013-06-27 15:15:32 +02:00
libceph: fix invalid unsigned->signed conversion for timespec encoding
2013-07-09 12:18:06 -07:00
The common clock framework changes for 3.11 include new clock drivers
2013-07-03 11:54:50 -07:00
lib: add support for LZ4-compressed kernel
2013-07-09 10:33:30 -07:00
iio: Fix iio_channel_has_info
2013-07-02 22:08:20 +01:00
For the 3.11 merge we only have one new MFD driver for the Kontron PLD.
2013-07-10 11:10:27 -07:00
MMC highlights for 3.11:
2013-07-10 11:16:00 -07:00
net/mlx4_core: Add HW enforcement to VF link state
2013-07-01 13:10:57 -07:00
mlx5_core: Adjust hca_cap.uar_page_sz to conform to Connect-IB spec
2013-07-11 16:45:08 -07:00
mmc: esdhc: Fix bug when writing to SDHCI_HOST_CONTROL register
2013-07-05 12:48:35 -04:00
pinctrl: set unit for debounce time pinconfig to usec
2013-06-25 15:34:44 +02:00
Trivial remoteproc fixes by Suman Anna, Wei Yongjun and Thomas Meyer.
2013-07-11 12:35:09 -07:00
Merge remote-tracking branch 'regulator/topic/linar' into regulator-next
2013-07-01 11:17:08 +01:00
Merge remote-tracking branch 'spi/topic/xilinx' into spi-next
2013-06-26 16:21:06 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-07-14 11:42:26 -07:00
ARM SoC specific changes
2013-07-02 13:43:38 -07:00
PCI changes for the v3.11 merge window:
2013-07-03 16:31:35 -07:00
drivers/dma: remove unused support for MEMSET operations
2013-07-03 16:07:42 -07:00
audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record
2013-07-09 10:33:19 -07:00
backlight: add devm_backlight_device_{register,unregister}()
2013-07-03 16:07:43 -07:00
xtensa: remove the second argument of __bio_kmap_atomic()
2013-07-08 01:23:15 -07:00
mm: kill free_all_bootmem_node()
2013-07-03 16:07:39 -07:00
mm: vmscan: take page buffers dirty and locked state into account
2013-07-03 16:07:29 -07:00
Merge branch 'for-3.11/core' of git://git.kernel.dk/linux-block
2013-07-11 13:03:24 -07:00
clocksource: Reselect clocksource when watchdog validated high-res capability
2013-07-05 11:09:28 +02:00
kernel: delete __cpuinit usage from all core kernel files
2013-07-14 19:36:59 -04:00
thermal: cpu_cooling: fix stub function
2013-07-08 10:13:40 -04:00
cpufreq: Fix serialization of frequency transitions
2013-07-04 13:12:44 +02:00
vfs: constify dentry parameter in d_count()
2013-07-20 05:06:27 +04:00
dm: optimize use SRCU and RCU
2013-07-10 23:41:18 +01:00
driver core: add default groups to struct class
2013-07-16 10:57:37 -07:00
drivers/dma: remove unused support for MEMSET operations
2013-07-03 16:07:42 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-07-06 14:09:38 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-07-06 14:09:38 -07:00
elevator: Fix a race in elevator switching
2013-07-03 13:25:24 +02:00
err.h: IS_ERR() can accept __user pointers
2013-07-03 16:07:41 -07:00
fb: make fp_get_options name argument const
2013-06-27 16:53:30 +08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-07-14 11:42:26 -07:00
Replace a bunch of file->dentry->d_inode refs with file_inode()
2013-06-29 12:57:13 +04:00
include/linux/gfp.h: fix the comment for GFP_ZONE_TABLE
2013-07-09 10:33:21 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-07-04 10:29:23 -07:00
mm/hugetlb: remove hugetlb_prefault
2013-07-03 16:07:32 -07:00
macvtap: Let TUNSETOFFLOAD actually controll offload features.
2013-06-25 16:44:56 -07:00
vlan: mask vlan prio bits
2013-07-18 13:05:23 -07:00
init.h: remove __cpuinit sections from the kernel
2013-06-26 12:13:18 -04:00
genirq: Add irq_get_trigger_type() to get IRQ flags
2013-06-25 11:48:24 +02:00
irqdomain: make irq_linear_revmap() a fast path again
2013-06-24 14:02:41 +01:00
jbd2: invalidate handle if jbd2_journal_restart() fails
2013-07-01 08:12:41 -04:00
net: convert lls to use time_in_range()
2013-07-02 15:53:53 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
KVM fixes for 3.11
2013-07-03 13:21:40 -07:00
lcd: add devm_lcd_device_{register,unregister}()
2013-07-03 16:07:43 -07:00
linked-list: Remove __list_for_each
2013-07-16 22:00:14 -07:00
llist: llist_add() can use llist_add_batch()
2013-07-13 13:29:32 +04:00
lib: add lz4 compressor module
2013-07-09 10:33:30 -07:00
mm, memcg: don't take task_lock in task_in_mem_cgroup
2013-07-03 16:07:26 -07:00
mm: remove unused VM_<READfoo> macros and expand other in-place
2013-07-09 10:33:23 -07:00
mm: remove free_area_cache
2013-07-10 18:11:34 -07:00
mm: tune vm_committed_as percpu_counter batching size
2013-07-03 16:07:32 -07:00
mm: remove unused functions is_{normal_idx, normal, dma32, dma}
2013-07-09 10:33:22 -07:00
rapidio: add udev notification
2013-07-03 16:08:05 -07:00
There is no /sys/parameters
2013-07-02 15:38:19 +09:30
mutex: Add support for wound/wait style locks
2013-06-26 12:10:56 +02:00
mutex: Move ww_mutex definitions to ww_mutex.h
2013-07-12 12:07:46 +02:00
nbd: correct disconnect behavior
2013-07-03 16:08:05 -07:00
net: rename ll methods to busy-poll
2013-07-10 17:08:27 -07:00
netlink: fix splat in skb_clone with large messages
2013-06-27 22:44:16 -07:00
NFS: Make nfs_attribute_cache_expired() non-static
2013-07-09 17:17:07 -04:00
Merge branch 'labeled-nfs' into linux-next
2013-06-28 16:29:51 -04:00
mm/pageblock: remove get/set_pageblock_flags
2013-07-03 16:07:32 -07:00
mm: remove lru parameter from __pagevec_lru_add and remove parts of pagevec API
2013-07-03 16:07:31 -07:00
pci: add pcibios_release_device
2013-06-26 21:10:05 +02:00
Merge branch 'pci/misc' into next
2013-06-26 15:55:52 -06:00
kernel: delete __cpuinit usage from all core kernel files
2013-07-14 19:36:59 -04:00
kernel/fork.c:copy_process(): don't add the uninitialized child to thread/task/pid lists
2013-07-03 16:08:03 -07:00
Device tree updates for v3.11
2013-07-04 15:51:45 -07:00
PM / Sleep: Fix comment typo in pm_wakeup.h
2013-07-15 01:31:37 +02:00
posix_cpu_timer: consolidate expiry time type
2013-07-03 16:16:20 +02:00
power_supply: Move of_node out of the #ifdef CONFIG_OF
2013-06-28 18:20:52 -07:00
pstore: Pass header size in the pstore write callback
2013-07-01 18:10:48 +10:00
ptrace: revert "Prepare to fix racy accesses on task breakpoints"
2013-07-09 10:33:26 -07:00
timekeeping: Indicate that clock was set in the pvclock gtod notifier
2013-06-28 23:15:06 +02:00
reboot: move arch/x86 reboot= handling to generic kernel
2013-07-09 10:33:29 -07:00
Merge remote-tracking branch 'regmap/topic/field' into regmap-next
2013-06-30 12:40:03 +01:00
mutex: Move ww_mutex definitions to ww_mutex.h
2013-07-12 12:07:46 +02:00
rapidio: change endpoint device name format
2013-07-03 16:08:05 -07:00
rapidio: add udev notification
2013-07-03 16:08:05 -07:00
lib/scatterlist: introduce sg_pcopy_from_buffer() and sg_pcopy_to_buffer()
2013-07-09 10:33:30 -07:00
mm: remove free_area_cache
2013-07-10 18:11:34 -07:00
NFS client updates for Linux 3.11
2013-07-09 12:09:43 -07:00
ipc/sem.c: replace shared sem_otime with per-semaphore value
2013-07-09 10:33:28 -07:00
seq_file: add seq_list_*_percpu helpers
2013-07-08 13:36:41 +04:00
DMA: shdma: shdma_chan_filter() has to be in shdma-base.h
2013-07-05 11:40:59 +05:30
DMA: shdma: add DT support
2013-07-05 11:41:00 +05:30
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-03 14:55:13 -07:00
slab: add kmalloc() to kernel API documentation
2013-07-07 19:02:59 +03:00
slab: add kmalloc() to kernel API documentation
2013-07-07 19:02:59 +03:00
include/linux/smp.h:on_each_cpu(): switch back to a macro
2013-07-03 16:07:22 -07:00
dt:net:stmmac: Add dt specific phy reset callback support.
2013-07-04 14:34:17 -07:00
swap: discard while swapping only if SWAP_FLAG_DISCARD_PAGES
2013-07-03 16:07:32 -07:00
sysfs: use file mode defines from stat.h
2013-07-16 10:57:37 -07:00
reboot: arm: change reboot_mode to use enum reboot_mode
2013-07-09 10:33:29 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-07-09 18:24:39 -07:00
virtio: include asm/barrier explicitly
2013-07-09 10:47:53 +09:30
mm/vmalloc.c: rename VM_UNLIST to VM_UNINITIALIZED
2013-07-09 10:33:21 -07:00
FS-Cache patches 2013-07-02
2013-07-02 09:52:47 -07:00
drivers: avoid format strings in names passed to alloc_workqueue()
2013-07-03 16:07:41 -07:00
mm/writeback: commit reason of WB_REASON_FORKER_THREAD mismatch name
2013-07-09 10:33:22 -07:00
mutex: Move ww_mutex definitions to ww_mutex.h
2013-07-12 12:07:46 +02:00
zbud: add to mm/
2013-07-10 18:11:34 -07:00
