Linus Torvalds
fbd918a202
Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata ...
Pull libata updates from Tejun Heo:
"Support for some new embedded controllers.
A couple late (<= a week) fixes have stable cc'd and one patch ("SATA:
MV: Add support for the optional PHYs") got committed yesterday
because otherwise the resulting kernel would fail boot on an embedded
board due to interdependent changes in its platform tree.
Other than that, nothing too noteworthy"
* 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
SATA: MV: Add support for the optional PHYs
sata-highbank: Remove unnecessary ahci_platform.h include
libata: disable LPM for some WD SATA-I devices
ARM: mvebu: update the SATA compatible string for Armada 370/XP
ata: sata_mv: fix disk hotplug for Armada 370/XP SoCs
ata: sata_mv: introduce compatible string "marvell, armada-370-sata"
ata: pata_samsung_cf: Remove unused macros
ata: pata_samsung_cf: Use devm_ioremap_resource()
ata: pata_samsung_cf: Merge pata_samsung_cf.h into pata_samsung_cf.c
ata: pata_samsung_cf: Move plat/regs-ata.h to drivers/ata
drivers: ata: Mark the function as static in libahci.c
drivers: ata: Mark the function ahci_init_interrupts() as static in ahci.c
ahci: imx: fix the error handling in imx_ahci_probe()
ahci: imx: ahci_imx_softreset() can be static
ahci: imx: Add i.MX53 support
ahci: imx: Pull out the clock enable/disable calls
libata, dt: Document sata_rcar bindings
sata_rcar: Add R-Car Gen2 SATA PHY support
ahci: mcp89: enter AHCI mode under Apple BIOS emulation
ata: libata-eh: Remove unnecessary snprintf arithmetic
2014-01-21 18:16:08 -08:00
Revert "serial: pl011: use DMA RX polling by default"
2013-12-17 09:33:18 -08:00
extcon: gpio: Add power resume support
2014-01-09 09:53:30 +09:00
fsl /bestcomm
gpiolib: convert gpiod_lookup description to kernel-doc
2013-12-09 14:18:33 +01:00
ASoC: twl4030: Remove reset registers functionality
2014-01-08 12:48:53 +00:00
iio: Remove support for the legacy event config interface
2013-12-08 13:13:52 +00:00
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2013-11-14 08:51:29 +09:00
MFD changes due for the v3.14 merge window
2014-01-21 10:58:17 -08:00
net/mlx4_en: Datapath structures are allocated per NUMA node
2013-11-07 19:22:48 -05:00
mlx5: Use enum to indicate adapter page size
2013-11-08 14:43:01 -08:00
mmc: core: Add MMC_CAP_RUNTIME_RESUME to resume at runtime_resume
2013-10-30 20:28:43 -04:00
mtd: nand_bbt: kill NAND_BBT_SCANALLPAGES
2013-11-06 23:33:14 -08:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2013-11-04 19:46:58 -05:00
phy: add phy_get_bus_width()/phy_set_bus_width() calls
2013-12-23 14:26:17 -06:00
pinctrl: Add void * to pinctrl_pin_desc
2014-01-16 14:25:37 +01:00
MFD changes due for the v3.14 merge window
2014-01-21 10:58:17 -08:00
isp1704_charger: Add DT support
2013-12-23 18:34:58 -08:00
sched/deadline: Remove the sysctl_sched_dl knobs
2014-01-13 13:47:23 +01:00
gpio: 74x164: Remove non-DT support
2013-12-12 14:27:57 +01:00
usb: chipidea: add freescale imx28 special write register method
2014-01-13 15:55:19 -08:00
uwb: Use dev_is_pci() to check whether it is pci device
2013-12-08 18:01:56 -08:00
ACPI: Provide acpi_dev_name accessor for struct acpi_device device name
2013-11-14 23:20:45 +01:00
... and kill anon_inode_getfile_private()
2013-11-09 00:16:28 -05:00
KEYS: Fix multiple key add into associative array
2013-12-02 11:24:18 +00:00
audit: call audit_bprm() only once to add AUDIT_EXECVE information
2013-11-05 11:15:03 -05:00
auxvec.h: account for AT_HWCAP2 in AT_VECTOR_SIZE_BASE
2013-12-24 09:35:17 -08:00
bdi: test bdi_init failure
2013-11-08 08:59:44 -07:00
Merge branch 'akpm' (patches from Andrew Morton)
2013-11-13 15:45:43 +09:00
Merge branch 'blk-mq/core' into for-3.13/core
2013-11-08 09:08:12 -07:00
ACPI and power management updates for 3.13-rc1
2013-11-14 13:41:48 +09:00
blk-mq: ensure that we set REQ_IO_STAT so diskstats work
2013-11-19 09:25:07 -07:00
kernel: trace: blktrace: remove redundent memcpy() in compat_blk_trace_setup()
2013-11-08 09:04:30 -07:00
sched/preempt, locking: Rework local_bh_{dis,en}able()
2014-01-13 17:32:27 +01:00
cgroup: remove stray references to css_id
2014-01-13 10:48:18 -05:00
cmdline-parser: fix build
2013-11-15 09:32:23 +09:00
Merge branch 'akpm' (patches from Andrew Morton)
2013-11-13 15:45:43 +09:00
x86, build, icc: Remove uninitialized_var() from compiler-intel.h
2013-12-10 15:01:01 -08:00
arch: Introduce smp_load_acquire(), smp_store_release()
2014-01-12 10:37:17 +01:00
sched: remove INIT_COMPLETION
2013-11-15 09:32:21 +09:00
drivers/base: provide an infrastructure for componentised subsystems
2014-01-10 16:27:36 -08:00
context_tracking: Wrap static key check into more intuitive function name
2013-12-02 20:43:14 +01:00
context_tracking: Rename context_tracking_active() to context_tracking_cpu_is_enabled()
2013-12-02 20:43:15 +01:00
constify do_coredump() argument
2013-11-09 00:16:29 -05:00
ACPI and power management updates for 3.13-rc1
2013-11-14 13:41:48 +09:00
Revert "cpufreq: suspend governors on system suspend/hibernate"
2013-12-08 01:04:17 +01:00
cpuidle: remove cpuidle_unregister_governor()
2013-10-30 01:21:24 +01:00
cpuset: Fix potential deadlock w/ set_mems_allowed
2013-11-06 12:40:27 +01:00
crash_dump: fix compilation error (on MIPS at least)
2014-01-15 14:19:42 +07:00
lib: crc32: add functionality to combine two crc32{, c}s in GF(2)
2013-11-03 23:04:56 -05:00
dcache: allow word-at-a-time name hashing with big-endian CPUs
2013-12-12 10:39:01 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-11-15 16:47:22 -08:00
Revert "kernfs, sysfs, driver-core: implement kernfs_remove_self() and its wrappers"
2014-01-13 14:05:13 -08:00
ARM: 7795/1: mm: dma-mapping: Add dma_max_pfn(dev) helper function
2013-10-31 14:49:24 +00:00
dma: Indicate residue granularity in dma_slave_caps
2014-01-14 21:28:39 +00:00
EDAC: Add an edac_report parameter to EDAC
2013-12-11 18:06:47 +01:00
Linux 3.13-rc7
2014-01-05 12:34:29 +01:00
switch elf_coredump_extra_notes_write() to dump_emit()
2013-11-09 00:16:24 -05:00
switch elf_core_write_extra_data() to dump_emit()
2013-11-09 00:16:23 -05:00
firmware: Introduce request_firmware_direct()
2013-12-08 18:22:32 -08:00
consolidate simple ->d_delete() instances
2013-11-15 22:04:17 -05:00
tracing: Make register/unregister_ftrace_command __init
2013-11-05 17:43:40 -05:00
ftrace, perf: Avoid infinite event generation loop
2013-11-19 16:57:40 +01:00
lib/genalloc: add a helper function for DMA buffer allocation
2013-11-13 12:09:22 +09:00
genetlink: make multicast groups const, prevent abuse
2013-11-19 16:39:06 -05:00
gpio: Remove duplicate include of errno.h
2013-11-25 09:03:39 +01:00
sched/preempt, locking: Rework local_bh_{dis,en}able()
2014-01-13 17:32:27 +01:00
HID: hid-sensor-hub: Add logical min and max
2013-12-02 21:05:30 +00:00
2nd round of new IIO drivers, features and cleanups for the 3.14 cycle.
2013-12-24 10:30:57 -08:00
gpu: host1x: Add syncpoint base support
2013-10-31 09:55:48 +01:00
mm, thp: move ptl taking inside page_check_address_pmd()
2013-11-15 09:32:14 +09:00
include/linux/hugetlb.h: make isolate_huge_page() an inline
2013-12-12 18:19:25 -08:00
i2c: pnx: Use devm_*() functions
2014-01-16 11:15:50 +01:00
i2c: Re-instate body of i2c_parent_is_i2c_adapter()
2014-01-14 17:11:13 +01:00
macvlan: introduce macvlan_dev_real_dev() helper function
2013-11-15 17:55:48 -05:00
vlan: Implement vlan_dev_get_egress_qos_mask as an inline.
2013-11-11 00:42:07 -05:00
init.h: add missing initcall variants
2013-12-10 22:58:13 -08:00
rtmutex: Turn the plist into an rb-tree
2014-01-13 13:41:50 +01:00
revert "softirq: Add support for triggering softirq work on softirqs"
2013-11-15 09:32:22 +09:00
ipc, msg: forbid negative values for "msg{max,mnb,mni}"
2013-11-03 10:53:11 -08:00
xen-netback: fix fragment detection in checksum setup
2013-12-05 20:31:40 -05:00
genirq: Prevent spurious detection for unconditionally polled interrupts
2013-11-13 16:03:02 +01:00
genirq: Add an accessor for IRQ_PER_CPU flag
2013-12-19 17:43:04 +00:00
genirq: Correct fuzzy and fragile IRQ_RETVAL() definition
2013-11-19 19:06:41 +01:00
jump_label: use defined macros instead of hard-coding for better readability
2014-01-08 15:23:53 +00:00
tools/vm/page-types.c: support KPF_SOFTDIRTY bit
2013-11-13 12:09:07 +09:00
Merge branch 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-01-20 10:22:12 -08:00
kernfs: add struct dentry declaration in kernfs.h
2014-01-17 11:50:07 -08:00
PCI: Disable Bus Master only on kexec reboot
2013-12-07 14:20:28 -07:00
kfifo API type safety
2013-11-15 09:32:23 +09:00
kernfs: s/sysfs_dirent/kernfs_node/ and rename its friends accordingly
2013-12-11 15:28:36 -08:00
Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue
2013-11-04 10:20:57 +02:00
no need to keep brlock macros anymore...
2013-11-09 00:16:21 -05:00
libata: disable LPM for some WD SATA-I devices
2014-01-16 09:49:10 -05:00
list: introduce list_last_entry(), use list_{first,last}_entry()
2013-11-13 12:09:24 +09:00
llists: move llist_reverse_order from raid5 to llist.c
2013-11-15 09:32:22 +09:00
seqcount: Add lockdep functionality to seqcount/seqlock structures
2013-11-06 12:40:26 +01:00
mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
2013-12-20 12:25:45 -08:00
math64: Add mul_u64_u32_shr()
2013-12-11 15:52:34 +01:00
mm/memblock.c: introduce bottom-up allocation mode
2013-11-13 12:09:08 +09:00
drivers: base: Add prototype declaration to the header file
2013-12-20 12:20:26 -08:00
mm/sparsemem: use PAGES_PER_SECTION to remove redundant nr_pages parameter
2013-11-13 12:09:06 +09:00
mm, mempolicy: make mpol_to_str robust and always succeed
2013-11-13 12:09:05 +09:00
micrel: add support for KSZ8041RNLI
2013-12-11 13:54:13 -05:00
aio/migratepages: make aio migrate pages sane
2013-12-21 17:56:08 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
2013-11-13 15:27:00 +09:00
mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
2013-12-20 12:25:45 -08:00
mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
2013-12-20 12:25:45 -08:00
mm: factor commit limit calculation
2013-11-13 12:09:11 +09:00
RCU'd vfsmounts
2013-11-09 00:16:19 -05:00
ipc, msg: fix message length check for negative values
2013-11-13 12:09:36 +09:00
PCI: Fix whitespace, capitalization, and spelling errors
2013-11-14 11:28:18 -07:00
locking/doc: Update references to kernel/mutex.c
2013-11-11 12:41:33 +01:00
RCU'd vfsmounts
2013-11-09 00:16:19 -05:00
net: unix: allow set_peek_off to fail
2013-12-10 21:45:15 -05:00
net: Add layer 2 hardware acceleration operations for macvlan devices
2013-11-07 19:11:41 -05:00
net: core: explicitly select a txq before doing l2 forwarding
2014-01-10 13:23:08 -05:00
NFS client bugfixes
2013-12-05 13:05:48 -08:00
NFS: Enabling v4.2 should not recompile nfsd and lockd
2013-11-19 16:20:40 -05:00
DeviceTree updates for 3.13. This is a bit larger pull request than
2013-11-12 16:52:17 +09:00
gpiolib: include gpio/consumer.h in of_gpio.h for desc_to_gpio()
2013-10-29 18:26:14 -07:00
dt/irq: add empty of_irq_count for !OF_IRQ
2013-11-08 10:47:28 -06:00
mm: add a helper function to check may oom condition
2013-11-13 12:09:04 +09:00
padata: make the sequence counter an atomic_t
2013-10-30 12:02:58 +08:00
ACPI: Eliminate the DEVICE_ACPI_HANDLE() macro
2013-11-14 23:17:21 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-12-15 11:56:47 -08:00
PCI: Fix whitespace, capitalization, and spelling errors
2013-11-14 11:28:18 -07:00
PCI: Fix whitespace, capitalization, and spelling errors
2013-11-14 11:28:18 -07:00
percpu: fix spurious sparse warnings from DEFINE_PER_CPU()
2013-12-05 12:59:23 -05:00
Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2013-11-13 15:17:16 +09:00
perf/x86: Fix active_entry initialization
2014-01-12 10:16:07 +01:00
net/phy: Add the autocross feature for forced links on VSC82x4
2013-11-20 22:09:19 -05:00
power_supply: Add power_supply_get_by_phandle
2013-12-23 18:21:11 -08:00
sched/preempt: Fix up missed PREEMPT_NEED_RESCHED folding
2014-01-13 17:38:55 +01:00
sched/preempt, locking: Rework local_bh_{dis,en}able()
2014-01-13 17:32:27 +01:00
printk: pr_debug_ratelimited: check state first to reduce "callbacks suppressed" messages
2013-10-29 16:50:52 -07:00
pstore: Don't allow high traffic options on fragile devices
2013-12-20 13:12:01 -08:00
random32: upgrade taus88 generator to taus113 from errata paper
2013-11-11 14:32:15 -05:00
rbtree: fix rbtree_postorder_for_each_entry_safe() iterator
2013-11-13 12:09:33 +09:00
rcu: Remove "extern" from function declarations in include/linux/*rcu*.h
2013-12-12 12:34:16 -08:00
Merge branches 'doc.2013.12.03a', 'fixes.2013.12.12a', 'rcutorture.2013.12.03a' and 'sparse.2013.12.12a' into HEAD
2013-12-12 12:35:38 -08:00
rcu: Remove "extern" from function declarations in include/linux/*rcu*.h
2013-12-12 12:34:16 -08:00
rcu: Remove "extern" from function declarations in include/linux/*rcu*.h
2013-12-12 12:34:16 -08:00
kexec: migrate to reboot cpu
2013-12-18 19:04:50 -08:00
rtmutex: Turn the plist into an rb-tree
2014-01-13 13:41:50 +01:00
net: allow netdev_all_upper_get_next_dev_rcu with rtnl lock held
2013-12-17 21:19:08 -08:00
locking: Optimize lock_bh functions
2014-01-13 13:47:36 +01:00
lib/scatterlist: export sg_miter_skip()
2013-12-08 17:56:37 -08:00
sched/preempt: Fix up missed PREEMPT_NEED_RESCHED folding
2014-01-13 17:38:55 +01:00
seq_file: introduce seq_setwidth() and seq_pad()
2013-11-15 09:32:20 +09:00
seqlock: Use raw_ prefix instead of _no_lockdep
2014-01-12 10:13:59 +01:00
security: shmem: implement kernel private shmem inodes
2013-12-02 11:24:19 +00:00
net: Add some clarification to skb_tx_timestamp() comment.
2013-12-27 13:04:33 -05:00
slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings
2013-11-24 11:01:16 -08:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2013-11-22 08:10:34 -08:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2013-11-22 08:10:34 -08:00
kernel-provide-a-__smp_call_function_single-stub-for-config_smp-fix
2013-11-15 09:32:22 +09:00
locking: Add an smp_mb__after_unlock_lock() for UNLOCK+BLOCK barrier
2013-12-16 11:36:13 +01:00
locking: Optimize lock_bh functions
2014-01-13 13:47:36 +01:00
locking: Optimize lock_bh functions
2014-01-13 13:47:36 +01:00
srcu: API for barrier after srcu read unlock
2013-11-06 09:32:09 +02:00
mfd: ssbi: Constify buffer in ssbi_write
2014-01-21 08:28:07 +00:00
mm, hugetlb: convert hugetlbfs to use split pmd lock
2013-11-15 09:32:14 +09:00
sched: Add new scheduler syscalls to support an extended scheduling parameters ABI
2014-01-13 13:41:04 +01:00
Revert "kernfs, sysfs, driver-core: implement kernfs_remove_self() and its wrappers"
2014-01-13 14:05:13 -08:00
ARM: tegra: Provide dummy powergate implementation
2013-11-25 13:34:51 -08:00
context_tracking: Wrap static key check into more intuitive function name
2013-12-02 20:43:14 +01:00
tpm: Create a tpm_class_ops structure and use it in the drivers
2014-01-06 14:37:25 +01:00
ftrace, perf: Avoid infinite event generation loop
2013-11-19 16:57:40 +01:00
USB patches for 3.14-rc1
2014-01-20 16:13:02 -08:00
tty: Halve flip buffer GFP_ATOMIC memory consumption
2013-12-09 11:09:24 -08:00
tty: Always handle NULL flag ptr
2013-12-08 16:56:05 -08:00
net: Explicitly initialize u64_stats_sync structures for lockdep
2013-11-06 12:40:25 +01:00
sched/preempt: Take away preempt_enable_no_resched() from modules
2014-01-13 13:47:37 +01:00
uprobes: Cleanup !CONFIG_UPROBES decls, unexport xol_area
2013-11-20 16:31:01 +01:00
usb: core: allow a reference device for new_id
2014-01-10 16:54:35 -08:00
mm: numa: return the number of base pages altered by protection changes
2013-11-13 12:09:11 +09:00
VME: Rename vme_slot_get to avoid confusion with reference counting
2013-12-03 11:15:58 -08:00
memcg: make cgroup_event deal with mem_cgroup instead of cgroup_subsys_state
2013-11-22 18:20:43 -05:00
context_tracking: Rename context_tracking_active() to context_tracking_cpu_is_enabled()
2013-12-02 20:43:15 +01:00
wait: add wait_event_cmd()
2013-11-14 15:16:16 +11:00
writeback: do not sync data dirtied after sync start
2013-11-13 12:09:07 +09:00
zorro/UAPI: Disintegrate include/linux/zorro*.h
2013-11-26 11:09:08 +01:00
