Linus Torvalds
65b97fb730
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ...
Pull powerpc updates from Ben Herrenschmidt:
"This is the powerpc changes for the 3.11 merge window. In addition to
the usual bug fixes and small updates, the main highlights are:
- Support for transparent huge pages by Aneesh Kumar for 64-bit
server processors. This allows the use of 16M pages as transparent
huge pages on kernels compiled with a 64K base page size.
- Base VFIO support for KVM on power by Alexey Kardashevskiy
- Wiring up of our nvram to the pstore infrastructure, including
putting compressed oopses in there by Aruna Balakrishnaiah
- Move, rework and improve our "EEH" (basically PCI error handling
and recovery) infrastructure. It is no longer specific to pseries
but is now usable by the new "powernv" platform as well (no
hypervisor) by Gavin Shan.
- I fixed some bugs in our math-emu instruction decoding and made it
usable to emulate some optional FP instructions on processors with
hard FP that lack them (such as fsqrt on Freescale embedded
processors).
- Support for Power8 "Event Based Branch" facility by Michael
Ellerman. This facility allows what is basically "userspace
interrupts" for performance monitor events.
- A bunch of Transactional Memory vs. Signals bug fixes and HW
breakpoint/watchpoint fixes by Michael Neuling.
And more ... I appologize in advance if I've failed to highlight
something that somebody deemed worth it."
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)
pstore: Add hsize argument in write_buf call of pstore_ftrace_call
powerpc/fsl: add MPIC timer wakeup support
powerpc/mpic: create mpic subsystem object
powerpc/mpic: add global timer support
powerpc/mpic: add irq_set_wake support
powerpc/85xx: enable coreint for all the 64bit boards
powerpc/8xx: Erroneous double irq_eoi() on CPM IRQ in MPC8xx
powerpc/fsl: Enable CONFIG_E1000E in mpc85xx_smp_defconfig
powerpc/mpic: Add get_version API both for internal and external use
powerpc: Handle both new style and old style reserve maps
powerpc/hw_brk: Fix off by one error when validating DAWR region end
powerpc/pseries: Support compression of oops text via pstore
powerpc/pseries: Re-organise the oops compression code
pstore: Pass header size in the pstore write callback
powerpc/powernv: Fix iommu initialization again
powerpc/pseries: Inform the hypervisor we are using EBB regs
powerpc/perf: Add power8 EBB support
powerpc/perf: Core EBB support for 64-bit book3s
powerpc/perf: Drop MMCRA from thread_struct
powerpc/perf: Don't enable if we have zero events
...
2013-07-04 10:29:23 -07:00
bcma: add more core IDs
2013-05-17 14:31:05 -04:00
libceph: use slab cache for osd client requests
2013-05-02 11:58:41 -05:00
The common clock framework changes for 3.11 include new clock drivers
2013-07-03 11:54:50 -07:00
iio:common: Removed stuff macros, added num_data_channels on st_sensors struct and added support on one-shot sysfs reads to 3 byte channel
2013-06-05 18:41:23 +01:00
For 3.10 we have a few new MFD drivers for:
2013-05-05 17:36:20 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2013-07-03 19:55:33 -07:00
net/mlx4: Strengthen VLAN tags/priorities enforcement in VST mode
2013-05-11 16:12:44 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2013-05-06 15:41:42 -07:00
- Lots of cleanups from Artem, including deletion of some obsolete drivers
2013-05-09 10:15:46 -07:00
netfilter: ipset: set match: add support to match the counters
2013-04-29 20:09:03 +02:00
pinctrl: set unit for debounce time pinconfig to usec
2013-06-25 15:34:44 +02:00
New driver to support GMT G762/G763 pwm fan controllers
2013-07-03 19:56:35 -07:00
PM / AVS: SmartReflex: use omap_sr * for enable/disable interface
2013-06-10 10:46:18 -07:00
Merge remote-tracking branch 'regulator/topic/linar' into regulator-next
2013-07-01 11:17:08 +01:00
Merge remote-tracking branch 'spi/topic/xilinx' into spi-next
2013-06-26 16:21:06 +01:00
Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10
2013-04-29 16:23:34 -04:00
ARM SoC specific changes
2013-07-02 13:43:38 -07:00
ACPI: Do not use CONFIG_ACPI_HOTPLUG_MEMORY_MODULE
2013-06-19 01:02:50 +02:00
dma: acpi-dma: parse CSRT to extract additional resources
2013-05-14 10:23:57 +05:30
PCI changes for the v3.11 merge window:
2013-07-03 16:31:35 -07:00
aio: kill ki_retry
2013-05-07 19:46:02 -07:00
drivers: bus: add ARM CCI support
2013-05-29 15:50:34 -04:00
drivers/dma: remove unused support for MEMSET operations
2013-07-03 16:07:42 -07:00
audit: Make testing for a valid loginuid explicit.
2013-05-07 22:27:15 -04:00
backlight: add devm_backlight_device_{register,unregister}()
2013-07-03 16:07:43 -07:00
new helper: read_code()
2013-04-29 15:40:23 -04:00
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
2013-05-08 10:13:35 -07:00
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
2013-05-08 10:13:35 -07:00
mm: kill free_all_bootmem_node()
2013-07-03 16:07:39 -07:00
broadcom: add include guards to include/linux/brcmphy.h
2013-05-15 14:42:15 -07:00
mm: vmscan: take page buffers dirty and locked state into account
2013-07-03 16:07:29 -07:00
Merge branch 'for-3.11-cpuset' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2013-07-02 20:04:25 -07:00
mm: cleancache: clean up cleancache_enabled
2013-04-30 17:04:01 -07:00
clk: gate: add CLK_GATE_HIWORD_MASK
2013-06-15 20:23:53 -07:00
Power management and ACPI updates for 3.10-rc1
2013-04-30 15:21:02 -07:00
ARM: arm-soc cleanup for 3.10
2013-05-02 09:03:55 -07:00
unify compat fanotify_mark(2), switch to COMPAT_SYSCALL_DEFINE
2013-05-09 13:46:38 -04:00
gcc4: disable __compiletime_object_size for GCC 4.6+
2013-04-29 18:28:13 -07:00
sched: Rename sched.c as sched/core.c in comments and Documentation
2013-06-19 12:58:42 +02:00
vt: delete unneeded function unregister_con_driver
2013-05-20 12:27:59 -07:00
kvm: Move guest entry/exit APIs to context_tracking
2013-05-31 11:32:30 +02:00
CPU hotplug: provide a generic helper to disable/enable CPU hotplug
2013-06-12 16:29:44 -07:00
acpi-cpufreq: Add new sysfs attribute freqdomain_cpus
2013-06-27 21:51:09 +02:00
cpuidle: simplify multiple driver support
2013-06-11 13:42:38 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
lib, net: make isodigit() public and use it
2013-04-29 18:28:19 -07:00
Don't pass inode to ->d_hash() and ->d_compare()
2013-06-29 12:57:36 +04:00
lockdep: remove task argument from debug_check_no_locks_held
2013-05-12 14:16:21 +02:00
debugfs: add get/set for atomic types
2013-06-03 13:55:01 -07:00
PM / devfreq: add comments and Documentation
2013-06-03 20:20:29 +09:00
dm: document iterate_devices
2013-05-10 14:37:17 +01:00
Power management and ACPI updates for 3.11-rc1
2013-07-03 14:35:40 -07:00
dma-buf: Add debugfs support
2013-05-01 16:36:22 +05:30
drivers/dma: remove unused support for MEMSET operations
2013-07-03 16:07:42 -07:00
dump_stack: implement arch-specific hardware description in task dumps
2013-04-30 17:04:02 -07:00
clocksource: dw_apb_timer_of: use clocksource_of_init
2013-06-12 13:47:38 +02:00
efi: Convert runtime services function ptrs
2013-06-11 07:39:26 +01:00
err.h: IS_ERR() can accept __user pointers
2013-07-03 16:07:41 -07:00
aio: remove retry-based AIO
2013-05-07 18:38:27 -07:00
fat: restructure export_operations
2013-04-29 18:28:40 -07:00
f2fs: align data types between on-disk and in-memory block addresses
2013-05-28 15:03:04 +09:00
don't bother with deferred freeing of fdtables
2013-05-01 17:31:42 -04:00
sock_diag: fix filter code sent to userspace
2013-06-10 22:23:32 -07:00
firmware loader: don't export cache_firmware and uncache_firmware
2013-06-06 12:41:57 -07:00
FMC: add needed headers
2013-06-17 16:38:57 -07:00
fmc: avoid readl/writel namespace conflict
2013-06-19 20:30:32 -07:00
freezer: add new freezable helpers using freezer_do_not_count()
2013-05-12 14:16:22 +02:00
frontswap: get rid of swap_lock dependency
2013-04-30 17:04:00 -07:00
mm: vmscan: take page buffers dirty and locked state into account
2013-07-03 16:07:29 -07:00
FS-Cache: The retrieval remaining-pages counter needs to be atomic_t
2013-06-19 14:16:47 +01:00
Replace a bunch of file->dentry->d_inode refs with file_inode()
2013-06-29 12:57:13 +04:00
inotify: convert inotify_add_to_idr() to use idr_alloc_cyclic()
2013-04-29 18:28:41 -07:00
ftrace, kprobes: Fix a deadlock on ftrace_regex_lock
2013-05-09 20:10:22 -04:00
tracing: Modify soft-mode only if there's no other referrer
2013-05-09 20:14:25 -04:00
genalloc: add devres support, allow to find a managed pool by device
2013-04-29 18:28:13 -07:00
rcu: Remove TINY_PREEMPT_RCU
2013-06-10 13:45:49 -07:00
HID: debug: break out hid_dump_report() into hid-debug
2013-04-30 10:09:06 +02:00
HID: debug: fix RCU preemption issue
2013-05-06 13:07:33 +02:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-07-04 10:29:23 -07:00
mm/hugetlb: remove hugetlb_prefault
2013-07-03 16:07:32 -07:00
Drivers: hv: Add the GUID fot synthetic fibre channel device
2013-06-03 14:09:14 -07:00
ipv6: Kill ipv6 dependency of icmpv6_send().
2013-04-29 13:54:36 -04:00
Merge branch 'for-3.10/drivers' of git://git.kernel.dk/linux-block
2013-05-08 11:51:05 -07:00
net: core: move mac_pton() to lib/net_utils.c
2013-06-05 12:00:27 -07:00
team: fix checks in team_get_first_port_txable_rcu()
2013-06-12 00:56:27 -07:00
net: vlan: fix comment for vlan_ethhdr->h_vlan_proto
2013-06-19 23:16:50 -07:00
Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next
2013-05-02 12:10:19 +02:00
resource: add release_mem_region_adjustable()
2013-04-29 15:54:37 -07:00
ipc: sysv shared memory limited to 8TiB
2013-05-01 08:12:58 -07:00
FMC: add needed headers
2013-06-17 16:38:57 -07:00
genirq: Add irq_get_trigger_type() to get IRQ flags
2013-06-25 11:48:24 +02:00
irqchip: Add irqchip_init dummy function
2013-06-06 10:23:58 +09:00
genirq: Generic chip: Add linear irq domain support
2013-05-29 10:57:11 +02:00
jbd/jbd2: relocate bit_spinlock header to jbd_common
2013-06-12 23:02:35 -04:00
jbd2: invalidate handle if jbd2_journal_restart() fails
2013-07-01 08:12:41 -04:00
jbd/jbd2: relocate bit_spinlock header to jbd_common
2013-06-12 23:02:35 -04:00
jbd,jbd2: fix oops in jbd2_journal_put_journal_head()
2013-05-13 09:45:01 -04:00
proc: Split kcore bits from linux/procfs.h into linux/kcore.h
2013-04-29 15:42:02 -04:00
Merge branch 'sched-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-07-02 16:19:24 -07:00
kmod: remove call_usermodehelper_fns()
2013-04-30 17:04:06 -07:00
Merge branch 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-05-16 07:55:07 -07:00
kthread: implement probe_kthread_data()
2013-04-30 17:04:02 -07:00
KVM fixes for 3.11
2013-07-03 13:21:40 -07:00
lcd: add devm_lcd_device_{register,unregister}()
2013-07-03 16:07:43 -07:00
ahci: make ahci_transmit_led_message into a function pointer
2013-06-06 14:05:23 -07:00
We get rid of the general module prefix confusion with a binary config option,
2013-05-05 10:58:06 -07:00
list: introduce list_first_entry_or_null
2013-05-31 17:31:52 -07:00
include/linux/math64.h: add div64_ul()
2013-06-12 16:29:47 -07:00
mm, memcg: don't take task_lock in task_in_mem_cgroup
2013-07-03 16:07:26 -07:00
Driver core / memory: Simplify __memory_block_change_state()
2013-06-01 21:37:09 +02:00
Memory hotplug: Move alternative function definitions to header
2013-06-01 22:24:07 +02:00
mm: introduce helper function set_max_mapnr()
2013-07-03 16:07:38 -07:00
mm: tune vm_committed_as percpu_counter batching size
2013-07-03 16:07:32 -07:00
sparsemem: add BUILD_BUG_ON when sizeof mem_section is non-power-of-2
2013-07-03 16:07:40 -07:00
rapidio: add udev notification
2013-07-03 16:08:05 -07:00
PCI: Allocate only as many MSI vectors as requested by driver
2013-05-28 11:31:16 -06:00
mutex: Add support for wound/wait style locks
2013-06-26 12:10:56 +02:00
mutex: Add w/w mutex slowpath debugging
2013-06-26 12:10:56 +02:00
nbd: correct disconnect behavior
2013-07-03 16:08:05 -07:00
net: rename random32 to prandom
2013-04-29 18:28:44 -07:00
net: Restore NETIF_F_* bit ordering.
2013-05-02 07:34:58 -07:00
net: fix kernel deadlock with interface rename and netdev name retrieval.
2013-06-26 13:42:54 -07:00
netfilter: add nf_ipv6_ops hook to fix xt_addrtype with IPv6
2013-05-23 11:58:55 +02:00
netpoll: convert mutex into a semaphore
2013-05-01 15:00:24 -04:00
NFSv4: Convert nfs41_free_stateid to use an asynchronous RPC call
2013-05-06 17:24:22 -04:00
include/linux/memory.h: implement register_hotmemory_notifier()
2013-04-29 15:54:36 -07:00
nubus: Kill nubus_proc_detach_device()
2013-05-04 14:47:26 -04:00
NVMe: Simplify Firmware Activate code slightly
2013-05-08 09:55:05 -04:00
ARM: arm-soc: late cleanups
2013-05-07 11:22:14 -07:00
of/pci: Provide support for parsing PCI DT ranges property
2013-05-19 20:29:55 +00:00
dma:of: Use a mutex to protect the of_dma_list
2013-05-02 21:50:38 +05:30
of/pci: Add of_pci_parse_bus_range() function
2013-05-19 20:30:10 +00:00
mailbox/omap: move the OMAP mailbox framework to drivers
2013-06-11 11:41:51 -05:00
mm/pageblock: remove get/set_pageblock_flags
2013-07-03 16:07:32 -07:00
vm: adjust ifdef for TINY_RCU
2013-04-29 15:54:28 -07:00
mm: remove lru parameter from __pagevec_lru_add and remove parts of pagevec API
2013-07-03 16:07:31 -07:00
PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check
2013-05-17 14:12:06 -06:00
pci: add pcibios_release_device
2013-06-26 21:10:05 +02:00
Merge branch 'pci/misc' into next
2013-06-26 15:55:52 -06:00
percpu-refcount: use RCU-sched insted of normal RCU
2013-06-16 16:12:26 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-07-02 16:17:25 -07:00
kernel/fork.c:copy_process(): don't add the uninitialized child to thread/task/pid lists
2013-07-03 16:08:03 -07:00
aio: don't include aio.h in sched.h
2013-05-07 20:16:25 -07:00
platform_device: use a macro instead of platform_driver_register
2013-06-03 13:59:03 -07:00
PM / Runtime: Rework the "runtime idle" helper routine
2013-06-03 21:49:52 +02:00
Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-05-05 13:23:27 -07:00
tracing/context-tracking: Add preempt_schedule_context() for tracing
2013-06-19 12:55:10 +02:00
Add include dependencies to <linux/printk.h>.
2013-05-22 01:34:24 +02:00
proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
2013-05-01 17:29:47 -04:00
proc: Split the namespace stuff out into linux/proc_ns.h
2013-05-01 17:29:39 -04:00
pstore: Pass header size in the pstore write callback
2013-07-01 18:10:48 +10:00
mm/shmem.c: remove an ifdef
2013-04-29 15:54:28 -07:00
remove unused random32() and srandom32()
2013-05-07 18:38:27 -07:00
rcu: Add _notrace variation of rcu_dereference_raw() and hlist_for_each_entry_rcu()
2013-05-28 22:47:13 -04:00
net: force a reload of first item in hlist_nulls_for_each_entry_rcu
2013-06-02 20:53:59 -07:00
rcu: Shrink TINY_RCU by moving exit_rcu()
2013-06-10 13:45:52 -07:00
rcu: Shrink TINY_RCU by moving exit_rcu()
2013-06-10 13:45:52 -07:00
rcu: Shrink TINY_RCU by moving exit_rcu()
2013-06-10 13:45:52 -07:00
Merge remote-tracking branch 'regmap/topic/field' into regmap-next
2013-06-30 12:40:03 +01:00
kernel/relay.c: move FIX_SIZE macro into relay.c
2013-04-30 17:04:09 -07:00
Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2013-04-29 19:14:20 -07:00
rapidio: change endpoint device name format
2013-07-03 16:08:05 -07:00
rapidio: make enumeration/discovery configurable
2013-05-24 16:22:50 -07:00
rapidio: add udev notification
2013-07-03 16:08:05 -07:00
drivers/rtc/class.c: use struct device as the first argument for devm_rtc_device_register()
2013-04-29 18:28:22 -07:00
scatterlist: sg_set_buf() argument must be in linear mapping
2013-05-30 09:20:20 +02:00
exit.c: unexport __set_special_pids()
2013-07-03 16:08:02 -07:00
FMC: add needed headers
2013-06-17 16:38:57 -07:00
security: clarify cap_inode_getsecctx description
2013-05-12 21:32:38 +10:00
serial: Move "uart_console" def to core header file.
2013-05-20 11:47:21 -07:00
serial: sh-sci: HSCIF support
2013-06-17 18:09:53 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
gre: fix a possible skb leak
2013-06-25 16:07:44 -07:00
slab: Return NULL for oversized allocations
2013-05-06 09:24:16 +03:00
include/linux/smp.h:on_each_cpu(): switch back to a macro
2013-07-03 16:07:22 -07:00
sock_diag: allow to dump bpf filters
2013-04-29 13:21:30 -04:00
net: Unbreak compat_sys_{send,recv}msg
2013-06-06 11:52:14 -07:00
sched: Rename sched.c as sched/core.c in comments and Documentation
2013-06-19 12:58:42 +02:00
splice: don't pass the address of ->f_pos to methods
2013-06-20 19:02:45 +04:00
rcu: Remove srcu_read_lock_raw() and srcu_read_unlock_raw().
2013-06-10 13:45:25 -07:00
lib/string_helpers: introduce generic string_unescape
2013-04-30 17:04:03 -07:00
sudmac: add support for SUDMAC
2013-04-30 15:50:12 +05:30
PM / Sleep: Print last wakeup source on failed wakeup_count write
2013-06-21 00:35:12 +02:00
swap: discard while swapping only if SWAP_FLAG_DISCARD_PAGES
2013-07-03 16:07:32 -07:00
mm: migration: add migrate_entry_wait_huge()
2013-06-12 16:29:46 -07:00
kmsg: honor dmesg_restrict sysctl on /dev/kmsg
2013-06-12 16:29:44 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2013-05-09 09:40:49 -07:00
time: Revert ALWAYS_USE_PERSISTENT_CLOCK compile time optimizaitons
2013-05-14 20:54:06 +02:00
tpm: move TPM_DIGEST_SIZE defintion
2013-05-21 12:25:02 -05:00
tracing: Add DEFINE_EVENT_FN() macro
2013-06-20 22:24:32 -07:00
n_tty: Encapsulate minimum_to_wake within N_TTY
2013-06-17 12:55:11 -07:00
n_tty: Encapsulate minimum_to_wake within N_TTY
2013-06-17 12:55:11 -07:00
Hoist memcpy_fromiovec/memcpy_toiovec into lib/
2013-05-20 10:24:22 +09:30
usb: add usb2 Link PM variables to sysfs and usb_device
2013-06-05 16:48:40 -07:00
virtio: remove virtqueue_add_buf().
2013-05-20 12:16:01 +09:30
vmalloc: introduce remap_vmalloc_range_partial
2013-07-03 16:07:30 -07:00
memcg: add memory.pressure_level events
2013-04-29 15:54:38 -07:00
mm: remove CONFIG_HOTPLUG ifdefs
2013-04-29 15:54:37 -07:00
Merge 3.10-rc3 into tty-next
2013-05-27 10:57:53 +09:00
vtime: Use consistent clocks among nohz accounting
2013-05-31 11:31:50 +02:00
FS-Cache patches 2013-07-02
2013-07-02 09:52:47 -07:00
drivers: avoid format strings in names passed to alloc_workqueue()
2013-07-03 16:07:41 -07:00
sync: don't block the flusher thread waiting on IO
2013-07-02 09:16:42 -07:00
