Linus Torvalds
b13bc8dda8
Staging tree patches for 3.6-rc1 ...
Here's the big staging tree merge for the 3.6-rc1 merge window.
There are some patches in here outside of drivers/staging/, notibly the iio
code (which is still stradeling the staging / not staging boundry), the pstore
code, and the tracing code. All of these have gotten ackes from the various
subsystem maintainers to be included in this tree. The pstore and tracing
patches are related, and are coming here as they replace one of the android
staging drivers.
Otherwise, the normal staging mess. Lots of cleanups and a few new drivers
(some iio drivers, and the large csr wireless driver abomination.)
Note, you will get a merge issue with the following files:
drivers/staging/comedi/drivers/s626.h
drivers/staging/gdm72xx/netlink_k.c
both of which should be trivial for you to handle.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
iEYEABECAAYFAlAQiD8ACgkQMUfUDdst+ykxhgCeMUjvc+1RTtSprzvkzpejgoUU
6A4AnAleWMnkaCD8vruGnRdGl/Qtz51+
=mN6M
-----END PGP SIGNATURE-----
Merge tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree patches from Greg Kroah-Hartman:
"Here's the big staging tree merge for the 3.6-rc1 merge window.
There are some patches in here outside of drivers/staging/, notibly
the iio code (which is still stradeling the staging / not staging
boundry), the pstore code, and the tracing code. All of these have
gotten acks from the various subsystem maintainers to be included in
this tree. The pstore and tracing patches are related, and are coming
here as they replace one of the android staging drivers.
Otherwise, the normal staging mess. Lots of cleanups and a few new
drivers (some iio drivers, and the large csr wireless driver
abomination.)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fixed up trivial conflicts in drivers/staging/comedi/drivers/s626.h and
drivers/staging/gdm72xx/netlink_k.c
* tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1108 commits)
staging: csr: delete a bunch of unused library functions
staging: csr: remove csr_utf16.c
staging: csr: remove csr_pmem.h
staging: csr: remove CsrPmemAlloc
staging: csr: remove CsrPmemFree()
staging: csr: remove CsrMemAllocDma()
staging: csr: remove CsrMemCalloc()
staging: csr: remove CsrMemAlloc()
staging: csr: remove CsrMemFree() and CsrMemFreeDma()
staging: csr: remove csr_util.h
staging: csr: remove CsrOffSetOf()
stating: csr: remove unneeded #includes in csr_util.c
staging: csr: make CsrUInt16ToHex static
staging: csr: remove CsrMemCpy()
staging: csr: remove CsrStrLen()
staging: csr: remove CsrVsnprintf()
staging: csr: remove CsrStrDup
staging: csr: remove CsrStrChr()
staging: csr: remove CsrStrNCmp
staging: csr: remove CsrStrCmp
...
2012-07-26 11:14:49 -07:00
bcma: cc: update defines
2012-07-17 15:11:37 -04:00
can: mark bittiming_const pointer in struct can_priv as const
2012-07-20 12:31:05 +02:00
libceph: fix messenger retry
2012-07-17 19:35:59 -07:00
mfd: twl: remove pdata->irq_base/_end, no more users
2012-06-19 15:24:34 -07:00
IIO channel type and modifiers for CCT and RGBC data
2012-07-10 18:49:26 +01:00
Sound update for 3.6-rc1
2012-07-24 13:37:37 -07:00
InfiniBand/RDMA changes for the 3.6 merge window:
2012-07-24 13:56:26 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-07-24 17:12:54 -07:00
netfilter: nfnetlink_queue: do not allow to set unsupported flag bits
2012-07-04 19:51:50 +02:00
pinctrl: add pinctrl_add_gpio_ranges function
2012-07-03 21:51:08 +02:00
Staging tree patches for 3.6-rc1
2012-07-26 11:14:49 -07:00
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-driver
2012-06-26 06:55:23 -07:00
Merge branch 'regulator-drivers' into regulator-next
2012-07-22 19:32:00 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-06-28 17:37:00 -07:00
USB patches for 3.6-rc1
2012-07-26 10:23:47 -07:00
aio: make kiocb->private NUll in init_sync_kiocb()
2012-07-05 01:33:59 -07:00
[SCSI] async: make async_synchronize_full() flush all work regardless of domain
2012-07-20 09:07:37 +01:00
libata: detect Device Attention support
2012-06-29 11:38:17 -04:00
block: Drop dead function blk_abort_queue()
2012-06-15 08:46:23 +02:00
mm: sparse: fix usemap allocation above node descriptor section
2012-07-11 16:04:49 -07:00
net: em_canid: Ematch rule to match CAN frames according to their identifiers
2012-07-04 13:07:05 +02:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
clk: Add CLK_IS_BASIC flag to identify basic clocks
2012-07-11 15:36:43 -07:00
clk: add DT fixed-clock binding support
2012-07-11 17:58:46 -07:00
The common clk framework changes for 3.6 include a small number of core
2012-07-24 16:40:57 -07:00
ftrace: Make all inline tags also include notrace
2012-06-18 09:47:00 -04:00
workqueue: perform cpu down operations from low priority cpu_notifier()
2012-07-17 12:39:26 -07:00
net/rps: Protect cpu_rmap.h from double inclusion
2012-07-19 08:34:37 -07:00
Merge branch 'pm-domains'
2012-07-19 00:03:17 +02:00
stop passing nameidata * to ->d_revalidate()
2012-07-14 16:34:14 +04:00
Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next
2012-07-23 12:17:00 +02:00
dmaengine: Add wrapper for device_tx_status callback
2012-06-20 15:38:27 +01:00
ARM: socfpga: initial support for Altera's SOCFPGA platform
2012-07-19 10:39:00 +02:00
etherdevice: Rename random_ether_addr to eth_random_addr
2012-07-16 22:38:27 -07:00
net: added support for 40GbE link.
2012-06-27 15:42:24 -07:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
switch fput to task_work_add
2012-07-22 23:57:58 +04:00
switch dentry_open() to struct path, make it grab references itself
2012-07-23 00:01:29 +04:00
tracing: Remove NR_CPUS array from trace_iterator
2012-06-28 13:52:15 -04:00
genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP
2012-07-24 00:01:30 -07:00
gpio: fix bits conflict for gpio flags
2012-07-05 15:04:10 +02:00
HID: Add suport for the brightness control keys on HP keyboards
2012-07-09 16:23:33 +02:00
timekeeping: Provide hrtimer update function
2012-07-11 23:34:39 +02:00
i2c: Add SCCB support
2012-07-24 14:13:59 +02:00
wireless: 60g protocol constants
2012-07-02 15:11:12 +02:00
net: introduce new priv_flag indicating iface capable of change mac when running
2012-06-30 01:08:00 -07:00
canfd: add new data structures and constants
2012-06-19 21:39:50 +02:00
rtnl: allow to specify number of rx and tx queues on device creation
2012-07-20 11:07:00 -07:00
team: add multiqueue support
2012-07-20 11:07:00 -07:00
net/ipv4: VTI support new module for ip_vti.
2012-07-18 09:36:12 -07:00
ipv4: Add interface option to enable routing of 127.0.0.0/8
2012-06-12 15:25:46 -07:00
rcu: Use new RCU_POINTER_INITIALIZER for gcc-style initializations
2012-07-02 12:34:22 -07:00
powerpc: Disable /dev/port interface on systems without an ISA bridge
2012-07-11 18:22:32 +10:00
Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next
2012-07-23 12:17:00 +02:00
ipv6: fix inet6_csk_xmit()
2012-07-18 08:59:58 -07:00
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 12:19:36 -07:00
jump label: Remove static_branch()
2012-07-06 10:53:49 +02:00
Staging tree patches for 3.6-rc1
2012-07-26 11:14:49 -07:00
Remove SYSTEM_SUSPEND_DISK system state
2012-07-21 13:58:17 -07:00
key: Remove extraneous parentheses from rcu_assign_keypointer()
2012-07-02 12:34:23 -07:00
printk: Implement some unlocked kmsg_dump functions
2012-07-21 10:34:00 -07:00
kthread_worker: reimplement flush_kthread_work() to allow freeing the work item being executed
2012-07-22 10:15:28 -07:00
KVM updates for the 3.6 merge window
2012-07-24 12:01:20 -07:00
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
2012-07-25 15:58:48 -04:00
phy: add the EEE support and the way to access to the MMD registers.
2012-07-01 03:34:50 -07:00
memblock: free allocated memblock_reserved_regions later
2012-07-11 16:04:50 -07:00
phy: add the EEE support and the way to access to the MMD registers.
2012-07-01 03:34:50 -07:00
xen/mce: Add mcelog support for Xen platform
2012-07-19 15:51:36 -04:00
x86/mce: Fix siginfo_t->si_addr value for non-recoverable memory faults
2012-07-11 10:20:47 -07:00
mm: fix slab->page _count corruption when using slub
2012-06-20 14:39:35 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-07-24 13:34:56 -07:00
USB: properly pad out usb_device_id.driver_info
2012-06-18 15:38:22 -07:00
video: mxsfb: move mxsfb.h into include/linux
2012-07-03 13:22:37 +08:00
fs: add nd_jump_link
2012-07-14 16:35:40 +04:00
net: netprio_cgroup: rework update socket logic
2012-07-22 12:44:01 -07:00
net: honour netif_set_real_num_tx_queues() retval
2012-07-20 11:06:59 -07:00
netfilter: nfnetlink_queue: fix compilation with CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y
2012-06-22 02:49:52 +02:00
netfilter: add user-space connection tracking helper infrastructure
2012-06-16 15:40:02 +02:00
netfilter: add user-space connection tracking helper infrastructure
2012-06-16 15:40:02 +02:00
netlink: add nlk->netlink_bind hook for module auto-loading
2012-06-29 16:46:06 -07:00
netpoll: move np->dev and np->dev_name init into __netpoll_setup()
2012-07-17 09:02:36 -07:00
NFC: Add ISO 14443 type B protocol
2012-07-09 16:42:24 -04:00
NFSv4.1: Fix umount when filelayout DS is also the MDS
2012-06-18 08:45:16 -04:00
nfs: clean up ->create in nfs_rpc_ops
2012-07-14 16:33:08 +04:00
cfg80211: add cellular base station regulatory hint support
2012-07-17 12:16:39 +02:00
mac802154: add wpan device-class support
2012-06-26 21:06:11 -07:00
Devicetree updates for 3.6
2012-07-24 14:07:22 -07:00
iommu: Add DMA window parser, of_get_dma_window()
2012-06-25 13:50:28 +02:00
of: mtd: nuke useless const qualifier
2012-07-10 10:32:06 -05:00
Viresh has moved
2012-06-20 14:39:36 -07:00
PCI/ACPI: provide MMCONFIG address for PCI host bridges
2012-06-22 15:16:51 -06:00
Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next
2012-07-23 12:17:00 +02:00
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 16:07:45 -07:00
Merge branch 'pci/bjorn-p2p-bridge-windows' into next
2012-07-10 08:36:09 -06:00
perf: Introduce perf_pmu_migrate_context()
2012-06-18 12:13:21 +02:00
phylib: Support registering a bunch of drivers
2012-07-09 00:10:56 -07:00
net: sched: add ipset ematch
2012-07-12 07:54:46 -07:00
PM / Domains: Add device domain data reference counter
2012-07-05 22:12:32 +02:00
PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h
2012-07-19 00:02:30 +02:00
security: Minor improvements to no_new_privs documentation
2012-07-08 00:25:48 +10:00
pstore: Headers should include all stuff they use
2012-07-17 12:15:30 -07:00
pstore/ram: Make tracing log versioned
2012-07-17 16:48:09 -07:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
rcu: Fix broken strings in RCU's source code.
2012-07-06 06:01:49 -07:00
Revert "rcu: Move PREEMPT_RCU preemption to switch_to() invocation"
2012-07-02 11:39:19 -07:00
Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next
2012-07-22 19:26:07 +01:00
rpmsg: make sure inflight messages don't invoke just-removed callbacks
2012-07-04 11:51:59 +03:00
rtnetlink: Remove ts/tsage args to rtnl_put_cacheinfo().
2012-07-10 22:40:13 -07:00
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-07-23 12:27:27 -07:00
ACPI: mark acpi_sfi_table_parse() as __init
2012-06-22 15:36:44 -06:00
dma: sh: provide a migration path for slave drivers to stop using .private
2012-07-20 11:28:20 +05:30
sh: pfc: Rudimentary pinctrl-backed GPIO support.
2012-07-10 12:08:14 +09:00
dma: sh: provide a migration path for slave drivers to stop using .private
2012-07-20 11:28:20 +05:30
skbuff: add an api to orphan frags
2012-07-22 12:39:33 -07:00
net-tcp: Fast Open client - sending SYN-data
2012-07-19 11:02:03 -07:00
net: make sock diag per-namespace
2012-07-16 22:31:34 -07:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
splice: fix racy pipe->buffers uses
2012-06-13 21:16:42 +02:00
PM / Sleep: Separate printing suspend times from initcall_debug
2012-07-01 13:31:23 +02:00
swap: fix shmem swapping when more than 8 areas
2012-06-15 21:48:14 -07:00
ipv4: Don't add deprecated new binary sysctl value.
2012-06-22 23:02:22 -07:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
tcp: dont drop MTU reduction indications
2012-07-23 00:58:46 -07:00
clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
2012-07-10 15:47:46 +02:00
tipc: remove print_buf and deprecated log buffer code
2012-07-13 19:34:43 -04:00
trim task_work: get rid of hlist
2012-07-22 23:57:55 +04:00
tracepoint: Use static_key_false(), since static_branch() is deprecated
2012-07-06 10:53:49 +02:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
HID: uhid: implement feature requests
2012-06-18 13:42:03 +02:00
USB: add USB_VENDOR_AND_INTERFACE_INFO() macro
2012-07-16 17:43:04 -07:00
[SCSI] usb-storage: add support for write cache quirk
2012-07-20 08:59:00 +01:00
usbdevfs: Use scatter-gather lists for large bulk transfers
2012-07-06 10:53:20 -07:00
vga_switcheroo: Add include guard
2012-06-21 09:32:16 +01:00
[SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
2012-07-20 08:59:03 +01:00
[SCSI] virtio-scsi: hotplug support for virtio-scsi
2012-07-20 08:58:58 +01:00
