Linus Torvalds
623ff7739e
MTD merge for 3.4 ...
Artem's cleanup of the MTD API continues apace.
Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst others.
More work on DiskOnChip G3, new driver for DiskOnChip G4.
Clean up debug/warning printks in JFFS2 to use pr_<level>.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEABECAAYFAk92K6UACgkQdwG7hYl686NrMACfWQJRWasR78MWKfkT2vWZwTFJ
X5AAoKiSYO2pfo5gWJGOAahNC1zUqMX0
=i3Vb
-----END PGP SIGNATURE-----
Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6
Pull MTD changes from David Woodhouse:
- Artem's cleanup of the MTD API continues apace.
- Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst
others.
- More work on DiskOnChip G3, new driver for DiskOnChip G4.
- Clean up debug/warning printks in JFFS2 to use pr_<level>.
Fix up various trivial conflicts, largely due to changes in calling
conventions for things like dmaengine_prep_slave_sg() (new inline
wrapper to hide new parameter, clashing with rewrite of previously last
parameter that used to be an 'append' flag, and is now a bitmap of
'unsigned long flags').
(Also some header file fallout - like so many merges this merge window -
and silly conflicts with sparse fixes)
* tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6: (120 commits)
mtd: docg3 add protection against concurrency
mtd: docg3 refactor cascade floors structure
mtd: docg3 increase write/erase timeout
mtd: docg3 fix inbound calculations
mtd: nand: gpmi: fix function annotations
mtd: phram: fix section mismatch for phram_setup
mtd: unify initialization of erase_info->fail_addr
mtd: support ONFI multi lun NAND
mtd: sm_ftl: fix typo in major number.
mtd: add device-tree support to spear_smi
mtd: spear_smi: Remove default partition information from driver
mtd: Add device-tree support to fsmc_nand
mtd: fix section mismatch for doc_probe_device
mtd: nand/fsmc: Remove sparse warnings and errors
mtd: nand/fsmc: Add DMA support
mtd: nand/fsmc: Access the NAND device word by word whenever possible
mtd: nand/fsmc: Use dev_err to report error scenario
mtd: nand/fsmc: Use devm routines
mtd: nand/fsmc: Modify fsmc driver to accept nand timing parameters via platform
mtd: fsmc_nand: add pm callbacks to support hibernation
...
2012-03-30 17:31:56 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-03-29 15:34:57 -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
mxs-dma : move the mxs dma.h to a more common place
2012-03-27 00:37:23 +01:00
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
Input: ili210x - add support for Ilitek ILI210x based touchscreens
2012-03-17 12:20:44 -07:00
Various small bugfixes and enhancements, plus two new drivers:
2012-03-30 16:09:02 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
MMC highlights for 3.4:
2012-03-28 20:59:45 -07:00
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
nfsd: add a header describing upcall to nfsdcld
2012-03-26 11:49:47 -04:00
pinctrl: introduce generic pin config
2012-03-12 22:49:02 +01:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Add I2C driver for Summit Microelectronics SMB347 Battery Charger.
2012-03-26 20:41:01 +04:00
md: Use existed macros instead of numbers
2012-03-13 11:21:23 +11:00
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
ARM: More device tree support updates
2012-03-28 12:34:33 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
Merge nfs containerization work from Trond's tree
2012-03-26 11:48:54 -04:00
USB: EHCI: Add a generic platform device driver
2012-03-15 12:42:07 -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
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
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
constify path argument of audit_log_d_path()
2012-03-20 21:29:40 -04: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
bitops: introduce for_each_clear_bit()
2012-03-23 16:58:34 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
cgroup: revert ss_id_lock to spinlock
2012-03-21 17:55:01 -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
clk: introduce the common clock framework
2012-03-16 20:35:01 +00: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
The following text was taken from the original review request:
2012-03-24 10:41:37 -07: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
lib/cpumask.c: remove __any_online_cpu()
2012-03-28 17:14:35 -07:00
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
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
vfs: d_alloc_root() gone
2012-03-20 21:29:37 -04:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
debugfs-related mode_t whack-a-mole
2012-03-20 21:29:53 -04:00
PM / devfreq: add relation of recommended frequency.
2012-03-17 21:51:34 +01:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-03-21 18:55:10 -07: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
ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
2012-03-25 14:35:58 -05:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-03-29 15:34:57 -07: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
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
vfs: drop_file_write_access() made static
2012-03-20 21:29:32 -04:00
firewire: allow explicit flushing of iso packet completions
2012-03-18 22:15:39 +01:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux
2012-03-29 14:53:25 -07:00
GPIO changes for v3.4
2012-03-28 14:08:46 -07:00
Input: gpio_keys - add support for interrupt only keys
2012-03-19 17:56:18 -07: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
Tools: hv: Support enumeration from all the pools
2012-03-16 13:36:04 -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: 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
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07: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
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01: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
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
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04: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
pagemap: export KPF_THP
2012-03-21 17:54:57 -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
NFS client updates for Linux 3.4
2012-03-23 08:53:47 -07:00
usermodehelper: kill umh_wait, renumber UMH_* constants
2012-03-23 16:58:41 -07:00
Merge branch 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2012-03-28 14:35:31 -07: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
Add #includes needed to permit the removal of asm/system.h
2012-03-28 18:30:03 +01: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
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01: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
memcg: fix performance of mem_cgroup_begin_update_page_stat()
2012-03-21 17:55:02 -07:00
mm: replace PAGE_MIGRATION with IS_ENABLED(CONFIG_MIGRATION)
2012-03-21 17:54:57 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-03-28 17:19:28 -07:00
vmscan: only defer compaction for failed order and higher
2012-03-21 17:54:56 -07:00
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -07:00
module: move __module_get and try_module_get() out of line.
2012-03-26 12:50:52 +10:30
params: <level>_initcall-like kernel parameters
2012-03-26 12:50:51 +10:30
The following text was taken from the original review request:
2012-03-24 10:41:37 -07: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
NFSv4.1: Clean ups and bugfixes for the pNFS read/writeback/commit code
2012-03-17 11:09:33 -04:00
NFS: Remove nfs4_setup_sequence from generic rename code
2012-03-21 09:31:46 -04:00
cfg80211: Add background scan period attribute.
2012-03-12 14:19:34 -04:00
nmi watchdog: do not use cpp symbol in Kconfig
2012-03-23 16:58:31 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-03-28 14:41:36 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
of/mtd/nand: add generic bindings and helpers
2012-03-15 23:28:19 +08: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
memcg: remove PCG_FILE_MAPPED
2012-03-21 17:55:01 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-03-23 14:02:12 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
pidns: add reboot_pid_ns() to handle the reboot syscall
2012-03-28 17:14:36 -07:00
magic.h: move some FS magic numbers into magic.h
2012-03-23 16:58:31 -07:00
Merge branch 'pm-qos'
2012-03-16 21:49:24 +01:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
PM / QoS: Make it possible to expose PM QoS latency constraints
2012-03-13 22:37:14 +01:00
poll: add poll_requested_events() and poll_does_not_wait() functions
2012-03-23 16:58:38 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision
2012-03-23 16:58:32 -07:00
driver core merge for 3.4-rc1
2012-03-20 11:16:20 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
fs: initial qnx6fs addition
2012-03-20 21:29:38 -04:00
radix-tree: introduce bit-optimized iterator
2012-03-28 17:14:37 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07: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
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
rmap: remove __anon_vma_link() declaration
2012-03-21 17:54:57 -07:00
rtc: Provide flag for rtc devices that don't support UIE
2012-03-15 18:23:10 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-03-21 13:25:04 -07:00
The following text was taken from the original review request:
2012-03-24 10:08:39 -07:00
device.h: audit and cleanup users in main include dir
2012-03-16 10:38:24 -04:00
sh: remove clk_ops
2012-03-12 22:19:13 +01:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07: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: add func to IPI cpus based on parameter func
2012-03-28 17:14:35 -07:00
tcp: reduce out_of_order memory use
2012-03-19 16:53:08 -04:00
net: get rid of some pointless casts to sockaddr
2012-03-11 19:11:22 -07: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
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
swapon: check validity of swap_flags
2012-03-28 17:14:35 -07: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 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 18:12:23 -07:00
ntp: Fix leap-second hrtimer livelock
2012-03-22 19:43:43 -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
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
USB: dynamically allocate usb_device children pointers instead of using a fix array
2012-03-13 14:24:07 -07:00
[media] V4L: Improve the selection API documentation
2012-03-19 15:33:24 -03:00
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -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
