Linus Torvalds
b7e97d2211
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ...
Pull slave-dmaengine updates from Vinod Koul:
"This time we have Andy updates on dw_dmac which is attempting to make
this IP block available as PCI and platform device though not fully
complete this time.
We also have TI EDMA moving the dma driver to use dmaengine APIs, also
have a new driver for mmp-tdma, along with bunch of small updates.
Now for your excitement the merge is little unusual here, while
merging the auto merge on linux-next picks wrong choice for pl330
(drivers/dma/pl330.c) and this causes build failure. The correct
resolution is in linux-next. (DMA: PL330: Fix build error) I didn't
back merge your tree this time as you are better than me so no point
in doing that for me :)"
Fixed the pl330 conflict as in linux-next, along with trivial header
file conflicts due to changed includes.
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (29 commits)
dma: tegra: fix interrupt name issue with apb dma.
dw_dmac: fix a regression in dwc_prep_dma_memcpy
dw_dmac: introduce software emulation of LLP transfers
dw_dmac: autoconfigure data_width or get it via platform data
dw_dmac: autoconfigure block_size or use platform data
dw_dmac: get number of channels from hardware if possible
dw_dmac: fill optional encoded parameters in register structure
dw_dmac: mark dwc_dump_chan_regs as inline
DMA: PL330: return ENOMEM instead of 0 from pl330_alloc_chan_resources
DMA: PL330: Remove redundant runtime_suspend/resume functions
DMA: PL330: Remove controller clock enable/disable
dmaengine: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
DMA: PL330: Set the capability of pdm0 and pdm1 as DMA_PRIVATE
ARM: EXYNOS: Set the capability of pdm0 and pdm1 as DMA_PRIVATE
dma: tegra: use list_move_tail instead of list_del/list_add_tail
mxs/dma: Enlarge the CCW descriptor area to 4 pages
dw_dmac: utilize slave_id to pass request line
dmaengine: mmp_tdma: add dt support
dmaengine: mmp-pdma support
spi: davici - make davinci select edma
...
2012-10-10 11:10:41 +09:00
spi: Updates for v3.7
2012-10-02 17:26:42 -07:00
UAPI Disintegration 2012-10-09
2012-10-09 15:04:25 +01:00
can: mark bittiming_const pointer in struct can_priv as const
2012-07-20 12:31:05 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-10-08 06:38:18 +09:00
ARM: bcm2835: add stub clock driver
2012-09-19 19:08:53 -06:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
[media] add LNA support for DVB API
2012-09-27 14:28:09 -03:00
extcon: adc_jack: adc-jack driver to support 3.5 pi or simliar devices
2012-09-05 12:20:49 -07:00
Sound updates for 3.7-rc1
2012-10-09 07:07:14 +09:00
iio:inkern: Add function to read the processed value
2012-09-17 21:48:51 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-10-02 17:16:10 -07:00
ARM: bcm2835: add interrupt controller driver
2012-09-19 19:08:37 -06:00
LockD: pass actual network namespace to grace period management functions
2012-07-27 16:49:22 -04:00
Sound updates for 3.7-rc1
2012-10-09 07:07:14 +09:00
mlx4: Modify proxy/tunnel QP mechanism so that guests do no calculations
2012-09-30 20:33:43 -07:00
mmc: core: Fixup broken suspend and eMMC4.5 power off notify
2012-10-07 17:41:45 -04:00
UAPI Disintegration 2012-10-09
2012-10-09 15:04:25 +01:00
Prepared for main script
2012-10-03 13:45:43 -07:00
netfilter: ip6tables: add stateless IPv6-to-IPv6 Network Prefix Translation target
2012-08-30 03:00:25 +02:00
nfsd: Push mnt_want_write() outside of i_mutex
2012-07-31 01:02:51 +04:00
Prepared for main script
2012-10-03 13:45:43 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-10-10 11:10:41 +09:00
1. New drivers:
2012-10-07 17:29:24 +09:00
Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next
2012-09-28 14:45:07 +01:00
mmc: spi: Pull out common DMA parts from MXS MMC
2012-08-17 22:54:15 +01:00
ssb: check for flash presentence
2012-08-10 15:27:02 -04:00
SUNRPC: Fix a UDP transport regression
2012-09-07 11:43:49 -04:00
USB: EHCI: Tegra: Fix wrong register definition
2012-09-18 17:40:56 +01:00
Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next
2012-09-24 16:36:10 -06:00
include/linux/aio.h: cpp->C conversions
2012-07-30 17:25:21 -07:00
[SCSI] async: make async_synchronize_full() flush all work regardless of domain
2012-07-20 09:07:37 +01:00
ahci: implement aggressive SATA device sleep support
2012-09-13 01:08:53 -04:00
ASoC: atmel-ssc: include linux/io.h for raw io
2012-08-28 10:14:01 -07:00
misc/atmel_tc: make atmel_tc.tcb_config member point to const data
2012-09-11 08:56:37 +02:00
atomic: implement generic atomic_dec_if_positive()
2012-10-09 16:22:46 +09:00
audit.h: replace defines with C stubs
2012-10-06 03:04:35 +09:00
vfs: kill write_super and sync_supers
2012-08-04 01:24:44 +04:00
usb/core: use bin2bcd() for bcdDevice in RH
2012-09-10 11:13:16 -07:00
ARM: bcm2835: add system timer
2012-09-19 19:08:46 -06:00
coredump: pass siginfo_t* to do_coredump() and below, not merely signr
2012-10-06 03:05:16 +09:00
mm: add get_kernel_page[s] for pinning of kernel addresses for I/O
2012-07-31 18:42:47 -07:00
block: disable discard request merge temporarily
2012-08-09 15:20:23 +02:00
block: add partition resize function to blkpg ioctl
2012-08-01 12:24:18 +02:00
mm: sparse: fix usemap allocation above node descriptor section
2012-07-11 16:04:49 -07:00
canfd: remove redundant CAN FD flag
2012-08-07 10:10:57 +02:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2012-10-02 10:52:28 -07:00
cgroup: Wrap subsystem selection macro
2012-09-14 09:57:37 -07:00
clk: Add CLK_IS_BASIC flag to identify basic clocks
2012-07-11 15:36:43 -07:00
clk: add of_clk_src_onecell_get() support
2012-09-07 18:30:19 -07:00
clk: add non CONFIG_HAVE_CLK routines
2012-07-30 17:25:11 -07:00
timekeeping: Add suspend and resume of clock event devices
2012-09-04 01:36:01 +02:00
mm: compaction: clear PG_migrate_skip based on compaction and reclaim activity
2012-10-09 16:22:51 +09:00
compat: move compat_siginfo_t definition to asm/compat.h
2012-10-06 03:05:16 +09:00
compiler.h: add __visible
2012-09-17 15:00:38 -07:00
compiler.h: add __visible
2012-09-17 15:00:38 -07:00
coredump: pass siginfo_t* to do_coredump() and below, not merely signr
2012-10-06 03:05:16 +09: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
ARM: omap: allow building omap44xx without SMP
2012-08-23 17:16:42 +02:00
cpumask: cpulist_parse() comments correction
2012-07-27 09:29:42 +09:30
cpusets, hotplug: Restructure functions that are invoked during hotplug
2012-07-24 13:53:22 +02:00
vfs: dcache: use DCACHE_DENTRY_KILLED instead of DCACHE_DISCONNECTED in d_kill()
2012-09-18 11:23:51 -07:00
dm thin: commit before gathering status
2012-07-27 15:08:16 +01:00
Power management updates for 3.7-rc1
2012-10-02 18:32:35 -07:00
dm thin: commit before gathering status
2012-07-27 15:08:16 +01:00
common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute
2012-07-30 12:25:47 +02:00
common: dma-mapping: introduce dma_get_sgtable() function
2012-07-30 12:25:46 +02:00
dmaengine: Add flags parameter to dmaengine_prep_dma_cyclic()
2012-09-24 18:35:29 +02:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
ARM: socfpga: initial support for Altera's SOCFPGA platform
2012-07-19 10:39:00 +02:00
dw_dmac: autoconfigure data_width or get it via platform data
2012-09-27 15:35:23 +05:30
dmaengine: add TI EDMA DMA engine driver
2012-09-01 06:14:02 +05:30
efi: Fix the ACPI BGRT driver for images located in EFI boot services memory
2012-09-29 12:21:03 -07:00
efi: Fix the ACPI BGRT driver for images located in EFI boot services memory
2012-09-29 12:21:03 -07:00
coredump: extend core dump note section to contain file names of mapped files
2012-10-06 03:05:17 +09:00
etherdevice: introduce help function eth_zero_addr()
2012-09-10 15:49:54 -04:00
ethtool.h: MDI setting support
2012-08-21 01:19:54 -07:00
epoll: support for disabling items, and a self-test app
2012-10-06 03:05:00 +09:00
extcon: fixing typos
2012-09-05 12:18:11 -07:00
fs: reserve fallocate flag codepoint
2012-09-27 09:29:33 -04:00
new helper: daemonize_descriptors()
2012-09-26 21:10:00 -04:00
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
filter: add XOR instruction for use with X/K
2012-09-24 16:49:21 -04:00
firewire: addendum to address handler RCU conversion
2012-09-28 11:47:42 +02:00
firmware loader: introduce cache_firmware and uncache_firmware
2012-08-16 13:24:21 -07:00
frontswap: support exclusive gets if tmem backend is capable
2012-09-21 10:38:12 -04:00
mm: replace vma prio_tree with an interval tree
2012-10-09 16:22:39 +09:00
powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY
2012-09-24 13:42:45 -07:00
ftrace: Make ftrace_location() a nop on !DYNAMIC_FTRACE
2012-07-31 10:29:57 -04:00
perf/trace: Add ability to set a target task for events
2012-07-31 17:02:05 +02:00
fuse: add missing INIT flag descriptions
2012-07-18 16:09:40 +02:00
genalloc: make it possible to use a custom allocation algorithm
2012-10-06 03:04:57 +09:00
genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP
2012-07-24 00:01:30 -07:00
Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block
2012-08-01 09:02:41 -07:00
make GFP_NOTRACK definition unconditional
2012-10-09 16:23:01 +09:00
cputime: Use a proper subsystem naming for vtime related APIs
2012-09-25 15:31:31 +02:00
net: Dont use ifindices in hash fns
2012-08-09 16:18:06 -07:00
HID: sensors: introduce sensor framework
2012-09-06 19:13:13 +01:00
HID: sensors: introduce sensor framework
2012-09-06 19:13:13 +01:00
HID: Allow more fields in the hid report
2012-09-19 19:50:20 +02:00
mm: add support for direct_IO to highmem pages
2012-07-31 18:42:47 -07:00
timekeeping: Provide hrtimer update function
2012-07-11 23:34:39 +02:00
mm, thp: fix mapped pages avoiding unevictable list on mlock
2012-10-09 16:23:02 +09:00
mm: hugetlbfs: close race during teardown of hugetlbfs shared page tables
2012-07-31 18:42:50 -07:00
hugetlb/cgroup: migrate hugetlb cgroup info from oldpage to new page during migration
2012-07-31 18:42:41 -07:00
Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO
2012-09-10 16:42:33 -07:00
i2c-mux-gpio: Add support for dynamically allocated GPIO pins
2012-10-05 22:23:54 +02:00
i2c-mux: Add support for device auto-detection
2012-10-05 22:23:51 +02:00
i2c: i2c-ocores: support for 16bit and 32bit IO
2012-07-14 13:30:25 +02:00
i2c: pnx: Fix read transactions of >= 2 bytes
2012-09-12 17:52:44 +02:00
i2c: Correct struct i2c_driver doc about detection
2012-10-05 22:23:54 +02:00
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
wireless: remove obsolete chan no/center freq conversion functions
2012-09-06 17:05:36 +02:00
gre: Support GRE over IPv6
2012-08-14 14:28:32 -07:00
vxlan: virtual extensible lan
2012-10-01 18:39:45 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-08-22 14:21:38 -07:00
gre: Support GRE over IPv6
2012-08-14 14:28:32 -07:00
vlan: add helper which can be called to see if device is used by vlan
2012-08-24 13:46:39 -04:00
ima: add ima_inode_setxattr/removexattr function and calls
2012-09-07 14:57:47 -04:00
userns: Teach inet_diag to work with user namespaces
2012-08-14 21:55:20 -07:00
ipv4: Introduce IN_DEV_NET_ROUTE_LOCALNET
2012-08-04 01:27:57 -07:00
sections: disable const sections for PA-RISC v2
2012-10-06 03:04:37 +09:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
Input: Send events one packet at a time
2012-09-19 19:50:18 +02:00
ima: allocating iint improvements
2012-09-07 14:57:45 -04:00
time: RCU permitted to stop idle entry via softirq
2012-09-23 07:42:52 -07:00
rbtree: add prio tree and interval tree tests
2012-10-09 16:22:39 +09:00
mm: interval tree updates
2012-10-09 16:22:40 +09:00
powerpc: Disable /dev/port interface on systems without an ISA bridge
2012-07-11 18:22:32 +10:00
iommu: static inline iommu group stub functions
2012-09-25 12:14:56 +02:00
resources: Document IORESOURCE_IO
2012-09-11 10:15:02 +02:00
gre: Support GRE over IPv6
2012-08-14 14:28:32 -07:00
userns: Convert ipc to use kuid and kgid where appropriate
2012-09-06 22:17:20 -07:00
netfilter: nf_conntrack_ipv6: improve fragmentation handling
2012-08-30 03:00:10 +02:00
genirq: Allow irq chips to mark themself oneshot safe
2012-07-25 12:46:38 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-10-01 09:06:36 -07:00
irqdomain: Eliminate dedicated radix lookup functions
2012-07-11 16:16:00 +01:00
ext4: make sure the journal sb is written in ext4_clear_journal_err()
2012-08-05 19:04:57 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-08-22 14:21:38 -07:00
vt: fix the keyboard/led locking
2012-07-17 09:13:37 -07:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-10-07 17:49:05 +09:00
kdb: Turn KGDB_KDB=n stubs into static inlines
2012-09-26 13:42:26 -07:00
printk: remove the now unnecessary "C" annotation for KERN_CONT
2012-07-30 17:25:14 -07:00
linux/kernel.h: Fix warning seen with W=1 due to change in DIV_ROUND_CLOSEST
2012-09-19 06:51:25 -07:00
vtime: Consolidate system/idle context detection
2012-09-25 15:42:37 +02:00
KEYS: linux/key-type.h needs linux/errno.h
2012-07-30 15:08:46 +10:00
userns: Convert security/keys to the new userns infrastructure
2012-09-13 18:28:02 -07:00
tty/serial: Add kgdb_nmi driver
2012-09-26 13:52:36 -07:00
printk: Implement some unlocked kmsg_dump functions
2012-07-21 10:34:00 -07:00
kobject: fix oops with "input0: bad kobj_uevent_env content in show_uevent()"
2012-09-06 10:13:58 -07:00
kprobes/x86: ftrace based optimization for x86
2012-07-31 10:29:59 -04:00
introduce kref_put_mutex()
2012-08-22 10:24:41 -04:00
kthread: Implement park/unpark facility
2012-08-13 17:01:06 +02:00
time: Improve sanity checking of timekeeping inputs
2012-08-15 15:54:01 +02:00
KVM: Add resampling irqfds for level triggered interrupts
2012-09-23 13:50:15 +02:00
KVM updates for the 3.7 merge window
2012-10-04 09:30:33 -07:00
Merge branch 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds into next/drivers
2012-08-13 16:45:48 +02:00
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
Partially revert a1ce39288e (UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers)
2012-10-06 02:48:09 +09:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
userns: Convert loop to use kuid_t instead of uid_t
2012-09-21 03:13:20 -07:00
mdio: translation of MMD EEE registers to/from ethtool settings
2012-08-22 22:58:27 -07:00
mm/memblock: cleanup early_node_map[] related comments
2012-10-09 16:22:47 +09:00
mm: memcg: clean up mm_match_cgroup() signature
2012-10-09 16:23:04 +09:00
mm/ia64: fix a memory block size bug
2012-09-17 15:00:37 -07:00
memory-hotplug: update memory block's state and notify userspace
2012-10-09 16:23:02 +09:00
mempolicy: fix a race in shared_policy_replace()
2012-10-09 16:22:22 +09:00
phy/micrel: Add missing header to micrel_phy.h
2012-09-24 15:54:33 -04:00
hugetlb: simplify migrate_huge_page()
2012-07-31 18:42:40 -07:00
xen/mce: Add mcelog support for Xen platform
2012-07-19 15:51:36 -04:00
mISDN: Fix wrong usage of flush_work_sync while holding locks
2012-09-13 14:58:54 -04:00
mm: fix-up zone present pages
2012-10-09 16:22:54 +09:00
mm: replace vma prio_tree with an interval tree
2012-10-09 16:22:39 +09:00
mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas
2012-10-09 16:22:18 +09:00
mm: move all mmu notifier invocations to be done outside the PT lock
2012-10-09 16:22:58 +09:00
CMA: migrate mlocked pages
2012-10-09 16:23:00 +09:00
ARM: soc: non-critical bug fixes
2012-10-01 18:02:07 -07:00
ARM: Orion: Set eth packet size csum offload limit
2012-08-15 13:58:09 +00:00
new helper: done_path_create()
2012-07-29 21:24:13 +04:00
nbd: handle discard requests
2012-10-06 03:05:24 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
netfilter: add protocol independent NAT core
2012-08-30 03:00:14 +02:00
netlink: Rearrange netlink_kernel_cfg to save space on 64-bit.
2012-09-23 02:09:23 -04:00
netpoll: convert several functions to bool
2012-08-14 14:33:32 -07:00
NFC: LLCP raw socket support
2012-09-27 10:47:59 +02:00
NFS: Fix the initialisation of the readdir 'cookieverf' array
2012-09-04 14:52:42 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
NFS: Convert v4 into a module
2012-07-30 19:06:52 -04:00
NFS41: add pg_layout_private to nfs_pageio_descriptor
2012-08-02 17:41:18 -04:00
NFSv4: Fix buffer overflow checking in __nfs4_get_acl_uncached
2012-09-06 11:11:53 -04:00
nilfs2: add omitted comments for structures in nilfs2_fs.h
2012-07-30 17:25:19 -07:00
cfg80211/nl80211: Notify connection request failure in AP mode
2012-09-18 19:54:06 +02:00
NVMe: Do not set IO queue depth beyond device max
2012-07-27 13:57:23 -04:00
powerpc/crypto: add 842 hardware compression driver
2012-08-01 17:47:56 +08:00
MFD bits for the 3.7 merge window.
2012-10-05 12:01:30 +09:00
of: Allow busses with #size-cells=0
2012-08-03 08:01:46 -05:00
of/irq: Create stub for of_irq_find_parent when !CONFIG_OF
2012-09-20 12:32:30 +02:00
of/mdio: Add dummy functions in of_mdio.h.
2012-08-30 12:37:52 -04:00
of: mtd: nuke useless const qualifier
2012-07-10 10:32:06 -05:00
Platform: OLPC: turn EC driver into a platform_driver
2012-07-31 23:27:30 -04:00
dmaengine: add OMAP DMA engine driver
2012-07-31 12:06:20 +01:00
[media] omap3isp: preview: Add support for non-GRBG Bayer patterns
2012-08-11 15:59:54 -03:00
ARM: OMAP1: move lcd pdata out of arch/arm/*
2012-09-10 16:34:00 -07:00
oom: remove deprecated oom_adj
2012-10-09 16:22:24 +09:00
PM / OPP: Initialize OPP table from device tree
2012-09-09 22:06:33 +02:00
packet: Report fanout status via diag engine
2012-08-20 02:23:14 -07:00
mm: sl[au]b: add knowledge of PFMEMALLOC reserve pages
2012-07-31 18:42:45 -07:00
mm/page_alloc: refactor out __alloc_contig_migrate_alloc()
2012-10-09 16:22:52 +09:00
memcg: rename config variables
2012-07-31 18:42:43 -07:00
mm: compaction: cache if a pageblock was scanned and no pages were isolated
2012-10-09 16:22:50 +09:00
mm: methods for teaching filesystems about PG_swapcache pages
2012-07-31 18:42:47 -07:00
PCI/ACPI: Use DEVICE_ACPI_HANDLE rather than searching acpi_pci_roots
2012-09-24 14:51:23 -06:00
Merge branch 'pci/trivial' into next
2012-09-13 09:08:02 -06:00
i2c-viapro: Add VIA VX900 device ID
2012-10-05 22:23:53 +02:00
Merge branch 'pci/bjorn-find-next-ext-cap' into next
2012-08-23 18:32:36 -06:00
PCI: Make pci_error_handlers const
2012-09-07 16:24:59 -06:00
sections: fix section conflicts in mm/percpu.c
2012-10-06 03:04:44 +09:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-10-01 10:28:49 -07:00
perf: Add ability to attach user level registers dump to sample
2012-08-10 11:31:26 -03:00
phylib: Support registering a bunch of drivers
2012-07-09 00:10:56 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
net: sched: add ipset ematch
2012-07-12 07:54:46 -07:00
platform: Add support for automatic device IDs
2012-08-16 10:32:07 -07:00
Power management updates for 3.7-rc1
2012-10-02 18:32:35 -07:00
PM / Domains: Operations related to cpuidle using domain names
2012-09-04 01:36:53 +02:00
PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h
2012-07-19 00:02:30 +02:00
pnfs_osd_xdr: Remove unused #include from pnfs_osd_xdr.h
2012-10-03 13:52:52 -07:00
userns: Convert vfs posix_acl support to use kuids and kgids
2012-09-18 01:01:35 -07:00
userns: Pass a userns parameter into posix_acl_to_xattr and posix_acl_from_xattr
2012-09-18 01:01:35 -07:00
posix_types.h: Cleanup stale __NFDBITS and related definitions
2012-07-26 13:36:43 -07:00
power_supply: Add new power supply properties CHARGE_CURRENT/VOLTAGE_MAX
2012-08-22 21:59:15 -07:00
pps/ptp: Allow PHC devices to adjust PPS events for known delay
2012-09-07 21:13:28 +01:00
printk: remove the now unnecessary "C" annotation for KERN_CONT
2012-07-30 17:25:14 -07:00
userns: Add kprojid_t and associated infrastructure in projid.h
2012-09-18 01:01:37 -07:00
pstore/ftrace: Convert to its own enable/disable debugfs knob
2012-09-06 22:16:58 -07:00
pstore/ram: Make tracing log versioned
2012-07-17 16:48:09 -07:00
ptp: clarify the clock_name sysfs attribute
2012-09-22 15:42:46 -04:00
ptrace: mark __ptrace_may_access() static
2012-08-03 14:47:17 +10:00
pwm-backlight: Add rudimentary device tree support
2012-07-23 13:23:52 +02:00
userns: Convert struct dquot dq_id to be a struct kqid
2012-09-18 01:01:41 -07:00
userns: Modify dqget to take struct kqid
2012-09-18 01:01:40 -07:00
random: remove rand_initialize_irq()
2012-07-19 10:38:32 -04:00
rbtree: move augmented rbtree functionality to rbtree_augmented.h
2012-10-09 16:22:40 +09:00
rbtree: move augmented rbtree functionality to rbtree_augmented.h
2012-10-09 16:22:40 +09:00
rcu: Switch task's syscall hooks on context switch
2012-09-26 15:47:02 +02:00
regmap: irq: Add mask invert flag for enable register
2012-08-30 11:13:41 -07:00
remtoteproc: maintain max notifyid
2012-09-18 21:55:52 +03:00
Revert "rfkill: remove dead code"
2012-08-21 20:50:25 +02:00
rapidio: add destination ID allocation mechanism
2012-10-06 03:05:23 +09:00
rapidio: add inbound memory mapping interface
2012-10-06 03:05:21 +09:00
mm: cma: discard clean pages during contiguous allocation instead of migration
2012-10-09 16:22:43 +09:00
rtc: add Dallas DS2404 driver
2012-10-06 03:05:01 +09:00
rtc_sysfs_show_hctosys(): display 0 if resume failed
2012-10-06 03:05:04 +09:00
rtnetlink: Remove ts/tsage args to rtnl_put_cacheinfo().
2012-07-10 22:40:13 -07:00
scatterlist: add sg_alloc_table_from_pages function
2012-07-30 12:25:44 +02:00
oom: remove deprecated oom_adj
2012-10-09 16:22:24 +09:00
efifb: Skip DMI checks if the bootloader knows what it's doing
2012-09-17 13:29:23 +01:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-10-02 21:38:48 -07:00
userns: Make seq_file's user namespace accessible
2012-08-14 21:47:55 -07:00
serial: diminish usage of struct serial_uart_config
2012-09-05 13:15:07 -07:00
8250: three way resolve of the 8250 diffs
2012-07-17 09:11:50 -07:00
tty/serial/core: Introduce poll_init callback
2012-09-26 13:47:02 -07:00
serial: add OMAP-specific defines
2012-09-06 09:17:01 -07: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
dmaengine: shdma: restore partial transfer calculation
2012-08-01 13:48:52 +09:00
ipc: add COMPAT_SHMLBA support
2012-07-30 17:25:20 -07:00
xattr: extract simple_xattr code from tmpfs
2012-08-24 15:55:33 -07:00
vmscan: remove obsolete shrink_control comment
2012-07-31 18:42:43 -07:00
net: skb_share_check() should use consume_skb()
2012-08-04 01:27:57 -07:00
mm, slob: Add support for kmalloc_track_caller()
2012-09-25 10:14:18 +03:00
mm/slab: Fix kmem_cache_alloc_node_trace() declaration
2012-09-29 10:02:27 +03:00
mm, slob: Use NUMA_NO_NODE instead of -1
2012-09-25 10:11:14 +03:00
smpboot: Provide infrastructure for percpu hotplug threads
2012-08-13 17:01:07 +02:00
tcp: TCP Fast Open Server - header & support functions
2012-08-31 20:02:18 -04: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
remoteproc: Add STE modem driver
2012-09-22 16:35:13 +03:00
net:stmmac: Remove bus_id from mdio platform data.
2012-08-31 16:11:28 -04:00
string: do not export memweight() to userspace
2012-08-21 16:45:03 -07:00
mm: remove vma arg from page_evictable
2012-10-09 16:22:55 +09:00
swiotlb: add the late swiotlb initialization function with iotlb memory
2012-08-21 14:47:25 -04:00
task_work: task_work_add() should not succeed after exit_task_work()
2012-09-13 16:47:34 +02:00
ipv4: Don't add TCP-code in inet_sock_destruct
2012-09-20 17:12:27 -04:00
tcp: add generic netlink support for tcp_metrics
2012-09-05 15:15:02 -04:00
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
drivers/misc/ti-st: remove sparse warnings
2012-08-16 10:11:45 -07:00
clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
2012-07-10 15:47:46 +02:00
time: Move ktime_t overflow checking into timespec_valid_strict
2012-09-01 10:24:48 -07:00
timer: Implement TIMER_IRQSAFE
2012-08-21 16:28:31 +02:00
rbtree: empty nodes have no color
2012-10-09 16:22:32 +09:00
time/jiffies: Rename ACTHZ to SHIFTED_HZ
2012-07-31 17:09:12 +02:00
tipc: eliminate configuration for maximum number of name publications
2012-08-20 02:26:31 -07:00
sched: recover SD_WAKE_AFFINE in select_task_rq_fair and code clean up
2012-08-13 19:02:05 +02:00
tpm: Move tpm_get_random api into the TPM device driver
2012-08-22 11:11:33 -05:00
trim task_work: get rid of hlist
2012-07-22 23:57:55 +04:00
trace: Don't declare trace_*_rcuidle functions in modules
2012-09-12 10:20:14 -04:00
userns: Convert taskstats to handle the user and pid namespaces.
2012-09-18 01:01:32 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
TTY: move cdev_add to tty_register_device
2012-08-13 16:45:39 -07:00
tty: move the async flags from the serial code into the tty includes
2012-09-05 13:11:03 -07:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
Input: uinput - specify exact bit sizes on userspace APIs
2012-08-21 22:29:54 -07:00
uprobes: Introduce arch_uprobe_enable/disable_step()
2012-09-15 17:37:28 +02:00
usb/acpi: Use ACPI methods to power off ports.
2012-09-10 13:04:01 -07:00
usb: remove libusual
2012-09-05 17:21:36 -07:00
usbfs: Add a new disconnect-and-claim ioctl (v2)
2012-09-10 11:10:37 -07:00
userns: Add kprojid_t and associated infrastructure in projid.h
2012-09-18 01:01:37 -07:00
[media] v4l: Add missing compatibility definitions for bounds rectangles
2012-07-31 00:32:28 -03:00
[media] videodev2.h: split off controls into v4l2-controls.h
2012-09-26 09:25:41 -03:00
[media] v4l2 core: add the missing pieces to support DVI/HDMI/DisplayPort
2012-09-13 16:05:27 -03:00
vfio: Add PCI device driver
2012-07-31 08:16:24 -06:00
[media] Rename V4L2_(IN|OUT)_CAP_CUSTOM_TIMINGS
2012-09-26 09:49:37 -03:00
virtio-ring: move queue_index to vring_virtqueue
2012-09-28 15:05:15 +09:30
virtio-blk: return VIRTIO_BLK_F_FLUSH to header.
2012-07-30 13:30:52 +09:30
virtio: support reserved vqs
2012-09-28 15:05:15 +09:30
virtio ids: fix comment for virtio-rng
2012-07-30 13:30:49 +09:30
virtio-ring: move queue_index to vring_virtqueue
2012-09-28 15:05:15 +09:30
[SCSI] virtio-scsi: hotplug support for virtio-scsi
2012-07-20 08:58:58 +01:00
mm: remove unevictable_pgs_mlockfreed
2012-10-09 16:22:59 +09:00
ARM: dma-mapping: remove custom consistent dma region
2012-07-30 12:25:45 +02:00
memory-hotplug: fix zone stat mismatch
2012-10-09 16:22:59 +09:00
onewire: w1-gpio: add ext_pullup_enable pin in platform data
2012-08-16 10:02:33 -07:00
workqueue: deprecate __cancel_delayed_work()
2012-08-21 13:18:24 -07:00
vfs: nuke pdflush from comments
2012-08-04 12:15:37 +04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-10-02 21:38:48 -07:00
xfrm_user: ensure user supplied esn replay window is valid
2012-09-20 18:08:40 -04:00
b7e97d2211