Linus Torvalds
ca520cab25
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ...
Pull locking and atomic updates from Ingo Molnar:
"Main changes in this cycle are:
- Extend atomic primitives with coherent logic op primitives
(atomic_{or,and,xor}()) and deprecate the old partial APIs
(atomic_{set,clear}_mask())
The old ops were incoherent with incompatible signatures across
architectures and with incomplete support. Now every architecture
supports the primitives consistently (by Peter Zijlstra)
- Generic support for 'relaxed atomics':
- _acquire/release/relaxed() flavours of xchg(), cmpxchg() and {add,sub}_return()
- atomic_read_acquire()
- atomic_set_release()
This came out of porting qwrlock code to arm64 (by Will Deacon)
- Clean up the fragile static_key APIs that were causing repeat bugs,
by introducing a new one:
DEFINE_STATIC_KEY_TRUE(name);
DEFINE_STATIC_KEY_FALSE(name);
which define a key of different types with an initial true/false
value.
Then allow:
static_branch_likely()
static_branch_unlikely()
to take a key of either type and emit the right instruction for the
case. To be able to know the 'type' of the static key we encode it
in the jump entry (by Peter Zijlstra)
- Static key self-tests (by Jason Baron)
- qrwlock optimizations (by Waiman Long)
- small futex enhancements (by Davidlohr Bueso)
- ... and misc other changes"
* 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (63 commits)
jump_label/x86: Work around asm build bug on older/backported GCCs
locking, ARM, atomics: Define our SMP atomics in terms of _relaxed() operations
locking, include/llist: Use linux/atomic.h instead of asm/cmpxchg.h
locking/qrwlock: Make use of _{acquire|release|relaxed}() atomics
locking/qrwlock: Implement queue_write_unlock() using smp_store_release()
locking/lockref: Remove homebrew cmpxchg64_relaxed() macro definition
locking, asm-generic: Add _{relaxed|acquire|release}() variants for 'atomic_long_t'
locking, asm-generic: Rework atomic-long.h to avoid bulk code duplication
locking/atomics: Add _{acquire|release|relaxed}() variants of some atomic operations
locking, compiler.h: Cast away attributes in the WRITE_ONCE() magic
locking/static_keys: Make verify_keys() static
jump label, locking/static_keys: Update docs
locking/static_keys: Provide a selftest
jump_label: Provide a self-test
s390/uaccess, locking/static_keys: employ static_branch_likely()
x86, tsc, locking/static_keys: Employ static_branch_likely()
locking/static_keys: Add selftest
locking/static_keys: Add a new static_key interface
locking/static_keys: Rework update logic
locking/static_keys: Add static_key_{en,dis}able() helpers
...
2015-09-03 15:46:07 -07:00
uart: pl011: Add support to ZTE ZX296702 uart
2015-08-04 22:07:26 -07:00
bcma: switch GPIO portions to use GPIOLIB_IRQCHIP
2015-08-18 09:08:47 +03:00
can: replace timestamp as unique skb attribute
2015-07-12 21:13:22 +02:00
libceph: enable ceph in a non-default network namespace
2015-07-09 20:30:34 +03:00
ARM: SoC driver updates for v4.3
2015-09-01 13:00:04 -07:00
fsl /bestcomm
gpio: Remove double "base" in comment
2015-07-16 00:12:24 +02:00
iio: Add inverse unit conversion macros
2015-08-08 12:50:40 +01:00
irqchip/gic: Ensure gic_cpu_if_up/down() programs correct GIC instance
2015-08-04 14:14:06 +02:00
ARM: SoC platform updates for v4.3
2015-09-01 12:18:40 -07:00
net/mlx4_en: Add support for hardware accelerated 802.1ad vlan
2015-07-27 15:00:37 -07:00
net/mlx5e: Support ethtool get/set_pauseparam
2015-08-17 15:51:36 -07:00
mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
2015-07-07 13:03:25 -07:00
netfilter: nf_conntrack: make nf_ct_zone_dflt built-in
2015-09-02 16:32:56 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-09-03 08:08:17 -07:00
Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom-spmi', 'regulator/topic/rk808', 'regulator/topic/stub' and 'regulator/topic/tol' into regulator-next
2015-08-30 14:40:11 +01:00
ARM: SoC driver updates for v4.3
2015-09-01 13:00:04 -07:00
spi: expose spi_master and spi_device statistics via sysfs
2015-07-07 13:33:23 +01:00
NFS client updates for Linux 4.2
2015-07-02 11:32:23 -07:00
Revert "usb: interface authorization: Introduces the default interface authorization"
2015-08-18 09:58:45 -07:00
Merge branches 'acpi-pci', 'acpi-soc', 'acpi-ec' and 'acpi-osl'
2015-09-01 03:41:19 +02:00
Revert "libata: Implement NCQ autosense"
2015-08-03 12:01:54 -04:00
tty/serial: at91: add support to FIFOs
2015-07-23 18:00:42 -07:00
locking/atomics: Add _{acquire|release|relaxed}() variants of some atomic operations
2015-08-12 11:58:59 +02:00
average: remove out-of-line implementation
2015-08-20 14:10:23 -07:00
writeback: don't embed root bdi_writeback_congested in bdi_writeback
2015-07-02 08:46:00 -06:00
writeback: don't embed root bdi_writeback_congested in bdi_writeback
2015-07-02 08:46:00 -06:00
block: Replace SG_GAPS with new queue limits mask
2015-08-19 14:26:02 -07:00
linux/bitmap: Force inlining of bitmap weight functions
2015-08-05 09:38:08 +02:00
linux/bitmap: Force inlining of bitmap weight functions
2015-08-05 09:38:08 +02:00
blk-cgroup: Drop unlikely before IS_ERR(_OR_NULL)
2015-08-13 10:45:09 -06:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2015-09-03 12:28:30 -07:00
block: Replace SG_GAPS with new queue limits mask
2015-08-19 14:26:02 -07:00
bpf: Implement function bpf_perf_event_read() that get the selected hardware PMU conuter
2015-08-09 22:50:06 -07:00
bufferhead: Add _gfp version for sb_getblk()
2015-07-02 01:32:44 -04:00
Merge branch 'for-4.3-unified-base' into for-4.3
2015-08-25 14:19:29 -04:00
Merge branch 'for-4.3-unified-base' into for-4.3
2015-08-25 14:19:29 -04:00
cgroup: implement the PIDs subsystem
2015-07-14 17:29:23 -04:00
clk: Constify clk_hw argument to provider APIs
2015-08-24 16:49:11 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
clockevents: Remove clockevents_notify() prototype
2015-07-20 11:37:46 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
locking, compiler.h: Cast away attributes in the WRITE_ONCE() magic
2015-08-12 11:58:58 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
context_tracking: Add ct_state() and CT_WARN_ON()
2015-07-07 10:59:04 +02:00
context_tracking: Add ct_state() and CT_WARN_ON()
2015-07-07 10:59:04 +02:00
coresight: Fix implicit inclusion of linux/sched.h
2015-08-05 13:30:16 -07:00
efi: Handle memory error structures produced based on old versions of standard
2015-07-15 13:30:38 +01:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
cpufeature: correctly annotate the module init function
2015-07-22 09:58:02 +02:00
Merge branch 'pm-opp'
2015-09-01 15:52:41 +02:00
cpuidle/coupled: Remove cpuidle_device::safe_state_index
2015-08-28 15:14:54 +02:00
crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag
2015-08-17 16:53:53 +08:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
block: kill merge_bvec_fn() completely
2015-08-13 12:31:57 -06:00
Power management and ACPI material for v4.3-rc1
2015-09-01 19:45:46 -07:00
The libnvdimm sub-system introduces, in addition to the libnvdimm-core,
2015-06-29 10:34:42 -07:00
net: fix endian check warning in etherdevice.h
2015-08-17 12:14:53 -07:00
extcon: Remove optional print_state() function pointer of struct extcon_dev
2015-08-10 11:48:55 +09:00
f2fs: add annotation for space utilization of regular/inline dentry
2015-08-21 22:45:13 -07:00
rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()
2015-07-22 15:27:32 -07:00
bpf: also show process name/pid in bpf_jit_dump
2015-07-30 11:13:21 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2015-09-01 16:13:25 -07:00
drivers: usb: fsl: Workaround for USB erratum-A005275
2015-08-14 16:50:36 -07:00
ftrace: Fix breakage of set_ftrace_pid
2015-07-24 13:58:14 -04:00
genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()
2015-06-30 19:45:01 -07:00
block: partition: convert percpu ref
2015-07-17 08:41:53 -06:00
mm: meminit: finish initialisation of struct pages before basic setup
2015-06-30 19:44:56 -07:00
First set of IIO fixes for the 4.2 cycle.
2015-07-13 14:18:07 -07:00
mm: hugetlb: allow hugepages_supported to be architecture specific
2015-07-17 16:39:52 -07:00
Drivers: hv: vmbus: Further improve CPU affiliation logic
2015-08-05 11:44:28 -07:00
mac80211: fix BIT position for TDLS WIDE extended cap
2015-08-14 17:49:53 +02:00
IGMP: Inhibit reports for local multicast groups
2015-08-28 13:28:47 -07:00
module: relocate module_init from init.h to module.h
2015-07-05 23:59:14 -04:00
sched/cputime: Guarantee stime + utime == rtime
2015-08-03 12:21:21 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
net: ipv6 sysctl option to ignore routes when nexthop link is down
2015-08-13 21:27:19 -07:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:33:35 -07:00
irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h
2015-07-02 22:34:38 +02:00
genirq: Provide irq_desc_has_action
2015-08-06 00:14:59 +02:00
genirq: Add DOMAIN_BUS_NEXUS irqdomain property
2015-07-30 00:14:38 +02:00
Pretty much all bug fixes and clean ups for 4.3, after a lot of
2015-09-03 12:52:19 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:04:50 -07:00
jump label, locking/static_keys: Update docs
2015-08-03 11:51:14 +02:00
x86/kasan, mm: Introduce generic kasan_populate_zero_shadow()
2015-08-22 14:54:55 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2015-07-03 15:20:57 -07:00
kexec: define kexec_in_progress in !CONFIG_KEXEC case
2015-08-04 22:25:28 -07:00
klist: implement klist_prev()
2015-07-28 08:50:42 +01:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
perf/x86/hw_breakpoints: Disallow kernel breakpoints unless kprobe-safe
2015-08-04 10:16:54 +02:00
sched: Fix a race between __kthread_bind() and sched_setaffinity()
2015-08-12 12:06:09 +02:00
KVM: document memory barriers for kvm->vcpus/kvm->online_vcpus
2015-07-30 16:02:54 +02:00
libata: add ATA_HORKAGE_MAX_SEC_1024 to revert back to previous max_sectors limit
2015-07-15 11:47:24 -04:00
libnvdimm: Add sysfs numa_node to NVDIMM devices
2015-06-26 11:23:38 -04:00
locking, include/llist: Use linux/atomic.h instead of asm/cmpxchg.h
2015-08-12 11:59:08 +02:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2015-06-27 13:26:03 -07:00
mei: bus: add and call callback on notify event
2015-08-03 17:30:00 -07:00
memblock: introduce a for_each_reserved_mem_region iterator
2015-06-30 19:44:55 -07:00
char: make misc_deregister a void function
2015-08-05 10:35:49 -07:00
mm: make page pfmemalloc check more robust
2015-08-21 14:30:10 -07:00
mm: make page pfmemalloc check more robust
2015-08-21 14:30:10 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
mm: meminit: initialise a subset of struct pages if CONFIG_DEFERRED_STRUCT_PAGE_INIT is set
2015-06-30 19:44:56 -07:00
mod_devicetable: add space before */
2015-08-07 15:03:42 +02:00
module: relocate module_init from init.h to module.h
2015-07-05 23:59:14 -04:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
mpls: ip tunnel support
2015-07-21 10:39:05 -07:00
PCI/MSI: Drop domain field from msi_controller
2015-07-30 00:14:39 +02:00
net_dbg_ratelimited: turn into no-op when !DEBUG
2015-08-06 23:51:30 -07:00
net: kill long time unused bonding private flags
2015-08-27 16:28:35 -07:00
netfilter: nf_conntrack: make nf_ct_zone_dflt built-in
2015-09-02 16:32:56 -07:00
netfilter: bridge: reduce nf_bridge_info to 32 bytes again
2015-07-30 13:37:42 +02:00
netfilter: Define v6ops in !CONFIG_NETFILTER case.
2015-08-27 16:35:51 -07:00
NFS: nfs_mark_for_revalidate should always set NFS_INO_REVAL_PAGECACHE
2015-07-22 17:15:54 -04:00
NFS: Remove the "NFS_CAP_CHANGE_ATTR" capability
2015-07-22 17:15:54 -04:00
NTB: Add NTB hardware abstraction layer
2015-07-04 14:04:44 -04:00
NTB: Split ntb_hw_intel and ntb_transport drivers
2015-07-04 14:05:49 -04:00
NVMe: Add nvme subsystem reset IOCTL
2015-08-18 11:56:13 -06:00
nvmem: Add nvmem_device based consumer apis.
2015-08-05 13:43:44 -07:00
nvmem: Add a simple NVMEM framework for nvmem providers
2015-08-05 13:43:12 -07:00
device property: check fwnode type in to_of_node()
2015-08-26 01:46:39 +02:00
of: constify drv arg of of_driver_match_device stub
2015-07-27 08:23:27 -05:00
Devicetree changes for v4.2
2015-07-01 19:40:18 -07:00
of/platform: Assign MSI domain to platform device
2015-07-30 00:14:37 +02:00
of/platform: add function to populate default bus
2015-08-25 11:29:55 -05:00
mm: check __PG_HWPOISON separately from PAGE_FLAGS_CHECK_AT_*
2015-08-07 04:39:42 +03:00
mm/page_owner: set correct gfp_mask on page_owner
2015-07-17 16:39:54 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-07-04 19:36:06 -07:00
Update Viresh Kumar's email address
2015-07-17 16:39:53 -07:00
PCI: Move ATS declarations to linux/pci.h so they're all together
2015-08-13 15:59:58 -05:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:33:35 -07:00
percpu: update incorrect comment for this_cpu_*() operations
2015-07-14 17:43:56 -04:00
perf: add the necessary core perf APIs when accessing events counters in eBPF programs
2015-08-09 22:50:05 -07:00
net: phy: Allow PHY devices to identify themselves as Ethernet switches, etc.
2015-08-31 14:48:01 -07:00
phy: fixed_phy: Add gpio to determine link up/down.
2015-08-31 14:48:02 -07:00
PM / Domains: Remove unusable governor dummies
2015-08-29 01:54:43 +02:00
PM / OPP: add dev_pm_opp_is_turbo() helper
2015-08-07 03:17:06 +02:00
PM / QoS: Make it possible to expose device latency tolerance to userspace
2015-07-28 08:50:41 +01:00
PM / sleep: Allow devices without runtime PM to do direct-complete
2015-07-21 23:14:22 +02:00
The libnvdimm sub-system introduces, in addition to the libnvdimm-core,
2015-06-29 10:34:42 -07:00
sched/preempt: Fix cond_resched_lock() and cond_resched_softirq()
2015-08-03 12:21:24 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
Add a matching set of device_ functions for determining mac/phy
2015-08-13 16:58:29 -07:00
proportions: Spelling s/consitent/consistent/
2015-08-07 14:37:04 +02:00
spi: pxa2xx: Add support for Intel Sunrisepoint
2015-07-31 19:13:33 +01:00
quota: Propagate error from ->acquire_dquot()
2015-07-23 20:59:10 +02:00
rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()
2015-07-22 15:27:32 -07:00
rcu: Add RCU-sched flavors of get-state and cond-sync
2015-07-22 15:26:58 -07:00
rcu: Add RCU-sched flavors of get-state and cond-sync
2015-07-22 15:26:58 -07:00
lib: scatterlist: add sg splitting function
2015-08-24 14:28:01 -06:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-08-31 20:26:22 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2015-06-27 13:26:03 -07:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
tty/early: make serial8250_early_{in,out} static again
2015-07-23 17:43:30 -07:00
flow_dissector: Use 'const' where possible.
2015-09-01 21:19:17 -07:00
Fix kmalloc slab creation sequence
2015-06-29 10:49:51 -07:00
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 08:40:25 -07:00
stmmac: remove setup/free glue callbacks
2015-07-29 00:13:25 -07:00
stop_machine: Use 'cpu_stop_fn_t' where possible
2015-08-03 12:21:27 +02:00
block: add a bi_error field to struct bio
2015-07-29 08:55:15 -06:00
This patch series contains several clean ups and even a new trace clock
2015-06-26 14:02:43 -07:00
sysctl: Allow creating permanently empty directories that serve as mountpoints.
2015-07-01 10:36:39 -05:00
sysfs: Add support for permanently empty directories to serve as mount points.
2015-07-01 10:36:45 -05:00
Revert "ti-st: add device tree support"
2015-08-05 13:24:12 -07:00
nohz: Remove useless argument on tick_nohz_task_switch()
2015-07-29 15:45:01 +02:00
time: Introduce struct itimerspec64
2015-08-17 11:25:28 -07:00
Merge branch 'fortglx/4.3/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
2015-08-20 21:13:22 +02:00
tracing, perf: Implement BPF programs attached to uprobes
2015-08-06 15:29:14 -03:00
tty: core: Add tty_debug() for printk(KERN_DEBUG) messages
2015-07-23 18:37:31 -07:00
Avoid usb reset crashes by making tty_io cdevs truly dynamic
2015-08-03 15:24:43 -07:00
rcu: Create a synchronize_rcu_mult()
2015-07-22 15:27:29 -07:00
lib: introduce strncpy_from_unsafe()
2015-08-28 16:27:27 -07:00
uprobes/x86: Make arch_uretprobe_is_alive(RP_CHECK_CALL) more clever
2015-07-31 10:38:06 +02:00
Revert "usb: interface authorization: Declare authorized attribute"
2015-08-18 09:59:12 -07:00
md updates for 4.2
2015-06-29 11:10:56 -07:00
watchdog: watchdog_core: Add watchdog registration deferral mechanism
2015-06-29 11:51:06 +02:00
workqueue: fix some docbook warnings
2015-08-17 15:48:24 -04:00
