Linus Torvalds
2aafe1a4d4
Takao Indoh reported that he was able to cause a ftrace bug while ...
loading a module and enabling function tracing at the same time.
He uncovered a race where the module when loaded will convert the
calls to mcount into nops, and expects the module's text to be RW.
But when function tracing is enabled, it will convert all kernel
text (core and module) from RO to RW to convert the nops to calls
to ftrace to record the function. After the convertion, it will
convert all the text back from RW to RO.
The issue is, it will also convert the module's text that is loading.
If it converts it to RO before ftrace does its conversion, it will
cause ftrace to fail and require a reboot to fix it again.
This patch moves the ftrace module update that converts calls to mcount
into nops to be done when the module state is still MODULE_STATE_UNFORMED.
This will ignore the module when the text is being converted from
RW back to RO.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJTXuHsAAoJEKQekfcNnQGuT7cIAJQhwX2fpdFr5eHwx0CyFo5c
75V0xcRhJsGeXqfgekkRhCHYEfL7v4sl6D+Bj8qzLG/0QresF9jVSMUTTZqYFpFc
t7f3oDDtdCmfofD/uyS7YOQ3JhU5ijo+Drzq8qRYtWNJJ0WCqbddpevcUiW1Zbvr
LAT3lcb+2I5Y1Jnyfd920+0plAnoeOw1/BPuRVJINwh8zeyvWnmp3iq9fOPdhMQQ
VhCCg+C2ILBPrCPFdwC5pVrL4a/CjyNd+LqtFXjLS9sO8s5KyUGkqKkbHMlhZeot
uRWlZUSNZsh/jpP4X2b+dtYGQ4Rrnp253a594Kmrzm/MPdsAV62oDqOfN0tzm7w=
=K59a
-----END PGP SIGNATURE-----
Merge tag 'trace-fixes-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull ftrace bugfix from Steven Rostedt:
"Takao Indoh reported that he was able to cause a ftrace bug while
loading a module and enabling function tracing at the same time.
He uncovered a race where the module when loaded will convert the
calls to mcount into nops, and expects the module's text to be RW.
But when function tracing is enabled, it will convert all kernel text
(core and module) from RO to RW to convert the nops to calls to ftrace
to record the function. After the convertion, it will convert all the
text back from RW to RO.
The issue is, it will also convert the module's text that is loading.
If it converts it to RO before ftrace does its conversion, it will
cause ftrace to fail and require a reboot to fix it again.
This patch moves the ftrace module update that converts calls to
mcount into nops to be done when the module state is still
MODULE_STATE_UNFORMED. This will ignore the module when the text is
being converted from RW back to RO"
* tag 'trace-fixes-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
ftrace/module: Hardcode ftrace_module_init() call into load_module()
2014-04-28 16:57:51 -07:00
arm: fix comment header and macro name
2014-01-02 10:46:41 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-01-30 17:20:32 -08:00
can: allow to change the device mtu for CAN FD capable devices
2014-03-07 09:18:23 +01:00
libceph: enable PRIMARY_AFFINITY feature bit
2014-04-04 21:08:20 -07:00
ARM: SoC: late cleanups
2014-04-05 15:46:37 -07:00
crush: add SET_CHOOSELEAF_VARY_R step
2014-04-04 21:07:28 -07:00
lib/decompress_inflate.c: include appropriate header file
2014-04-03 16:21:12 -07:00
extcon: Move OF helper function to extcon core and change function name
2014-03-19 14:41:58 +09:00
fsl /bestcomm
gpio: unmap gpio irqs properly
2014-03-28 20:42:01 +01:00
treewide: Fix typo in Documentation/DocBook
2014-02-19 14:58:17 +01:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-04-09 08:45:40 -07:00
iio:drop IIO_ST macro
2014-02-15 10:58:17 +00:00
Input: pmic8xxx-pwrkey - migrate to DT
2014-03-30 13:25:19 -07:00
Add support for GIC crossbar that routes interrupts on newer omaps.
2014-03-08 23:32:26 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-04-10 09:06:10 -07:00
net/mlx4: Implement vxlan ndo calls
2014-03-28 16:29:35 -04:00
IB/mlx5: Add block multicast loopback support
2014-04-10 18:43:32 -07:00
MMC highlights for 3.15:
2014-04-09 08:39:39 -07:00
Shiraz has moved
2014-04-18 16:40:08 -07:00
netfilter: nf_conntrack: flush net_gre->keymap_list only from gre helper
2014-04-08 10:56:12 +02:00
phy: core: make NULL a valid phy reference if !CONFIG_GENERIC_PHY
2014-04-24 12:53:38 -07:00
pinctrl: Add void * to pinctrl_pin_desc
2014-01-16 14:25:37 +01:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-04-10 09:06:10 -07:00
isp1704_charger: Add DT support
2013-12-23 18:34:58 -08:00
regulator: core: Return error in get optional stub
2014-04-18 15:11:54 +01:00
sched/prio: Add 3 macros of MAX_NICE, MIN_NICE and NICE_WIDTH in prio.h
2014-02-22 18:14:13 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-04-02 16:23:38 -07:00
ssb: gpio: add own IRQ domain
2014-01-24 22:39:54 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-04-12 17:31:22 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-04-02 20:53:45 -07:00
uwb: Use dev_is_pci() to check whether it is pci device
2013-12-08 18:01:56 -08:00
PCI changes for the v3.15 merge window:
2014-04-01 15:14:04 -07:00
acpi-dma: convert to return error code when asked for channel
2014-02-11 23:30:50 +05:30
ahci_platform: Drop unused ahci_platform_data members
2014-02-22 17:13:01 -05: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
libata: Add some missing command descriptions
2013-10-27 08:40:39 -04:00
ath9k: Use a separate TX gain table for WZR-HP-G450H
2013-12-09 15:37:58 -05:00
ASoC: atmel_ssc_dai: make option to choose clock
2014-02-12 17:21:22 +00:00
AUDIT: make audit_is_compat depend on CONFIG_AUDIT_COMPAT_GENERIC
2014-04-10 17:51:29 -04:00
auxvec.h: account for AT_HWCAP2 in AT_VECTOR_SIZE_BASE
2013-12-24 09:35:17 -08:00
bdi: avoid oops on device removal
2014-04-03 16:20:49 -07:00
backlight: update bd state & fb_blank properties when necessary
2014-04-03 16:21:09 -07:00
gpio: generic: Add label to platform data
2014-02-06 10:33:47 +01:00
exec: kill bprm->tcomm[], simplify the "basename" logic
2014-04-07 16:36:05 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
ext4: atomically set inode->i_flags in ext4_set_inode_flags()
2014-03-30 17:02:06 -07:00
block: remove old blk_iopoll_enabled variable
2014-03-13 09:38:42 -06:00
Merge branch 'for-3.15/core' of git://git.kernel.dk/linux-block
2014-04-01 19:19:15 -07:00
block: fix regression with block enabled tagging
2014-04-09 21:54:06 -06:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
kernel: trace: blktrace: remove redundent memcpy() in compat_blk_trace_setup()
2013-11-08 09:04:30 -07:00
memblock, bootmem: restore goal for alloc_low
2014-01-30 16:56:54 -08:00
sched/preempt, locking: Rework local_bh_{dis,en}able()
2014-01-13 17:32:27 +01:00
net: phy: add Broadcom BCM7xxx internal PHY driver
2014-02-14 00:27:58 -05:00
switch ->is_partially_uptodate() to saner arguments
2014-04-01 23:19:19 -04:00
printk/cache: mark printk_once test variable __read_mostly
2014-01-23 16:36:56 -08:00
crypto: ccp - Move HMAC calculation down to ccp ops file
2014-02-09 09:59:23 +08:00
cgroup: remove useless argument from cgroup_exit()
2014-03-29 09:15:54 -04:00
cgroup: clean up cgroup_subsys names and initialization
2014-02-08 10:36:58 -05:00
Merge branch 'clk-next-unregister' into clk-next
2013-12-31 11:35:12 -08:00
clk: support hardware-specific debugfs entries
2014-03-24 17:10:07 -07:00
clk: add pr_debug & kerneldoc around clk notifiers
2014-02-24 17:13:55 -08:00
clk: Add common __clk_get(), __clk_put() implementations
2013-12-04 17:19:44 +01:00
tick: Fixup more fallout from hrtimer broadcast mode
2014-02-09 15:11:47 +01:00
block: remove unrelated header files and export symbol
2014-01-21 20:18:26 -08:00
mm: compaction: encapsulate defer reset logic
2014-01-21 16:19:48 -08:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-02 12:51:41 -07:00
LLVMLinux: Add support for clang to compiler.h and new compiler-clang.h
2014-04-09 13:44:35 -07:00
crypto: more robust crypto_memneq
2013-12-05 21:28:41 +08:00
compiler/gcc4: Make quirk for asm_volatile_goto() unconditional
2014-02-13 12:34:05 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2014-01-23 18:11:00 -08:00
LLVMLinux: Add support for clang to compiler.h and new compiler-clang.h
2014-04-09 13:44:35 -07: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
connector: add portid to unicast in addition to broadcasting
2014-02-07 15:40:17 -08:00
ACPI / hotplug / driver core: Handle containers in a special way
2013-12-29 15:25:48 +01: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
CPU hotplug notifiers registration fixes for 3.15-rc1
2014-04-07 14:55:46 -07:00
thermal: cpu_cooling: introduce of_cpufreq_cooling_register
2013-12-04 09:33:34 -04:00
cpu: add generic support for CPU feature based module autoloading
2014-02-18 12:38:37 -08:00
cpufreq: create another field .flags in cpufreq_frequency_table
2014-04-07 14:43:50 +02:00
sched/idle: Reorganize the idle loop
2014-03-11 11:52:47 +01:00
mm: optimize put_mems_allowed() usage
2014-04-03 16:20:58 -07:00
cputime: Bring cputime -> nsecs conversion
2014-03-13 15:56:44 +01:00
include/linux/crash_dump.h: add vmcore_cleanup() prototype
2014-04-07 16:36:06 -07:00
lib: crc32: add functionality to combine two crc32{, c}s in GF(2)
2013-11-03 23:04:56 -05:00
kernel/groups.c: remove return value of set_groups
2014-04-03 16:21:05 -07:00
vfs: add cross-rename
2014-04-01 17:08:43 +02: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
dm table: add dm_table_run_md_queue_async
2014-03-27 16:56:24 -04:00
sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_owner()
2014-04-16 11:56:33 -07:00
block: Convert drivers to immutable biovecs
2013-11-23 22:33:51 -08:00
dma-buf: update debugfs output
2014-02-13 10:08:52 +05:30
dma-debug: introduce debug_dma_assert_idle()
2014-01-21 16:19:41 -08:00
ARM: 7795/1: mm: dma-mapping: Add dma_max_pfn(dev) helper function
2013-10-31 14:49:24 +00:00
iommu/vt-d: keep shared resources when failed to initialize iommu devices
2014-01-09 12:43:40 +01:00
dma: Remove comment about embedding dma_slave_config into custom structs
2014-03-06 20:41:15 +05:30
iommu/vt-d: Change scope lists to struct device, bus, devfn
2014-03-24 14:05:08 +00:00
drbd: Move string function prototypes from linux/drbd.h to drbd_string.h
2014-02-17 16:50:37 +01:00
drbd: Define the size of res_opts->cpu_mask in a single place
2014-02-17 16:46:48 +01:00
dma: dw: remove leftovers in the comment blocks
2014-02-17 14:16:54 +05:30
EDAC: Add an edac_report parameter to EDAC
2013-12-11 18:06:47 +01:00
Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo
2014-03-05 18:15:37 +00:00
block: Remove useless IPI struct initialization
2014-02-24 14:46:38 -08: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
err.h: use bool for IS_ERR and IS_ERR_OR_NULL
2014-04-03 16:21:06 -07:00
etherdevice: Use ether_addr_copy to copy an Ethernet address
2014-01-15 15:39:33 -08:00
ethtool: Document the general convention for VLAs in kernel space
2014-02-12 17:33:03 -05:00
export: declare ksymtab symbols
2014-01-16 10:23:02 +10:30
extcon: Move OF helper function to extcon core and change function name
2014-03-19 14:41:58 +09:00
f2fs: introduce large directory support
2014-02-27 19:56:09 +09:00
video/fb: Propagate error code from failing to unregister conflicting fb
2013-12-18 10:56:13 +10:00
get rid of files_defer_init()
2014-04-01 23:19:14 -04:00
get rid of fget_light()
2014-03-10 11:44:42 -04:00
net: filter: seccomp: fix wrong decoding of BPF_S_ANC_SECCOMP_LD_W
2014-04-14 16:26:47 -04:00
firewire: don't use PREPARE_DELAYED_WORK
2014-03-07 10:19:57 -05:00
firmware: Introduce request_firmware_direct()
2013-12-08 18:22:32 -08:00
reciprocal_divide: update/correction of the algorithm
2014-01-21 23:17:20 -08:00
FMC: show_sdb_tree: dump synthesis/commit ID info
2014-02-28 15:12:09 -08:00
locks: rename FL_FILE_PVT and IS_FILE_PVT to use "*_OFDLCK" instead
2014-04-23 16:17:03 -04:00
driver/memory:Move Freescale IFC driver to a common driver
2014-02-18 12:20:45 -08:00
fanotify: convert access_mutex to spinlock
2014-04-03 16:20:51 -07:00
ftrace/module: Hardcode ftrace_module_init() call into load_module()
2014-04-28 10:37:21 -04:00
tracepoint: Use struct pointer instead of name hash for reg/unreg tracepoints
2014-04-08 20:43:28 -04:00
futex: Allow architectures to skip futex_atomic_cmpxchg_inatomic() test
2014-03-03 11:32:08 +01:00
include/linux/genalloc.h: spinlock_t needs spinlock_types.h
2014-01-23 16:36:52 -08:00
genetlink: make multicast groups const, prevent abuse
2013-11-19 16:39:06 -05:00
mm: fix GFP_THISNODE callers and clarify
2014-03-10 17:26:19 -07:00
Merge branch 'master' into for-next
2014-02-20 14:54:28 +01:00
genirq: Provide synchronize_hardirq()
2014-02-19 17:22:44 +01:00
lib: introduce arch optimized hash library
2013-12-17 14:27:17 -05:00
drm/docs: Include hdmi infoframe helper reference
2014-03-13 12:48:32 +01:00
HID: hid-sensor-hub: Processing for duplicate physical ids
2014-02-17 17:12:47 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-04-02 16:24:28 -07:00
Merge branches 'for-3.15/multitouch', 'for-3.15/sony' and 'for-3.15/uhid' into for-linus
2014-04-01 19:06:50 +02:00
gpu: host1x: export host1x_syncpt_incr_max() function
2014-04-04 09:12:49 +02:00
hrtimer: Rearrange comments in the order struct members are declared
2014-03-20 12:35:45 +01:00
mm: close PageTail race
2014-03-04 07:55:47 -08:00
mm, hugetlb: fix race in region tracking
2014-04-03 16:20:59 -07:00
cgroup: clean up cgroup_subsys names and initialization
2014-02-08 10:36:58 -05:00
Drivers: hv: vmbus: Negotiate version 3.0 when running on ws2012r2 hosts
2014-04-16 14:14:07 -07:00
i2c: pnx: Use devm_*() functions
2014-01-16 11:15:50 +01:00
Update Jean Delvare's e-mail address
2014-01-29 20:40:08 +01:00
i2c: add deprecation warning for class based instantiation
2014-03-05 17:16:45 +01:00
ACPI: Clean up inclusions of ACPI header files
2013-12-07 01:03:14 +01:00
idr: remove dead code
2014-04-07 16:36:07 -07:00
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
2014-03-20 11:53:20 -04:00
macvlan: unify macvlan_pcpu_stats and vlan_pcpu_stats
2014-01-04 20:11:33 -05:00
net: unify the pcpu_tstats and br_cpu_netstats as one
2014-01-04 20:10:24 -05:00
vlan: make a new function vlan_dev_vlan_proto() and export
2014-03-26 16:41:28 -04:00
lro: remove dead code
2013-12-29 16:34:25 -05:00
ipv4: fix wildcard search with inet_confirm_addr()
2013-12-11 14:47:40 -05:00
lto, workaround: Add workaround for initcall reordering
2014-02-13 20:24:13 -08:00
Linux 3.13
2014-03-07 11:41:32 -05:00
iommu/vt-d: Store PCI segment number in struct intel_iommu
2014-03-24 14:07:31 +00:00
genirq: Allow forcing cpu affinity of interrupts
2014-04-17 23:36:27 +02:00
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
2014-04-07 16:36:11 -07:00
Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu', 'iommu/fixes' and 'arm/msm' into next
2014-01-09 13:06:59 +01:00
vsprintf: Add support for IORESOURCE_UNSET in %pR
2014-02-26 14:42:09 -07:00
iommu/vt-d: Update IOMMU state when memory hotplug happens
2014-03-04 17:51:06 +01:00
ipc: change kern_ipc_perm.deleted type to bool
2014-01-27 21:02:39 -08:00
ipc,mqueue: remove limits for the amount of system-wide queues
2014-02-25 15:25:45 -08:00
ipmi: Turn off all activity on an idle ipmi interface
2014-04-17 12:23:07 -07:00
ipmi: boolify some things
2014-04-17 12:30:40 -07:00
ipv6: make IPV6_RECVPKTINFO work for ipv4 datagrams
2014-01-19 19:53:18 -08:00
genirq: Allow forcing cpu affinity of interrupts
2014-04-17 23:36:27 +02:00
perf/x86: Warn to early_printk() in case irq_work is too slow
2014-02-21 21:49:07 +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
module: remove MODULE_GENERIC_TABLE
2014-03-13 12:11:00 +10:30
ACPI / IBFT: Fix incorrect <acpi/acpi.h> inclusion in iSCSI boot firmware module
2013-12-07 01:24:33 +01:00
net: isdn: use sk_unattached_filter api
2014-03-31 00:45:09 -04:00
sched/nohz: Fix overflow error in scheduler_tick_max_deferment()
2014-01-16 00:08:12 +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
Nothing major: the stricter permissions checking for sysfs broke
2014-04-06 09:38:07 -07:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-01 11:22:57 -07:00
kernfs: cache atomic_write_len in kernfs_open_file
2014-03-08 22:08:29 -08:00
kexec/compat: convert to COMPAT_SYSCALL_DEFINE with changing parameter types
2014-03-06 16:30:46 +01:00
treewide: Fix typo in Documentation/DocBook
2014-02-19 14:58:17 +01:00
kgdb/kdb: Fix no KDB config problem
2014-01-25 08:55:09 +01:00
kmemleak: remove redundant code
2014-04-03 16:20:50 -07:00
kobject: don't block for each kobject_uevent
2014-04-03 16:21:04 -07:00
mm/rmap: use rmap_walk() in page_referenced()
2014-01-21 16:19:45 -08:00
KVM: Bump KVM_MAX_IRQ_ROUTES for s390
2014-03-21 13:43:13 +01:00
lglock: map to spinlock when !CONFIG_SMP
2014-04-07 16:36:14 -07:00
libata/ahci: accommodate tag ordered controllers
2014-04-18 15:56:03 -04:00
lto: Make asmlinkage __visible
2014-02-13 20:21:59 -08:00
list: introduce list_last_entry(), use list_{first,last}_entry()
2013-11-13 12:09:24 +09:00
mm: keep page cache radix tree nodes in check
2014-04-03 16:21:01 -07:00
llists: move llist_reverse_order from raid5 to llist.c
2013-11-15 09:32:22 +09:00
Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-03-31 14:13:25 -07: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
fs/mbcache.c: change block and index hash chain to hlist_bl_node
2014-03-18 19:19:41 -04:00
drivers: Introduce MEN Chameleon Bus
2014-02-28 15:36:37 -08:00
net: mdio-gpio: Add support for separate MDI and MDO gpio pins
2014-04-16 15:09:51 -04:00
mdio: unused ethtool functions
2013-12-26 13:29:35 -05:00
ARM: 7993/1: mm/memblock: add memblock_get_current_limit
2014-03-12 00:16:56 +00:00
memcg, slab: do not destroy children caches if parent has aliases
2014-04-07 16:36:13 -07: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: remove per-process flag
2014-04-07 16:35:54 -07:00
micrel: add support for KSZ8041RNLI
2013-12-11 13:54:13 -05:00
mm/migrate: remove unused function, fail_migrate_page()
2014-01-21 16:19:49 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-04-02 20:53:45 -07:00
Merge git://git.infradead.org/users/eparis/audit
2014-04-12 12:38:53 -07:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2014-04-13 13:28:13 -07:00
mm: add overcommit_kbytes sysctl variable
2014-01-21 16:19:44 -08:00
mm: use 'const char *' insted of 'char *' for reason in dump_page()
2014-04-07 16:35:55 -07:00
mm: keep page cache radix tree nodes in check
2014-04-03 16:21:01 -07:00
x86: LLVMLinux: Fix "incomplete type const struct x86cpu_device_id"
2014-04-09 13:44:35 -07:00
Nothing major: the stricter permissions checking for sysfs broke
2014-04-06 09:38:07 -07:00
VERIFY_OCTAL_PERMISSIONS: stricter checking for sysfs perms.
2014-03-24 12:21:00 +10:30
smarter propagate_mnt()
2014-04-01 23:19:08 -04:00
UAPI: add MPLS label stack definition
2014-03-04 13:51:06 -05:00
ipc: whitespace cleanup
2014-01-27 21:02:39 -08:00
PCI: Drop "irq" param from *_restore_msi_irqs()
2013-12-13 08:44:30 -07:00
locking/mutexes: Introduce cancelable MCS lock for adaptive spinning
2014-03-11 12:14:56 +01:00
RCU'd vfsmounts
2013-11-09 00:16:19 -05:00
switch nbd to sockfd_lookup/sockfd_put
2014-04-01 23:19:10 -04:00
net: replace macros net_random and net_srandom with direct calls to prandom
2014-01-14 15:15:25 -08:00
net: add busy_poll device feature
2014-04-03 14:31:34 -04:00
packet: fix packet_direct_xmit for BQL enabled drivers
2014-04-03 14:29:12 -04:00
netlink: cleanup tap related functions
2014-01-01 23:43:36 -05:00
netpoll: Rename netpoll_rx_enable/disable to netpoll_poll_disable/enable
2014-03-29 17:58:37 -04:00
NFS client bugfixes
2013-12-05 13:05:48 -08:00
nfs: make nfs_async_rename non-static
2014-03-17 15:14:16 -04:00
NFS: cache parsed auth_info in nfs_server
2013-10-28 15:37:43 -04:00
Merge branch 'devel' into linux-next
2014-03-17 15:15:21 -04:00
nilfs2: verify metadata sizes read from disk
2014-04-03 16:21:26 -07:00
mac802154: make csma/cca parameters per-wpan
2014-04-01 16:25:51 -04:00
nls: have register_nls() set ->owner
2014-01-25 03:14:05 -05:00
NTB: Code Style Clean-up
2014-04-07 10:59:19 -07:00
Merge git://git.infradead.org/users/willy/linux-nvme
2014-04-11 16:45:59 -07:00
of: add empty of_find_node_by_path() for !OF
2014-04-18 08:36:10 -05:00
of/device: Nullify match table in of_match_device() for CONFIG_OF=n
2014-02-05 10:04:37 -06:00
drivers: of: add initialization code for static reserved memory
2014-03-11 17:26:47 +00:00
gpiolib: include gpio/consumer.h in of_gpio.h for desc_to_gpio()
2013-10-29 18:26:14 -07:00
of: Fix of_graph_parse_endpoint stub for !CONFIG_OF builds
2014-03-07 16:02:46 +01:00
of/irq: do irq resolution in platform_get_irq
2014-04-24 21:40:22 +01:00
phylib: Add of_phy_attach
2014-01-13 14:29:49 -08:00
of_mtd: Add helpers to get ECC strength and ECC step size
2014-03-10 22:42:28 -07:00
of/irq: Create of_irq_parse_and_map_pci() to consolidate arch code.
2013-10-24 11:50:36 +01:00
drivers: of: add support for custom reserved memory drivers
2014-03-11 17:27:12 +00:00
dmaengine: omap-dma: move register read/writes into omap-dma.c
2014-04-04 00:31:49 +01: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
swap: add a simple detector for inappropriate swapin readahead
2014-02-06 13:48:51 -08:00
mm: remove read_cache_page_async()
2014-04-03 16:21:04 -07:00
mm + fs: prepare for non-page entries in page cache radix trees
2014-04-03 16:21:00 -07:00
lib/parser.c: add match_wildcard() function
2014-01-23 16:36:55 -08:00
ACPI / hotplug / PCI: Rework acpiphp_check_host_bridge()
2014-02-06 17:31:52 +01:00
PCI: Removed unused parts of Page Request Interface support
2014-01-10 14:00:47 -07:00
Merge branch 'pci/resource' into next
2014-03-19 15:11:19 -06:00
ACPI: Clean up inclusions of ACPI header files
2013-12-07 01:03:14 +01:00
SCSI misc on 20140401
2014-04-01 18:49:04 -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
percpu: add preemption checks to __this_cpu ops
2014-04-07 16:36:14 -07:00
percpu_ida: Make percpu_ida_alloc + callers accept task state bitmask
2014-01-23 20:17:18 +00:00
CPU hotplug, perf: Fix CPU hotplug callback registration
2014-03-20 13:43:40 +01:00
net: phy: add minimal support for QSGMII PHY
2014-04-16 14:36:12 -04:00
pid_namespace: make freeing struct pid_namespace rcu-delayed
2013-10-24 23:43:29 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
Merge branches 'pm-runtime' and 'pm-sleep'
2014-03-20 13:25:54 +01:00
PM / OPP: rename header to linux/pm_opp.h
2013-10-25 22:33:23 +02:00
PM / QoS: Add type to dev_pm_qos_add_ancestor_request() arguments
2014-02-11 00:36:00 +01:00
PM: Add pm_runtime_suspend|resume_force functions
2014-03-02 00:18:15 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-01-28 08:38:04 -08:00
fs: add generic xattr_acl handlers
2014-01-25 23:58:17 -05:00
power_supply: Add power_supply_get_by_phandle
2013-12-23 18:21:11 -08:00
sched/preempt/x86: Fix voluntary preempt for x86
2014-01-23 14:48:35 +01:00
sched/preempt, locking: Rework local_bh_{dis,en}able()
2014-01-13 17:32:27 +01:00
include/linux/printk.h: remove double asmlinkage in printk_emit
2014-04-03 16:21:08 -07:00
userns: userns: Remove UIDGID_STRICT_TYPE_CHECKS
2013-11-26 20:55:33 -08:00
pstore: Don't allow high traffic options on fragile devices
2013-12-20 13:12:01 -08:00
net: ptp: move PTP classifier in its own file
2014-04-01 16:43:18 -04:00
ptp: introduce programmable pins.
2014-03-21 14:21:13 -04:00
pwm: Remove obsolete HAVE_PWM Kconfig symbol
2014-02-10 11:16:39 +01:00
ARM: pxa: fix pxa_ssp_* declarations
2014-03-21 18:26:03 +01:00
quota: provide function to grab quota structure reference
2014-04-03 16:20:54 -07:00
mm: keep page cache radix tree nodes in check
2014-04-03 16:21:01 -07:00
fs/ramfs/file-nommu.c: make ramfs_nommu_get_unmapped_area() and ramfs_nommu_mmap() static
2014-01-23 16:36:58 -08:00
random: Add arch_has_random[_seed]()
2014-03-19 22:24:08 -04:00
rbtree: fix rbtree_postorder_for_each_entry_safe() iterator
2013-11-13 12:09:33 +09:00
rcu: Indentation and spacing fixes.
2014-02-17 15:01:52 -08:00
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-03-31 11:05:24 -07:00
rcu: Provide grace-period piggybacking API
2014-03-20 17:12:25 -07:00
rcu: Provide grace-period piggybacking API
2014-03-20 17:12:25 -07:00
x86: Remove the PCI reboot method from the default chain
2014-04-16 08:56:09 +02:00
reciprocal_divide: update/correction of the algorithm
2014-01-21 23:17:20 -08:00
Char/Misc driver patches for 3.15-rc1
2014-04-01 16:13:21 -07:00
res_counter: remove interface for locked charging and uncharging
2014-04-07 16:35:54 -07:00
reset: Silence warning in reset-controller.h
2014-01-16 12:00:56 -08:00
reset: Add optional resets and stubs
2014-03-09 19:53:45 +01:00
rapidio: rework device hierarchy and introduce mport class of devices
2014-04-07 16:36:07 -07:00
mm: fix swapops.h:131 bug if remap_file_pages raced migration
2014-03-20 22:09:09 -07: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
rwsem: add rwsem_is_contended
2014-01-28 13:20:09 -08:00
lib/scatterlist: export sg_miter_skip()
2013-12-08 17:56:37 -08:00
Merge git://git.infradead.org/users/eparis/audit
2014-04-12 12:38:53 -07:00
sctp: fix missing SCTP mailing list address update
2014-01-19 19:55:50 -08:00
net: filter: rework/optimize internal BPF interpreter's instruction set
2014-03-31 00:45:09 -04:00
security: add flags to rename hooks
2014-04-01 17:08:43 +02: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
tty: serial: bcm63xx_uart: define UART_REG_SIZE constant
2014-02-28 16:27:18 -08:00
serial: s3c: Fix build of header without serial_core.h preinclusion
2014-03-21 04:12:33 +09:00
serial: sh-sci: Add more register documentation
2014-03-17 16:20:49 -07:00
Input: serio - add firmware_id sysfs attribute
2014-04-19 22:42:19 -07:00
SFI / ACPI: Fix warnings reported during builds with W=1
2013-12-07 01:24:33 +01:00
ARM: shmobile: wait for MSTP clock status to toggle, when enabling it
2014-02-04 10:22:39 +09:00
sh_eth: add PHY IRQ to platform data
2013-12-19 19:09:38 -05:00
ipc: whitespace cleanup
2014-01-27 21:02:39 -08:00
mm + fs: prepare for non-page entries in page cache radix trees
2014-04-03 16:21:00 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-04-02 20:53:45 -07:00
Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux
2014-04-13 13:28:13 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
slub: rework sysfs layout for memcg caches
2014-04-07 16:36:13 -07:00
smp: Rename __smp_call_function_single() to smp_call_function_single_async()
2014-02-24 14:47:15 -08:00
net: update comments of "struct msghdr" with the more accurate RFC3542 ones
2014-01-22 21:57:05 -08: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
splice: fix unexpected size truncation
2014-01-27 21:02:40 -08:00
spmi: Linux driver framework for SPMI
2014-02-15 11:55:28 -08:00
rcu: Stop tracking FSF's postal address
2014-02-17 15:01:37 -08:00
mfd: ssbi: Add regmap read/write helpers
2014-03-19 08:58:30 +00:00
stmmac: Fix kernel crashes for jumbo frames
2014-01-21 17:05:27 -08:00
mm: keep page cache radix tree nodes in check
2014-04-03 16:21:01 -07:00
mm, hugetlb: convert hugetlbfs to use split pmd lock
2013-11-15 09:32:14 +09:00
net: sxgbe: add basic framework for Samsung 10Gb ethernet driver
2014-03-26 16:49:31 -04:00
This includes the final patch to clean up and fix the issue with the
2014-04-12 13:06:10 -07:00
sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_owner()
2014-04-16 11:56:33 -07:00
ACPI: Clean up inclusions of ACPI header files
2013-12-07 01:03:14 +01:00
tcp: switch rtt estimations to usec resolution
2014-02-26 17:08:40 -05:00
ARM: tegra: fix tegra_powergate_sequence_power_up() inline
2014-01-14 08:01:10 -08:00
thermal: core: introduce thermal_of_cooling_device_register
2013-12-04 09:31:34 -04:00
tick: Rename tick_check_idle() to tick_irq_enter()
2014-01-15 23:05:31 +01:00
mm: use raw_cpu ops for determining current NUMA node
2014-04-07 16:36:13 -07:00
rcutorture: Stop generic kthreads in torture_cleanup()
2014-02-23 09:04:27 -08:00
tpm: Create a tpm_class_ops structure and use it in the drivers
2014-01-06 14:37:25 +01:00
tracepoint: Fix sparse warnings in tracepoint.c
2014-04-09 10:12:11 -04:00
tty: Fix race condition between __tty_buffer_request_room and flush_to_ldisc
2014-04-24 15:18:02 -07:00
tty: Halve flip buffer GFP_ATOMIC memory consumption
2013-12-09 11:09:24 -08:00
tty: tty_ldisc.h: Remove duplicate include
2014-02-18 12:50:26 -08:00
net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irq
2014-03-14 22:41:36 -04:00
sched/preempt: Take away preempt_enable_no_resched() from modules
2014-01-13 13:47:37 +01:00
userns: userns: Remove UIDGID_STRICT_TYPE_CHECKS
2013-11-26 20:55:33 -08:00
Input: uinput - add UI_GET_SYSNAME ioctl to retrieve the sysfs path
2014-02-12 15:00:34 -08:00
introduce copy_page_to_iter, kill loop over iovec in generic_file_aio_read()
2014-04-01 23:19:21 -04:00
uprobes: allow ignoring of probe hits
2014-03-18 16:39:34 -04:00
USB patches for 3.15-rc1
2014-04-01 17:06:09 -07:00
uas: Add the posibilty to blacklist uas devices from using the uas driver
2014-03-04 15:38:16 -08:00
vfio: Add external user check extension interface
2014-02-26 11:38:39 -07:00
virtio_ring: add new function virtqueue_is_broken()
2013-10-29 11:28:17 +10:30
virtio_ring: change host notification API
2013-10-29 11:28:11 +10:30
drop_caches: add some documentation and info message
2014-04-03 16:21:04 -07:00
mm: per-thread vma caching
2014-04-07 16:35:53 -07: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
vmstat: use raw_cpu_ops to avoid false positives on preemption checks
2014-04-07 16:36:14 -07:00
context_tracking: Rename context_tracking_active() to context_tracking_cpu_is_enabled()
2013-12-02 20:43:15 +01:00
drivers/w1/masters/w1-gpio.c: add strong pullup emulation
2014-01-23 16:37:04 -08:00
wait: explain the shadowing and type inconsistencies
2014-04-18 16:40:08 -07:00
wl1251: move power GPIO handling into the driver
2014-02-28 14:08:26 -05:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-01 11:00:07 -07:00
mm: remove unused arg of set_page_dirty_balance()
2014-04-07 16:35:57 -07:00
zorro/UAPI: Disintegrate include/linux/zorro*.h
2013-11-26 11:09:08 +01:00
zsmalloc: add copyright
2014-01-30 16:56:55 -08:00
2aafe1a4d4