Linus Torvalds
c9b88e9581
Oleg Nesterov did several clean ups with the tracing filter code. ...
As he found some small bugs that went into 3.16, and these changes were
based on that, I had to apply his changes to a separate branch than
my main development branch.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJT3533AAoJEKQekfcNnQGuaNkIALM9uf6gvIXgvyAlhK1qfjJL
0pxAlgppukA7hZT9gcubGuStPxKnwtVSvd/GwGI/mc7Ls57vOvdA61TEHN48l2MW
SUev1Jeu1Nx3Wh4B2ivRq+dJadrwU9NwG507yvuXn2L8Gqzwal133dg3AHnsTYgz
yu7oe8baxMniFFYlAmSELFp2cA3kli/WrRuQB7weudbT12jZlpOMqz7OUN9o7dfo
E4XfwkkDUuo9EiKD1QwVMk2cIkCaHFI8lJDYJbrM3L5XJKfnKzZNRMWfwDG2L7hS
DGjMl6T0SjU+ZIoTidHdbyF/Q+I0o9kKTnUrErGu88+2Z1gfEKN5O8zovNMbPUM=
=dT/x
-----END PGP SIGNATURE-----
Merge tag 'trace-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing filter cleanups from Steven Rostedt:
"Oleg Nesterov did several clean ups with the tracing filter code. As
he found some small bugs that went into 3.16, and these changes were
based on that, I had to apply his changes to a separate branch than my
main development branch.
This was based on work that was already pulled into 3.16, and is a
separate pull request to keep from having local merges in my pull
request"
* tag 'trace-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Kill "filter_string" arg of replace_preds()
tracing: Change apply_subsystem_event_filter() paths to check file->system == dir
tracing: Kill ftrace_event_call->files
tracing/uprobes: Kill the dead TRACE_EVENT_FL_USE_CALL_FILTER logic
tracing: Kill call_filter_disable()
tracing: Kill destroy_call_preds()
tracing: Kill destroy_preds() and destroy_file_preds()
2014-08-04 12:02:48 -07:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-06-10 10:28:45 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2014-06-12 23:06:23 -07:00
clk: Support for clock parents and rates assigned from device tree
2014-07-25 15:16:27 -07:00
fsl /bestcomm
This pull-request contains some misplaced patches from Tony
2014-06-12 12:42:32 -07:00
Input: add common DT binding for touchscreens
2014-05-29 00:05:59 -07:00
isdn/capi: move capi_info2str to capidrv.c
2014-06-04 23:13:41 -07:00
rtc: s5m: use shorter time of register update
2014-06-10 15:34:47 -07:00
net/mlx4_en: Don't use irq_affinity_notifier to track changes in IRQ affinity map
2014-07-02 18:29:23 -07:00
mlx5_core: Store MR attributes in mlx5_mr_core during creation and after UMR
2014-05-27 11:53:06 -07:00
MTD updates for 3.16:
2014-06-11 08:35:34 -07:00
ata: pata_samsung_cf: removes s5pc100 related ata codes
2014-06-30 10:48:08 -04:00
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
2014-06-16 16:05:56 +01:00
mm: update comment for DEFAULT_MAX_MAP_COUNT
2014-06-04 16:54:05 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
NFS client updates for Linux 3.16
2014-06-10 15:02:42 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
Merge branch 'acpi-enumeration'
2014-06-03 23:12:20 +02:00
ata: libahci_platform: move port_map parameters into the AHCI structure
2014-07-30 15:39:46 -04:00
backlight: Add backlight device (un)registration notification
2014-05-27 01:29:01 +02:00
block: add support for limiting gaps in SG lists
2014-06-24 16:22:24 -06:00
blk-mq: bitmap tag: fix races on shared ::wake_index fields
2014-06-17 22:12:35 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-06-12 10:30:18 -07:00
block: add support for limiting gaps in SG lists
2014-06-24 16:22:24 -06:00
include/linux/bootmem.h: cleanup the comment for BOOTMEM_ flags
2014-06-04 16:54:04 -07:00
fs/buffer.c: remove block_write_full_page_endio()
2014-06-04 16:54:02 -07:00
fs,userns: Change inode_capable to capable_wrt_inode_uidgid
2014-06-10 13:57:22 -07:00
cgroup: make CFTYPE_ONLY_ON_DFL and CFTYPE_NO_ internal to cgroup core
2014-07-15 11:05:10 -04:00
clk: define and export clk_debugs_add_file
2014-07-02 16:15:55 -07:00
mm, compaction: embed migration mode in compact_control
2014-06-04 16:54:06 -07:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-06-12 19:18:49 -07:00
connector: allow multiple messages to be sent in one packet
2014-05-27 13:56:21 -07:00
console: Use explicit pointer type for vc_uni_pagedir* fields
2014-05-28 13:37:21 -07:00
idle: remove cpu_idle() forward declarations
2014-06-06 16:08:18 -07:00
cpufreq: make table sentinel macros unsigned to match use
2014-07-18 02:56:38 +02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-06-09 18:10:34 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
mm: page_alloc: use jump labels to avoid checking number_of_cpusets
2014-06-04 16:54:08 -07:00
crypto: Resolve shadow warnings
2014-08-01 22:35:55 +08:00
PM / devfreq: Add devm_devfreq_{register,unregister}_opp_notfier function
2014-05-24 22:33:41 +09:00
dm: remove symbol export for dm_set_device_limits
2014-06-04 09:46:34 -04:00
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next
2014-06-05 15:57:04 -07:00
cma: add placement specifier for "cma=" kernel parameter
2014-06-04 16:53:57 -07:00
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next
2014-06-05 15:57:04 -07:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-06-10 10:28:45 -07:00
Revert "block: add __init to elv_register"
2014-06-22 16:34:11 -06:00
ethtool: Replace ethtool_ops::{get,set}_rxfh_indir() with {get,set}_rxfh()
2014-06-03 02:42:44 +01:00
f2fs: large volume support
2014-06-04 13:34:30 +09:00
net: filter: cleanup A/X name usage
2014-06-11 00:13:16 -07:00
ALSA: firewire/bebob: Add a workaround for M-Audio special Firewire series
2014-05-26 14:33:10 +02:00
locks: typedef fl_owner_t to void *
2014-07-13 21:38:49 -04:00
ftrace: Rename ftrace_ops field from trampolines to nr_trampolines
2014-07-23 15:03:00 -04:00
tracing: Kill ftrace_event_call->files
2014-07-16 14:28:41 -04:00
include/linux/gfp.h: exclude duplicate header
2014-06-04 16:54:10 -07:00
Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16/thingm' into for-linus
2014-06-04 13:09:43 +02:00
kexec: export free_huge_page to VMCOREINFO
2014-07-30 17:16:13 -07:00
idr: reorder the fields
2014-06-06 16:08:13 -07:00
wireless: add missing WLAN_EID_BSS_INTOLERANT_CHL_REPORT
2014-05-28 16:22:47 +02:00
bridge: memorize and export selected IGMP/MLD querier port
2014-06-10 23:50:47 -07:00
net-next:v4: Add support to configure SR-IOV VF minimum and maximum Tx rate through ip tool.
2014-05-23 15:04:02 -04:00
macvlan: add netpoll support
2014-06-02 16:05:24 -07:00
team: fix mtu setting
2014-06-02 14:56:01 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-24 00:32:30 -04:00
init.h: Update initcall_sync variants to fix build errors
2014-05-27 14:26:31 -07:00
Merge commit ' 3cf2f34' into sched/core, to fix build error
2014-06-12 13:46:37 +02:00
include/linux/jump_label.h: expose the reference count
2014-06-04 16:54:08 -07:00
Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2014-07-10 11:38:23 -07:00
Merge branch 'serge-next-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security
2014-06-10 10:05:36 -07:00
mm: introduce kmemleak_update_trace()
2014-06-06 16:08:17 -07:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-06-12 19:18:49 -07:00
kthread_work: remove the unused wait_queue_head
2014-07-28 14:16:30 -04:00
ktime: add ktime_after and ktime_before helper
2014-06-11 12:23:17 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-06-12 19:42:15 -07:00
libata: introduce ata_host->n_tags to avoid oops on SAS controllers
2014-07-23 10:30:34 -04:00
drivers/rtc/rtc-cmos.c: drivers/char/rtc.c features for DECstation support
2014-06-06 16:08:07 -07:00
mcb: Add support for shared PCI IRQs
2014-05-27 17:38:11 -07:00
memblock: introduce memblock_alloc_range()
2014-06-04 16:53:57 -07:00
memcg: cleanup kmem cache creation/destruction functions naming
2014-06-04 16:54:08 -07:00
mem-hotplug: implement get/put_online_mems
2014-06-04 16:53:59 -07:00
hugetlb: restrict hugepage_migration_support() to x86_64
2014-06-04 16:53:51 -07:00
mm, migration: add destination page freeing callback
2014-06-04 16:54:06 -07:00
miscdevice.h: Simple syntax fix to make pointers consistent.
2014-05-27 17:43:11 -07:00
Merge branch 'x86/vdso' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-05 08:05:29 -07:00
Merge branch 'x86/vdso' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-05 08:05:29 -07:00
mm: pass VM_BUG_ON() reason to dump_page()
2014-06-04 16:53:58 -07:00
mm: page_alloc: use unsigned int for order in more places
2014-06-04 16:54:09 -07:00
PCI/MSI: Cache Multiple Message Capable in struct msi_desc
2014-07-03 16:55:07 -06:00
locking/spinlocks/mcs: Convert osq lock to atomic_t to reduce overhead
2014-07-16 13:28:04 +02:00
net: Fix GSO constants to match NETIF flags
2014-06-15 01:00:49 -07:00
net: Fix GSO constants to match NETIF flags
2014-06-15 01:00:49 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-06-03 23:32:12 -07:00
pnfs: support multiple verfs per direct req
2014-05-29 11:11:48 -04:00
nfs4: remove unused CHANGE_SECURITY_LABEL
2014-06-06 19:22:49 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-06-12 10:30:18 -07:00
nfs: page group syncing in write path
2014-05-29 11:11:45 -04:00
pnfs: support multiple verfs per direct req
2014-05-29 11:11:48 -04:00
kernel/watchdog.c: print traces for all cpus on lockup detection
2014-06-23 16:47:44 -07:00
NVMe: Fix hot cpu notification dead lock
2014-06-13 10:43:34 -04:00
DeviceTree for 3.16:
2014-06-04 10:02:38 -07:00
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next
2014-06-05 15:57:04 -07:00
of: Add memory limiting function for flattened devicetrees
2014-07-29 21:26:45 -06:00
net: fix circular dependency in of_mdio code
2014-07-02 00:24:14 -07:00
of/irq: provide more wrappers for !CONFIG_OF
2014-06-04 04:45:46 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
MMC highlights for 3.16:
2014-06-10 14:35:22 -07:00
MMC highlights for 3.16:
2014-06-10 14:35:22 -07:00
locking/spinlocks/mcs: Introduce and use init macro and function for osq locks
2014-07-16 13:28:05 +02:00
kexec: save PG_head_mask in VMCOREINFO
2014-06-23 16:47:43 -07:00
mm: page_alloc: reduce number of times page_to_pfn is called
2014-06-04 16:54:09 -07:00
mm/rmap.c: fix pgoff calculation to handle hugepage correctly
2014-07-23 15:10:54 -07:00
Merge branches 'pci/host-generic', 'pci/host-mvebu', 'pci/host-rcar', 'pci/host-tegra', 'pci/msi', 'pci/misc', 'pci/resource' and 'pci/virtualization' into next
2014-07-16 17:09:47 -06:00
PCI: Add include guard to include/linux/pci_ids.h
2014-07-10 16:49:15 -06:00
Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-08-04 10:09:27 -07:00
percpu-refcount: implement percpu_ref_reinit() and percpu_ref_is_zero()
2014-06-28 08:10:14 -04:00
percpu: move {raw|this}_cpu_*() definitions to include/linux/percpu-defs.h
2014-06-17 19:12:39 -04:00
perf: Differentiate exec() and non-exec() comm events
2014-06-06 07:56:22 +02:00
net: phylib: add link_change_notify callback to phy device
2014-06-21 15:50:00 -07:00
net: phy: fix sparse warning in fixed.c
2014-06-05 15:38:57 -07:00
lib/plist: add plist_requeue
2014-06-04 16:54:07 -07:00
power_supply: allow power supply devices registered w/o wakeup source
2014-05-30 13:45:25 +02:00
kernel/printk: use symbolic defines for console loglevels
2014-06-04 16:54:17 -07:00
init/main.c: remove an ifdef
2014-06-04 16:54:21 -07:00
ptrace,x86: force IRET path after a ptrace_stop()
2014-07-03 17:27:23 -07:00
rcu: Reduce overhead of cond_resched() checks for RCU
2014-06-23 11:19:32 -07:00
ring-buffer: Check if buffer exists before polling
2014-06-10 09:46:00 -04:00
mm/rmap.c: cleanup ttu_flags
2014-06-04 16:54:12 -07:00
locking/rwsem: Rename 'activity' to 'count'
2014-07-16 14:56:55 +02:00
locking/rwsem: Add CONFIG_RWSEM_SPIN_ON_OWNER
2014-07-16 14:57:13 +02:00
sched: Fix compiler warnings
2014-07-02 08:33:48 +02:00
Merge branch 'serge-next-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security
2014-06-10 10:05:36 -07:00
ipc/shm.c: increase the defaults for SHMALL, SHMMAX
2014-06-06 16:08:14 -07:00
signals: introduce kernel_sigaction()
2014-06-06 16:08:12 -07:00
net: add skb_pop_rcv_encapsulation
2014-06-15 01:00:50 -07:00
memcg: cleanup kmem cache creation/destruction functions naming
2014-06-04 16:54:08 -07:00
idle: remove cpu_idle() forward declarations
2014-06-06 16:08:18 -07:00
iovec: move memcpy_from/toiovecend to lib/iovec.c
2014-06-27 11:47:58 -07:00
fs/splice.c: remove unneeded exports
2014-06-12 00:21:11 -04:00
PM / hibernate: introduce "nohibernate" boot parameter
2014-06-16 23:29:39 +02:00
mm/vmscan.c: use DIV_ROUND_UP for calculation of zone's balance_gap and correct comments.
2014-06-04 16:54:11 -07:00
swap: change swap_list_head to plist, add swap_avail_head
2014-06-04 16:54:07 -07:00
x86: define _PAGE_NUMA by reusing software bits on the PMD and PTE levels
2014-06-04 16:53:55 -07:00
x86: enable DMA CMA with swiotlb
2014-06-04 16:53:57 -07:00
mm: constify nmask argument to set_mempolicy()
2014-06-04 16:54:03 -07:00
sysfs.h: don't return a void-valued expression in sysfs_remove_file
2014-05-27 14:29:56 -07:00
mm: get rid of __GFP_KMEMCG
2014-06-04 16:53:56 -07:00
mm: disable zone_reclaim_mode by default
2014-06-04 16:53:59 -07:00
tracing: Add trace_seq_buffer_ptr() helper function
2014-07-01 07:13:39 -04:00
net: Make enabling of zero UDP6 csums more restrictive
2014-05-23 16:28:53 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-06-28 09:43:58 -07:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-06-12 19:18:49 -07:00
USB: separate usb_address0 mutexes for each bus
2014-05-27 16:11:49 -07:00
usb-storage/SCSI: Add broken_fua blacklist flag
2014-06-30 22:47:18 -07:00
drivers/vfio: Rework offsetofend()
2014-05-30 11:35:54 -06:00
virtio-scsi.h: Add virtio_scsi_cmd_req_pi + VIRTIO_SCSI_F_T10_PI bits
2014-06-02 12:41:33 -07:00
mm,vmacache: add debug data
2014-06-04 16:53:57 -07:00
mm,vmacache: add debug data
2014-06-04 16:53:57 -07:00
mm/zbud.c: make size unsigned like unique callsite
2014-06-04 16:54:13 -07:00
