Linus Torvalds
d484864dd9
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping ...
Pull CMA and ARM DMA-mapping updates from Marek Szyprowski:
"These patches contain two major updates for DMA mapping subsystem
(mainly for ARM architecture). First one is Contiguous Memory
Allocator (CMA) which makes it possible for device drivers to allocate
big contiguous chunks of memory after the system has booted.
The main difference from the similar frameworks is the fact that CMA
allows to transparently reuse the memory region reserved for the big
chunk allocation as a system memory, so no memory is wasted when no
big chunk is allocated. Once the alloc request is issued, the
framework migrates system pages to create space for the required big
chunk of physically contiguous memory.
For more information one can refer to nice LWN articles:
- 'A reworked contiguous memory allocator':
http://lwn.net/Articles/447405/
- 'CMA and ARM':
http://lwn.net/Articles/450286/
- 'A deep dive into CMA':
http://lwn.net/Articles/486301/
- and the following thread with the patches and links to all previous
versions:
https://lkml.org/lkml/2012/4/3/204
The main client for this new framework is ARM DMA-mapping subsystem.
The second part provides a complete redesign in ARM DMA-mapping
subsystem. The core implementation has been changed to use common
struct dma_map_ops based infrastructure with the recent updates for
new dma attributes merged in v3.4-rc2. This allows to use more than
one implementation of dma-mapping calls and change/select them on the
struct device basis. The first client of this new infractructure is
dmabounce implementation which has been completely cut out of the
core, common code.
The last patch of this redesign update introduces a new, experimental
implementation of dma-mapping calls on top of generic IOMMU framework.
This lets ARM sub-platform to transparently use IOMMU for DMA-mapping
calls if one provides required IOMMU hardware.
For more information please refer to the following thread:
http://www.spinics.net/lists/arm-kernel/msg175729.html
The last patch merges changes from both updates and provides a
resolution for the conflicts which cannot be avoided when patches have
been applied on the same files (mainly arch/arm/mm/dma-mapping.c)."
Acked by Andrew Morton <akpm@linux-foundation.org>:
"Yup, this one please. It's had much work, plenty of review and I
think even Russell is happy with it."
* 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: (28 commits)
ARM: dma-mapping: use PMD size for section unmap
cma: fix migration mode
ARM: integrate CMA with DMA-mapping subsystem
X86: integrate CMA with DMA-mapping subsystem
drivers: add Contiguous Memory Allocator
mm: trigger page reclaim in alloc_contig_range() to stabilise watermarks
mm: extract reclaim code from __alloc_pages_direct_reclaim()
mm: Serialize access to min_free_kbytes
mm: page_isolation: MIGRATE_CMA isolation functions added
mm: mmzone: MIGRATE_CMA migration type added
mm: page_alloc: change fallbacks array handling
mm: page_alloc: introduce alloc_contig_range()
mm: compaction: export some of the functions
mm: compaction: introduce isolate_freepages_range()
mm: compaction: introduce map_pages()
mm: compaction: introduce isolate_migratepages_range()
mm: page_alloc: remove trailing whitespace
ARM: dma-mapping: add support for IOMMU mapper
ARM: dma-mapping: use alloc, mmap, free from dma_ops
ARM: dma-mapping: remove redundant code and do the cleanup
...
Conflicts:
arch/x86/include/asm/dma-mapping.h
2012-05-25 09:18:59 -07:00
ARM: 7369/1: amba: add functions to add devices dynamically
2012-04-19 19:31:33 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-03-28 10:01:29 -07:00
[media] DVB: remove "stats" property bits from ATSC-MH API property additions
2012-05-20 10:06:08 -03:00
Extcon: support generic GPIO extcon driver
2012-04-20 09:22:02 -07:00
mxs-dma : move the mxs dma.h to a more common place
2012-03-27 00:37:23 +01:00
HSI: hsi: Rework hsi_event interface
2012-04-23 14:23:32 +03:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-05-24 10:34:29 -07:00
iio: Add dev_to_iio_dev() helper function
2012-05-14 13:34:31 -07:00
Input: matrix-keymap - wire up device tree support
2012-05-10 22:39:43 -07:00
Lockd: shutdown NLM hosts in network namespace context
2012-02-15 00:19:48 -05:00
GPIO driver changes for v3.5 merge window
2012-05-24 14:01:46 -07:00
InfiniBand/RDMA changes for the 3.5 merge window:
2012-05-21 17:54:55 -07:00
mmc: dw_mmc: make multiple instances of dw_mci_card_workqueue
2012-05-09 10:14:10 -04:00
UBI: modify ubi_wl_flush function to clear work queue for a lnum
2012-05-21 11:34:41 +03:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-16 22:17:37 -04:00
netfilter: ebtables: fix alignment problem in ppc
2012-02-21 13:29:06 +01:00
netfilter: remove ip_queue support
2012-05-08 20:25:42 +02:00
netfilter: ip6_tables: add flags parameter to ipv6_find_hdr()
2012-05-09 12:53:47 +02:00
NFC: HCI based pn544 driver
2012-05-15 17:30:30 -04:00
nfsd: include cld.h in the headers_install target
2012-04-16 15:19:12 -04:00
ux500 GPIO and pinctrl changes for kernel 3.5
2012-05-12 19:57:34 -07:00
hwmon updates for 3.5-rc1
2012-05-23 14:15:09 -07:00
Add I2C driver for Summit Microelectronics SMB347 Battery Charger.
2012-03-26 20:41:01 +04:00
lib/raid6: Add SSSE3 optimized recovery functions
2012-05-22 13:54:18 +10:00
regulator: tps62360: support force PWM mode via regulator mode
2012-05-14 18:03:04 +01:00
SPI changes for v3.5 merge window
2012-05-24 13:56:24 -07:00
bcma/ssb: parse new attributes from sprom
2012-05-16 12:45:22 -04:00
Merge nfs containerization work from Trond's tree
2012-03-26 11:48:54 -04:00
USB 3.5-rc1 pull request
2012-05-22 15:50:46 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
aio: Use __kernel_ulong_t to define aio_context_t
2012-02-20 12:48:48 -08:00
alarmtimer: Provide accessor to alarmtimer rtc device
2012-04-20 14:56:36 -07:00
iommu/amd: Split amd_iommu_init function
2012-03-01 16:14:48 +01:00
apple_bl: Add register/unregister functions
2012-03-22 09:31:55 -04:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter
2012-03-01 13:38:49 +01:00
atm: remove the coupling to token ring support
2012-05-15 20:14:35 -04:00
atomic: Allow atomic_inc_not_zero to be overridden
2012-03-07 17:06:08 +11:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
seccomp: remove duplicated failure logging
2012-04-14 11:13:20 +10:00
gpio/generic: initialize basic_mmio_gpio shadow variables properly
2012-05-19 12:17:35 -06:00
__register_binfmt() made void
2012-03-20 21:29:46 -04:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
bitops: introduce for_each_clear_bit()
2012-03-23 16:58:34 -07:00
Fix blkdev.h build errors when BLOCK=n
2012-05-14 08:29:23 +02:00
mm: add a low limit to alloc_large_system_hash
2012-05-24 00:28:21 -04:00
bug: consolidate BUILD_BUG_ON with other bug code
2012-03-04 17:54:35 -05:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-05-23 17:42:39 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
cgroup: remove cgroup_subsys->populate()
2012-04-11 09:16:48 -07:00
clk: basic clock hardware types
2012-03-16 20:35:02 +00:00
clk: basic clock hardware types
2012-03-16 20:35:02 +00:00
ARM: 7376/1: clkdev: Implement managed clk_get()
2012-04-19 19:34:18 +01:00
CLKDEV: provide helpers for common clock framework
2012-05-02 09:30:32 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
vmscan: only defer compaction for failed order and higher
2012-03-21 17:54:56 -07:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 18:12:23 -07:00
include/ and checkpatch: prefer __scanf to __attribute__((format(scanf,...)
2012-03-23 16:58:36 -07:00
compiler.h: Fix typo
2012-02-28 16:02:54 +01:00
sched: Remove stale power aware scheduling remnants and dysfunctional knobs
2012-05-17 13:48:56 +02:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
cpuidle: power_usage should be declared signed integer
2012-03-30 03:23:30 -04:00
cpumask: remove old cpu_*_map.
2012-03-29 15:38:31 +10:30
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 14:46:05 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
crc32: bolt on crc32c
2012-03-23 16:58:38 -07:00
userns: Convert in_group_p and in_egroup_p to use kgid_t
2012-05-03 03:29:33 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
crypto: user - Fix size of netlink dump message
2012-03-29 19:52:48 +08:00
x86/olpc/xo1/sci: Report RTC wakeup events
2012-05-07 15:02:26 +02:00
vfs: make it possible to access the dentry hash/len as one 64-bit entry
2012-05-10 19:54:35 -07:00
net/dcb: Add an optional max rate attribute
2012-04-05 05:08:04 -04:00
inet: makes syn_ack_timeout mandatory
2012-04-14 15:24:26 -04:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
debugfs: Add support to print u32 array in debugfs
2012-04-17 00:18:36 -04:00
PM / devfreq: add relation of recommended frequency.
2012-03-17 21:51:34 +01:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-05-25 09:18:59 -07:00
digsig: changed type of the timestamp
2012-02-20 19:46:36 +11:00
dlm: fixes for nodir mode
2012-05-02 14:15:27 -05:00
common: DMA-mapping: add NON-CONSISTENT attribute
2012-03-28 16:36:44 +02:00
Merge branch 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
2012-03-28 15:02:41 -07:00
drivers: add Contiguous Memory Allocator
2012-05-21 15:09:37 +02:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-04-04 17:13:43 -07:00
dmaengine-fixes for 3.4-rc3
2012-04-10 15:30:16 -07:00
x86, iommu/vt-d: Clean up interfaces for interrupt remapping
2012-05-07 14:35:00 +02:00
dmaengine/dw_dmac: Remove unused fields in struct dw_dma_slave
2012-02-22 18:15:39 +05:30
dynamic_debug: use printk(KERN_WARNING..) in stub function
2012-05-01 08:58:06 -04:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2012-03-28 14:24:40 -07:00
efi: Add new variable attributes
2012-04-30 15:30:18 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
drivercore: Add driver probe deferral mechanism
2012-03-08 11:53:13 -08:00
etherdevice: fix comments
2012-05-17 15:36:35 -04:00
linux/ethtool: Added macro ETH_FW_DUMP_DISABLE
2012-05-15 13:13:33 -04:00
epoll: Add a flag, EPOLLWAKEUP, to prevent suspend while epoll events are ready
2012-05-05 21:50:41 +02:00
migrate ext2_fs.h guts to fs/ext2/ext2.h
2012-03-31 16:03:16 -04:00
extcon: Add EXTCON_MECHANICAL cable type for physical presence
2012-05-04 16:25:29 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
Replace the fd_sets in struct fdtable with an array of unsigned longs
2012-02-19 10:30:57 -08:00
vfs: drop_file_write_access() made static
2012-03-20 21:29:32 -04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-05-21 20:27:36 -07:00
firewire: allow explicit flushing of iso packet completions
2012-03-18 22:15:39 +01:00
IEEE 1394 (FireWire) subsystem updates post v3.4:
2012-05-24 12:57:47 -07:00
[media] Input: move drivers/input/fixp-arith.h to include/linux
2012-05-14 09:47:23 -03:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-05-23 17:42:39 -07:00
fsl/usb: Add controller version based ULPI and UTMI phy support
2012-04-18 13:46:42 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()
2012-05-16 20:00:27 -04:00
tracing: Do not enable function event with enable
2012-05-10 15:55:43 -04:00
fuse: use flexible array in fuse.h
2012-04-12 12:57:08 +02:00
Input: gameport - add helper macro for gameport_driver boilerplate
2012-04-04 09:25:44 -07:00
TTY: deprecate linux/generic_serial.h
2012-04-09 11:14:50 -07:00
block: fix buffer overflow when printing partition UUIDs
2012-05-15 08:22:04 +02:00
mm: page_isolation: MIGRATE_CMA isolation functions added
2012-05-21 15:09:33 +02:00
GFS2: FITRIM ioctl support
2012-02-28 17:10:21 +00:00
ARM: pxa: fix gpio wakeup setting
2012-04-27 10:46:45 +08:00
gpiolib: Implement devm_gpio_request_one()
2012-05-18 16:48:35 -06:00
Input: gpio_keys - add support for interrupt only keys
2012-03-19 17:56:18 -07:00
Merge branch 'upstream' into for-linus
2012-05-22 11:32:31 +02:00
HID: fix return value of hidraw_report_event() when !CONFIG_HIDRAW
2012-04-30 10:39:17 +02:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE
2012-03-21 17:55:02 -07:00
hugetlbfs: fix alignment of huge page requests
2012-03-21 17:54:59 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Add device tree support to i2c-pnx.c
2012-04-22 11:59:47 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
i2c: Update the FSF address
2012-03-26 21:47:19 +02:00
MCA: delete all remaining traces of microchannel bus support.
2012-05-17 19:06:13 -04:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
mac80211: Set the correct values for hwmp (1) and airtimeLinkMetric (1)
2012-04-16 14:19:29 -04:00
net: Add framework to allow sending packets with customized CRC.
2012-02-24 01:37:35 -08:00
if: restore token ring ARP type to header
2012-05-22 17:13:11 -04:00
eql: dont rely on HZ=100
2012-03-27 22:45:26 -04:00
macvlan: add FDB bridge ops and macvlan flags
2012-04-15 13:06:05 -04:00
macvlan: add FDB bridge ops and macvlan flags
2012-04-15 13:06:05 -04:00
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
2012-03-04 20:41:38 -05:00
net/l2tp: add support for L2TP over IPv6 UDP
2012-04-28 22:21:51 -04:00
pppox: Replace __attribute__((packed)) in if_pppox.h
2012-05-01 09:30:55 -04:00
team: allow to enable/disable ports
2012-04-21 16:26:33 -04:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
ipv6: correct the ipv6 option name - Pad0 to Pad1
2012-05-17 15:49:51 -04:00
arp: allow arp processing to honor per interface arp_accept sysctl
2012-03-16 23:00:20 -07:00
cpuset: mm: reduce large amounts of memory barrier related damage v3
2012-03-21 17:54:59 -07:00
Merge branch 'for-next' of github.com:rydberg/linux into next
2012-03-09 10:56:35 -08:00
genirq: Streamline irq_action
2012-04-19 13:56:55 +02:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
block: exit_io_context() should call elevator_exit_icq_fn()
2012-02-15 09:45:53 +01:00
resources: add resource_overlaps()
2012-05-07 10:58:57 -06:00
ipvs: always update some of the flags bits in backup
2012-05-08 19:38:31 +02:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
ipx: restore token ring define to include/linux/ipx.h
2012-05-23 13:49:23 -04:00
irq: Remove irq_chip->release()
2012-05-21 21:09:38 +02:00
irqdomain: Kill off duplicate definitions.
2012-05-19 12:41:56 -06:00
TTY: isdn, use xmit_buf from tty_port
2012-04-09 11:16:55 -07:00
jbd: Write journal superblock with WRITE_FUA after checkpointing
2012-05-15 23:34:37 +02:00
jbd2: cleanup journal tail after transaction commit
2012-03-13 22:45:38 -04:00
jbd2: remove bh_state lock from checkpointing code
2012-03-13 22:45:25 -04:00
static keys: Inline the static_key_enabled() function
2012-02-28 20:01:08 +01:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-05-24 11:54:29 -07:00
kconfig: fix IS_ENABLED to not require all options to be defined
2012-04-12 18:35:58 -07:00
pagemap: export KPF_THP
2012-03-21 17:54:57 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
2012-05-24 15:10:28 -07:00
KEYS: Don't check for NULL key pointer in key_validate()
2012-05-16 00:54:33 +10:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
KEYS: Add invalidation support
2012-05-11 10:56:56 +01:00
x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()
2012-03-29 17:41:25 -05:00
Revert "driver core: check start node in klist_iter_init_node"
2012-04-19 19:17:30 -07:00
PM / Sleep: Mitigate race between the freezer and request_firmware()
2012-03-28 23:30:28 +02:00
kmsg_dump: don't run on non-error paths by default
2012-03-05 15:49:42 -08:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
KVM: s390: add capability indicating COW support
2012-05-17 21:06:01 -03:00
KVM: MMU: Don't use RCU for lockless shadow walking
2012-05-16 16:08:28 -03:00
l2tp: introduce L2TPv3 IP encapsulation support for IPv6
2012-05-01 09:30:55 -04:00
leds-lm3530: support pwm input mode
2012-03-23 16:58:35 -07:00
drivers/leds/leds-lp5521.c: support led pattern data
2012-03-23 16:58:34 -07:00
libata: add a host flag to ignore detected ATA devices
2012-05-07 15:32:23 -04:00
Add #includes needed to permit the removal of asm/system.h
2012-03-28 18:30:03 +01:00
lockdep: fix oops in processing workqueue
2012-05-15 08:08:31 -07:00
backlight: new backlight driver for LP855x devices
2012-03-23 16:58:33 -07:00
lp8727_charger: Correct typos on the comment
2012-03-26 20:40:59 +04:00
LSM: do not initialize common_audit_data to 0
2012-04-09 12:23:04 -04:00
magic.h: move some FS magic numbers into magic.h
2012-03-23 16:58:31 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
math: Introduce div64_long
2012-03-15 21:41:34 +01:00
netdev/of/phy: Add MDIO bus multiplexer support.
2012-05-07 22:58:09 -04:00
mdio.h: Include linux/types.h
2012-03-03 15:04:45 -05:00
mei: export mei.h for the user space
2012-05-09 13:58:06 -07:00
memcg: fix performance of mem_cgroup_begin_update_page_stat()
2012-03-21 17:55:02 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
phy/micrel: Fix ID of KSZ9021
2012-05-22 15:20:28 -04:00
mm: replace PAGE_MIGRATION with IS_ENABLED(CONFIG_MIGRATION)
2012-03-21 17:54:57 -07:00
mISDN: Implement MISDN_CTRL_RX_OFF for more drivers
2012-05-16 15:24:36 -04:00
mISDN: Allow to set a minimum length for transparent data
2012-05-16 15:23:46 -04:00
vm: remove 'nr_accounted' calculations from the unmap_vmas() interfaces
2012-05-06 14:05:17 -07:00
uprobes/core: Allocate XOL slots for uprobes use
2012-03-31 11:50:01 +02:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-05-25 09:18:59 -07:00
HID: Allow bus wildcard matching
2012-05-01 12:54:54 +02:00
module: move __module_get and try_module_get() out of line.
2012-03-26 12:50:52 +10:30
params: add 3rd arg to option handler callback signature
2012-04-30 14:05:27 -04:00
[SCSI] st: expand ability to write immediate filemarks
2012-03-27 08:26:34 +01:00
net: add generic PF_BRIDGE:RTM_ FDB hooks
2012-04-15 13:06:04 -04:00
net: Add net_ratelimited_function and net_<level>_ratelimited macros
2012-05-15 13:45:02 -04:00
net: Support RX-ALL feature flag.
2012-02-24 01:42:07 -08:00
net: napi_frags_skb() is static
2012-05-19 02:51:00 -04:00
net: Delete all remaining instances of ctl_path
2012-04-20 21:22:30 -04:00
set fake_rtable's dst to NULL to avoid kernel Oops
2012-04-24 00:16:24 -04:00
netfilter: remove ip_queue support
2012-05-08 20:25:42 +02:00
NFC: Add a target lost netlink event
2012-04-12 15:10:33 -04:00
Merge nfs containerization work from Trond's tree
2012-03-26 11:48:54 -04:00
NFS: Fix more NFS debug related build warnings
2012-03-21 09:31:44 -04:00
NFS: Request fh_expire_type attribute in "server caps" operation
2012-03-02 17:18:10 -05:00
NFS: Undo changes to idmap.h
2012-03-05 15:26:47 -05:00
SUNRPC: add sending,pending queue and max slot to xprt stats
2012-02-16 14:55:27 -05:00
NFSv4.1: Clean ups and bugfixes for the pNFS read/writeback/commit code
2012-03-17 11:09:33 -04:00
NFSv4: Ensure we do not reuse open owner names
2012-04-20 23:14:28 -04:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
nl80211: prevent additions to old station flags API
2012-05-16 13:08:15 -04:00
mac802154: monitor device support
2012-05-16 15:17:08 -04:00
nmi watchdog: do not use cpp symbol in Kconfig
2012-03-23 16:58:31 -07:00
dt: add of_get_child_count helper function
2012-05-02 01:14:40 +02:00
of/address: add empty static inlines for !CONFIG_OF
2012-02-16 06:11:23 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
gpio: Adjust of_xlate API to support multiple GPIO chips
2012-05-18 16:48:36 -06:00
of/irq: add empty irq_of_parse_and_map() for non-dt builds
2012-04-17 16:37:22 -06:00
netdev/of/phy: New function: of_mdio_find_bus().
2012-05-07 22:58:09 -04:00
of/mtd/nand: add generic bindings and helpers
2012-03-15 23:28:19 +08:00
dt: fix twl4030 for non-dt compile on x86
2012-03-05 08:09:09 -07:00
tegra, serial8250: add ->handle_break() uart_port op
2012-04-18 15:07:53 -07:00
OMAP1: pass LCD config with omapfb_set_lcd_config()
2012-02-23 09:39:23 +02:00
mm, oom: force oom kill on sysrq+f
2012-03-21 17:54:58 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
padata: Fix race on sequence number wrap
2012-03-14 17:25:56 +08:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
mm: page_isolation: MIGRATE_CMA isolation functions added
2012-05-21 15:09:33 +02:00
memcg: remove PCG_FILE_MAPPED
2012-03-21 17:55:01 -07:00
mm: fixup compilation error due to an asm write through a const pointer
2012-04-23 17:41:18 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
PCI: add host bridge release support
2012-04-30 14:52:43 -06:00
tg3: Recode PCI MRRS adjustment as a PCI quirk
2012-03-04 20:54:01 -05:00
PCI: Add PCI_EXP_TYPE_PCIE_BRIDGE value
2012-02-23 12:05:21 -08:00
percpu: remove percpu_xxx() functions
2012-05-14 14:15:32 -07:00
Revert "sched, perf: Use a single callback into the scheduler"
2012-05-23 17:40:51 +02:00
netdev/phy: Make get_phy_id() static and quit EXPORTing it.
2012-05-16 00:59:12 -04:00
userns: Convert proc to use kuid/kgid where appropriate
2012-05-15 14:59:28 -07:00
pipes: add a "packetized pipe" mode for writing
2012-04-29 13:12:42 -07:00
fq_codel: Fair Queue Codel AQM
2012-05-12 15:53:42 -04:00
PM / Runtime: Remove device fields related to suspend time, v2
2012-05-01 21:28:38 +02:00
PM / Domains: Make it possible to add devices to inactive domains
2012-05-18 20:45:26 +02:00
PM / QoS: add pm_qos_update_request_timeout() API
2012-03-28 23:31:24 +02:00
PM / Runtime: Remove device fields related to suspend time, v2
2012-05-01 21:28:38 +02:00
PM / Sleep: Add "prevent autosleep time" statistics to wakeup sources
2012-05-01 21:25:49 +02:00
poll: add poll_requested_events() and poll_does_not_wait() functions
2012-03-23 16:58:38 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
ppp: Change copyright notices from ANU to me
2012-03-04 20:41:38 -05:00
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
2012-03-04 20:41:38 -05:00
ppp: Change copyright notices from ANU to me
2012-03-04 20:41:38 -05:00
Add PR_{GET,SET}_NO_NEW_PRIVS to prevent execve from granting privs
2012-04-14 11:13:18 +10:00
sched/rt: Document scheduler related skip-resched-check sites
2012-03-01 10:28:04 +01:00
kmsg: export printk records to the /dev/kmsg interface
2012-05-07 17:03:27 -07:00
userns: Convert proc to use kuid/kgid where appropriate
2012-05-15 14:59:28 -07:00
pstore/ram: Add ECC support
2012-05-17 08:51:59 -07:00
ptp: Add a method for obtaining the device index.
2012-04-04 05:28:45 -04:00
ptrace,seccomp: Add PTRACE_SECCOMP support
2012-04-14 11:13:21 +10:00
fs: initial qnx6fs addition
2012-03-20 21:29:38 -04:00
userns: Use uid_eq gid_eq helpers when comparing kuids and kgids in the vfs
2012-05-03 03:29:34 -07:00
radix-tree: introduce bit-optimized iterator
2012-03-28 17:14:37 -07:00
lib: Change mail address of Oskar Schirmer
2012-05-17 15:18:37 +02:00
rcu: Replace list_first_entry_rcu() with list_first_or_null_rcu()
2012-04-24 20:54:49 -07:00
Merge branches 'barrier.2012.05.09a', 'fixes.2012.04.26a', 'inline.2012.05.02b' and 'srcu.2012.05.07b' into HEAD
2012-05-11 10:14:21 -07:00
rcu: Make exit_rcu() more precise and consolidate
2012-05-02 14:48:27 -07:00
Merge branches 'barrier.2012.05.09a', 'fixes.2012.04.26a', 'inline.2012.05.02b' and 'srcu.2012.05.07b' into HEAD
2012-05-11 10:14:21 -07:00
regmap: add support for non contiguous status to regmap-irq
2012-05-14 17:40:05 +01:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
move private bits of reiserfs_fs.h to fs/reiserfs/reiserfs.h
2012-03-20 21:29:43 -04:00
take private bits of reiserfs_xattr.h to fs/reiserfs/xattr.h
2012-03-20 21:29:42 -04:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
remoteproc: remove the hardcoded vring alignment
2012-03-06 19:14:37 +02:00
res_counter: Merge res_counter_charge and res_counter_charge_nofail
2012-04-27 14:36:45 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
ring-buffer: Add per_cpu ring buffer control files
2012-04-23 21:17:51 -04:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
rmap: remove __anon_vma_link() declaration
2012-03-21 17:54:57 -07:00
usb/net: rndis: move bus message definition
2012-05-12 15:15:20 -04:00
rtc: Provide flag for rtc devices that don't support UIE
2012-03-15 18:23:10 -07:00
net: add generic PF_BRIDGE:RTM_ FDB hooks
2012-04-15 13:06:04 -04:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
DMA: sa11x0: add SA-11x0 DMA driver
2012-03-07 11:32:21 +00:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
Merge branch 'perf-uprobes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-24 11:39:34 -07:00
seccomp: ignore secure_computing return values
2012-04-18 12:24:50 +10:00
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
2012-05-22 11:21:06 +10:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
seqlock: add 'raw_seqcount_begin()' function
2012-05-04 15:13:54 -07:00
serial: delete the MCA specific 8250 support.
2012-05-17 19:02:14 -04:00
Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-05-23 17:12:06 -07:00
Merge 3.4-rc3 into tty-next
2012-04-18 15:57:31 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
serial: sh-sci: modify sci_break_ctl()
2012-04-09 17:39:34 +09:00
Input: serio - add helper macro for serio_driver boilerplate
2012-04-04 09:25:42 -07:00
sh: clkfwk: Support variable size accesses for MSTP clocks.
2012-04-11 12:05:50 +09:00
net: sh_eth: change the condition of initialization
2012-02-16 17:08:09 -05:00
sh: intc: Kill off special reservation interface.
2012-05-22 19:07:55 +09:00
userns: Convert tmpfs to use kuid and kgid where appropriate
2012-05-15 14:59:29 -07:00
new helper: sigsuspend()
2012-05-21 23:52:30 -04:00
epoll: introduce POLLFREE to flush ->signalfd_wqh before kfree()
2012-02-24 11:42:50 -08:00
net: introduce skb_try_coalesce()
2012-05-19 18:34:57 -04:00
slab: introduce kmalloc_array()
2012-03-06 11:01:33 +02:00
Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2012-03-28 15:04:26 -07:00
smp: Implement kick_all_cpus_sync()
2012-05-08 12:35:06 +02:00
tcp: reduce out_of_order memory use
2012-03-19 16:53:08 -04:00
net: sock_diag_handler structs can be const
2012-04-25 20:46:59 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
2012-03-23 13:18:57 +01:00
rcu: Implement per-domain single-threaded call_srcu() state machine
2012-04-30 10:48:25 -07:00
userns: Convert stat to return values mapped from kuids and kgids
2012-05-15 14:08:35 -07:00
static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()
2012-02-24 10:05:59 +01:00
do not export kernel's NULL #define to userspace
2012-04-14 07:47:49 -07:00
stmmac: add mixed burst for DMA
2012-05-14 18:53:19 -04:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
PM / Sleep: Add "prevent autosleep time" statistics to wakeup sources
2012-05-01 21:25:49 +02:00
memcg swap: use mem_cgroup_uncharge_swap fix
2012-04-05 15:25:51 -07:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
sysfs: get rid of some lockdep false positives
2012-05-14 12:19:56 -07:00
sysinfo: Use explicit types in <linux/sysinfo.h>
2012-02-20 12:48:47 -08:00
x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.
2012-03-13 14:06:33 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
fork: Move thread info gfp flags to header
2012-05-08 13:55:20 +02:00
ARM: OMAP: WiLink platform data for the PandaBoard
2012-05-09 14:19:13 -07:00
time: remove obsolete declaration
2012-05-21 16:16:58 -07:00
ntp: Fix leap-second hrtimer livelock
2012-03-22 19:43:43 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-05-22 18:27:32 -07:00
constify path argument of trace_seq_path()
2012-03-20 21:29:40 -04:00
ptrace: the killed tracee should not enter the syscall
2012-03-23 16:58:40 -07:00
static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()
2012-02-24 10:05:59 +01:00
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
tty_lock: Localise the lock
2012-05-04 16:58:47 -07:00
TTY: tty_driver, document tty->ops->shutdown limitation
2012-03-08 11:38:51 -08:00
tty: move global ldisc idle waitqueue to the individual ldisc
2012-05-10 11:24:03 -07:00
irq: Kill pointless irqd_to_hw export
2012-04-10 22:39:17 -06:00
userns: Rework the user_namespace adding uid/gid mapping support
2012-04-26 02:01:39 -07:00
uprobes/core: Decrement uprobe count before the pages are unmapped
2012-04-14 13:25:48 +02:00
USB: Fix core compile with CONFIG_USB_SUSPEND=n
2012-05-21 09:00:03 -07:00
userns: Replace user_ns_map_uid and user_ns_map_gid with from_kuid and from_kgid
2012-05-03 03:28:39 -07:00
uuid: add uuid.h to exported header list
2012-05-09 13:57:30 -07:00
[media] v4l2-dv-timings.h: definitions for CEA-861 and VESA DMT timings
2012-05-20 08:27:44 -03:00
[media] v4l: VIDIOC_SUBDEV_S_SELECTION and VIDIOC_SUBDEV_G_SELECTION IOCTLs
2012-04-10 15:00:41 -03:00
vga_switcheroo: Add the support for audio clients
2012-05-13 11:27:21 +02:00
vgaarb: Provide dummy default device functions
2012-05-03 09:30:55 +01:00
[media] V4L2: Mark the DV Preset API as deprecated
2012-05-20 08:31:52 -03:00
virtio: drop thaw PM operation
2012-03-31 08:09:50 +05:30
virtio: fix typo in comment
2012-05-22 12:16:16 +09:30
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -07:00
virtio-net: send gratuitous packets when needed
2012-04-15 03:23:31 -04:00
[SCSI] virtio-scsi: SCSI driver for QEMU based virtual machines
2012-02-19 09:50:20 -06:00
mm: fix up the vmscan stat in vmstat
2012-04-25 21:26:33 -07:00
Staging: VME: move VME drivers out of staging
2012-04-26 12:34:58 -07:00
vt: push the tty_lock down into the map handling
2012-04-24 16:14:14 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core
2012-03-27 20:15:37 +02:00
Block: use a freezable workqueue for disk-event polling
2012-03-02 10:51:00 +01:00
writeback: fix typo in the writeback_control comment
2012-03-07 16:08:46 +01:00
d484864dd9