aboutsummaryrefslogtreecommitdiff
path: root/Documentation/filesystems
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'android-3.18' of ↵Michael Bestas2018-06-091-0/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/kernel/common into lineage-15.1-caf-8996 This brings LA.UM.6.6.r1-08500-89xx.0 up to date with android-3.18 at commit 0e469fca572e0bf641e84e1c054ea4807d79b6d8. MMC related changes were ignored as qualcomm did the same in their previous google-common merges Manual edits to fix compilation: arch/arm/crypto/Kconfig Conflicts: Documentation/ABI/testing/sysfs-fs-f2fs Documentation/filesystems/f2fs.txt android/configs/android-recommended.cfg arch/arm/crypto/Makefile arch/arm/crypto/aes-ce-core.S arch/arm/crypto/aes-ce-glue.c arch/arm/crypto/sha2-ce-glue.c arch/arm64/Kconfig arch/arm64/include/asm/cpufeature.h arch/arm64/include/asm/mmu.h arch/arm64/include/asm/mmu_context.h arch/arm64/kernel/efi.c arch/arm64/kernel/io.c arch/arm64/mm/context.c arch/arm64/mm/mmu.c arch/x86/mm/mmap.c crypto/Kconfig drivers/clocksource/arm_arch_timer.c drivers/mmc/core/core.c drivers/of/Kconfig drivers/staging/android/Kconfig drivers/staging/android/Makefile drivers/staging/android/binder.c fs/f2fs/checkpoint.c fs/f2fs/data.c fs/f2fs/debug.c fs/f2fs/dir.c fs/f2fs/f2fs.h fs/f2fs/file.c fs/f2fs/gc.c fs/f2fs/inline.c fs/f2fs/inode.c fs/f2fs/namei.c fs/f2fs/node.c fs/f2fs/segment.c fs/f2fs/super.c fs/f2fs/sysfs.c include/linux/f2fs_fs.h include/linux/mm_types.h include/linux/mmc/host.h include/linux/sched.h include/trace/events/f2fs.h kernel/fork.c kernel/sched/fair.c Change-Id: I68eef5ec5f95be5fe7b0ac99cc62327fb00c1915
| * FROMLIST: f2fs: early updates queued for v4.18-rc1Jaegeuk Kim2018-05-301-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from: origin/upstream-f2fs-stable-linux-3.18.y 0643d71e87e5 ("f2fs: turn down IO priority of discard from background") 6d854622f61f ("f2fs: don't split checkpoint in fstrim") da639d169ac6 ("f2fs: issue discard commands proactively in high fs utilization") 413fa22b9319 ("f2fs: add fsync_mode=nobarrier for non-atomic files") d7a1b25656a0 ("f2fs: let fstrim issue discard commands in lower priority") Change-Id: Ic83898da3eb921238ec154e839120e825325925c Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
| * f2fs/fscrypt: updates to v4.17-rc1Jaegeuk Kim2018-04-121-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull f2fs update from Jaegeuk Kim: "In this round, we've mainly focused on performance tuning and critical bug fixes occurred in low-end devices. Sheng Yong introduced lost_found feature to keep missing files during recovery instead of thrashing them. We're preparing coming fsverity implementation. And, we've got more features to communicate with users for better performance. In low-end devices, some memory-related issues were fixed, and subtle race condtions and corner cases were addressed as well. Enhancements: - large nat bitmaps for more free node ids - add three block allocation policies to pass down write hints given by user - expose extension list to user and introduce hot file extension - tune small devices seamlessly for low-end devices - set readdir_ra by default - give more resources under gc_urgent mode regarding to discard and cleaning - introduce fsync_mode to enforce posix or not - nowait aio support - add lost_found feature to keep dangling inodes - reserve bits for future fsverity feature - add test_dummy_encryption for FBE Bug fixes: - don't use highmem for dentry pages - align memory boundary for bitops - truncate preallocated blocks in write errors - guarantee i_times on fsync call - clear CP_TRIMMED_FLAG correctly - prevent node chain loop during recovery - avoid data race between atomic write and background cleaning - avoid unnecessary selinux violation warnings on resgid option - GFP_NOFS to avoid deadlock in quota and read paths - fix f2fs_skip_inode_update to allow i_size recovery In addition to the above, there are several minor bug fixes and clean-ups" Cherry-pick from origin/upstream-f2fs-stable-linux-3.18.y: 6b863986e0cc f2fs: remain written times to update inode during fsync 7e1903bccf2f f2fs: make assignment of t->dentry_bitmap more readable cb40e79a67cb f2fs: truncate preallocated blocks in error case 61a1f92005be f2fs: fix a wrong condition in f2fs_skip_inode_update 60e88b22fa4b f2fs: reserve bits for fs-verity e9d296fa66db f2fs: Add a segment type check in inplace write a6abda931228 f2fs: no need to initialize zero value for GFP_F2FS_ZERO 6552559b76d4 f2fs: don't track new nat entry in nat set 0a83c6fbc676 f2fs: clean up with F2FS_BLK_ALIGN 561144cbddc6 f2fs: check blkaddr more accuratly before issue a bio f5c308c3fa92 f2fs: Set GF_NOFS in read_cache_page_gfp while doing f2fs_quota_read b6b63b2663d0 f2fs: introduce a new mount option test_dummy_encryption 2a1db739111b f2fs: introduce F2FS_FEATURE_LOST_FOUND feature 8cdc2bd05a7f f2fs: release locks before return in f2fs_ioc_gc_range() 25cbaa648ca2 f2fs: align memory boundary for bitops ef169ce0c97d f2fs: remove unneeded set_cold_node() 893b5cbd6db6 f2fs: wrap all options with f2fs_sb_info.mount_opt e00dfe43a45f f2fs: Don't overwrite all types of node to keep node chain 8b06bd6ab89f f2fs: introduce mount option for fsync mode d4f5f9260431 f2fs: fix to restore old mount option in ->remount_fs 28e06bec820a f2fs: wrap sb_rdonly with f2fs_readonly ac00fbd0bd5f f2fs: avoid selinux denial on CAP_SYS_RESOURCE 62141c39a3e9 f2fs: support hot file extension 94f9b2bd8d3c f2fs: fix to avoid race in between atomic write and background GC 972aa9b77a94 f2fs: do gc in greedy mode for whole range if gc_urgent mode is set 43df79e001a2 f2fs: issue discard aggressively in the gc_urgent mode 820bafa82f61 f2fs: set readdir_ra by default fd867fadc9af f2fs: add auto tuning for small devices 7135d061e65d f2fs: add mount option for segment allocation policy 1010797c1326 f2fs: don't stop GC if GC is contended 07b7ac026eb5 f2fs: expose extension_list sysfs entry d3f1ecce0217 f2fs: fix to set KEEP_SIZE bit in f2fs_zero_range 6a2a51a39561 f2fs: introduce sb_lock to make encrypt pwsalt update exclusive b25cb37a89db f2fs: remove redundant initialization of pointer 'p' f712a5e9f0d9 f2fs: flush cp pack except cp pack 2 page at first 9cc8ab4e3aa1 f2fs: clean up f2fs_sb_has_xxx functions e7e6b338e105 f2fs: remove redundant check of page type when submit bio 00e3ba7fe02e f2fs: fix to handle looped node chain during recovery 878a8d3c55e5 f2fs: handle quota for orphan inodes 5b20df494831 f2fs: support passing down write hints to block layer with F2FS policy 249b112bd06c f2fs: support passing down write hints given by users to block layer 3b8cef6e16c9 f2fs: fix to clear CP_TRIMMED_FLAG f77295576611 f2fs: support large nat bitmap b3fea69dc0cd f2fs: fix to check extent cache in f2fs_drop_extent_tree e01f70867c34 f2fs: restrict inline_xattr_size configuration 956a72d8a04b f2fs: fix heap mode to reset it back 08cdc84117b7 f2fs: fix potential corruption in area before F2FS_SUPER_OFFSET 9c696c1f506e fscrypt: fix build with pre-4.6 gcc versions db4247d1f008 fscrypt: remove 'ci' parameter from fscrypt_put_encryption_info() 29127d3977e5 fscrypt: fix up fscrypt_fname_encrypted_size() for internal use 439466d22a44 fscrypt: define fscrypt_fname_alloc_buffer() to be for presented names e33110200036 fscrypt: calculate NUL-padding length in one place only a7f4d8acd4d1 fscrypt: move fscrypt_symlink_data to fscrypt_private.h 5ea58407aff9 fscrypt: remove fscrypt_fname_usr_to_disk() 81b1614f3186 f2fs: switch to fscrypt_get_symlink() aef534bb13de f2fs: switch to fscrypt ->symlink() helper functions 398293781f68 fscrypt: new helper function - fscrypt_get_symlink() fcc38431ea35 fscrypt: new helper functions for ->symlink() 82b04f2db173 fscrypt: trim down fscrypt.h includes 9b0ef251f46e fscrypt: move fscrypt_is_dot_dotdot() to fs/crypto/fname.c 8319d163e70c fscrypt: move fscrypt_valid_enc_modes() to fscrypt_private.h 02cbbef829e3 fscrypt: move fscrypt_operations declaration to fscrypt_supp.h 646d687ff01c fscrypt: split fscrypt_dummy_context_enabled() into supp/notsupp versions fc0f52e7ab31 fscrypt: move fscrypt_ctx declaration to fscrypt_supp.h 1f8b1364e1f4 fscrypt: move fscrypt_info_cachep declaration to fscrypt_private.h 67a6c99fa311 fscrypt: move fscrypt_control_page() to supp/notsupp headers 2099761dc7ae fscrypt: move fscrypt_has_encryption_key() to supp/notsupp headers Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
| * Merge 3.18.103 into android-3.18Greg Kroah-Hartman2018-04-081-30/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in 3.18.103 ALSA: usb-audio: Fix parsing descriptor of UAC2 processing unit ALSA: aloop: Sync stale timer before release ALSA: aloop: Fix access to not-yet-ready substream via cable libata: fix length validation of ATAPI-relayed SCSI commands libata: remove WARN() for DMA or PIO command without data libata: Apply NOLPM quirk to Crucial MX100 512GB SSDs libata: disable LPM for Crucial BX100 SSD 500GB drive libata: Enable queued TRIM for Samsung SSD 860 libata: Apply NOLPM quirk to Crucial M500 480 and 960GB SSDs libata: Make Crucial BX100 500GB LPM quirk apply to all firmware versions libata: Modify quirks for MX100 to limit NCQ_TRIM quirk to MU01 version drm: udl: Properly check framebuffer mmap offsets brcmfmac: fix P2P_DEVICE ethernet address generation tracing: probeevent: Fix to support minus offset from symbol staging: ncpfs: memory corruption in ncp_read_kernel() can: cc770: Fix stalls on rt-linux, remove redundant IRQ ack can: cc770: Fix queue stall & dropped RTR reply can: cc770: Fix use after free in cc770_tx_interrupt() tty: vt: fix up tabstops properly kvm/x86: fix icebp instruction handling scsi: sg: don't return bogus Sg_requests Revert "genirq: Use irqd_get_trigger_type to compare the trigger type for shared IRQs" dccp: check sk for closed state in dccp_sendmsg() ipv6: fix access to non-linear packet in ndisc_fill_redirect_hdr_option() l2tp: do not accept arbitrary sockets net: ethernet: arc: Fix a potential memory leak if an optional regulator is deferred net/iucv: Free memory obtained by kzalloc netlink: avoid a double skb free in genlmsg_mcast() net: Only honor ifindex in IP_PKTINFO if non-0 skbuff: Fix not waking applications when errors are enqueued team: Fix double free in error path s390/qeth: free netdevice when removing a card s390/qeth: when thread completes, wake up all waiters s390/qeth: lock read device while queueing next buffer s390/qeth: on channel error, reject further cmd requests net: fec: Fix unbalanced PM runtime calls mtd: jedec_probe: Fix crash in jedec_read_mfr() ALSA: pcm: Use dma_bytes as size parameter in dma_mmap_coherent() ALSA: pcm: potential uninitialized return values perf/hwbp: Simplify the perf-hwbp code, fix documentation partitions/msdos: Unable to mount UFS 44bsd partitions usb: gadget: define free_ep_req as universal function usb: gadget: change len to size_t on alloc_ep_req() usb: gadget: fix usb_ep_align_maybe endianness and new usb_ep_align usb: gadget: align buffer size when allocating for OUT endpoint usb: gadget: f_hid: fix: Prevent accessing released memory Revert "led: core: Fix brightness setting when setting delay_off=0" xhci: Fix ring leak in failure path of xhci_alloc_virt_device() kprobes/x86: Fix to set RWX bits correctly before releasing trampoline xfrm_user: uncoditionally validate esn replay attribute struct net: xfrm: use preempt-safe this_cpu_read() in ipcomp_alloc_tfms() xfrm: Refuse to insert 32 bit userspace socket policies on 64 bit systems netfilter: bridge: ebt_among: add more missing match size checks netfilter: x_tables: add and use xt_check_proc_name Bluetooth: Fix missing encryption refresh on Security Request scsi: virtio_scsi: always read VPD pages for multiqueue too media: v4l2-ioctl.c: don't copy back the result for -ENOTTY vb2: V4L2_BUF_FLAG_DONE is set after DQBUF media: v4l2-compat-ioctl32.c: add missing VIDIOC_PREPARE_BUF media: v4l2-compat-ioctl32.c: fix the indentation media: v4l2-compat-ioctl32.c: move 'helper' functions to __get/put_v4l2_format32 media: v4l2-compat-ioctl32.c: avoid sizeof(type) media: v4l2-compat-ioctl32.c: copy m.userptr in put_v4l2_plane32 media: v4l2-compat-ioctl32.c: fix ctrl_is_pointer media: v4l2-compat-ioctl32.c: make ctrl_is_pointer work for subdevs media: v4l2-compat-ioctl32: Copy v4l2_window->global_alpha media: v4l2-compat-ioctl32.c: copy clip list in put_v4l2_window32 media: v4l2-compat-ioctl32.c: drop pr_info for unknown buffer type media: v4l2-compat-ioctl32.c: don't copy back the result for certain errors media: v4l2-compat-ioctl32.c: refactor compat ioctl32 logic media: v4l2-ctrls: fix sparse warning media: media/v4l2-ctrls: volatiles should not generate CH_VALUE media: v4l2-compat-ioctl32: use compat_u64 for video standard media: v4l2-compat-ioctl32: initialize a reserved field USB: serial: ftdi_sio: add RT Systems VX-8 cable USB: serial: ftdi_sio: add support for Harman FirmwareHubEmulator USB: serial: cp210x: add ELDAT Easywave RX09 id mei: remove dev_err message on an unsupported ioctl media: usbtv: prevent double free in error case parport_pc: Add support for WCH CH382L PCI-E single parallel port card. crypto: ahash - Fix early termination in hash walk crypto: x86/cast5-avx - fix ECB encryption when long sg follows short one proc: revert /proc/<pid>/maps [stack:TID] annotation fs/proc: Stop trying to report thread stacks Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad vt: change SGR 21 to follow the standards Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition ARM: dts: dra7: Add power hold and power controller properties to palmas md/raid10: reset the 'first' at the end of loop Revert "PCI/MSI: Stop disabling MSI/MSI-X in pci_device_shutdown()" Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin" Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin" Linux 3.18.103 Change-Id: Ia6ce64926f1680bd20d38fc457ee7d77e95e1b5e Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| * \ Merge 3.18.96 into android-3.18Greg Kroah-Hartman2018-02-261-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in 3.18.96 IB/mlx4: Fix incorrectly releasing steerable UD QPs when have only ETH ports PM / devfreq: Propagate error from devfreq_add_device() s390: fix handling of -1 in set{,fs}[gu]id16 syscalls arm: spear600: Add missing interrupt-parent of rtc arm: spear13xx: Fix dmas cells arm: spear13xx: Fix spics gpio controller's warning ALSA: seq: Fix regression by incorrect ioctl_mutex usages drm/radeon: adjust tested variable ext4: save error to disk in __ext4_grp_locked_error() ext4: correct documentation for grpid mount option video: fbdev: atmel_lcdfb: fix display-timings lookup console/dummy: leave .con_font_get set to NULL Btrfs: fix deadlock in run_delalloc_nocow Btrfs: fix crash due to not cleaning up tree log block's dirty bits ALSA: seq: Fix racy pool initializations ARM: dts: s5pv210: add interrupt-parent for ohci media: r820t: fix r820t_write_reg for KASAN mm,vmscan: Make unregister_shrinker() no-op if register_shrinker() failed. xfrm: check id proto in validate_tmpl() selinux: skip bounded transition processing if the policy isn't loaded crypto: x86/twofish-3way - Fix %rbp usage netfilter: x_tables: fix int overflow in xt_alloc_table_info() netfilter: x_tables: avoid out-of-bounds reads in xt_request_find_{match|target} netfilter: ipt_CLUSTERIP: fix out-of-bounds accesses in clusterip_tg_check() netfilter: on sockopt() acquire sock lock only in the required scope netfilter: xt_RATEEST: acquire xt_rateest_mutex for hash insert net: avoid skb_warn_bad_offload on IS_ERR Provide a function to create a NUL-terminated string from unterminated data selinux: ensure the context is NUL terminated in security_context_to_sid_core() ASoC: ux500: add MODULE_LICENSE tag video: fbdev/mmp: add MODULE_LICENSE dn_getsockoptdecnet: move nf_{get/set}sockopt outside sock lock usbip: keep usbip_device sockfd state in sync with tcp_socket usb: build drivers/usb/common/ when USB_SUPPORT is set ARM: AM33xx: PRM: Remove am33xx_pwrdm_read_prev_pwrst function ARM: dts: am4372: Correct the interrupts_properties of McASP perf top: Fix window dimensions change handling perf bench numa: Fixup discontiguous/sparse numa nodes media: s5k6aa: describe some function parameters scripts/kernel-doc: Don't fail with status != 0 if error encountered with -none powerpc/perf: Fix oops when grouping different pmu events s390/dasd: prevent prefix I/O error gianfar: fix a flooded alignment reports because of padding issue. net_sched: red: Avoid devision by zero net_sched: red: Avoid illegal values btrfs: Fix possible off-by-one in btrfs_search_path_in_tree 509: fix printing uninitialized stack memory when OID is empty spi: sun4i: disable clocks in the remove function xfrm: Fix stack-out-of-bounds with misconfigured transport mode policies. dmaengine: jz4740: disable/unprepare clk if probe fails mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep x86/mm/kmmio: Fix mmiotrace for page unaligned addresses xen: XEN_ACPI_PROCESSOR is Dom0-only hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close KVM: async_pf: Fix #DF due to inject "Page not Present" and "Page Ready" exceptions simultaneously crypto: s5p-sss - Fix kernel Oops in AES-ECB mode Linux 3.18.96 Change-Id: I4fbf699657677841ad8c8219d924e4462a87661b Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| * | | f2fs: support journalled quotaChao Yu2017-09-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4b2414d04e99120ce852ba15a1926c9c3a77d9ce upstream. This patch supports to enable f2fs to accept quota information through mount option: - {usr,grp,prj}jquota=<quota file path> - jqfmt=<quota type> Then, in ->mount flow, we can recover quota file during log replaying, by this, journelled quota can be supported. Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| * | | f2fs: introduce gc_urgent mode for background GCJaegeuk Kim2017-09-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit d9872a698c393e0d1abca86bf05b62712cbfc581 upstream. This patch adds a sysfs entry to control urgent mode for background GC. If this is set, background GC thread conducts GC with gc_urgent_sleep_time all the time. Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| * | | f2fs: support project quotaChao Yu2017-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 5c57132eaf5265937e46340bfbfb97ffb078c423 upstream. This patch adds to support plain project quota. Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
* | | | Merge tag 'v3.18.111' of ↵Michael Bestas2018-05-312-31/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into lineage-15.1-caf-8996 This brings LA.UM.6.6.r1-08500-89xx.0 up to date with the 3.18.111 stable release. Conflicts: drivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem_submit.c drivers/input/input.c drivers/media/dvb-core/dmxdev.c drivers/media/v4l2-core/v4l2-compat-ioctl32.c drivers/scsi/sd.c drivers/scsi/sg.c drivers/scsi/ufs/ufshcd.c drivers/usb/gadget/function/f_fs.c drivers/usb/gadget/function/f_midi.c fs/ecryptfs/inode.c fs/ext4/xattr.h fs/f2fs/namei.c fs/proc/task_mmu.c include/linux/usb/gadget.h kernel/time/timekeeping.c net/ipv4/raw.c net/ipv6/route.c net/packet/af_packet.c sound/usb/card.c sound/usb/mixer.c Change-Id: I8f42b5ee89374b45b171920a756a7e012877379c
| * | | fs/proc: Stop trying to report thread stacksAndy Lutomirski2018-04-081-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit b18cb64ead400c01bf1580eeba330ace51f8087d upstream. This reverts more of: b76437579d13 ("procfs: mark thread stack correctly in proc/<pid>/maps") ... which was partially reverted by: 65376df58217 ("proc: revert /proc/<pid>/maps [stack:TID] annotation") Originally, /proc/PID/task/TID/maps was the same as /proc/TID/maps. In current kernels, /proc/PID/maps (or /proc/TID/maps even for threads) shows "[stack]" for VMAs in the mm's stack address range. In contrast, /proc/PID/task/TID/maps uses KSTK_ESP to guess the target thread's stack's VMA. This is racy, probably returns garbage and, on arches with CONFIG_TASK_INFO_IN_THREAD=y, is also crash-prone: KSTK_ESP is not safe to use on tasks that aren't known to be running ordinary process-context kernel code. This patch removes the difference and just shows "[stack]" for VMAs in the mm's stack range. This is IMO much more sensible -- the actual "stack" address really is treated specially by the VM code, and the current thread stack isn't even well-defined for programs that frequently switch stacks on their own. Reported-by: Jann Horn <jann@thejh.net> Signed-off-by: Andy Lutomirski <luto@kernel.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Kees Cook <keescook@chromium.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Linux API <linux-api@vger.kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Tycho Andersen <tycho.andersen@canonical.com> Link: http://lkml.kernel.org/r/3e678474ec14e0a0ec34c611016753eea2e1b8ba.1475257877.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * | | proc: revert /proc/<pid>/maps [stack:TID] annotationJohannes Weiner2018-04-081-6/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 65376df582174ffcec9e6471bf5b0dd79ba05e4a upstream. Commit b76437579d13 ("procfs: mark thread stack correctly in proc/<pid>/maps") added [stack:TID] annotation to /proc/<pid>/maps. Finding the task of a stack VMA requires walking the entire thread list, turning this into quadratic behavior: a thousand threads means a thousand stacks, so the rendering of /proc/<pid>/maps needs to look at a million combinations. The cost is not in proportion to the usefulness as described in the patch. Drop the [stack:TID] annotation to make /proc/<pid>/maps (and /proc/<pid>/numa_maps) usable again for higher thread counts. The [stack] annotation inside /proc/<pid>/task/<tid>/maps is retained, as identifying the stack VMA there is an O(1) operation. Siddesh said: "The end users needed a way to identify thread stacks programmatically and there wasn't a way to do that. I'm afraid I no longer remember (or have access to the resources that would aid my memory since I changed employers) the details of their requirement. However, I did do this on my own time because I thought it was an interesting project for me and nobody really gave any feedback then as to its utility, so as far as I am concerned you could roll back the main thread maps information since the information is available in the thread-specific files" Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Cc: "Kirill A. Shutemov" <kirill@shutemov.name> Cc: Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com> Cc: Shaohua Li <shli@fb.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Cc: Ben Hutchings <ben.hutchings@codethink.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * | ext4: correct documentation for grpid mount optionErnesto A. Fernández2018-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9f0372488cc9243018a812e8cfbf27de650b187b upstream. The grpid option is currently described as being the same as nogrpid. Signed-off-by: Ernesto A. Fernández <ernesto.mnd.fernandez@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | f2fs: support journalled quotaChao Yu2017-12-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4b2414d04e99120ce852ba15a1926c9c3a77d9ce upstream. This patch supports to enable f2fs to accept quota information through mount option: - {usr,grp,prj}jquota=<quota file path> - jqfmt=<quota type> Then, in ->mount flow, we can recover quota file during log replaying, by this, journelled quota can be supported. Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Git-commit: de76d5aca9095747856f4286b9ace5abfd2baa2e Git-repo: https://android.googlesource.com/kernel/common.git Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
* | | f2fs: introduce gc_urgent mode for background GCJaegeuk Kim2017-12-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit d9872a698c393e0d1abca86bf05b62712cbfc581 upstream. This patch adds a sysfs entry to control urgent mode for background GC. If this is set, background GC thread conducts GC with gc_urgent_sleep_time all the time. Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Git-commit: 9860ff4bc6abdd4c756694696a42b18fa7d5f3a3 Git-repo: https://android.googlesource.com/kernel/common.git Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
* | | f2fs: support project quotaChao Yu2017-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 5c57132eaf5265937e46340bfbfb97ffb078c423 upstream. This patch adds to support plain project quota. Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Git-commit: ce2617a969fb02e3f0760eafcd837cea6852bb28 Git-repo: https://android.googlesource.com/kernel/common.git Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
* | | Merge tag 'google-common-android-3.18' into 'msm-3.18'Imran Khan2017-08-111-0/+20
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | google-common-android-3.18 v3.18 * origin/tmp-ba420f35a: ext4: ext4_encrypted_zeroout: fix merge error with duplicated call ANDROID: Fix missing header file for get_cmdline() call perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race f2fs, block_dump: give WRITE direction to submit_bio FROMLIST: f2fs: add ioctl to expose current features FROMLIST: f2fs: don't give partially written atomic data from process crash FROMLIST: f2fs: give a try to do atomic write in -ENOMEM case ANDROID: f2fs: fix location fo android tracepoint f2fs: avoid cpu lockup f2fs: include seq_file.h for sysfs.c f2fs: remove extra inode_unlock() in error path fscrypt: add support for AES-128-CBC fscrypt: inline fscrypt_free_filename() f2fs: enable f2fs_migrate_page f2fs: make more close to v4.13-rc1 f2fs: support plain user/group quota f2fs: avoid deadlock caused by lock order of page and lock_op f2fs: use spin_{,un}lock_irq{save,restore} f2fs: relax migratepage for atomic written page f2fs: don't count inode block in in-memory inode.i_blocks Revert "f2fs: fix to clean previous mount option when remount_fs" f2fs: do not set LOST_PINO for renamed dir f2fs: do not set LOST_PINO for newly created dir f2fs: skip ->writepages for {mete,node}_inode during recovery f2fs: introduce __check_sit_bitmap f2fs: stop gc/discard thread in prior during umount f2fs: introduce reserved_blocks in sysfs f2fs: avoid redundant f2fs_flush after remount f2fs: report # of free inodes more precisely f2fs: add ioctl to do gc with target block address f2fs: don't need to check encrypted inode for partial truncation f2fs: measure inode.i_blocks as generic filesystem f2fs: set CP_TRIMMED_FLAG correctly f2fs: require key for truncate(2) of encrypted file f2fs: move sysfs code from super.c to fs/f2fs/sysfs.c f2fs: clean up sysfs codes f2fs: fix wrong error number of fill_super f2fs: fix to show injection rate in ->show_options f2fs: Fix a return value in case of error in 'f2fs_fill_super' f2fs: use proper variable name f2fs: fix to avoid panic when encountering corrupt node f2fs: don't track newly allocated nat entry in list f2fs: add f2fs_bug_on in __remove_discard_cmd f2fs: introduce __wait_one_discard_bio f2fs: dax: fix races between page faults and truncating pages f2fs: simplify the way of calulating next nat address f2fs: fix a panic caused by NULL flush_cmd_control f2fs: remove the unnecessary cast for PTR_ERR f2fs: remove false-positive bug_on f2fs: Do not issue small discards in LFS mode f2fs: don't bother checking for encryption key in ->write_iter() f2fs: don't bother checking for encryption key in ->mmap() f2fs: wait discard IO completion without cmd_lock held f2fs: wake up all waiters in f2fs_submit_discard_endio f2fs: show more info if fail to issue discard f2fs: introduce io_list for serialize data/node IOs f2fs: split wio_mutex f2fs: combine huge num of discard rb tree consistence checks f2fs: fix a bug caused by NULL extent tree f2fs: try to freeze in gc and discard threads f2fs: add a new function get_ssr_cost f2fs: declare load_free_nid_bitmap static f2fs: avoid f2fs_lock_op for IPU writes f2fs: split bio cache f2fs: use fio instead of multiple parameters f2fs: remove unnecessary read cases in merged IO flow f2fs: use f2fs_submit_page_bio for ra_meta_pages f2fs: make sure f2fs_gc returns consistent errno f2fs: load inode's flag from disk uid_sys_stats: log task io with a debug flag ANDROID: binder: Don't BUG_ON(!spin_is_locked()). Linux 3.18.63 MIPS: Send SIGILL for BPOSGE32 in `__compute_return_epc_for_insn' alarmtimer: don't rate limit one-shot timers tracing: Fix kmemleak in instance_rmdir spmi: Include OF based modalias in device uevent of: device: Export of_device_{get_modalias, uvent_modalias} to modules KVM: PPC: Book3S HV: Context-switch EBB registers properly drm/mst: Avoid processing partially received up/down message transactions drm/mst: Avoid dereferencing a NULL mstb in drm_dp_mst_handle_up_req() drm/mst: Fix error handling during MST sideband message reception staging: rtl8188eu: add TL-WN722N v2 support Revert "perf/core: Drop kernel samples even though :u is specified" perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target target: Fix COMPARE_AND_WRITE caw_sem leak during se_cmd quiesce udf: Fix deadlock between writeback and udf_setsize() NFS: only invalidate dentrys that are clearly invalid. Input: i8042 - fix crash at boot time MIPS: math-emu: Prevent wrong ISA mode instruction emulation MIPS: Fix unaligned PC interpretation in `compute_return_epc' MIPS: Actually decode JALX in `__compute_return_epc_for_insn' MIPS: Save static registers before sysmips x86/acpi: Prevent out of bound access caused by broken ACPI tables MIPS: Negate error syscall return in trace MIPS: Fix mips_atomic_set() with EVA MIPS: Fix mips_atomic_set() retry condition vfio: New external user group/file match vfio: Fix group release deadlock f2fs: Don't clear SGID when inheriting ACLs drm/radeon/ci: disable mclk switching for high refresh rates (v2) s390/syscalls: Fix out of bounds arguments access Raid5 should update rdev->sectors after reshape md: don't use flush_signals in userspace processes PCI/PM: Restore the status of PCI devices across hibernation af_key: Fix sadb_x_ipsecrequest parsing powerpc/asm: Mark cr0 as clobbered in mftb() powerpc: Fix emulation of mfocrf in emulate_step() powerpc: Fix emulation of mcrf in emulate_step() powerpc/64: Fix atomic64_inc_not_zero() to return an int scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails. PM / Domains: Fix unsafe iteration over modified list of domain providers PM / Domains: Fix unsafe iteration over modified list of device links ASoC: compress: Derive substream from stream based on direction Bluetooth: use constant time memory comparison for secret values NFC: Add sockaddr length checks before accessing sa_family in bind handlers stddef.h: move offsetofend inside #ifndef/#endif guard, neaten include/stddef.h: Move offsetofend() from vfio.h to a generic kernel header nfc: Fix the sockaddr length sanitization in llcp_sock_connect nfc: Ensure presence of required attributes in the activate_target handler NFC: fix broken device allocation ath9k: fix tx99 bus error ath9k: fix tx99 use after free CIFS: Fix handle_cancelled_mid callback initialization ir-core: fix gcc-7 warning on bool arithmetic x86/rtc: Remove duplicate const specifier kvm: x86: memset whole irq_eoi disable new gcc-7.1.1 warnings for now android: configs: Remove CONFIG_USB_G_ANDROID from base. UPSTREAM: af_key: Fix sadb_x_ipsecrequest parsing Revert "proc: smaps: Allow smaps access for CAP_SYS_RESOURCE" Linux 3.18.62 tracing: Use SOFTIRQ_OFFSET for softirq dectection for more accurate results PM / QoS: return -EINVAL for bogus strings crypto: caam - fix signals handling crypto: sha1-ssse3 - Disable avx2 crypto: atmel - only treat EBUSY as transient if backlog crypto: talitos - Extend max key length for SHA384/512-HMAC and AEAD mm: fix overflow check in expand_upwards() vt: fix unchecked __put_user() in tioclinux ioctls exec: Limit arg stack to at most 75% of _STK_LIM checkpatch: silence perl 5.26.0 unescaped left brace warnings fs/dcache.c: fix spin lockup issue on nlru->lock kernel/extable.c: mark core_kernel_text notrace tools/lib/lockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain/: Depth parisc/mm: Ensure IRQs are off in switch_mm() parisc: DMA API: return error instead of BUG_ON for dma ops on non dma devs parisc: use compat_sys_keyctl() parisc: Report SIGSEGV instead of SIGBUS when running out of stack irqchip/gic-v3: Fix out-of-bound access in gic_set_affinity cfg80211: Check if PMKID attribute is of expected size cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES cfg80211: Define nla_policy for NL80211_ATTR_LOCAL_MESH_POWER_MODE brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx() ipv6: dad: don't remove dynamic addresses if link is down net: prevent sign extension in dev_get_stats() tcp: reset sk_rx_dst in tcp_disconnect() ipv6: avoid unregistering inet6_dev for loopback ANDROID: android-verity: mark dev as rw for linear target ANDROID: sdcardfs: Remove unnecessary lock uid_sys_stats: make hash_table static ANDROID: binder: don't check prio permissions on restore. Add BINDER_GET_NODE_DEBUG_INFO ioctl ANDROID: binder: add RT inheritance flag to node. ANDROID: binder: improve priority inheritance. ANDROID: binder: add min sched_policy to node. ANDROID: binder: add support for RT prio inheritance. ANDROID: binder: push new transactions to waiting threads. ANDROID: binder: remove proc waitqueue FROMLIST: binder: remove global binder lock FROMLIST: binder: fix death race conditions FROMLIST: binder: protect against stale pointers in print_binder_transaction FROMLIST: binder: protect binder_ref with outer lock FROMLIST: binder: use inner lock to protect thread accounting FROMLIST: binder: protect transaction_stack with inner lock. FROMLIST: binder: protect proc->threads with inner_lock FROMLIST: binder: protect proc->nodes with inner lock FROMLIST: binder: add spinlock to protect binder_node FROMLIST: binder: add spinlocks to protect todo lists FROMLIST: binder: use inner lock to sync work dq and node counts FROMLIST: binder: introduce locking helper functions FROMLIST: binder: use node->tmp_refs to ensure node safety FROMLIST: binder: refactor binder ref inc/dec for thread safety FROMLIST: binder: make sure accesses to proc/thread are safe FROMLIST: binder: make sure target_node has strong ref FROMLIST: binder: guarantee txn complete / errors delivered in-order FROMLIST: binder: refactor binder_pop_transaction FROMLIST: binder: use atomic for transaction_log index FROMLIST: binder: add more debug info when allocation fails. FROMLIST: binder: protect against two threads freeing buffer FROMLIST: binder: remove dead code in binder_get_ref_for_node FROMLIST: binder: don't modify thread->looper from other threads FROMLIST: binder: avoid race conditions when enqueuing txn FROMLIST: binder: refactor queue management in binder_thread_read FROMLIST: binder: add log information for binder transaction failures FROMLIST: binder: make binder_last_id an atomic FROMLIST: binder: change binder_stats to atomics FROMLIST: binder: add protection for non-perf cases FROMLIST: binder: remove binder_debug_no_lock mechanism FROMLIST: binder: move binder_alloc to separate file FROMLIST: binder: separate out binder_alloc functions FROMLIST: binder: remove unneeded cleanup code FROMLIST: binder: separate binder allocator structure from binder proc FROMLIST: binder: Use wake up hint for synchronous transactions. Revert "android: binder: move global binder state into context struct." ANDROID: binder: check set_context_mgr permission on time. Linux 3.18.61 saa7134: fix warm Medion 7134 EEPROM read staging: comedi: fix clean-up of comedi_class in comedi_init() staging: vt6556: vnt_start Fix missing call to vnt_key_init_table. md: fix super_offset endianness in super_1_rdev_size_change mqueue: fix a use-after-free in sys_mq_notify() KEYS: Fix an error code in request_master_key() pinctrl: sh-pfc: Update info pointer after SoC-specific init pinctrl: mxs: atomically switch mux and drive strength config tracing/kprobes: Allow to create probe with a module name starting with a digit bgmac: reset & enable Ethernet core before using it bgmac: fix device initialization on Northstar SoCs (condition typo) MIPS: UAPI: Ignore __arch_swab{16,32,64} when using MIPS16 driver core: platform: fix race condition with driver_override ANDROID: android-base.cfg: remove CONFIG_CGROUP_DEBUG ANDROID: sdcardfs: use mount_nodev and fix a issue in sdcardfs_kill_sb Linux 3.18.60 KVM: nVMX: Fix exception injection KVM: x86: zero base3 of unusable segments cpufreq: s3c2416: double free on driver init error path iommu/amd: Fix incorrect error handling in amd_iommu_bind_pasid() iommu/vt-d: Don't over-free page table directories ARM: 8685/1: ensure memblock-limit is pmd-aligned watchdog: bcm281xx: Fix use of uninitialized spinlock. xfrm: Oops on error in pfkey_msg2xfrm_state() xfrm: NULL dereference on allocation failure xfrm: fix stack access out of bounds with CONFIG_XFRM_SUB_POLICY mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only net: korina: Fix NAPI versus resources freeing ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags mm: numa: avoid waiting on freed migrated pages sysctl: enable strict writes drm/vmwgfx: Free hash table allocated by cmdbuf managed res mgr ALSA: hda - set input_path bitmap to zero after moving it to new place MIPS: Fix IRQ tracing & lockdep when rescheduling MIPS: pm-cps: Drop manual cache-line alignment of ready_count MIPS: Avoid accidental raw backtrace arm64: cpuinfo: Missing NULL terminator in compat_hwcap_str net: 8021q: Fix one possible panic caused by BUG_ON in free_netdev decnet: always not take dst->__refcnt when inserting dst into hash table ipv6: fix calling in6_ifa_hold incorrectly for dad work igmp: add a missing spin_lock_init() igmp: acquire pmc lock for ip_mc_clear_src() net: caif: Fix a sleep-in-atomic bug in cfpkt_create_pfx Fix an intermittent pr_emerg warning about lo becoming free. decnet: dn_rtmsg: Improve input length sanitization in dnrmg_receive_user_skb net: don't call strlen on non-terminated string in dev_set_alias() netfilter: synproxy: fix conntrackd interaction netfilter: xt_TCPMSS: add more sanity tests on tcph->doff ipv6: release dst on error in ip6_dst_lookup_tail xhci: fix deadlock at host remove by running watchdog correctly UPSTREAM: selinux: enable genfscon labeling for tracefs Linux 3.18.59 mac80211/wpa: use constant time memory comparison for MACs net: phy: fix marvell phy status reading powerpc/slb: Force a full SLB flush when we insert for a bad EA mtd: spi-nor: fix spansion quad enable of: Add check to of_scan_flat_dt() before accessing initial_boot_params rxrpc: Fix several cases where a padded len isn't checked in ticket decode target: Fix kref->refcount underflow in transport_cmd_finish_abort Input: i8042 - add Fujitsu Lifebook AH544 to notimeout list powerpc/kprobes: Pause function_graph tracing during jprobes handling signal: Only reschedule timers on signals timers have sent CIFS: Improve readdir verbosity KVM: PPC: Book3S HV: Preserve userspace HTM state properly lib/cmdline.c: fix get_options() overflow while parsing ranges autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL fs/exec.c: account for argv/envp pointers UPSTREAM: packet: fix races in fanout_add() ANDROID: squashfs: Fix endianness issue ANDROID: squashfs: Fix signed division issue Linux 3.18.58 mm: fix new crash in unmapped_area_topdown() Allow stack to grow up to address space limit mm: larger stack guard gap, between vmas alarmtimer: Rate limit periodic intervals genirq: Release resources in __setup_irq() error path swap: cond_resched in swap_cgroup_prepare() mm/memory-failure.c: use compound_head() flags for huge pages usb: xhci: ASMedia ASM1042A chipset need shorts TX quirk drivers/misc/c2port/c2port-duramar2150.c: checking for NULL instead of IS_ERR() iio: proximity: as3935: recalibrate RCO after resume staging: rtl8188eu: prevent an underflow in rtw_check_beacon_data() mfd: omap-usb-tll: Fix inverted bit use for USB TLL mode x86/mm/32: Set the '__vmalloc_start_set' flag in initmem_init() serial: efm32: Fix parity management in 'efm32_uart_console_get_options()' mac80211: don't look at the PM bit of BAR frames vb2: Fix an off by one error in 'vb2_plane_vaddr' cpufreq: conservative: Allow down_threshold to take values from 1 to 10 can: gs_usb: fix memory leak in gs_cmd_reset() configfs: Fix race between create_link and configfs_rmdir sparc64: make string buffers large enough log2: make order_base_2() behave correctly on const input value zero ipv6: Inhibit IPv4-mapped src address on the wire. ipv6: Handle IPv4-mapped src to in6addr_any dst. net: xilinx_emaclite: fix receive buffer overflow net: xilinx_emaclite: fix freezes due to unordered I/O Call echo service immediately after socket reconnect partitions/msdos: FreeBSD UFS2 file systems are not recognized s390/vmem: fix identity mapping BACKPORT: ext4: fix data exposure after a crash BACKPORT: ipv6/dccp: do not inherit ipv6_mc_list from parent ANDROID: sdcardfs: remove dead function open_flags_to_access_mode() ANDROID: android-base.cfg: split out arm64-specific configs fscrypt,f2fs: catch up fscrypt and f2fs-stable/v3.18 having v4.12-rc1 Linux 3.18.57 ALSA: timer: Fix race between read and ioctl mlx5: stop including <asm-generic/kmap_types.h> arm64: ensure extension of smp_store_release value usercopy: Adjust tests to deal with SMAP/PAN RDMA/qib,hfi1: Fix MR reference count leak on write with immediate arm64: entry: improve data abort handling of tagged pointers arm64: hw_breakpoint: fix watchpoint matching for tagged pointers serial: sh-sci: Fix panic when serial console and DMA are enabled drivers: char: mem: Fix wraparound check to allow mappings up to the end ASoC: Fix use-after-free at card unregistration ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT drm/vmwgfx: limit the number of mip levels in vmw_gb_surface_define_ioctl() drm/vmwgfx: Handle vmalloc() failure in vmw_local_fifo_reserve() perf/core: Drop kernel samples even though :u is specified powerpc/numa: Fix percpu allocations to be NUMA aware powerpc/eeh: Avoid use after free in eeh_handle_special_event() scsi: qla2xxx: don't disable a not previously enabled PCI device btrfs: fix memory leak in update_space_info failure path btrfs: use correct types for page indices in btrfs_page_exists_in_range stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms random: properly align get_random_int_hash drivers: char: random: add get_random_long() iio: proximity: as3935: fix AS3935_INT mask staging/lustre/lov: remove set_fs() call from lov_getstripe() ext4: keep existing extra fields when inode expands ext4: fix SEEK_HOLE dmaengine: ep93xx: Always start from BASE0 arm: KVM: Allow unaligned accesses at HYP KVM: cpuid: Fix read/write out-of-bounds vulnerability in cpuid emulation kvm: async_pf: fix rcu_irq_enter() with irqs enabled nfsd4: fix null dereference on replay crypto: gcm - wait for crypto op not signal safe KEYS: fix freeing uninitialized memory in key_update() KEYS: fix dereferencing NULL payload with nonzero length serial: ifx6x60: fix use-after-free on module unload net: ethoc: enable NAPI before poll may be scheduled net: ping: do not abuse udp_poll() ipv6: Fix leak in ipv6_gso_segment(). tcp: disallow cwnd undo when switching congestion control cxgb4: avoid enabling napi twice to the same queue ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt() bnx2x: Fix Multi-Cos ANDROID: sdcardfs: d_splice_alias can return error values UPSTREAM: merge d_materialise_unique() into d_splice_alias() tracing: fix race condition reading saved tgids Linux 3.18.56 xfs: fix unaligned access in xfs_btree_visit_blocks xfs: bad assertion for delalloc an extent that start at i_size xfs: fix indlen accounting error on partial delalloc conversion xfs: fix up quotacheck buffer list error handling xfs: prevent multi-fsb dir readahead from reading random blocks xfs: handle array index overrun in xfs_dir2_leaf_readbuf() xfs: fix over-copying of getbmap parameters from userspace xfs: fix off-by-one on max nr_pages in xfs_find_get_desired_pgoff() xfs: Fix missed holes in SEEK_HOLE implementation mlock: fix mlock count can not decrease in race condition mm/migrate: fix refcount handling when !hugepage_migration_supported() drm/gma500/psb: Actually use VBT mode when it is found slub/memcg: cure the brainless abuse of sysfs attributes ALSA: hda - apply STAC_9200_DELL_M22 quirk for Dell Latitude D430 pcmcia: remove left-over %Z format drm/radeon/ci: disable mclk switching for high refresh rates (v2) i2c: i2c-tiny-usb: fix buffer not being DMA capable sctp: fix ICMP processing if skb is non-linear tcp: avoid fastopen API to be used on AF_UNSPEC ipv6: fix out of bound writes in __ip6_append_data() qmi_wwan: add another Lenovo EM74xx device ID ipv6: Check ip6_find_1stfragopt() return value properly. ipv6: Prevent overrun when parsing v6 header options tcp: eliminate negative reordering in tcp_clean_rtx_queue sctp: do not inherit ipv6_{mc|ac|fl}_list from parent sctp: fix src address selection if using secondary addresses for ipv6 tcp: avoid fragmenting peculiar skbs in SACK s390/qeth: avoid null pointer dereference on OSN s390/qeth: unbreak OSM and OSN support s390/qeth: handle sysfs error during initialization dccp/tcp: do not inherit mc_list from parent netem: fix skb_orphan_partial() Revert "stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms" android: base-cfg: disable CONFIG_NFSD and CONFIG_NFS_FS BACKPORT: f2fs: sanity check size of nat and sit cache Revert "FROMLIST: f2fs: sanity check size of nat and sit cache" FROMLIST: f2fs: sanity check size of nat and sit cache FROMLIST: f2fs: sanity check checkpoint segno and blkoff ANDROID: hid: uhid: implement refcount for open and close ANDROID: mnt: Fix next_descendent UPSTREAM: fscrypt: avoid collisions when presenting long encrypted filenames UPSTREAM: fscrypt: fix context consistency check when key(s) unavailable UPSTREAM: ext4 crypto: fix some error handling UPSTREAM: ext4 crypto: don't let data integrity writebacks fail with ENOMEM UPSTREAM: ext4/fscrypto: avoid RCU lookup in d_revalidate UPSTREAM: ext4 crypto: use dget_parent() in ext4_d_revalidate() UPSTREAM: ext4 crypto: revalidate dentry after adding or removing the key UPSTREAM: fscrypt: remove broken support for detecting keyring key revocation UPSTREAM: fscrypto: lock inode while setting encryption policy UPSTREAM: fscrypt: fix renaming and linking special files UPSTREAM: fscrypto: require write access to mount to set encryption policy UPSTREAM: fscrypto: add authorization check for setting encryption policy UPSTREAM: ext4: enforce online defrag restriction for encrypted files UPSTREAM: ext4 crypto: add missing locking for keyring_key access Linux 3.18.55 drivers: char: mem: Check for address space wraparound with mmap() PCI: Freeze PME scan before suspending devices PCI: Fix pci_mmap_fits() for HAVE_PCI_RESOURCE_TO_USER platforms tracing/kprobes: Enforce kprobes teardown after testing osf_wait4(): fix infoleak uwb: fix device quirk on big-endian hosts stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms metag/uaccess: Check access_ok in strncpy_from_user metag/uaccess: Fix access_ok() mm/huge_memory.c: respect FOLL_FORCE/FOLL_COW for thp xc2028: Fix use-after-free bug properly arm64: documentation: document tagged pointer stack constraints arm64: uaccess: ensure extension of access_ok() addr ARM: dts: at91: sama5d3_xplained: not all ADC channels are available ARM: dts: at91: sama5d3_xplained: fix ADC vref powerpc/pseries: Fix of_node_put() underflow during DLPAR remove cx231xx-audio: fix NULL-deref at probe cx231xx-cards: fix NULL-deref at probe zr364xx: enforce minimum size when reading header dib0700: fix NULL-deref at probe s5p-mfc: Fix unbalanced call to clock management gspca: konica: add missing endpoint sanity check iio: proximity: as3935: fix as3935_write ipx: call ipxitf_put() in ioctl error path tty: Prevent ldisc drivers from re-using stale tty fields pid_ns: Sleep in TASK_INTERRUPTIBLE in zap_pid_ns_processes iio: dac: ad7303: fix channel description of: fdt: add missing allocation-failure check of: fix sparse warning in of_pci_range_parser_one cdc-acm: fix possible invalid access when processing notification ath9k_htc: fix NULL-deref at probe regulator: tps65023: Fix inverted core enable logic. ima: accept previously set IMA_NEW_FILE mwifiex: pcie: fix cmd_buf use-after-free in remove/reset dm space map disk: fix some book keeping in the disk space map dm thin metadata: call precommit before saving the roots dm bufio: avoid a possible ABBA deadlock dm btree: fix for dm_btree_find_lowest_key() char: lp: fix possible integer overflow in lp_setup() watchdog: pcwd_usb: fix NULL-deref at probe UPSTREAM: arm: perf: Fix callchain parse error with kernel tracepoint events UPSTREAM: ARM: 8170/1: Add global named register current_stack_pointer for ARM UPSTREAM: arm64: perf: Fix callchain parse error with kernel tracepoint events uid_sys_stats: defer io stats calulation for dead tasks ANDROID: sdcardfs: Check for NULL in revalidate Linux 3.18.54 ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt ALSA: timer: Fix leak in events via snd_timer_user_ccallback ALSA: timer: Fix leak in SNDRV_TIMER_IOCTL_PARAMS ALSA: timer: Fix race among timer ioctls ALSA: seq: Fix race at timer setup and close cdc_ncm: do not call usbnet_link_change from cdc_ncm_bind HID: core: prevent out-of-bound readings ppp: defer netns reference release for ppp channel af_unix: Guard against other == sk in unix_dgram_sendmsg ipv6: sctp: fix lockdep splat in sctp_v6_get_dst() ipv6: sctp: add rcu protection around np->opt sg: Fix double-free when drives detach during SG_IO ext4: fix potential use after free in __ext4_journal_stop KEYS: Fix ASN.1 indefinite length object parsing ASN.1: Fix non-match detection failure on data overrun perf: Fix race in swevent hash arm64: perf: reject groups spanning multiple HW PMUs perf: Fix event->ctx locking arm64: make sys_call_table const Bluetooth: Fix user channel for 32bit userspace on 64bit kernel serial: omap: suspend device on probe errors serial: omap: fix runtime-pm handling on unbind md/raid1: avoid reusing a resync bio after error handling. padata: free correct variable CIFS: add misssing SFM mapping for doublequote CIFS: fix mapping of SFM_SPACE and SFM_PERIOD SMB3: Work around mount failure when using SMB3 dialect to Macs Set unicode flag on cifs echo request to avoid Mac error fs/block_dev: always invalidate cleancache in invalidate_bdev() ceph: fix memory leak in __ceph_setxattr() fs/xattr.c: zero out memory copied to userspace in getxattr IB/mlx4: Fix ib device initialization error flow IB/IPoIB: ibX: failed to create mcg debug file dm era: save spacemap metadata root after the pre-commit um: Fix PTRACE_POKEUSER on x86_64 x86/boot: Fix BSS corruption/overwrite bug in early x86 kernel startup staging: comedi: jr3_pci: cope with jiffies wraparound staging: comedi: jr3_pci: fix possible null pointer dereference staging: gdm724x: gdm_mux: fix use-after-free on module unload staging: vt6656: use off stack for out buffer USB transfers. staging: vt6656: use off stack for in buffer USB transfers. target/fileio: Fix zero-length READ and WRITE handling ANDROID: sdcardfs: Add linux/kref.h include ANDROID: sdcardfs: Move top to its own struct lowmemorykiller: account for unevictable pages BACKPORT: ARM: dts: add wl12xx/wl18xx bindings Linux 3.18.53 ARM: 8452/3: PJ4: make coprocessor access sequences buildable in Thumb2 mode drm/ttm: fix use-after-free races in vm fault handling f2fs: sanity check segment count tcp: fix wraparound issue in tcp_lp ipv6: reorder ip6_route_dev_notifier after ipv6_dev_notf ipv6: initialize route null entry in addrconf_init() ipv4, ipv6: ensure raw socket message is big enough to hold an IP header tcp: do not underestimate skb->truesize in tcp_trim_head() staging: emxx_udc: remove incorrect __init annotations brcmfmac: Make skb header writable before use brcmfmac: Ensure pointer correctly set if skb data location changes Revert "KVM: nested VMX: disable perf cpuid reporting" x86/platform/intel-mid: Correct MSI IRQ line for watchdog device kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0 mwifiex: Avoid skipping WEP key deletion for AP mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print power: supply: bq24190_charger: Call set_mode_host() on pm_resume() power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING powerpc/powernv: Fix opal_exit tracepoint opcode cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores mtd: cfi: reduce stack size tty: remove platform_sysrq_reset_seq 9p: fix a potential acl leak ANDROID: android-base.cfg: remove spurious CONFIG_MODULES line HID: logitech-hidpp: adapt to input_configured API change ARM: 8285/1: remove ARMv3 user access code again Revert "cpu: add generic support for CPU feature based module autoloading" PM / Suspend: use time_to_tm for printing timestamps trace: fix trace_graph_ret_raw return type ANDROID: rfkill: fix unused function warning ANDROID: power: Provide dummy log_suspend_abort_reason() if SUSPEND is disabled ANDROID: dm: android-verity: hide __setup functions in loadable module ANDROID: memory_state_time: fix undefined behavior with missing DT properties UPSTREAM: wlcore: add p2p device support BACKPORT: wl18xx: add radar detection implementation UPSTREAM: wl18xx: fallback to default conf in case of invalid conf file UPSTREAM: wlcore: sdio: return correct error code UPSTREAM: wlcore: remove wl12xx_platform_data BACKPORT: wl12xx: use frequency instead of enumerations for pdata clocks UPSTREAM: wlcore: add device-tree support UPSTREAM: wlcore: set irq_trigger in board files instead of hiding behind a quirk ANDROID: make PF_KEY SHA256 use RFC-compliant truncation. ANDROID: sdcardfs: fix sdcardfs_destroy_inode for the inode RCU approach Revert "BACKPORT: [UPSTREAM] ext2: convert to mbcache2" Revert "BACKPORT: [UPSTREAM] mbcache2: reimplement mbcache" Revert "BACKPORT: [UPSTREAM] ext4: convert to mbcache2" ANDROID: android-base.cfg: remove NETFILTER_XT_MATCH_QUOTA2_LOG ANDROID: sdcardfs: Don't iput if we didn't igrab Linux 3.18.52 dm ioctl: prevent stack leak in dm ioctl call kbuild: mergeconfig: fix "jobserver unavailable" warning gfs2: remove IS_ERR_VALUE abuse e1000e: fix call to do_div() to use u64 arg cpumask_set_cpu_local_first => cpumask_local_spread, lament modpost: don't emit section mismatch warnings for compiler optimizations modpost: expand pattern matching to support substring matches scsi: advansys: remove #warning message i2o: hide unsafe ioctl on 64-bit staging: unisys: correctly handle return value from queue_delayed_work() MIPS: elf2ecoff: Fix warning due to dead code. MIPS: elf2ecoff: Ignore PT_MIPS_ABIFLAGS program headers. MIPS: jz4740: fix build error in irq.h mm/cma: silence warnings due to max() usage arm64: build vdso without libgcov mISDN: avoid arch specific __builtin_return_address call ips: remove pointless #warning infiniband: mlx5: avoid a compile-time warning tty/isicom: fix big-endian compile warning IB/ehca: fix maybe-uninitialized warnings IB/qib: rename BITS_PER_PAGE to RVT_BITS_PER_PAGE staging: bcm: add 32-bit host dependency staging: imx-drm: fix indentation warning staging: vt6655: fix overly large stack usage arm64: Provide a namespace to NCAPS ARM: cns3xxx: shut up frame size warning mm: avoid setting up anonymous pages into file mapping net: avoid signed overflows for SO_{SND|RCV}BUFFORCE l2tp: fix racy SOCK_ZAPPED flag check in l2tp_ip{,6}_bind() posix_acl: Clear SGID bit when setting file permissions perf: Tighten (and fix) the grouping condition regulator: core: Fix regualtor_ena_gpio_free not to access pin after freeing ALSA: pcm : Call kill_fasync() in stream lock Handle mismatched open calls timerfd: Protect the might cancel mechanism proper net: tg3: avoid uninitialized variable warning cred/userns: define current_user_ns() as a function ALSA: ppc/awacs: shut up maybe-uninitialized warning PCI: xilinx: Fix harmless format string warning mlx5: avoid build warnings on 32-bit mtd: avoid stack overflow in MTD CFI code IB/iser: Fix sparse warnings drbd: avoid redefinition of BITS_PER_PAGE powerpc/ptrace: Fix out of bounds array access warning ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram nfsd: check for oversized NFSv2/v3 arguments Input: i8042 - add Clevo P650RS to the i8042 reset list p9_client_readdir() fix MIPS: KGDB: Use kernel context for sleeping threads ALSA: seq: Don't break snd_use_lock_sync() loop by timeout ip6mr: fix notification device destruction netpoll: Check for skb->queue_mapping sctp: listen on the sock only when it's state is listening or closed net/packet: fix overflow in check for tp_reserve net/packet: fix overflow in check for tp_frame_nr l2tp: purge socket queues in the .destruct() callback net: phy: handle state correctly in phy_stop_machine net: neigh: guard against NULL solicit() method sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write() sparc64: kern_addr_valid regression xen/x86: don't lose event interrupts RDS: Fix the atomicity for congestion map update MIPS: Fix crash registers on non-crashing CPUs md:raid1: fix a dead loop when read from a WriteMostly disk ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea() xc2028: unlock on error in xc2028_set_config() f2fs: do more integrity verification for superblock ANDROID: android-base.cfg: remove USB_OTG_WAKELOCK ANDROID: android-base.cfg: remove defunct options ANDROID: Add untag hacks to inet_release function Linux 3.18.51 ping: implement proper locking staging/android/ion : fix a race condition in the ion driver vfio/pci: Fix integer overflows, bitmask check xc2028: avoid use after free ARM: 8383/1: nommu: avoid deprecated source register on mov kconfig: tinyconfig: provide whole choice blocks to avoid warnings MIPS: ralink: Cosmetic change to prom_init(). aic94xx: Skip reading user settings if flash is not found ARM: 8296/1: cache-l2x0: clean up aurora cache handling btrfs: fix state->private cast on 32 bit machines gfs2: avoid uninitialized variable warning net: tulip: turn compile-time warning into dev_warn() MIPS: MSP71xx: remove odd locking in PCI config space access code hostap: avoid uninitialized variable use in hfa384x_get_rid misc: ioc4: simplify wave period measurement in clock_calibrate net: vxge: avoid unused function warnings tty: nozomi: avoid a harmless gcc warning brcmfmac: avoid gcc-5.1 warning Fix signed/unsigned pointer warning nfsd: work around a gcc-5.1 warning MIPS: asm: compiler: Add new macros to set ISA and arch asm annotations net: ti: cpmac: Fix compiler warning due to type confusion mm/init: fix zone boundary creation iommu/vt-d: Remove unused variable fs/nfs: fix new compiler warning about boolean in switch perf: Avoid horrible stack usage MIPS: Fix the build on jz4740 after removing the custom gpio.h dm bufio: hide bogus warning gadgetfs: fix uninitialized variable in error handling clk: at91: usb: fix determine_rate prototype again arm64: avoid returning from bad_mode kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd x86/mce/AMD: Give a name to MCA bank 3 when accessed with legacy MSRs powerpc/kprobe: Fix oops when kprobed on 'stdu' instruction ubi/upd: Always flush after prepared for an update ACPI / power: Avoid maybe-uninitialized warning Input: elantech - add Fujitsu Lifebook E547 to force crc_enabled s390/mm: fix CMMA vs KSM vs others CIFS: remove bad_network_name flag cifs: Do not send echoes before Negotiate is complete ring-buffer: Have ring_buffer_iter_empty() return true when empty tracing: Allocate the snapshot buffer before enabling probe KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings KEYS: Change the name of the dead type to ".dead" to prevent user access KEYS: Disallow keyrings beginning with '.' to be joined as session keyrings ANDROID: uid_sys_stats: fix access of task_uid(task) UPSTREAM: ext4: fix fencepost in s_first_meta_bg validation BACKPORT: ext4: validate s_first_meta_bg at mount time BACKPORT: f2fs: sanity check log_blocks_per_seg ANDROID: sdcardfs: Call lower fs's revalidate ANDROID: sdcardfs: Avoid setting GIDs outside of valid ranges ANDROID: sdcardfs: Copy meta-data from lower inode Revert "Revert "Android: sdcardfs: Don't do d_add for lower fs"" ANDROID: sdcardfs: Use filesystem specific hash Revert "cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions" Revert "ANDROID: Add untag hacks to inet_release function" Revert "ANDROID: Add config check to qtaguid_untag" Linux 3.18.50 give up on gcc ilog2() constant optimizations metag/usercopy: Add missing fixups metag/usercopy: Fix src fixup in from user rapf loops metag/usercopy: Set flags before ADDZ metag/usercopy: Zero rest of buffer from copy_from_user metag/usercopy: Add early abort to copy_to_user metag/usercopy: Fix alignment error checking metag/usercopy: Drop unused macros ring-buffer: Fix return value check in test_ringbuffer() mm/mempolicy.c: fix error handling in set_mempolicy and mbind. mtd: bcm47xxpart: fix parsing first block after aligned TRX mm, hugetlb: use pte_present() instead of pmd_present() in follow_huge_pmd() pinctrl: qcom: Don't clear status bit on irq_unmask virtio_balloon: init 1st buffer in stats vq block: allow WRITE_SAME commands with the SG_IO ioctl uvcvideo: uvc_scan_fallback() for webcams with broken chain serial: 8250_pci: Detach low-level driver during PCI error recovery ACPI: Do not create a platform_device for IOAPIC/IOxAPIC ACPI: Fix incompatibility with mcount-based function graph tracing xfs: clear _XBF_PAGES from buffers when readahead page xfs: fix up xfs_swap_extent_forks inline extent handling xfs: don't allow di_size with high bit set igb: add i211 to i210 PHY workaround igb: Workaround for igb i210 firmware issue iommu/vt-d: Fix NULL pointer dereference in device_to_iommu ext4: mark inode dirty after converting inline directory iio: adc: ti_am335x_adc: fix fifo overrun recovery uwb: i1480-dfu: fix NULL-deref at probe uwb: hwa-rc: fix NULL-deref at probe tcp: initialize icsk_ack.lrcvtime at session start time socket, bpf: fix sk_filter use after free in sk_clone_lock net: unix: properly re-increment inflight counter of GC discarded candidates net: properly release sk_frag.page net: bcmgenet: Do not suspend PHY if Wake-on-LAN is enabled net/mlx5: Increase number of max QPs in default profile ACM gadget: fix endianness in notifications Input: sur40 - validate number of endpoints before using them Input: kbtab - validate number of endpoints before using them Input: cm109 - validate number of endpoints before using them Input: yealink - validate number of endpoints before using them Input: hanwang - validate number of endpoints before using them Input: ims-pcu - validate number of endpoints before using them Input: iforce - validate number of endpoints before using them Input: i8042 - add noloop quirk for Dell Embedded Box PC 3000 ipv4: provide stronger user input validation in nl_fib_input() percpu: acquire pcpu_lock when updating pcpu_nr_empty_pop_pages isdn/gigaset: fix NULL-deref at probe target: Fix VERIFY_16 handling in sbc_parse_cdb md/raid1/10: fix potential deadlock perf/core: Fix event inheritance on fork() arm/arm64: KVM: Take mmap_sem in kvm_arch_prepare_memory_region KVM: kvm_io_bus_unregister_dev() should never fail KVM: x86: clear bus pointer when destroyed KVM: PPC: Book3S PR: Fix illegal opcode emulation net sched actions: decrement module reference count after table flush. sctp: deny peeloff operation on asocs with threads sleeping on it net: ipv6: check route protocol when deleting routes catc: Use heap buffer for memory size test catc: Combine failure cleanup code in catc_probe() rtl8150: Use heap buffers for all register access pegasus: Use heap buffers for all register access virtio-console: avoid DMA from stack dvb-usb-firmware: don't do DMA on stack dvb-usb: don't use stack for firmware load mm: Tighten x86 /dev/mem with zeroing reads rtc: tegra: Implement clock handling platform/x86: acer-wmi: setup accelerometer when machine has appropriate notify event dvb-usb-v2: avoid use-after-free crypto: ahash - Fix EINPROGRESS notification callback powerpc: Disable HFSCR[TM] if TM is not supported zram: do not use copy_page with non-page aligned address tty/serial: atmel: fix race condition (TX+DMA) crypto: caam - fix RNG deinstantiation error checking xen/acpi: upload PM state from init-domain to Xen scsi: libsas: fix ata xfer length scsi: sg: check length passed to SG_NEXT_CMD_LEN scsi: libiscsi: add lock around task lists to fix list corruption regression scsi: lpfc: Add shutdown method for kexec target/pscsi: Fix TYPE_TAPE + TYPE_MEDIMUM_CHANGER export powerpc/boot: Fix zImage TOC alignment powerpc: Don't try to fix up misaligned load-with-reservation instructions powerpc/mm: Add missing global TLB invalidate if cxl is active ALSA: seq: Fix race during FIFO resize ALSA: seq: Fix racy cell insertions during snd_seq_pool_done() rtc: s35390a: improve irq handling rtc: s35390a: implement reset routine as suggested by the reference rtc: s35390a: make sure all members in the output are set rtc: s35390a: fix reading out alarm Drivers: hv: balloon: don't crash when memory is added in non-sorted order ptrace: fix PTRACE_LISTEN race corrupting task->state Reset TreeId to zero on SMB2 TREE_CONNECT s390/uaccess: get_user() should zero on failure (again) s390/decompressor: fix initrd corruption caused by bss clear metag/ptrace: Reject partial NT_METAG_RPIPE writes metag/ptrace: Provide default TXSTATUS for short NT_PRSTATUS metag/ptrace: Preserve previous registers for short regset write sparc/ptrace: Preserve previous registers for short regset write mips/ptrace: Preserve previous registers for short regset write c6x/ptrace: Remove useless PTRACE_SETREGSET implementation drm/vmwgfx: fix integer overflow in vmw_surface_define_ioctl() drm/vmwgfx: Remove getparam error message drm/ttm, drm/vmwgfx: Relax permission checking when opening surfaces drm/vmwgfx: avoid calling vzalloc with a 0 size in vmw_get_cap_3d_ioctl() drm/vmwgfx: NULL pointer dereference in vmw_surface_define_ioctl() drm/vmwgfx: Type-check lookups of fence objects kvm: fix page struct leak in handle_vmon Revert "ARM: 8457/1: psci-smp is built only for SMP" char: lack of bool string made CONFIG_DEVPORT always on char: Drop bogus dependency of DEVPORT on !M68K ftrace: Fix removing of second function probe xen, fbfront: fix connecting to backend scsi: sd: Fix capacity calculation with 32-bit sector_t scsi: sr: Sanity check returned mode data iscsi-target: Drop work-around for legacy GlobalSAN initiator iscsi-target: Fix TMR reference leak during session shutdown x86/vdso: Ensure vdso32_enabled gets set to valid values only x86/vdso: Plug race between mapping and ELF header setup perf/x86: Avoid exposing wrong/stale data in intel_pmu_lbr_read_32() Input: xpad - add support for Razer Wildcat gamepad CIFS: store results of cifs_reopen_file to avoid infinite wait ANDROID: Add config check to qtaguid_untag ANDROID: Add untag hacks to inet_release function ANDROID: uid_sys_stats: reduce update_io_stats overhead UPSTREAM: char: lack of bool string made CONFIG_DEVPORT always on UPSTREAM: char: Drop bogus dependency of DEVPORT on !M68K Revert "Android: sdcardfs: Don't do d_add for lower fs" Android: sdcardfs: Don't complain in fixup_lower_ownership Android: sdcardfs: Don't do d_add for lower fs ANDROID: sdcardfs: ->iget fixes Android: sdcardfs: Change cache GID value BACKPORT: [UPSTREAM] ext2: convert to mbcache2 BACKPORT: [UPSTREAM] ext4: convert to mbcache2 BACKPORT: [UPSTREAM] mbcache2: reimplement mbcache UPSTREAM: ARM: keystone2: move update of the phys-to-virt constants into generic code Linux 3.18.49 Input: gscps2 - fix MODULE_DEVICE_TABLE invocation dccp: fix memory leak during tear-down of unsuccessful connection request dccp/tcp: fix routing redirect race uapi: fix linux/packet_diag.h userspace compilation error net: fix socket refcounting in skb_complete_tx_timestamp() net: fix socket refcounting in skb_complete_wifi_ack() tcp: fix various issues for sockets morphing to listen state libceph: don't set weight to IN when OSD is destroyed powerpc: Emulation support for load/store instructions on LE MIPS: DEC: Avoid la pseudo-instruction in delay slots MIPS: ip22: Fix ip28 build for modern gcc MIPS: ip27: Disable qlge driver in defconfig KVM: s390: Fix guest migration for huge guests resulting in panic s390: use correct input data address for setup_randomness s390: make setup_randomness work s390: TASK_SIZE for kernel threads s390/qdio: clear DSCI prior to scanning multiple input queues crypto: ghash-clmulni - Fix load failure crypto: algif_hash - avoid zero-sized array crypto: mcryptd - Fix load failure crypto: cryptd - Assign statesize properly futex: Add missing error handling to FUTEX_REQUEUE_PI futex: Fix potential use-after-free in FUTEX_REQUEUE_PI net/mlx4_core: Fix when to save some qp context flags for dynamic VST to VGT transitions net/mlx4_core: Fix racy CQ (Completion Queue) free net/mlx4_en: Fix bad WQE issue net/packet: fix overflow in check for priv area size dccp: Unlock sock before calling sk_free() net: don't call strlen() on the user buffer in packet_bind_spkt() l2tp: avoid use-after-free caused by l2tp_ip_backlog_recv ipv4: mask tos for input route vti6: return GRE_KEY for vti6 vxlan: correctly validate VXLAN ID against VXLAN_N_VID netlink: remove mmapped netlink support tracing: Add #undef to fix compile error cpmac: remove hopeless #warning drm/ttm: Make sure BOs being swapped out are cacheable drm/ast: Fix AST2400 POST failure without BMC FW or VBIOS drm/ast: Call open_key before enable_mmio in POST code drm/ast: Fix test for VGA enabled samples: move mic/mpssd example code from Documentation padata: avoid race in reordering dm: flush queued bios when process blocks to avoid deadlock mvsas: fix misleading indentation mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy crypto: improve gcc optimization flags for serpent and wp512 ktest: Fix child exit code processing fat: fix using uninitialized fields of fat_inode/fsinfo_inode libceph: use BUG() instead of BUG_ON(1) mac80211: flush delayed work when entering suspend xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD nlm: Ensure callback code also checks that the files match IB/ipoib: Fix deadlock between rmmod and set_mode Bluetooth: Add another AR3012 04ca:3018 device KVM: s390: Disable dirty log retrieval for UCONTROL guests serial: 8250_pci: Add MKS Tenta SCOM-0800 and SCOM-0801 cards staging: android: ashmem: lseek failed due to no FMODE_LSEEK. xfrm_user: validate XFRM_MSG_NEWAE XFRMA_REPLAY_ESN_VAL replay_window xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder xfrm: policy: init locks early raid10: increment write counter after bio is split cancel the setfilesize transation when io error happen tty: n_hdlc: get rid of racy n_hdlc.tbuf TTY: n_hdlc, fix lockdep false positive lib/vsprintf.c: improve sanity check in vsnprintf() net: socket: fix recvmmsg not returning error from sock_error dccp: fix freeing skb too early for IPV6_RECVPKTINFO net/llc: avoid BUG_ON() in skb_orphan() drbd: Fix kernel_sendmsg() usage - potential NULL deref Revert "staging: nvec: ps2: change serio type to passthrough" drivers: staging: nvec: remove bogus reset command for PS/2 interface staging: iio: ad5933: avoid uninitialized variable in error case coredump: fix unfreezable coredumping task swapfile: fix memory corruption via malformed swapfile dib0700: fix nec repeat handling ASoC: cs4270: fix DAPM stream name mismatch netlink: do not enter direct reclaim from netlink_dump() packet: on direct_xmit, limit tso and csum to supported devices sctp: validate chunk len before actually using it net: sctp, forbid negative length ipv4: disable BH in set_ping_group_range() net: pktgen: remove rcu locking in pktgen_change_name() ipv6: correctly add local routes when lo goes up packet: call fanout_release, while UNREGISTERING a netdev net: Add netdev all_adj_list refcnt propagation to fix panic ipmr, ip6mr: fix scheduling while atomic and a deadlock with ipmr_get_route ip6_gre: fix flowi6_proto value in ip6gre_xmit_other() tcp: fix a compile error in DBGUNDO() tcp: fix wrong checksum calculation on MTU probing fbdev: color map copying bounds checking selinux: fix off-by-one in setprocattr pwm: Unexport children before chip removal UBI: fastmap: scrub PEB when bitflips are detected in a free PEB EC header smc91x: avoid self-comparison warning drm/exynos: fix error handling in exynos_drm_subdrv_open ARM: 8584/1: floppy: avoid gcc-6 warning tty: vt, fix bogus division in csi_J Fix potential infoleak in older kernels ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct ANDROID: binder: Add strong ref checks tcp: fix overflow in __tcp_retransmit_skb() iommu/vt-d: Fix IOMMU lookup for SR-IOV Virtual Functions tcp: avoid infinite loop in tcp_splice_read() ipv6: tcp: add a missing tcp_v6_restore_cb() ipv6: tcp: restore IP6CB for pktoptions skbs ip6_gre: fix ip6gre_err() invalid reads l2tp: do not use udp_ioctl() ping: fix a null pointer dereference sit: fix a double free on error path sctp: avoid BUG_ON on sctp_wait_for_sndbuf mlx4: Invoke softirqs after napi_reschedule netlabel: out of bound access in cipso_v4_validate() ipv4: keep skb->dst around in presence of IP options net: use a work queue to defer net_disable_timestamp() work tcp: fix 0 divide in __tcp_select_window() ipv6: pointer math error in ip6_tnl_parse_tlv_enc_lim() ipv6: fix ip6_tnl_parse_tlv_enc_lim() can: Fix kernel panic at security_sock_rcv_skb Revert "af_unix: Fix splice-bind deadlock" UPSTREAM: net: socket: Make unnecessarily global sockfs_setattr() static UPSTREAM: net: ipv4: Don't crash if passing a null sk to ip_do_redirect. UPSTREAM: net/packet: fix overflow in check for priv area size ANDROID: dm verity: Export dm_disk BACKPORT: UPSTREAM: selinux: fix off-by-one in setprocattr ANDROID: Skip building uid_sys_stats and keyreset drivers as modules UPSTREAM: init: export name_to_dev_t and mark name argument as const BACKPORT: UPSTREAM: sysctl: Drop reference added by grab_header in proc_sys_readdir Revert "BACKPORT [UPSTREAM] net: add real socket cookies" BACKPORT: UPSTREAM: dccp: fix freeing skb too early for IPV6_RECVPKTINFO UPSTREAM: ipv4: keep skb->dst around in presence of IP options BACKPORT [UPSTREAM] net: add real socket cookies BACKPORT: checkpatch: special audit for revert commit line ANDROID: sdcardfs: Directly pass lower file for mmap UPSTREAM: PM / sleep: make PM notifiers called symmetrically Revert "ARM: 8457/1: psci-smp is built only for SMP" UPSTREAM: ARM: 8408/1: Fix the secondary_startup function in Big Endian case BACKPORT: ARM: re-implement physical address space switching arm: vdso: Rename timekeeper::tkr to timekeeper::tkr_mono staging: android: ashmem: lseek failed due to no FMODE_LSEEK. ANDROID: sdcardfs: update module info ANDROID: sdcardfs: use d_splice_alias ANDROID: sdcardfs: add read_iter/write_iter opeations ANDROID: sdcardfs: fix ->llseek to update upper and lower offset ANDROID: sdcardfs: copy lower inode attributes in ->ioctl ANDROID: sdcardfs: remove unnecessary call to do_munmap UPSTREAM: ipv6 addrconf: implement RFC7559 router solicitation backoff Revert "[ARM] armv6 dcc tty driver" Revert "arm: dcc_tty: fix armv6 dcc tty build failure" Revert "panic: Add board ID to panic output" video: adf: Set ADF_MEMBLOCK to boolean video: adf: Fix modular build ANDROID: fs: Export vfs_rmdir2 ANDROID: fs: Export free_fs_struct and set_fs_pwd ANDROID: export security_path_chown mm: Export do_munmap Revert "net: socket ioctl to reset connections matching local address" Revert "net: tcp: fix rtable leak in tcp_is_local[6]" Revert "net: fix iterating over hashtable in tcp_nuke_addr()" Revert "net: fix crash in tcp_nuke_addr()" Revert "Don't kill IPv4 sockets when killing IPv6 sockets was requested." ANDROID: base-cfg: enable CONFIG_IP_NF_NAT ANDROID: android-base.cfg: enable UID_SYS_STATS android: base-cfg: Add CONFIG_INET_DIAG_DESTROY config: android: set SELinux as default security mode config: android: move device mapper options to recommended ANDROID: android-base.cfg: add CONFIG_MODULES option ANDROID: android-base.cfg: add CONFIG_IKCONFIG option ANDROID: android-base.cfg: properly sort the file ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES. Merge 3.18.40 into android-3.18 Merge 3.18.39 into android-3.18 Merge 3.18.38 into android-3.18 Merge 3.18.37 into android-3.18 config/android: Remove CONFIG_IPV6_PRIVACY net: ipv6: Add sysctl for minimum prefix len acceptable in RIOs. config: disable CONFIG_USELIB and CONFIG_FHANDLE UPSTREAM: seccomp: always propagate NO_NEW_PRIVS on tsync UPSTREAM: arm64: vdso: constify vm_special_mapping used for aarch32 vectors page UPSTREAM: arm64: vdso: add __init section marker to alloc_vectors_page UPSTREAM: ARM: 8597/1: VDSO: put RO and RO after init objects into proper sections UPSTREAM: arm64: Add support for CLOCK_MONOTONIC_RAW in clock_gettime() vDSO UPSTREAM: arm64: Refactor vDSO time functions BACKPORT: arm64: fix vdso-offsets.h dependency UPSTREAM: kbuild: drop FORCE from PHONY targets UPSTREAM: mm: add PHYS_PFN, use it in __phys_to_pfn() UPSTREAM: ARM: 8476/1: VDSO: use PTR_ERR_OR_ZERO for vma check UPSTREAM: arm64: build vdso without libgcov UPSTREAM: arm64: vdso: work-around broken ELF toolchains in Makefile UPSTREAM: mm: fix type cast in __pfn_to_phys() UPSTREAM: mm: move __phys_to_pfn and __pfn_to_phys to asm/generic/memory_model.h UPSTREAM: ARM: 8410/1: VDSO: fix coarse clock monotonicity regression UPSTREAM: ARM: 8405/1: VDSO: fix regression with toolchains lacking ld.bfd executable UPSTREAM: ARM: 8384/1: VDSO: force use of BFD linker UPSTREAM: ARM: 8385/1: VDSO: group link options UPSTREAM: ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile UPSTREAM: ARM: 8343/1: VDSO: add build artifacts to .gitignore UPSTREAM: ARM: 8342/1: VDSO: depend on CPU_V7 UPSTREAM: ARM: 8332/1: add CONFIG_VDSO Kconfig and Makefile bits BACKPORT: ARM: 8331/1: VDSO initialization, mapping, and synchronization UPSTREAM: ARM: 8330/1: add VDSO user-space code UPSTREAM: ARM: 8329/1: miscellaneous vdso infrastructure, preparation BACKPORT: time: Add timerkeeper::tkr_raw BACKPORT: time: Rename timekeeper::tkr to timekeeper::tkr_mono ANDROID: sdcardfs: Fix style issues in macros ANDROID: sdcardfs: Use seq_puts over seq_printf ANDROID: sdcardfs: Use to kstrout ANDROID: sdcardfs: Use pr_[...] instead of printk ANDROID: sdcardfs: remove unneeded null check ANDROID: sdcardfs: Fix style issues with comments ANDROID: sdcardfs: Fix formatting ANDROID: sdcardfs: correct order of descriptors ANDROID: fix the deadlock in xt_qtaguid when enable DDEBUG net: ping: check minimum size on ICMP header length netfilter: Change %p to %pK in debug messages UPSTREAM: drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE UPSTREAM: pstore-ram: Allow optional mapping with pgprot_noncached UPSTREAM: pstore-ram: Fix hangs by using write-combine mappings BACKPORT: perf: Fix event->ctx locking misc: uidstat: change release handler for stat read operation power: align wakeup_sources format ANDROID: dm: android-verity: allow disable dm-verity for Treble VTS uid_sys_stats: fix typo in init uid_sys_stats: change to use rt_mutex ANDROID: sdcardfs: Fix gid issue ANDROID: sdcardfs: Use tabs instead of spaces in multiuser.h ANDROID: sdcardfs: Remove uninformative prints ANDROID: sdcardfs: move path_put outside of spinlock ANDROID: sdcardfs: Use case insensitive hash function ANDROID: sdcardfs: declare MODULE_ALIAS_FS ANDROID: sdcardfs: Get the blocksize from the lower fs ANDROID: sdcardfs: Use d_invalidate instead of drop_recurisve ANDROID: sdcardfs: Switch to internal case insensitive compare ANDROID: sdcardfs: Use spin_lock_nested ANDROID: sdcardfs: Replace get/put with d_lock ANDROID: sdcardfs: rate limit warning print ANDROID: sdcardfs: Fix case insensitive lookup ANDROID: Replace spaces by '_' for some android filesystem tracepoints. android: binder: move global binder state into context struct. android: binder: add padding to binder_fd_array_object. binder: use group leader instead of open thread input: evdev: Move wake_lock_destroy call UPSTREAM staging: ion: Fix error handling in ion_buffer_create UPSTREAM: regulator: core: Fix regualtor_ena_gpio_free not to access pin after freeing crypto: arm - ignore generated SHA2 assembly files ANDROID: uid_sys_stats: account for fsync syscalls ANDROID: uid_sys_stats: fix negative write bytes. ANDROID: uid_sys_stats: remove unnecessary code in procstat switch ANDROID: uid_sys_stats: return full size when state is not changed. ANDROID: uid_sys_stats: allow writing same state ANDROID: uid_sys_stats: rename uid_cputime.c to uid_sys_stats.c ANDROID: uid_cputime: add per-uid IO usage accounting UPSTREAM: Input: powermate - fix oops with malicious USB descriptors PM / sleep: Increase default DPM watchdog timeout to 60 Revert "drivers: power: Add watchdog timer to catch drivers which lockup during suspend." cpufreq: interactive governor drops bits in time calculation BACKPORT: n_tty: Fix unordered accesses to lockless read buffer perf: Tighten (and fix) the grouping condition ALSA: pcm : Call kill_fasync() in stream lock ANDROID: sdcardfs: support direct-IO (DIO) operations ANDROID: sdcardfs: implement vm_ops->page_mkwrite ANDROID: sdcardfs: Don't bother deleting freelist ANDROID: sdcardfs: Add missing path_put ANDROID: sdcardfs: Fix incorrect hash ANDROID: Refactor fs readpage/write tracepoints. ANDROID: ext4 crypto: Disables zeroing on truncation when there's no key ANDROID: binder: fix format specifier for type binder_size_t Squashfs: optimize reading uncompressed data Squashfs: implement .readpages() Squashfs: replace buffer_head with BIO Squashfs: refactor page_actor Squashfs: remove the FILE_CACHE option ANDROID: android-recommended.cfg: CONFIG_CPU_SW_DOMAIN_PAN=y UPSTREAM: udp: properly support MSG_PEEK with truncated buffers UPSTREAM: arm64: Allow hw watchpoint of length 3,5,6 and 7 BACKPORT: arm64: hw_breakpoint: Handle inexact watchpoint addresses UPSTREAM: arm64: Allow hw watchpoint at varied offset from base address BACKPORT: hw_breakpoint: Allow watchpoint of length 3,5,6 and 7 ANDROID: sdcardfs: Switch strcasecmp for internal call ANDROID: sdcardfs: switch to full_name_hash and qstr ANDROID: sdcardfs: Add GID Derivation to sdcardfs ANDROID: sdcardfs: Remove redundant operation ANDROID: sdcardfs: add support for user permission isolation ANDROID: sdcardfs: Refactor configfs interface ANDROID: sdcardfs: Allow non-owners to touch UPSTREAM: FROMLIST: 9p: fix a potential acl leak BACKPORT: posix_acl: Clear SGID bit when setting file permissions BACKPORT: Input: xpad - validate USB endpoint count during probe BACKPORT: Input: xpad - fix oops when attaching an unknown Xbox One gamepad android: base-cfg: remove CONFIG_IP[6]_NF_TARGET_REJECT_SKERR android: base-cfg: enable CONFIG_INET_DIAG_DESTROY UPSTREAM: packet: fix race condition in packet_set_ring UPSTREAM: l2tp: fix racy SOCK_ZAPPED flag check in l2tp_ip{,6}_bind() UPSTREAM: netlink: Fix dump skb leak/double free UPSTREAM: net: avoid signed overflows for SO_{SND|RCV}BUFFORCE net: socket: don't set sk_uid to garbage value in ->setattr() ANDROID: mnt: remount should propagate to slaves of slaves ANDROID: configs: CONFIG_ARM64_SW_TTBR0_PAN=y UPSTREAM: arm64: Disable PAN on uaccess_enable() UPSTREAM: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN UPSTREAM: arm64: xen: Enable user access before a privcmd hvc call UPSTREAM: arm64: Handle faults caused by inadvertent user access with PAN enabled BACKPORT: arm64: Disable TTBR0_EL1 during normal kernel execution BACKPORT: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1 BACKPORT: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros UPSTREAM: arm64: alternative: add auto-nop infrastructure BACKPORT: arm64: barriers: introduce nops and __nops macros for NOP sequences Revert "FROMLIST: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros" Revert "FROMLIST: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1" Revert "FROMLIST: arm64: Disable TTBR0_EL1 during normal kernel execution" Revert "FROMLIST: arm64: Handle faults caused by inadvertent user access with PAN enabled" Revert "FROMLIST: arm64: xen: Enable user access before a privcmd hvc call" Revert "FROMLIST: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN" ANDROID: sdcardfs: Fix locking issue with permision fix up ANDROID: trace: net: use %pK for kernel pointers ANDROID: android-base: Enable QUOTA related configs net: ipv4: Don't crash if passing a null sk to ip_rt_update_pmtu. net: inet: Support UID-based routing in IP protocols. net: core: add UID to flows, rules, and routes net: core: Add a UID field to struct sock. Revert "net: core: Support UID-based routing." Revert "Handle 'sk' being NULL in UID-based routing." Revert "net: core: fix UID-based routing build" Revert "ANDROID: net: fib: remove duplicate assignment" tcp: fix more NULL deref after prequeue changes ipv4: tcp: get rid of ugly unicast_sock tcp: ipv4: initialize unicast_sock sk_pacing_rate Revert "BACKPORT: n_tty: Fix unordered accesses to lockless read buffer" BACKPORT: n_tty: Fix unordered accesses to lockless read buffer ANDROID: dm verity: add minimum prefetch size UPSTREAM: arm64: vdso: Mark vDSO code as read-only FROMLIST: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN FROMLIST: arm64: xen: Enable user access before a privcmd hvc call FROMLIST: arm64: Handle faults caused by inadvertent user access with PAN enabled BACKPORT: arm64: use ENDPIPROC() to annotate position independent assembler routines FROMLIST: arm64: Disable TTBR0_EL1 during normal kernel execution BACKPORT: arm64: mm: place empty_zero_page in bss UPSTREAM: arm64: head.S: use memset to clear BSS FROMLIST: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1 FROMLIST: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros UPSTREAM: arm64: use non-global mappings for UEFI runtime regions UPSTREAM: arm64: Store struct thread_info in sp_el0 BACKPORT: arm64: Handle el1 synchronous instruction aborts cleanly BACKPORT: arm64: kernel: Save and restore UAO and addr_limit on exception entry UPSTREAM: Revert "arm64: alternatives: add enable parameter to conditional asm macros" UPSTREAM: arm64: kill ESR_LNX_EXEC UPSTREAM: arm64: add macro to extract ESR_ELx.EC UPSTREAM: arm64: mm: mark fault_info table const BACKPORT: arm64: Fold proc-macros.S into assembler.h UPSTREAM: arm64/kernel: fix incorrect EL0 check in inv_entry macro UPSTREAM: arm64: Add macros to read/write system registers UPSTREAM: arm64: mm: remove dsb from update_mmu_cache UPSTREAM: arm64: tlb: remove redundant barrier from __flush_tlb_pgtable UPSTREAM: arm64: mm: kill mm_cpumask usage UPSTREAM: arm64: switch_mm: simplify mm and CPU checks UPSTREAM: arm64: Use the reserved TTBR0 if context switching to the init_mm UPSTREAM: arm64: tlbflush: avoid flushing when fullmm == 1 UPSTREAM: arm64: tlbflush: remove redundant ASID casts to (unsigned long) BACKPORT: arm64: mm: rewrite ASID allocator and MM context-switching code UPSTREAM: arm64/efi: move virtmap init to early initcall UPSTREAM: arm64/efi: handle potential failure to remap memory map UPSTREAM: arm64: flush: use local TLB and I-cache invalidation UPSTREAM: arm64: kernel: fix __cpu_suspend mm switch on warm-boot UPSTREAM: arm64: efi: don't restore TTBR0 if active_mm points at init_mm UPSTREAM: arm64: proc: de-scope TLBI operation during cold boot UPSTREAM: arm64: Move swapper pagetable definitions UPSTREAM: arm64: mm: remove unused cpu_set_idmap_tcr_t0sz function UPSTREAM: arm64: remove dead code UPSTREAM: arm64: kill flush_cache_all() UPSTREAM: arm/arm64: KVM: Use set/way op trapping to track the state of the caches UPSTREAM: arm64: KVM: Fix HCR setting for 32bit guests UPSTREAM: arm/arm64: KVM: Reset the HCR on each vcpu when resetting the vcpu UPSTREAM: arm64: head.S: ensure idmap_t0sz is visible UPSTREAM: arm64: head.S: ensure visibility of page tables UPSTREAM: arm64: mm: increase VA range of identity map UPSTREAM: arm64: enforce x1|x2|x3 == 0 upon kernel entry as per boot protocol UPSTREAM: arm64: remove __calc_phys_offset UPSTREAM: arm64: merge __enable_mmu and __turn_mmu_on BACKPORT: arm64: use PC-relative reference for secondary_holding_pen_release UPSTREAM: arm64: remove __switch_data object from head.S UPSTREAM: arm64: add macros for common adrp usages UPSTREAM: arm64: Add contiguous page flag shifts and constants UPSTREAM: arm64: entry: always restore x0 from the stack on syscall return BACKPORT: arm64: entry: use ldp/stp instead of push/pop when saving/restoring regs UPSTREAM: arm64: mdscr_el1: avoid exposing DCC to userspace UPSTREAM: locking/atomics: Add _{acquire|release|relaxed}() variants of some atomic operations UPSTREAM: arm64: mm: ensure patched kernel text is fetched from PoU UPSTREAM: arm64: Use last level TLBI for user pte changes UPSTREAM: arm64: Clean up __flush_tlb(_kernel)_range functions BACKPORT: arm64: force CONFIG_SMP=y and remove redundant #ifdefs UPSTREAM: arm64: move update_mmu_cache() into asm/pgtable.h UPSTREAM: arm64: entry: fix context tracking for el0_sp_pc UPSTREAM: arm64: fix missing syscall trace exit UPSTREAM: arm64: Fix section mismatch on alloc_init_p[mu]d() UPSTREAM: arm64: mm: remove reference to tlb.S from comment block BACKPORT: arm64: expose number of page table levels on Kconfig level UPSTREAM: arm64: mm: remove unused functions and variable protoypes UPSTREAM: arm64: drop unnecessary cache+tlb maintenance UPSTREAM: arm64:mm: free the useless initial page table UPSTREAM: arm64: remove broken cachepolicy code UPSTREAM: arm64: Invalidate the TLB corresponding to intermediate page table levels UPSTREAM: mmu_gather: move minimal range calculations into generic code BACKPORT: mm: avoid setting up anonymous pages into file mapping UPSTREAM: ring-buffer: Prevent overflow of size in ring_buffer_resize() UPSTREAM: arm64: fix dump_instr when PAN and UAO are in use UPSTREAM: arm64: Remove the get_thread_info() function BACKPORT: arm64: kernel: Don't toggle PAN on systems with UAO UPSTREAM: arm64: cpufeature: Test 'matches' pointer to find the end of the list BACKPORT: arm64: kernel: Add support for User Access Override UPSTREAM: arm64: guard asm/assembler.h against multiple inclusions UPSTREAM: arm64: add ARMv8.2 id_aa64mmfr2 boiler plate BACKPORT: arm64: cpufeature: Change read_cpuid() to use sysreg's mrs_s macro UPSTREAM: arm64/kvm: Make use of the system wide safe values BACKPORT: arm64/debug: Make use of the system wide safe value BACKPORT: arm64: add __init/__initdata section marker to some functions/variables UPSTREAM: arm64: cpufeature: Track unsigned fields UPSTREAM: arm64: cpufeature: Add helpers for extracting unsigned values UPSTREAM: arm64: mark cpus_have_hwcap as __maybe_unused UPSTREAM: arm64: cpufeature: declare enable_cpu_capabilities as static UPSTREAM: arm64: Move FP/ASIMD hwcap handling to common code UPSTREAM: arm64: flush FP/SIMD state correctly after execve() UPSTREAM: arm64: fix bug for reloading FPSIMD state after CPU hotplug. UPSTREAM: arm64: kernel thread don't need to save fpsimd context. UPSTREAM: arm64/HWCAP: Use system wide safe values BACKPORT: arm64/capabilities: Make use of system wide safe value UPSTREAM: arm64: Delay cpu feature capability checks UPSTREAM: arm64: Refactor check_cpu_capabilities UPSTREAM: arm64: Cleanup mixed endian support detection UPSTREAM: arm64: Read system wide CPUID value UPSTREAM: arm64: Consolidate CPU Sanity check to CPU Feature infrastructure BACKPORT: arm64: Keep track of CPU feature registers UPSTREAM: arm64: sanity checks: add missing AArch32 registers UPSTREAM: arm64: Handle width of a cpuid feature BACKPORT: arm64: Move /proc/cpuinfo handling code BACKPORT: arm64: Move mixed endian support detection BACKPORT: arm64: Move cpu feature detection code UPSTREAM: arm64: Add COMPAT_HWCAP_LPAE BACKPORT: arm64: Delay cpuinfo_store_boot_cpu UPSTREAM: arm64: Delay ELF HWCAP initialisation until all CPUs are up UPSTREAM: arm64: Make the CPU information more clear BACKPORT: arm64: copy_to-from-in_user optimization using copy template UPSTREAM: arm64: Change memcpy in kernel to use the copy template file UPSTREAM: arm64: remove processor_id UPSTREAM: arm64: alternative: put secondary CPUs into polling loop during patch UPSTREAM: arm64: alternatives: add enable parameter to conditional asm macros BACKPORT: arm64: elf: use cpuid_feature_extract_field for hwcap detection UPSTREAM: arm64: Get rid of struct cpu_table BACKPORT: arm64: lse: use generic cpufeature detection for LSE atomics BACKPORT: arm64: kconfig: group the v8.1 features together UPSTREAM: arm64: cpufeature.h: add missing #include of kernel.h cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions CHROMIUM: cgroups: relax permissions on moving tasks between cgroups Revert "cgroup: refactor allow_attach function into common code" Revert "memcg: add permission check" Revert "cgroup: Add generic cgroup subsystem permission checks" Revert "cgroup: memcg: pass correct argument to subsys_cgroup_allow_attach" Revert "cgroup: Fix issues in allow_attach callback" Revert "Fix generic cgroup subsystem permission checks" Revert "include: linux: cgroup: Fix compiler warning" Revert "cpuset: Add allow_attach hook for cpusets on android." Revert "cpuset: Fix allow_attach hook for cpusets on android." BACKPORT: arm64: kernel: Add support for Privileged Access Never UPSTREAM: arm64/uaccess: fix sparse errors UPSTREAM: arm64: Generalise msr_s/mrs_s operations UPSTREAM: arm64: kernel: Add optional CONFIG_ parameter to ALTERNATIVE() UPSTREAM: arm64: kernel: Add min_field_value and use '>=' for feature detection UPSTREAM: arm64: kernel: Add cpufeature 'enable' callback UPSTREAM: arm64: kernel: Move config_sctlr_el1 BACKPORT: arm64: kernel: Adopt new alternative assembler macros UPSTREAM: arm64: mm: Adopt new alternative assembler macros UPSTREAM: arm64: alternative: Provide if/else/endif assembler macros UPSTREAM: arm64: kernel: Add cpuid_feature_extract_field() for 4bit sign extension BACKPORT: arm64: lib: use pair accessors for copy_*_user routines UPSTREAM: arm64: alternative: Introduce feature for GICv3 CPU interface UPSTREAM: arm64: fix midr range for Cortex-A57 erratum 832075 BACKPORT: arm64: errata: add workaround for cortex-a53 erratum #845719 BACKPORT: arm64: Extract feature parsing code from cpu_errata.c UPSTREAM: arm64: Provide a namespace to NCAPS UPSTREAM: arm64: alternative: Work around .inst assembler bugs BACKPORT: arm64: alternative: Merge alternative-asm.h into alternative.h UPSTREAM: arm64: decode ESR_ELx.EC when reporting exceptions UPSTREAM: arm64: move to ESR_ELx macros UPSTREAM: arm64: introduce common ESR_ELx_* definitions UPSTREAM: arm64: alternative: Allow immediate branch as alternative instruction UPSTREAM: arm64: add module support for alternatives fixups UPSTREAM: arm64: insn: Add aarch64_{get,set}_branch_offset UPSTREAM: arm64: insn: Add aarch64_insn_decode_immediate UPSTREAM: arm64: insn: fix compare-and-branch encodings UPSTREAM: arm64: sanity checks: add ID_AA64DFR{0,1}_EL1 UPSTREAM: arm64: sanity checks: add missing newline to print UPSTREAM: arm64: sanity checks: ignore ID_MMFR0.AuxReg UPSTREAM: arm64: protect alternatives workarounds with Kconfig options UPSTREAM: arm64: add Cortex-A57 erratum 832075 workaround UPSTREAM: arm64: add Cortex-A53 cache errata workaround BACKPORT: arm64: detect silicon revisions and set cap bits accordingly UPSTREAM: arm64: add alternative runtime patching BACKPORT: arm64: add cpu_capabilities bitmap sdcardfs: Change magic value sdcardfs: Use per mount permissions sdcardfs: Add gid and mask to private mount data sdcardfs: User new permission2 functions vfs: Add setattr2 for filesystems with per mount permissions vfs: Add permission2 for filesystems with per mount permissions vfs: Allow filesystems to access their private mount data mnt: Add filesystem private data to mount points sdcardfs: Move directory unlock before touch sdcardfs: fix external storage exporting incorrect uid sdcardfs: Added top to sdcardfs_inode_info sdcardfs: Switch package list to RCU sdcardfs: Fix locking for permission fix up sdcardfs: Check for other cases on path lookup sdcardfs: override umask on mkdir and create ANDROID: video: adf: Avoid directly referencing user pointers BACKPORT: security: fix typo in security_task_prctl android: binder: support for file-descriptor arrays. android: binder: support for scatter-gather. android: binder: add extra size to allocator. android: binder: refactor binder_transact() android: binder: support multiple /dev instances. android: binder: deal with contexts in debugfs. android: binder: support multiple context managers. android: binder: split flat_binder_object. ARM64: Ignore Image-dtb from git point of view arm64: add option to build Image-dtb BACKPORT: lib: harden strncpy_from_user Fix compilation error UPSTREAM: tracefs: Fix refcount imbalance in start_creating() UPSTREAM: tracing: Have mkdir and rmdir be part of tracefs UPSTREAM: tracing: Automatically mount tracefs on debugfs/tracing UPSTREAM: new primitive: debugfs_create_automount() UPSTREAM: debugfs: split end_creating() into success and failure cases UPSTREAM: debugfs: take mode-dependent parts of debugfs_get_inode() into callers UPSTREAM: fold debugfs_mknod() into callers UPSTREAM: fold debugfs_create() into caller UPSTREAM: fold debugfs_mkdir() into caller UPSTREAM: debugfs_mknod(): get rid useless arguments UPSTREAM: fold debugfs_link() into caller UPSTREAM: debugfs: kill __create_file() UPSTREAM: debugfs: split the beginning and the end of __create_file() off UPSTREAM: debugfs_{mkdir,create,link}(): get rid of redundant argument UPSTREAM: tracing: Convert the tracing facility over to use tracefs UPSTREAM: tracing: Move enabling tracepoints to just after rcu_init() UPSTREAM: tracing: Separate out initializing top level dir from instances UPSTREAM: tracing: Make tracing_init_dentry_tr() static UPSTREAM: tracing: Use IS_ERR() check for return value of tracing_init_dentry() UPSTREAM: tracefs: Add directory /sys/kernel/tracing UPSTREAM: tracefs: Add new tracefs file system UPSTREAM: move d_rcu from overlapping d_child to overlapping d_alias UPSTREAM: percpu: fix synchronization between synchronous map extension and chunk destruction UPSTREAM: percpu: fix synchronization between chunk->map_extend_work and chunk destruction ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct ANDROID: binder: Add strong ref checks UPSTREAM: staging/android/ion : fix a race condition in the ion driver ANDROID: android-base: CONFIG_HARDENED_USERCOPY=y UPSTREAM: fs/proc/kcore.c: Add bounce buffer for ktext data UPSTREAM: fs/proc/kcore.c: Make bounce buffer global for read BACKPORT: arm64: Correctly bounds check virt_addr_valid UPSTREAM: KEYS: Fix crash when attempt to garbage collect an uninstantiated keyring UPSTREAM: KEYS: Fix race between key destruction and finding a keyring by name ANDROID: dm: android-verity: Remove fec_header location constraint BACKPORT: audit: consistently record PIDs with task_tgid_nr() UPSTREAM: vmlinux.lds.h: allow arch specific handling of ro_after_init data section UPSTREAM: x86/vdso: Mark the vDSO code read-only after init UPSTREAM: lkdtm: Verify that '__ro_after_init' works correctly UPSTREAM: arch: Introduce post-init read-only memory BACKPORT: x86/mm: Always enable CONFIG_DEBUG_RODATA and remove the Kconfig option UPSTREAM: mm/init: Add 'rodata=off' boot cmdline parameter to disable read-only kernel mappings UPSTREAM: asm-generic: Consolidate mark_rodata_ro() UPSTREAM: arm64: make sys_call_table const ANDROID: fs: Fix for a (allmod) build failure. ANDROID: fs: FS tracepoints to track IO. Android: Fix build breakages. net: inet: diag: expose the socket mark to privileged processes. net: diag: make udp_diag_destroy work for mapped addresses. net: diag: support SOCK_DESTROY for UDP sockets net: diag: allow socket bytecode filters to match socket marks net: diag: slightly refactor the inet_diag_bc_audit error checks. net: diag: Add support to filter on device index BACKPORT: x86: fix SMAP in 32-bit environments UPSTREAM: ARM: alignment: fix alignment handling for uaccess changes UPSTREAM: ARM: software-based priviledged-no-access support UPSTREAM: ARM: 8431/1: fix alignement of __bug_table section entries UPSTREAM: ARM: domains: add memory dependencies to get_domain/set_domain UPSTREAM: ARM: domains: thread_info.h no longer needs asm/domains.h UPSTREAM: ARM: uaccess: fix undefined instruction on ARMv7M/noMMU UPSTREAM: sched/preempt, arm/futex: Disable preemption in UP futex_atomic_op_inuser() explicitly BACKPORT: sched/preempt, arm/futex: Disable preemption in UP futex_atomic_cmpxchg_inatomic() explicitly UPSTREAM: ARM: entry: provide uaccess assembly macro hooks UPSTREAM: ARM: entry: get rid of multiple macro definitions UPSTREAM: ARM: 8266/1: Remove early stack deallocation from restore_user_regs UPSTREAM: ARM: mm: improve do_ldrd_abort macro UPSTREAM: ARM: swpan: fix nwfpe for uaccess changes UPSTREAM: ARM: domains: remove DOMAIN_TABLE UPSTREAM: ARM: domains: keep vectors in separate domain UPSTREAM: ARM: domains: get rid of manager mode for user domain UPSTREAM: ARM: domains: move initial domain setting value to asm/domains.h UPSTREAM: ARM: redo TTBR setup code for LPAE UPSTREAM: ARM: 8350/1: proc-feroceon: Fix feroceon_proc_info macro UPSTREAM: ARM: 8314/1: replace PROCINFO embedded branch with relative offset UPSTREAM: ARM: 8196/1: vfp: Workaround bad MVFR1 register on some Kraits UPSTREAM: ARM: domains: provide domain_mask() UPSTREAM: ARM: domains: switch to keeping domain value in register UPSTREAM: all arches, signal: move restart_block to struct task_struct UPSTREAM: audit: fix a double fetch in audit_log_single_execve_arg() UPSTREAM: Fix broken audit tests for exec arg len UPSTREAM: audit: Fix check of return value of strnlen_user() UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor BACKPORT: ARM: 8235/1: Support for the PXN CPU feature on ARMv7 Revert "BACKPORT: ARM: 8235/1: Support for the PXN CPU feature on ARMv7 Modern ARMv7-A/R cores optionally implement below new hardware feature:" Revert "UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor The VMSA field of MMFR0 (bottom 4 bits) is incremented for each added feature. PXN is supported if the value is >= 4 and LPAE is supported if it is >= 5." UPSTREAM: perf: Fix race in swevent hash ANDROID: dm: Fix symbol exports for dm target callbacks UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor The VMSA field of MMFR0 (bottom 4 bits) is incremented for each added feature. PXN is supported if the value is >= 4 and LPAE is supported if it is >= 5. BACKPORT: ARM: 8235/1: Support for the PXN CPU feature on ARMv7 Modern ARMv7-A/R cores optionally implement below new hardware feature: ANDROID: dm: android-verity: Allow android-verity to be compiled as an independent module FROMLIST: pstore: drop pmsg bounce buffer UPSTREAM: usercopy: remove page-spanning test for now UPSTREAM: usercopy: force check_object_size() inline BACKPORT: usercopy: fold builtin_const check into inline function UPSTREAM: x86/uaccess: force copy_*_user() to be inlined UPSTREAM: block: fix use-after-free in sys_ioprio_get() UPSTREAM: HID: core: prevent out-of-bound readings UPSTREAM: sg: Fix double-free when drives detach during SG_IO UPSTREAM: tty: Prevent ldisc drivers from re-using stale tty fields BACKPORT: netfilter: nfnetlink: correctly validate length of batch messages UPSTREAM: netfilter: nfnetlink: validate nfnetlink header from batch cpuset: Make cpusets restore on hotplug UPSTREAM: Make the hardened user-copy code depend on having a hardened allocator UPSTREAM: usercopy: fix overlap check for kernel text UPSTREAM: usercopy: avoid potentially undefined behavior in pointer math UPSTREAM: mm: SLUB hardened usercopy support UPSTREAM: mm/slub: support left redzone UPSTREAM: mm: SLAB hardened usercopy support BACKPORT: arm64/uaccess: Enable hardened usercopy BACKPORT: ARM: uaccess: Enable hardened usercopy UPSTREAM: ARM: fix uaccess_with_memcpy() with SW_DOMAIN_PAN BACKPORT: ARM: uaccess: provide uaccess_save_and_enable() and uaccess_restore() BACKPORT: x86/uaccess: Enable hardened usercopy BACKPORT: mm: Hardened usercopy BACKPORT: mm: Implement stack frame object validation UPSTREAM: mm: Add is_migrate_cma_page UPSTREAM: unsafe_[get|put]_user: change interface to use a error target label BACKPORT: arm64: mm: fix location of _etext BACKPORT: ARM: 8583/1: mm: fix location of _etext UPSTREAM: Use the new batched user accesses in generic user string handling BACKPORT: Add 'unsafe' user access functions for batched accesses UPSTREAM: x86: reorganize SMAP handling in user space accesses UPSTREAM: x86/uaccess: Tell the compiler that uaccess is unlikely to fault UPSTREAM: x86/uaccess: fix sparse errors UPSTREAM: tcp: fix use after free in tcp_xmit_retransmit_queue() Don't show empty tag stats for unprivileged uids ext4 crypto: fix bugs in ext4_encrypted_zeroout() ext4 crypto: replace some BUG_ON()'s with error checks ext4 crypto: ext4_page_crypto() doesn't need a encryption context ext4: optimize ext4_writepage() for attempted 4k delalloc writes ext4 crypto: fix memory leak in ext4_bio_write_page() ext4: disable zeroout optimization when encryption is enabled ext4 crypto: remove duplicate header file ext4 crypto: fix spelling typo in comment ext4 crypto: exit cleanly if ext4_derive_key_aes() fails ext4 crypto: check for too-short encrypted file names ext4 crypto: use a jbd2 transaction when adding a crypto policy ext4 crypto: fail the mount if blocksize != pagesize ext4 crypto: fix sparse warnings in fs/ext4/ioctl.c ext4 crypto: fix ext4_get_crypto_ctx()'s calling convention in ext4_decrypt_one ext4 crypto: allocate bounce pages using GFP_NOWAIT ext4 crypto: release crypto resource on module exit ext4 crypto: handle unexpected lack of encryption keys ext4 crypto: allocate the right amount of memory for the on-disk symlink ext4 crypto: clean up error handling in ext4_fname_setup_filename ext4 crypto: policies may only be set on directories ext4 crypto: enforce crypto policy restrictions on cross-renames ext4 crypto: encrypt tmpfile located in encryption protected directory ext4 crypto: make sure the encryption info is initialized on opendir(2) ext4 crypto: set up encryption info for new inodes in ext4_inherit_context() ext4 crypto: fix memory leaks in ext4_encrypted_zeroout ext4 crypto: use per-inode tfm structure ext4 crypto: require CONFIG_CRYPTO_CTR if ext4 encryption is enabled ext4 crypto: shrink size of the ext4_crypto_ctx structure ext4 crypto: get rid of ci_mode from struct ext4_crypt_info ext4 crypto: use slab caches ext4: clean up superblock encryption mode fields ext4 crypto: reorganize how we store keys in the inode ext4 crypto: separate kernel and userspace structure for the key ext4 crypto: don't allocate a page when encrypting/decrypting file names ext4 crypto: optimize filename encryption ext4 crypto: Do not select from EXT4_FS_ENCRYPTION ext4 crypto: add padding to filenames before encrypting ext4 crypto: simplify and speed up filename encryption ext4 crypto: enable encryption feature flag ext4 crypto: Add symlink encryption ext4 crypto: enable filename encryption ext4 crypto: filename encryption modifications ext4 crypto: partial update to namei.c for fname crypto ext4 crypto: insert encrypted filenames into a leaf directory block ext4 crypto: teach ext4_htree_store_dirent() to store decrypted filenames ext4 crypto: filename encryption facilities ext4 crypto: implement the ext4 decryption read path ext4 crypto: implement the ext4 encryption write path ext4 crypto: inherit encryption policies on inode and directory create ext4 crypto: enforce context consistency ext4 crypto: add encryption key management facilities ext4 crypto: add ext4 encryption facilities ext4 crypto: add encryption policy and password salt support ext4 crypto: add encryption xattr support ext4 crypto: export ext4_empty_dir() ext4 crypto: add ext4 encryption Kconfig ext4 crypto: reserve codepoints used by the ext4 encryption feature ext4 crypto: add ext4_mpage_readpages() UPSTREAM: proc: prevent accessing /proc/<PID>/environ until it's ready UPSTREAM: [media] xc2028: unlock on error in xc2028_set_config() UPSTREAM: [media] xc2028: avoid use after free Android: MMC/UFS IO Latency Histograms. UPSTREAM: block: fix use-after-free in seq file UPSTREAM: assoc_array: don't call compare_object() on a node ANDROID: base-cfg: enable SECCOMP config DEBUG: cpufreq: fix cpu_capacity tracing build for non-smp systems UPSTREAM: capabilities: ambient capabilities kernel: kcov: include missing header for ‘struct task_struct’ arm: Fix #if/#ifdef typo in topology.c arm: Fix build error "conflicting types for 'scale_cpu_capacity'" Revert "Android: MMC/UFS IO Latency Histograms." Android: MMC/UFS IO Latency Histograms. UPSTREAM: af_unix: Guard against other == sk in unix_dgram_sendmsg UPSTREAM: ALSA: timer: Fix race among timer ioctls ipv6: fix endianness error in icmpv6_err net: ipv6: Fix ping to link-local addresses. UPSTREAM: Bluetooth: Fix potential NULL dereference in RFCOMM bind callback BACKPORT: tcp: make challenge acks less predictable BACKPORT: ecryptfs: fix handling of directory opening UPSTREAM: ecryptfs: don't allow mmap when the lower fs doesn't support it UPSTREAM: Revert "ecryptfs: forbid opening files without mmap handler" ANDROID: net: fib: remove duplicate assignment arm64: defconfig: add few misc configs for development/debugging/testing BACKPORT: kernel: add kcov code coverage sched/autogroup: Fix failure to set cpu.rt_runtime_us sched: Fix hrtick_start() on UP vmstat: make vmstat_updater deferrable again and shut down on idle UPSTREAM: cpuidle: Clean up fallback handling in cpuidle_idle_call() UPSTREAM: PM / sleep: Re-implement suspend-to-idle handling UPSTREAM: sched: Improve load balancing in the presence of idle CPUs sched/fair: call OPP update when going idle after migration UPSTREAM: sched/fair: Avoid pulling all tasks in idle balancing UPSTREAM: sched: Add SD_PREFER_SIBLING for SMT level sched/cpufreq_sched: fix thermal capping events sched/fair: Picking cpus with low OPPs for tasks that prefer idle CPUs FIXUP: sched/tune: do initialization as a postcore_initicall DEBUG: sched: add tracepoint for RD overutilized sched/tune: Introducing a new schedtune attribute prefer_idle sched: use util instead of capacity to select busy cpu arch_timer: add error handling when the MPM global timer is cleared cpufreq: introduce cpufreq_driver_is_slow arm: Enable max freq invariant scheduler load-tracking and capacity support arm: Cpu invariant scheduler load-tracking and capacity support arm: topology: Define TC2 energy and provide it to the scheduler arm: Update arch_scale_cpu_capacity() to reflect change to define arm: Enable frequency invariant scheduler load-tracking support arm64, topology: Updates to use DT bindings for EAS costing data sched: Support for extracting EAS energy costs from DT Documentation: DT bindings for energy model cost data required by EAS cgroup: reorder SUBSYS(blkio) in cgroup_subsys.h cpumask, nodemask: implement cpumask/nodemask_pr_args() kernel: make READ_ONCE() valid on const arguments kernel: Change ASSIGN_ONCE(val, x) to WRITE_ONCE(x, val) kernel: Provide READ_ONCE and ASSIGN_ONCE UPSTREAM: net: Fix use after free in the recvmmsg exit path Implement memory_state_time, used by qcom,cpubw power: Refactors the code which prints suspend time. UPSTREAM: ecryptfs: forbid opening files without mmap handler UPSTREAM: proc: prevent stacking filesystems on top UPSTREAM: ppp: defer netns reference release for ppp channel cpuset: Fix allow_attach hook for cpusets on android. cpuset: Add allow_attach hook for cpusets on android. Revert "CHROMIUM: android: binder: Fix potential scheduling-while-atomic" CHROMIUM: android: binder: Fix potential scheduling-while-atomic UPSTREAM: netfilter: x_tables: make sure e->next_offset covers remaining blob size UPSTREAM: netfilter: x_tables: validate e->target_offset early UPSTREAM: KEYS: potential uninitialized variable UPSTREAM: unix: avoid use-after-free in ep_remove_wait_queue UPSTREAM: KEYS: Fix ASN.1 indefinite length object parsing UPSTREAM: ppp: take reference on channels netns BACKPORT: ipv6: tcp: add rcu locking in tcp_v6_send_synack() UPSTREAM: netfilter: x_tables: fix unconditional helper UPSTREAM: ipv6: Don't reduce hop limit for an interface UPSTREAM: ipv4: try to cache dst_entries which would cause a redirect UPSTREAM: ASN.1: Fix non-match detection failure on data overrun ANDROID: sdcardfs: fix itnull.cocci warnings UPSTREAM: KEYS: close race between key lookup and freeing ANDROID: dm: android-verity: Verify header before fetching table android-recommended.cfg: enable fstack-protector-strong sdcardfs: Truncate packages_gid.list on overflow UPSTREAM: cdc_ncm: do not call usbnet_link_change from cdc_ncm_bind UPSTREAM: udp: fix behavior of wrong checksums ANDROID: dm: allow adb disable-verity only in userdebug ANDROID: dm: mount as linear target if eng build netfilter: xt_quota2: make quota2_log work well UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_ccallback UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt UPSTREAM: ALSA: timer: Fix leak in SNDRV_TIMER_IOCTL_PARAMS UPSTREAM: net: validate the range we feed to iov_iter_init() in sys_sendto/sys_recvfrom BACKPORT: ipv6: add complete rcu protection around np->opt BACKPORT: net: fix infoleak in rtnetlink BACKPORT: netfilter: Kconfig: get rid of parens around depends on cpu: send KOBJ_ONLINE event when enabling cpus ANDROID: dm verity fec: initialize recursion level ANDROID: dm verity fec: fix RS block calculation ANDROID: dm verity fec: pack the fec_header structure ANDROID: dm verity fec: add missing release from fec_ktype ANDROID: dm verity fec: limit error correction recursion ANDROID: restrict access to perf events FROMLIST: security,perf: Allow further restriction of perf_event_open BACKPORT: perf tools: Document the perf sysctls ANDROID: dm: use default verity public key ANDROID: dm: fix signature verification flag UPSTREAM: tty: Fix unsafe ldisc reference via ioctl(TIOCGETD) UPSTREAM: procfs: fixes pthread cross-thread naming if !PR_DUMPABLE ANDROID: dm: use name_to_dev_t dm: fix dm_substitute_devices() fuse: Add support for d_canonical_path vfs: change d_canonical_path to take two paths UPSTREAM: arm64: Fix text patching logic when using fixmap BACKPORT: selinux: restrict kernel module loading android: base-cfg: enable CONFIG_QUOTA ANDROID: dm: rename dm-linear methods for dm-android-verity ANDROID: dm verity fec: add sysfs attribute fec/corrected sdcardfs: remove unneeded __init and __exit sdcardfs: Remove unused code ANDROID: dm: Mounting root as linear device when verity disabled BACKPORT: nl80211: Stop scheduled scan if netlink client disappears sdcardfs: remove effectless config option trace: cpufreq: fix typo in min/max cpufreq inotify: Fix erroneous update of bit count sdcardfs: Add support for d_canonicalize vfs: add d_canonical_path for stacked filesystem support sdcardfs: Bring up to date with Android M permissions: Changed type-casting in packagelist management Port of sdcardfs to 3.18 Included sdcardfs source code for kernel 3.0 BACKPORT: FROMLIST: mm: ASLR: use get_random_long() FROMLIST: drivers: char: random: add get_random_long() UPSTREAM: ALSA: timer: Harden slave timer list handling ANDROID: dm-crypt: Remove WQ_NON_REENTRANT flag. ANDROID: recommended.cfg: Setup verity root A/B ANDROID: dm-android-verity: Rebase on top of 4.1 ANDROID: dm: Rebase on top of 4.1 ANDROID: dm: Add android verity target UPSTREAM: lib/string.c: introduce strreplace() CHROMIUM: dm: boot time specification of dm= ANDROID: dm-crypt: run in a WQ_HIGHPRI workqueue ANDROID: dm-verity: run in a WQ_HIGHPRI workqueue net: tcp: fix rtable leak in tcp_is_local[6] UPSTREAM: arm64: cpu hotplug: ensure we mask out CPU_TASKS_FROZEN in notifiers UPSTREAM: dm crypt: sort writes UPSTREAM: dm crypt: offload writes to thread UPSTREAM: dm crypt: remove unused io_pool and _crypt_io_pool UPSTREAM: dm crypt: avoid deadlock in mempools UPSTREAM: dm crypt: don't allocate pages for a partial request android: base-cfg: Add CONFIG_IP_MULTICAST Conflicts: Documentation/sysctl/kernel.txt android/configs/android-base.cfg arch/arm/kernel/head-nommu.S arch/arm/kernel/vdso.c arch/arm/mm/mmap.c arch/arm/mm/mmu.c arch/arm/vdso/vgettimeofday.c arch/arm64/Kconfig arch/arm64/include/asm/assembler.h arch/arm64/include/asm/cacheflush.h arch/arm64/include/asm/cputype.h arch/arm64/include/asm/mmu_context.h arch/arm64/include/asm/pgalloc.h arch/arm64/include/asm/thread_info.h arch/arm64/include/asm/tlbflush.h arch/arm64/kernel/Makefile arch/arm64/kernel/alternative.c arch/arm64/kernel/cpu_errata.c arch/arm64/kernel/cpu_ops.c arch/arm64/kernel/cpuinfo.c arch/arm64/kernel/entry.S arch/arm64/kernel/insn.c arch/arm64/kernel/setup.c arch/arm64/kernel/smp.c arch/arm64/kernel/topology.c arch/arm64/kernel/traps.c arch/arm64/lib/memcpy.S arch/arm64/lib/memmove.S arch/arm64/lib/memset.S arch/arm64/mm/cache.S arch/arm64/mm/context.c arch/arm64/mm/fault.c arch/arm64/mm/mmu.c arch/x86/Kconfig drivers/cpufreq/cpufreq.c drivers/cpuidle/cpuidle.c drivers/gpu/drm/vmwgfx/vmwgfx_surface.c drivers/md/Makefile drivers/md/dm-android-verity.c drivers/md/dm-crypt.c drivers/media/tuners/tuner-xc2028.c drivers/misc/Kconfig drivers/misc/Makefile drivers/misc/uid_sys_stats.c drivers/mmc/card/Kconfig drivers/mmc/card/block.c drivers/mmc/card/queue.c drivers/mmc/card/queue.h drivers/mmc/core/bus.c drivers/mmc/core/core.c drivers/mmc/core/host.c drivers/mmc/core/mmc.c drivers/mmc/host/sdhci.c drivers/net/usb/cdc_ncm.c drivers/net/usb/qmi_wwan.c drivers/scsi/ufs/ufshcd.c drivers/scsi/ufs/ufshcd.h drivers/staging/android/binder.c drivers/staging/android/ion/ion.c drivers/tty/serial/atmel_serial.c drivers/tty/sysrq.c drivers/usb/core/quirks.c drivers/usb/gadget/configfs.c drivers/usb/gadget/function/f_accessory.c drivers/usb/gadget/function/f_fs.c drivers/usb/gadget/function/f_mass_storage.c drivers/usb/gadget/function/f_midi.c drivers/usb/gadget/function/f_mtp.c drivers/usb/gadget/function/u_ether.c drivers/usb/gadget/legacy/gmidi.c drivers/usb/host/xhci-plat.c drivers/usb/host/xhci-ring.c drivers/usb/host/xhci.c drivers/usb/serial/option.c drivers/usb/serial/qcserial.c drivers/video/fbdev/core/fbcmap.c fs/9p/acl.c fs/btrfs/acl.c fs/ext2/acl.c fs/ext4/acl.c fs/ext4/crypto.c fs/ext4/crypto_fname.c fs/ext4/crypto_key.c fs/ext4/crypto_policy.c fs/ext4/dir.c fs/ext4/ext4.h fs/ext4/ext4_crypto.h fs/ext4/inline.c fs/ext4/ioctl.c fs/ext4/namei.c fs/ext4/page-io.c fs/ext4/readpage.c fs/f2fs/acl.c fs/f2fs/data.c fs/f2fs/f2fs.h fs/f2fs/super.c fs/gfs2/acl.c fs/hfsplus/posix_acl.c fs/namei.c fs/ocfs2/acl.c fs/pnode.c fs/reiserfs/xattr_acl.c fs/sdcardfs/inode.c fs/sdcardfs/lookup.c fs/sdcardfs/main.c fs/sdcardfs/packagelist.c fs/sdcardfs/sdcardfs.h fs/squashfs/block.c fs/xfs/xfs_acl.c include/linux/cgroup.h include/linux/mmc/card.h include/linux/mmc/core.h include/linux/mmc/host.h include/linux/mmc/mmc.h include/linux/mmzone.h include/linux/posix_acl.h include/linux/sched.h include/linux/sched/sysctl.h include/net/cfg80211.h include/trace/events/sched.h include/uapi/linux/ipv6.h init/do_mounts_dm.c kernel/cgroup.c kernel/events/core.c kernel/exit.c kernel/power/wakeup_reason.c kernel/sched/Makefile kernel/sched/core.c kernel/sched/cputime.c kernel/sched/deadline.c kernel/sched/fair.c kernel/sched/features.h kernel/sched/rt.c kernel/sched/sched.h kernel/sched/stop_task.c kernel/sysctl.c kernel/trace/trace.c lib/Kconfig.debug mm/Makefile mm/memory.c mm/page_alloc.c mm/slub.c net/ipv4/tcp.c net/ipv4/tcp_input.c net/netfilter/xt_qtaguid.c net/netfilter/xt_quota2.c net/unix/af_unix.c net/wireless/nl80211.c net/xfrm/xfrm_user.c scripts/kconfig/Makefile sound/usb/quirks-table.h USB, MMC and scheduler related changes were ignored as per feedback from respective teams. Some of the commit headers in the commit message are common with earlier upmerge commit, because this merge is merging google-common tip and earlier merges were with lsk-android. Change-Id: Idf6bc8ca9c902e3ac1cdae30a1820304bc909d9c Signed-off-by: Imran Khan <kimran@codeaurora.org>
| * | f2fs: support plain user/group quotaChao Yu2017-07-311-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0abd675e97e60d40e61d59532f8118b0e439034e upstream. This patch adds to support plain user/group quota. Change Note by Jaegeuk Kim. - Use f2fs page cache for quota files in order to consider garbage collection. so, quota files are not tolerable for sudden power-cuts, so user needs to do quotacheck. - setattr() calls dquot_transfer which will transfer inode->i_blocks. We can't reclaim that during f2fs_evict_inode(). So, we need to count node blocks as well in order to match i_blocks with dquot's space. Note that, Chao wrote a patch to count inode->i_blocks without inode block. (f2fs: don't count inode block in in-memory inode.i_blocks) - in f2fs_remount, we need to make RW in prior to dquot_resume. - handle fault_injection case during f2fs_quota_off_umount - TODO: Project quota Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| * | Merge 3.18.31 into android-3.18Greg Kroah-Hartman2017-04-011-0/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in 3.18.31: x86/iopl/64: Properly context-switch IOPL on Xen PV net: Clone skb before setting peeked flag net: Fix skb_set_peeked use-after-free bug ALSA: hda - Fixup inverted internal mic for Lenovo E50-80 MAINTAINERS: return arch/sh to maintained state, with new maintainers irqchip: omap-intc: Improve IRQ handler irqchip/omap-intc: Add support for spurious irq handling drm/dp/mst: move GUID storage from mgr, port to only mst branch drm/dp/mst: Reverse order of MST enable and clearing VC payload table. arm64: vmemmap: use virtual projection of linear region arm64: account for sparsemem section alignment when choosing vmemmap offset powerpc: Fix dedotify for binutils >= 2.26 ovl: fix permission checking for setattr fuse: break infinite loop in fuse_fill_write_pages() EDAC, amd64_edac: Shift wrapping issue in f1x_get_norm_dct_addr() crypto: ccp - Add hash state import and export support tty: Fix GPF in flush_to_ldisc(), part 2 [media] media: v4l2-compat-ioctl32: fix missing length copy in put_v4l2_buffer32 [media] pwc: Add USB id for Philips Spc880nc webcam crypto: ccp - Limit the amount of information exported crypto: ccp - Don't assume export/import areas are aligned net: irda: Fix use-after-free in irtty_open() staging: comedi: ni_tiocmd: change mistaken use of start_src for start_arg tools: hv: Makefile: Add hv_fcopy_daemon to Makefile tools/hv: Use include/uapi with __EXPORTED_HEADERS__ ARM: dts: armada-375: use armada-370-sata for SATA usb: retry reset if a device times out HID: core: do not scan reports if the group is already set HID: fix hid_ignore_special_drivers module parameter ALSA: usb-audio: Set correct type for some UAC2 mixer controls. ALSA: hda - Implement loopback control switch for Realtek and other codecs sched: Fix crash in sched_init_numa() HID: multitouch: fix input mode switching on some Elan panels ptrace: use fsuid, fsgid, effective creds for fs access checks iio: adis_buffer: Fix out-of-bounds memory access iio: dac: mcp4725: set iio name property in sysfs iio: pressure: mpl115: fix temperature offset sign module: wrapper for symbol name. drm/gma500: Use correct unref in the gem bo create function ARM: 8457/1: psci-smp is built only for SMP lib/ucs2_string: Add ucs2 -> utf8 helper functions efi: efivar_create_sysfs_entry() should return negative error codes efi: Use ucs2_as_utf8 in efivarfs instead of open coding a bad version efi: Do variable name validation tests in utf8 efi: Make our variable validation list include the guid efi: Make efivarfs entries immutable by default efi: Add pstore variables to the deletion whitelist lib/ucs2_string: Correct ucs2 -> utf8 conversion iw_cxgb3: Fix incorrectly returning error on success Btrfs: add missing brelse when superblock checksum fails Btrfs: igrab inode in writepage btrfs: statfs: report zero available if metadata are exhausted Btrfs: send, don't BUG_ON() when an empty symlink is found Btrfs: fix number of transaction units required to create symlink Btrfs: fix transaction handle leak on failure to create hard link btrfs: initialize the seq counter in struct btrfs_device [media] si2157: Bounds check firmware [media] si2157: return -EINVAL if firmware blob is too big kernel/resource.c: fix muxed resource handling in __request_region() security: let security modules use PTRACE_MODE_* with bitmasks btrfs: async-thread: Fix a use-after-free error for trace modules: fix longstanding /proc/kallsyms vs module insertion race. Revert "drm/radeon: call hpd_irq_event on resume" KVM: x86: Reload pit counters for all channels when restoring state KEYS: Fix handling of stored error in a negatively instantiated user key include/linux/poison.h: fix LIST_POISON{1,2} offset clk: rockchip: add pclk_cpu to the list of rk3188 critical clocks clk: rockchip: Add pclk_peri to critical clocks on RK3066/RK3188 scripts/coccinelle: modernize & [media] adv7511: TX_EDID_PRESENT is still 1 after a disconnect [media] saa7134: Fix bytesperline not being set correctly for planar formats ext4: iterate over buffer heads correctly in move_extent_per_page() perf tools: Dont stop PMU parsing on alias parse error Bluetooth: btusb: Add new AR3012 ID 13d3:3395 Bluetooth: Add new AR3012 ID 0489:e095 aacraid: Fix memory leak in aac_fib_map_free mtd: onenand: fix deadlock in onenand_block_markbad x86, irq: Keep balance of IOAPIC pin reference count PCI: Add dev->has_secondary_link to track downstream PCIe links PCI: Disable IO/MEM decoding for devices with non-compliant BARs md/raid5: Compare apples to apples (or sectors to sectors) crypto: ccp - memset request context to zero during import Bluetooth: btusb: Add a new AR3012 ID 04ca:3014 mmc: sdhci: fix data timeout (part 1) mmc: sdhci: fix data timeout (part 2) IB/srpt: Simplify srpt_handle_tsk_mgmt() [media] bttv: Width must be a multiple of 16 when capturing planar formats watchdog: rc32434_wdt: fix ioctl error handling nfsd4: fix bad bounds checking xfs: fix two memory leaks in xfs_attr_list.c error paths quota: Fix possible GPF due to uninitialised pointers mtip32xx: Print exact time when an internal command is interrupted mtip32xx: Avoid issuing standby immediate cmd during FTL rebuild mtip32xx: fix rmmod issue mtip32xx: fix crash on surprise removal of the drive mtip32xx: Handle safe removal during IO mtip32xx: fix incorrectly setting MTIP_DDF_SEC_LOCK_BIT mtip32xx: Handle FTL rebuild failure state during device initialization of: alloc anywhere from memblock if range not specified usb: hub: fix a typo in hub_port_init() leading to wrong logic KVM: i8254: change PIT discard tick policy x86: Add new MSRs and MSR bits used for Intel Skylake PMU support perf/x86/intel: Add definition for PT PMI bit sched/cputime: Fix steal_account_process_tick() to always return jiffies bcache: fix race of writeback thread starting before complete initialization bcache: cleaned up error handling around register_cache() bcache: fix cache_set_flush() NULL pointer dereference on OOM x86/PCI: Mark Broadwell-EP Home Agent & PCU as having non-compliant BARs be2iscsi: set the boot_kset pointer to NULL in case of failure drm/radeon: disable runtime pm on PX laptops without dGPU power control drm/radeon: Don't drop DP 2.7 Ghz link setup on some cards. sg: fix dxferp in from_to case jbd2: fix FS corruption possibility in jbd2_journal_destroy() on umount path EDAC/sb_edac: Fix computation of channel address Bluetooth: btusb: Add a new AR3012 ID 13d3:3472 ALSA: hda - fix the mic mute button and led problem for a Lenovo AIO xtensa: ISS: don't hang if stdin EOF is reached xtensa: fix preemption in {clear,copy}_user_highpage xtensa: clear all DBREAKC registers on start bus: imx-weim: Take the 'status' property value into account ALSA: hda - Add new GPU codec ID 0x10de007d to snd-hda ALSA: hda - Add new GPU codec ID 0x10de0082 to snd-hda ALSA: hda - Add new GPU codec ID 0x10de0083 to snd-hda ALSA: intel8x0: Add clock quirk entry for AD1981B on IBM ThinkPad X41. s390/pci: extract software counters from fmb s390/pci: enforce fmb page boundary rule Input: powermate - fix oops with malicious USB descriptors radeon/fb: add wrapper functions around fb connector add/remove drm/radeon: rework fbdev handling on chips with no connectors md: multipath: don't hardcopy bio in .make_request path net: mvneta: enable change MAC address when interface is up HID: i2c-hid: fix OOB write in i2c_hid_set_or_send_report() ALSA: hda - Fix unconditional GPIO toggle via automute mmc: mmc_spi: Add Card Detect comments and fix CD GPIO case ALSA: usb-audio: Fix NULL dereference in create_fixed_stream_quirk() nfsd: fix deadlock secinfo+readdir compound ARM: dts: sunxi: Adjust touchscreen compatible for sun5i and later x86/iopl: Fix iopl capability check on Xen PV mmc: sdhci: Fix override of timeout clk wrt max_busy_timeout Input: ims-pcu - sanity check against missing interfaces Input: synaptics - handle spurious release of trackstick buttons, again Thermal: Ignore invalid trip points x86/apic: Fix suspicious RCU usage in smp_trace_call_function_interrupt() USB: iowarrior: fix oops with malicious USB descriptors USB: usb_driver_claim_interface: add sanity checking USB: cdc-acm: more sanity checking USB: uas: Reduce can_queue to MAX_CMNDS tracing: Fix crash from reading trace_pipe with sendfile splice: handle zero nr_pages in splice_to_pipe() ALSA: usb-audio: add Microsoft HD-5001 to quirks bitops: Do not default to __clear_bit() for __clear_bit_unlock() target: Fix target_release_cmd_kref shutdown comp leak KVM: VMX: avoid guest hang on invalid invept instruction KVM: fix spin_lock_init order on x86 tracing: Fix trace_printk() to print when not using bprintk() fs/coredump: prevent fsuid=0 dumps into user-controlled directories rapidio/rionet: fix deadlock on SMP staging: comedi: ni_mio_common: fix the ni_write[blw]() functions ideapad-laptop: Add ideapad Y700 (15) to the no_hw_rfkill DMI list Input: ati_remote2 - fix crashes on detecting device with invalid descriptor ocfs2/dlm: fix race between convert and recovery ocfs2/dlm: fix BUG in dlm_move_lockres_to_recovery_list mm: page_alloc: pass PFN to __free_pages_bootmem mm: use 'unsigned int' for page order mm/page_alloc: prevent merging between isolated and other pageblocks arm64: errata: Add -mpc-relative-literal-loads to build flags ALSA: hda - Fix regression of monitor_present flag in eld proc file crypto: algif_skcipher - Require setkey before accept(2) crypto: algif_skcipher - Add nokey compatibility path crypto: algif_skcipher - Remove custom release parent function crypto: algif_skcipher - Fix race condition in skcipher_check_key Linux 3.18.31 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
* | | Merge tag 'lsk-v3.18-16.04-android' into 'msm-3.18'Imran Khan2016-06-092-5/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LSK Android 16.04 v3.18 * origin/tmp-a79bee5: (1037 commits) mm: vmalloc: don't remove inexistent guard hole in remove_vm_area() arm64: Don't relocate non-existent initrd mm/early_ioremap: add explicit #include of asm/early_ioremap.h compiler, atomics, kasan: Provide READ_ONCE_NOCHECK() locking: Remove atomicy checks from {READ,WRITE}_ONCE ARM64: kasan: print memory assignment UPSTREAM: arm64: Fix text patching logic when using fixmap Linux 3.18.31 crypto: algif_skcipher - Fix race condition in skcipher_check_key crypto: algif_skcipher - Remove custom release parent function crypto: algif_skcipher - Add nokey compatibility path crypto: algif_skcipher - Require setkey before accept(2) ALSA: hda - Fix regression of monitor_present flag in eld proc file arm64: errata: Add -mpc-relative-literal-loads to build flags mm/page_alloc: prevent merging between isolated and other pageblocks mm: use 'unsigned int' for page order mm: page_alloc: pass PFN to __free_pages_bootmem ocfs2/dlm: fix BUG in dlm_move_lockres_to_recovery_list ocfs2/dlm: fix race between convert and recovery Input: ati_remote2 - fix crashes on detecting device with invalid descriptor ideapad-laptop: Add ideapad Y700 (15) to the no_hw_rfkill DMI list staging: comedi: ni_mio_common: fix the ni_write[blw]() functions rapidio/rionet: fix deadlock on SMP fs/coredump: prevent fsuid=0 dumps into user-controlled directories tracing: Fix trace_printk() to print when not using bprintk() KVM: fix spin_lock_init order on x86 KVM: VMX: avoid guest hang on invalid invept instruction target: Fix target_release_cmd_kref shutdown comp leak bitops: Do not default to __clear_bit() for __clear_bit_unlock() ALSA: usb-audio: add Microsoft HD-5001 to quirks splice: handle zero nr_pages in splice_to_pipe() tracing: Fix crash from reading trace_pipe with sendfile USB: uas: Reduce can_queue to MAX_CMNDS USB: cdc-acm: more sanity checking USB: usb_driver_claim_interface: add sanity checking USB: iowarrior: fix oops with malicious USB descriptors x86/apic: Fix suspicious RCU usage in smp_trace_call_function_interrupt() Thermal: Ignore invalid trip points Input: synaptics - handle spurious release of trackstick buttons, again Input: ims-pcu - sanity check against missing interfaces mmc: sdhci: Fix override of timeout clk wrt max_busy_timeout x86/iopl: Fix iopl capability check on Xen PV ARM: dts: sunxi: Adjust touchscreen compatible for sun5i and later nfsd: fix deadlock secinfo+readdir compound ALSA: usb-audio: Fix NULL dereference in create_fixed_stream_quirk() mmc: mmc_spi: Add Card Detect comments and fix CD GPIO case ALSA: hda - Fix unconditional GPIO toggle via automute HID: i2c-hid: fix OOB write in i2c_hid_set_or_send_report() net: mvneta: enable change MAC address when interface is up md: multipath: don't hardcopy bio in .make_request path drm/radeon: rework fbdev handling on chips with no connectors radeon/fb: add wrapper functions around fb connector add/remove Input: powermate - fix oops with malicious USB descriptors s390/pci: enforce fmb page boundary rule s390/pci: extract software counters from fmb ALSA: intel8x0: Add clock quirk entry for AD1981B on IBM ThinkPad X41. ALSA: hda - Add new GPU codec ID 0x10de0083 to snd-hda ALSA: hda - Add new GPU codec ID 0x10de0082 to snd-hda ALSA: hda - Add new GPU codec ID 0x10de007d to snd-hda bus: imx-weim: Take the 'status' property value into account xtensa: clear all DBREAKC registers on start xtensa: fix preemption in {clear,copy}_user_highpage xtensa: ISS: don't hang if stdin EOF is reached ALSA: hda - fix the mic mute button and led problem for a Lenovo AIO Bluetooth: btusb: Add a new AR3012 ID 13d3:3472 EDAC/sb_edac: Fix computation of channel address jbd2: fix FS corruption possibility in jbd2_journal_destroy() on umount path sg: fix dxferp in from_to case drm/radeon: Don't drop DP 2.7 Ghz link setup on some cards. drm/radeon: disable runtime pm on PX laptops without dGPU power control be2iscsi: set the boot_kset pointer to NULL in case of failure x86/PCI: Mark Broadwell-EP Home Agent & PCU as having non-compliant BARs bcache: fix cache_set_flush() NULL pointer dereference on OOM bcache: cleaned up error handling around register_cache() bcache: fix race of writeback thread starting before complete initialization sched/cputime: Fix steal_account_process_tick() to always return jiffies perf/x86/intel: Add definition for PT PMI bit x86: Add new MSRs and MSR bits used for Intel Skylake PMU support KVM: i8254: change PIT discard tick policy usb: hub: fix a typo in hub_port_init() leading to wrong logic of: alloc anywhere from memblock if range not specified mtip32xx: Handle FTL rebuild failure state during device initialization mtip32xx: fix incorrectly setting MTIP_DDF_SEC_LOCK_BIT mtip32xx: Handle safe removal during IO mtip32xx: fix crash on surprise removal of the drive mtip32xx: fix rmmod issue mtip32xx: Avoid issuing standby immediate cmd during FTL rebuild mtip32xx: Print exact time when an internal command is interrupted quota: Fix possible GPF due to uninitialised pointers xfs: fix two memory leaks in xfs_attr_list.c error paths nfsd4: fix bad bounds checking watchdog: rc32434_wdt: fix ioctl error handling [media] bttv: Width must be a multiple of 16 when capturing planar formats IB/srpt: Simplify srpt_handle_tsk_mgmt() mmc: sdhci: fix data timeout (part 2) mmc: sdhci: fix data timeout (part 1) Bluetooth: btusb: Add a new AR3012 ID 04ca:3014 crypto: ccp - memset request context to zero during import md/raid5: Compare apples to apples (or sectors to sectors) PCI: Disable IO/MEM decoding for devices with non-compliant BARs PCI: Add dev->has_secondary_link to track downstream PCIe links x86, irq: Keep balance of IOAPIC pin reference count mtd: onenand: fix deadlock in onenand_block_markbad aacraid: Fix memory leak in aac_fib_map_free Bluetooth: Add new AR3012 ID 0489:e095 Bluetooth: btusb: Add new AR3012 ID 13d3:3395 perf tools: Dont stop PMU parsing on alias parse error ext4: iterate over buffer heads correctly in move_extent_per_page() [media] saa7134: Fix bytesperline not being set correctly for planar formats [media] adv7511: TX_EDID_PRESENT is still 1 after a disconnect scripts/coccinelle: modernize & clk: rockchip: Add pclk_peri to critical clocks on RK3066/RK3188 clk: rockchip: add pclk_cpu to the list of rk3188 critical clocks fs: sdcardfs: build fix include/linux/poison.h: fix LIST_POISON{1,2} offset KEYS: Fix handling of stored error in a negatively instantiated user key KVM: x86: Reload pit counters for all channels when restoring state Revert "drm/radeon: call hpd_irq_event on resume" modules: fix longstanding /proc/kallsyms vs module insertion race. btrfs: async-thread: Fix a use-after-free error for trace security: let security modules use PTRACE_MODE_* with bitmasks kernel/resource.c: fix muxed resource handling in __request_region() [media] si2157: return -EINVAL if firmware blob is too big [media] si2157: Bounds check firmware btrfs: initialize the seq counter in struct btrfs_device Btrfs: fix transaction handle leak on failure to create hard link Btrfs: fix number of transaction units required to create symlink Btrfs: send, don't BUG_ON() when an empty symlink is found btrfs: statfs: report zero available if metadata are exhausted Btrfs: igrab inode in writepage Btrfs: add missing brelse when superblock checksum fails iw_cxgb3: Fix incorrectly returning error on success arm64: kill off the libgcc dependency lib/clz_tab.c: put in lib-y rather than obj-y compiler-gcc.h: neatening compiler-gcc: integrate the various compiler-gcc[345].h files lib/ucs2_string: Correct ucs2 -> utf8 conversion efi: Add pstore variables to the deletion whitelist efi: Make efivarfs entries immutable by default efi: Make our variable validation list include the guid efi: Do variable name validation tests in utf8 efi: Use ucs2_as_utf8 in efivarfs instead of open coding a bad version efi: efivar_create_sysfs_entry() should return negative error codes lib/ucs2_string: Add ucs2 -> utf8 helper functions ARM: 8457/1: psci-smp is built only for SMP drm/gma500: Use correct unref in the gem bo create function module: wrapper for symbol name. iio: pressure: mpl115: fix temperature offset sign iio: dac: mcp4725: set iio name property in sysfs iio: adis_buffer: Fix out-of-bounds memory access ptrace: use fsuid, fsgid, effective creds for fs access checks HID: multitouch: fix input mode switching on some Elan panels sched: Fix crash in sched_init_numa() ALSA: hda - Implement loopback control switch for Realtek and other codecs ALSA: usb-audio: Set correct type for some UAC2 mixer controls. HID: fix hid_ignore_special_drivers module parameter HID: core: do not scan reports if the group is already set usb: retry reset if a device times out ARM: dts: armada-375: use armada-370-sata for SATA tools/hv: Use include/uapi with __EXPORTED_HEADERS__ tools: hv: Makefile: Add hv_fcopy_daemon to Makefile staging: comedi: ni_tiocmd: change mistaken use of start_src for start_arg net: irda: Fix use-after-free in irtty_open() crypto: ccp - Don't assume export/import areas are aligned crypto: ccp - Limit the amount of information exported [media] pwc: Add USB id for Philips Spc880nc webcam [media] media: v4l2-compat-ioctl32: fix missing length copy in put_v4l2_buffer32 tty: Fix GPF in flush_to_ldisc(), part 2 crypto: ccp - Add hash state import and export support EDAC, amd64_edac: Shift wrapping issue in f1x_get_norm_dct_addr() fuse: break infinite loop in fuse_fill_write_pages() ovl: fix permission checking for setattr powerpc: Fix dedotify for binutils >= 2.26 arm64: account for sparsemem section alignment when choosing vmemmap offset arm64: vmemmap: use virtual projection of linear region drm/dp/mst: Reverse order of MST enable and clearing VC payload table. drm/dp/mst: move GUID storage from mgr, port to only mst branch irqchip/omap-intc: Add support for spurious irq handling irqchip: omap-intc: Improve IRQ handler MAINTAINERS: return arch/sh to maintained state, with new maintainers ALSA: hda - Fixup inverted internal mic for Lenovo E50-80 net: Fix skb_set_peeked use-after-free bug net: Clone skb before setting peeked flag BACKPORT: selinux: restrict kernel module loading android: base-cfg: enable CONFIG_QUOTA ANDROID: dm: rename dm-linear methods for dm-android-verity ANDROID: mmc: Add CONFIG_MMC_SIMULATE_MAX_SPEED ANDROID: dm verity fec: add sysfs attribute fec/corrected sdcardfs: remove unneeded __init and __exit sdcardfs: Remove unused code ANDROID: dm: Mounting root as linear device when verity disabled BACKPORT: nl80211: Stop scheduled scan if netlink client disappears sdcardfs: remove effectless config option trace: cpufreq: fix typo in min/max cpufreq inotify: Fix erroneous update of bit count CHROMIUM: usb: gadget: f_accessory: add .raw_request callback CHROMIUM: usb: gadget: audio_source: add .free_func callback ANDROID: usb: gadget: Add support for MTP OS desc CHROMIUM: usb: gadget: f_mtp: fix usb_ss_ep_comp_descriptor CHROMIUM: usb: gadget: f_mtp: Add SuperSpeed support sdcardfs: Add support for d_canonicalize vfs: add d_canonical_path for stacked filesystem support kasan: add functions to clear stack poison kasan: fix kmemleak false-positive in kasan_module_alloc() kasan: always taint kernel on report mm, slub, kasan: enable user tracking by default with KASAN=y kasan: use IS_ALIGNED in memory_is_poisoned_8() kasan: Fix a type conversion error lib: test_kasan: add some testcases kasan: update reference to kasan prototype repo kasan: move KASAN_SANITIZE in arch/x86/boot/Makefile kasan: various fixes in documentation kasan: update log messages kasan: accurately determine the type of the bad access kasan: update reported bug types for kernel memory accesses kasan: update reported bug types for not user nor kernel memory accesses mm/kasan: prevent deadlock in kasan reporting mm/kasan: don't use kasan shadow pointer in generic functions mm/kasan: MODULE_VADDR is not available on all archs mm/kasan: rename kasan_enabled() to kasan_report_enabled() arm64: KASAN depends on !(ARM64_16K_PAGES && ARM64_VA_BITS_48) arm64: kasan: fix issues reported by sparse arm64: add KASAN support sdcardfs: Bring up to date with Android M permissions: Changed type-casting in packagelist management Port of sdcardfs to 3.18 Included sdcardfs source code for kernel 3.0 BACKPORT: FROMLIST: mm: ASLR: use get_random_long() FROMLIST: drivers: char: random: add get_random_long() ANDROID: usb: u_ether: Add missing rx_work init Revert "mmc: core: Hold a wake lock accross delayed work + mmc rescan" Revert "mmc: Extend wakelock if bus is dead" ANDROID: dm-crypt: Remove WQ_NON_REENTRANT flag. ANDROID: recommended.cfg: Setup verity root A/B ANDROID: dm-android-verity: Rebase on top of 4.1 ANDROID: dm: Rebase on top of 4.1 ANDROID: dm: Add android verity target UPSTREAM: lib/string.c: introduce strreplace() CHROMIUM: dm: boot time specification of dm= ANDROID: dm-crypt: run in a WQ_HIGHPRI workqueue ANDROID: dm-verity: run in a WQ_HIGHPRI workqueue ANDROID: mmc: move to a SCHED_FIFO thread net: tcp: fix rtable leak in tcp_is_local[6] UPSTREAM: arm64: cpu hotplug: ensure we mask out CPU_TASKS_FROZEN in notifiers android: base-cfg: Add CONFIG_IP_MULTICAST kasan: fix last shadow judgement in memory_is_poisoned_16() mm/mempool.c: kasan: poison mempool elements mm/mempool: avoid KASAN marking mempool poison checks as use-after-free mm/mempool: allow NULL `pool' pointer in mempool_destroy() mm/mempool.c: kasan: poison mempool elements mm, mempool: poison elements backed by slab allocator mm, mempool: disallow mempools based on slab caches with constructors mm, mempool: do not allow atomic resizing x86/kasan, mm: Introduce generic kasan_populate_zero_shadow() x86/kasan: Define KASAN_SHADOW_OFFSET per architecture kasan: remove duplicate definition of the macro KASAN_FREE_PAGE kasan: show gcc version requirements in Kconfig and Documentation kasan: Makefile: shut up warnings if CONFIG_COMPILE_TEST=y kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h> kasan, module, vmalloc: rework shadow allocation for modules kasan: enable instrumentation of global variables module: fix types of device tables aliases kernel: add support for .init_array.* constructors mm: vmalloc: pass additional vm_flags to __vmalloc_node_range() mm: vmalloc: add flag preventing guard hole allocation kasan: enable stack instrumentation x86_64: kasan: add interceptors for memset/memmove/memcpy functions lib: add kasan test module kmemleak: disable kasan instrumentation for kmemleak fs: dcache: manually unpoison dname after allocation to shut up kasan's reports mm: slub: add kernel address sanitizer support for slub allocator mm: slub: introduce metadata_access_enable()/metadata_access_disable() mm: slub: share object_err function mm: slub: introduce virt_to_obj function mm: page_alloc: add kasan hooks on alloc and free paths x86_64: add KASan support kasan: disable memory hotplug kasan: add kernel address sanitizer infrastructure compiler: introduce __alias(symbol) shortcut MODULE_DEVICE_TABLE: fix some callsites arm64: Move some head.text functions to executable section arm64: introduce VA_START macro - the first kernel virtual address. arm64: support initrd outside kernel linear map mm: add utility for early copy from unmapped ram arm64: Change memcpy in kernel to use the copy template file arm64: move PGD_SIZE definition to pgalloc.h arm64: pgalloc: consistently use PGALLOC_GFP arm64: use ENDPIPROC() to annotate position independent assembler routines arm64: add macros for common adrp usages arm64: guard asm/assembler.h against multiple inclusions x86/iopl/64: Properly context-switch IOPL on Xen PV Linux 3.18.30 PM / OPP: Fix incorrect comments PM / OPP: Initialize regulator pointer to an error value PM / OPP: Initialize u_volt_min/max to a valid value PM / OPP: Fix NULL pointer dereference crash when disabling OPPs PM / OPP: Add dev_pm_opp_set_rate() regulator: core: Define regulator_set_voltage_triplet() PM / OPP: Manage device clk PM / OPP: Parse clock-latency and voltage-tolerance for v1 bindings PM / OPP: Introduce dev_pm_opp_get_max_transition_latency() PM / OPP: Introduce dev_pm_opp_get_max_volt_latency() PM / OPP: Disable OPPs that aren't supported by the regulator PM / OPP: get/put regulators from OPP core PM / OPP: build bug fix PM / OPP: Use snprintf() instead of sprintf() PM / OPP: Set cpu_dev->id in cpumask first PM / OPP: Fix parsing of opp-microvolt and opp-microamp properties PM / OPP: Parse 'opp-<prop>-<name>' bindings PM / OPP: Parse 'opp-supported-hw' binding PM / OPP: Add missing doc comments PM / OPP: Rename OPP nodes as opp@<opp-hz> PM / OPP: Remove 'operating-points-names' binding PM / OPP: Add {opp-microvolt|opp-microamp}-<name> binding PM / OPP: Add "opp-supported-hw" binding PM / OPP: Add opp_rcu_lockdep_assert() to _find_device_opp() PM / OPP: Hold dev_opp_list_lock for writers PM / OPP: Protect updates to list_dev with mutex PM / OPP: Propagate error properly from dev_pm_opp_set_sharing_cpus() PM / OPP: Parse all power-supply related bindings together PM / OPP: Rename routines specific to old bindings with _v1 PM / OPP: Improve print messages with pr_fmt PM / OPP: passing NULL to PTR_ERR() PM / OPP: Move cpu specific code to opp/cpu.c PM / OPP: Move opp core to its own directory PM / OPP: Prefix exported opp routines with dev_pm_opp_ PM / OPP: Rename opp init/free table routines PM / OPP: Return suspend_opp only if it is enabled imx6q: free OPP table created during ->init() exynos5440: free OPP table created during ->init() cpufreq: arm_big_little: free OPP table created during ->init() PM / OPP: reuse of_parse_phandle() PM: Convert dev_pm_put_subsys_data() into a void function PM: Update function header for dev_pm_get_subsys_data() arm64: psci: move psci firmware calls out of line Revert "MIPS: Kconfig: Disable SMP/CPS for 64-bit" ld-version: Fix awk regex compile failure tracing: Fix check for cpu online when event is disabled Revert "drm/radeon/pm: adjust display configuration after powerstate" KVM: VMX: disable PEBS before a guest entry KVM: PPC: Book3S HV: Sanitize special-purpose register values on guest exit ARM: dts: dra7: do not gate cpsw clock due to errata i877 ARM: dts: dra7: Add CPSW and MDIO module nodes for dra7 target: Drop incorrect ABORT_TASK put for completed commands ovl: copy new uid/gid into overlayfs runtime inode ovl: fix getcwd() failure after unsuccessful rmdir mac80211: Fix Public Action frame RX in AP mode ASoC: wm_adsp: Fix enum ctl accesses in a wrong type ASoC: wm8994: Fix enum ctl accesses in a wrong type ASoC: wm8958: Fix enum ctl accesses in a wrong type can: gs_usb: fixed disconnect bug by removing erroneous use of kfree() mac80211: minstrel_ht: set default tx aggregation timeout to 0 iwlwifi: mvm: inc pending frames counter also when txing non-sta mac80211: fix use of uninitialised values in RX aggregation cfg80211/wext: fix message ordering wext: fix message delay/ordering Linux 3.18.29 arm64: kernel: pause/unpause function graph tracer in cpu_suspend() ipv6: drop frames with attached skb->sk in forwarding Correct backport for ip6_gre: release cached dst on tunnel removal KVM: x86: move steal time initialization to vcpu entry time tools: Add a "make all" rule HID: usbhid: fix recursive deadlock iwlwifi: pcie: support loading FW with extended mem range ubi: Fix out of bounds write in volume update code MIPS: traps: Fix SIGFPE information leak from `do_ov' and `do_trap_or_bp' block: bio: introduce helpers to get the 1st and last bvec ALSA: hda - Fix mic issues on Acer Aspire E1-472 PM / sleep / x86: Fix crash on graph trace through x86 suspend drm/radeon/pm: update current crtc info after setting the powerstate USB: qcserial: add Sierra Wireless EM74xx device ID USB: qcserial: add Sierra Wireless MC74xx/EM74xx drm/ast: Fix incorrect register check for DRAM width ALSA: seq: oss: Don't drain at closing a client ALSA: usb-audio: Add a quirk for Plantronics DA45 USB: serial: option: add support for Quectel UC20 USB: serial: option: add support for Telit LE922 PID 0x1045 USB: cp210x: Add ID for Parrot NMEA GPS Flight Recorder USB: qcserial: add Dell Wireless 5809e Gobi 4G HSPA+ (rev3) ALSA: hdsp: Fix wrong boolean ctl value accesses ALSA: hdspm: Fix zero-division ALSA: hdspm: Fix wrong boolean ctl value accesses arm/arm64: KVM: Fix ioctl error handling Fix cifs_uniqueid_to_ino_t() function for s390x CIFS: Fix SMB2+ interim response processing for read requests cifs: fix out-of-bounds access in lease parsing ALSA: timer: Fix ioctls for X32 ABI ALSA: timer: Fix broken compat timer user status ioctl ALSA: rawmidi: Fix ioctls X32 ABI ALSA: ctl: Fix ioctls for X32 ABI vfio: fix ioctl error handling do_last(): don't let a bogus return value from ->open() et.al. to confuse us hpfs: don't truncate the file when delete fails mm: thp: fix SMP race condition between THP page fault and MADV_DONTNEED libata: Align ata_device's id on a cacheline iommu/amd: Apply workaround for ATS write permission check iommu/amd: Fix boot warning when device 00:00.0 is not iommu covered ALSA: hda - Fix headset support and noise on HP EliteBook 755 G2 ALSA: hda - Fixup speaker pass-through control for nid 0x14 on ALC225 ALSA: hda/realtek - Support Dell headset mode for ALC225 ALSA: hda - Fixing background noise on Dell Inspiron 3162 Fix directory hardlinks from deleted directories jffs2: Fix page lock / f->sem deadlock Revert "jffs2: Fix lock acquisition order bug in jffs2_write_begin" KVM: x86: MMU: fix ubsan index-out-of-range warning ALSA: hda - Add mic mute hotkey quirk for Lenovo ThinkCentre AIO ALSA: hda - Fixing speaker noise on the two latest thinkpad models ALSA: hda - Fix headphone noise after Dell XPS 13 resume back from S3 ALSA: hda/realtek - Dell XPS one ALC3260 speaker no sound after resume back ALSA: hda/realtek - Support Dell headset mode for ALC298 ALSA: hda/realtek - Support Dell headset mode for ALC288 ALSA: hda - Enable docking station for an HP machine ALSA: hda - Enable mic mute hotkey and LEDs for an HP machine ALSA: hda/realtek - Supported HP mute Led for ALC286 ALSA: hda/realtek - Clean up mute/mic GPIO LED handling usb: chipidea: otg: change workqueue ci_otg as freezable libceph: don't bail early from try_read() when skipping a message tracing: Fix showing function event in available_events KVM: async_pf: do not warn on page allocation failures KVM: arm/arm64: vgic: Ensure bitmaps are long enough sunrpc/cache: fix off-by-one in qword_get() drm/radeon/pm: adjust display configuration after powerstate s390/compat: correct restore of high gprs on signal return can: ems_usb: Fix possible tx overflow hwmon: (ads1015) Handle negative conversion values correctly Adding Intel Lewisburg device IDs for SATA ahci: Order SATA device IDs for codename Lewisburg USB: option: add "4G LTE usb-modem U901" usb: cp210x support SEL C662 Vendor/Device USB: cp210x: add IDs for GE B650V3 and B850V3 boards USB: cp210x: add ID for ELV Marble Sound Board 1 USB: option: add support for SIM7100E NFSv4: Fix a dentry leak on alias use usb: dwc3: Fix assignment of EP transfer resources [media] adv7604: fix tx 5v detect regression xen/pcifront: Fix mysterious crashes when NUMA locality information was extracted. xen/pciback: Don't allow MSI-X ops if PCI_COMMAND_MEMORY is not set. xen/pciback: Return error on XEN_PCI_OP_enable_msix when device has MSI or MSI-X enabled xen/pciback: Save xen_pci_op commands before processing it iwlwifi: mvm: don't allow sched scans without matches to be started libata: fix HDIO_GET_32BIT ioctl nfs: fix nfs_size_to_loff_t xen/scsiback: correct frontend counting x86/entry/compat: Add missing CLAC to entry_INT80_32 target: Fix race with SCF_SEND_DELAYED_TAS handling target: Fix remote-port TMR ABORT + se_cmd fabric stop target: Fix TAS handling for multi-session se_node_acls target: Fix LUN_RESET active I/O handling for ACK_KREF target: fix COMPARE_AND_WRITE non zero SGL offset data corruption target: Fix race for SCF_COMPARE_AND_WRITE_POST checking iscsi-target: Fix rx_login_comp hang after login failure Linux 3.18.28 fs-writeback: unplug before cond_resched in writeback_sb_inodes ext4: fix crashes in dioread_nolock mode ALSA: pcm: Fix rwsem deadlock for non-atomic PCM stream ALSA: pcm: More kerneldoc updates drm/qxl: use kmalloc_array to alloc reloc_info in qxl_process_single_command drm/radeon: use post-decrement in error handling ALSA: seq: Fix double port list deletion tracing: Fix freak link error caused by branch tracer tracepoints: Do not trace when cpu is offline dmaengine: dw: disable BLOCK IRQs for non-cyclic xfer ALSA: seq: Fix leak of pool buffer at concurrent writes ALSA: seq: Drop superfluous error/debug messages after malloc failures powerpc/powernv: Shorten EEH function names ALSA: usb-audio: avoid freeing umidi object twice EVM: Use crypto_memneq() for digest comparisons ext4: don't read blocks from disk after extents being swapped ext4: move_extent improve bh vanishing success factor ext4: fix potential integer overflow btrfs: properly set the termination value of ctx->pos in readdir ARM: 8519/1: ICST: try other dividends than 1 s390/dasd: fix refcount for PAV reassignment s390/dasd: prevent incorrect length error under z/VM after PAV changes cifs: fix erroneous return value drm/radeon: hold reference to fences in radeon_sa_bo_new ahci: Intel DNV device IDs SATA phy: twl4030-usb: Fix unbalanced pm_runtime_enable on module reload phy: twl4030-usb: Relase usb phy on unload phy: core: fix wrong err handle for phy_power_on phy: core: Fixup return value of phy_exit when !pm_runtime_enabled ALSA: timer: Fix race at concurrent reads ALSA: timer: Handle disconnection more safely ALSA: timer: Fix race between stop and interrupt ARM: 8517/1: ICST: avoid arithmetic overflow in icst_hz() ALSA: timer: Fix wrong instance passed to slave callbacks drm/i915/dsi: don't pass arbitrary data to sideband drm/i915/dsi: defend gpio table against out of bounds access ALSA: dummy: Implement timer backend switching more safely klist: fix starting point removed bug in klist iterators ALSA: hda - Fix speaker output from VAIO AiO machines pty: make sure super_block is still valid in final /dev/tty close pty: fix possible use after free of tty->driver_data tty: Add support for PCIe WCH382 2S multi-IO card tty: Add support for the WCH384 4S multi-IO card parport: Add support for the WCH382 2S/1P multi-IO card qla2xxx: Use pci_enable_msix_range() instead of pci_enable_msix() crypto: user - lock crypto_alg_list on alg dump ALSA: hda - Fix static checker warning in patch_hdmi.c SCSI: Add Marvell Console to VPD blacklist scsi_dh_rdac: always retry MODE SELECT on command lock violation Btrfs: fix hang on extent buffer lock caused by the inode_paths ioctl target: Fix LUN_RESET active TMR descriptor handling target: Remove first argument of target_{get,put}_sess_cmd() ASoC: dpcm: fix the BE state on hw_free cputime: Prevent 32bit overflow in time[val|spec]_to_cputime() MIPS: Fix buffer overflow in syscall_get_arguments() libata: fix sff host state machine locking while polling intel_scu_ipcutil: underflow in scu_reg_access() qla2xxx: terminate exchange when command is aborted by LIO qla2xxx: added sess generations to detect RSCN update races qla2xxx: Mark port lost when we receive an RSCN for it. qla2xxx: Abort stale cmds on qla_tgt_wq when plogi arrives qla2xxx: drop cmds/tmrs arrived while session is being deleted qla2xxx: delay plogi/prli ack until existing sessions are deleted qla2xxx: cleanup cmd in qla workqueue before processing TMR qla2xxx: kill sessions/log out initiator on RSCN and port down events libata: disable forced PORTS_IMPL for >= AHCI 1.3 PCI/AER: Flush workqueue on device remove to avoid use-after-free ASoC: rt5645: fix the shift bit of IN1 boost iommu/vt-d: Fix 64-bit accesses to 32-bit DMAR_GSTS_REG qla2xxx: fix busy wait regression Linux 3.18.27 xfrm: dst_entries_init() per-net dst_ops xen-netfront: update num_queues to real created xen-netfront: respect user provided max_queues xen-netback: respect user provided max_queues team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid ppp, slip: Validate VJ compression slot parameters completely isdn_ppp: Add checks for allocation failure in isdn_ppp_open() ipv6: update skb->csum when CE mark is propagated net: bpf: reject invalid shifts phonet: properly unshare skbs in phonet_rcv() bonding: Prevent IPv6 link local address on enslaved devices tcp_yeah: don't set ssthresh below 2 ipv6: tcp: add rcu locking in tcp_v6_send_synack() net: sctp: prevent writes to cookie_hmac_alg from accessing invalid memory vxlan: fix test which detect duplicate vxlan iface net: possible use after free in dst_release net: sched: fix missing free per cpu on qstats net: filter: make JITs zero A for SKF_AD_ALU_XOR_X bridge: Only call /sbin/bridge-stp for the initial network namespace unix: properly account for FDs passed over unix sockets connector: bump skb->users before callback invocation sctp: sctp should release assoc when sctp_make_abort_user return NULL in sctp_close ipv6/addrlabel: fix ip6addrlbl_get() veth: don’t modify ip_summed; doing so treats packets with bad checksums as good. X.509: Don't strip leading 00's from key ID when constructing key description radix-tree: fix oops after radix_tree_iter_retry mm: replace vma_lock_anon_vma with anon_vma_lock_read/write ocfs2/dlm: clear refmap bit of recovery lock while doing local recovery cleanup dump_stack: avoid potential deadlocks drm/dp/mst: Calculate MST PBN with 31.32 fixed point drm: Add drm_fixp_from_fraction and drm_fixp2int_ceil drm: fix missing reference counting decrease ARM: nomadik: set up MCDATDIR2 [media] saa7134-alsa: Only frees registered sound cards ALSA: timer: Fix leftover link at closing ALSA: timer: Fix double unlink of active_list [media] tda1004x: only update the frontend properties if locked xhci: Fix list corruption in urb dequeue at host removal usb: xhci: apply XHCI_PME_STUCK_QUIRK to Intel Broxton-M platforms usb: xhci: set SSIC port unused only if xhci_suspend succeeds usb: xhci: add a quirk bit for ssic port unused usb: xhci: handle both SSIC ports in PME stuck quirk xhci: Move xhci_pme_quirk() behind #ifdef CONFIG_PM xhci: Workaround to get D3 working in Intel xHCI xhci: call BIOS workaround to enable runtime suspend on Intel Braswell radix-tree: fix race in gang lookup drivers/scsi/sg.c: mark VMA as VM_IO to prevent migration ALSA: seq: Fix lockdep warnings due to double mutex locks ALSA: rawmidi: Fix race at copying & updating the position ALSA: rawmidi: Make snd_rawmidi_transmit() race-free ALSA: hda - Add fixup for Mac Mini 7,1 model drm/radeon: mask out WC from BO on unsupported arches drm/radeon: Always disable RADEON_GEM_GTT_UC along with RADEON_GEM_GTT_WC drm: add helper to check for wc memory support ALSA: timer: Fix link corruption due to double start or stop ALSA: timer: Code cleanup ALSA: timer: Harden slave timer list handling ALSA: seq: Fix yet another races among ALSA timer accesses ALSA: pcm: Fix potential deadlock in OSS emulation ALSA: rawmidi: Remove kernel WARNING for NULL user-space buffer check ALSA: seq: Fix race at closing in virmidi driver crypto: algif_hash - wait for crypto_ahash_init() to complete ALSA: usb-audio: Add quirk for Microsoft LifeCam HD-6000 ALSA: usb-audio: Add native DSD support for PS Audio NuWave DAC ALSA: usb: Add native DSD support for Aune X1S drm/i915/dp: fall back to 18 bpp when sink capability is unknown crypto: shash - Fix has_key setting ARM: dts: at91: sama5d4: fix instance id of DBGU rfkill: fix rfkill_fop_read wait_event usage mac80211: Requeue work after scan complete for all VIF types. arm64: restore bogomips information in /proc/cpuinfo USB: fix invalid memory access in hub_activate() serial: 8250_pci: Add Intel Broadwell ports x86/mm/pat: Avoid truncation when converting cpa->numpages to address Staging: speakup: Fix getting port information drm/vmwgfx: respect 'nomodeset' ALSA: dummy: Disable switching timer backend via sysfs seccomp: always propagate NO_NEW_PRIVS on tsync irqchip/atmel-aic: Fix wrong bit operation for IRQ priority staging/speakup: Use tty_ldisc_ref() for paste kworker n_tty: Fix unsafe reference to "other" ldisc tty: Fix unsafe ldisc reference via ioctl(TIOCGETD) SCSI: fix crashes in sd and sr runtime PM powerpc/eeh: Fix PE location code arm64: mm: avoid calling apply_to_page_range on empty range ALSA: bebob: Use a signed return type for get_formation_index ALSA: usb-audio: Fix TEAC UD-501/UD-503/NT-503 usb delay ALSA: compress: Disable GET_CODEC_CAPS ioctl for some architectures USB: option: fix Cinterion AHxx enumeration USB: serial: ftdi_sio: add support for Yaesu SCU-18 cable ALSA: seq: Degrade the error message for too many opens ALSA: seq: Fix incorrect sanity check at snd_seq_oss_synth_cleanup() USB: serial: option: Adding support for Telit LE922 USB: serial: visor: fix crash on detecting device without write_urbs USB: visor: fix null-deref at probe USB: cp210x: add ID for IAI USB to RS485 adaptor usb: hub: do not clear BOS field during reset device cdc-acm:exclude Samsung phone 04e8:685d usb: cdc-acm: send zero packet for intel 7260 modem usb: cdc-acm: handle unlinked urb in acm read callback ideapad-laptop: Add Lenovo Yoga 700 to no_hw_rfkill dmi list ideapad-laptop: Add Lenovo Yoga 900 to no_hw_rfkill dmi list ACPI / PCI / hotplug: unlock in error path in acpiphp_enable_slot() MIPS: Fix some missing CONFIG_CPU_MIPSR6 #ifdefs HID: hidpp: update input_configured callback usb: gadget: build audio_source function only if SND is enabled usb: gadget: function: fix unused func warning kbuild: Makefile.clean: make Kbuild and Makefile optional iscsi-target: Fix potential dead-lock during node acl delete ideapad-laptop: Add Lenovo ideapad Y700-17ISK to no_hw_rfkill dmi list IB/qib: Support creating qps with GFP_NOIO flag IB/qib: fix mcast detach when qp not attached crypto: crc32c - Fix crc32c soft dependency crypto: algif_hash - Fix race condition in hash_check_key crypto: af_alg - Forbid bind(2) when nokey child sockets are present crypto: algif_hash - Remove custom release parent function crypto: af_alg - Allow af_af_alg_release_parent to be called on nokey path crypto: algif_hash - Require setkey before accept(2) crypto: hash - Add crypto_ahash_has_setkey mac802154: fix typo IEEE802515 to IEEE802154 crypto: af_alg - Add nokey compatibility path crypto: af_alg - Fix socket double-free when accept fails crypto: af_alg - Disallow bind/setkey/... after accept(2) printk: do cond_resched() between lines while outputting to consoles kernel/panic.c: turn off locks debug before releasing console lock panic: release stale console lock to always get the logbuf printed out memcg: only free spare array when readers are done mm: soft-offline: check return value in second __get_any_page() call zram: try vmalloc() after kmalloc() zram/zcomp: use GFP_NOIO to allocate streams ocfs2/dlm: ignore cleaning the migration mle that is inuse scripts/bloat-o-meter: fix python3 syntax error dma-debug: switch check from _text to _stext m32r: fix m32104ut_defconfig build fail cifs_dbg() outputs an uninitialized buffer in cifs_readdir() cifs: fix race between call_async() and reconnect() cifs: Ratelimit kernel log messages cifs: convert printk(LEVEL...) to pr_<level> cifs: convert to print_hex_dump() instead of custom implementation sparc64: fix incorrect sign extension in sys_sparc64_personality mmc: core: Enable tuning according to the actual timing mmc: core: enable CMD19 tuning for DDR50 mode mmc: core: Simplify by adding mmc_execute_tuning() mmc: core: Fix error paths and messages in mmc_init_card mmc: mmci: fix an ages old detection error dmaengine: dw: fix cyclic transfer callbacks dmaengine: dw: fix cyclic transfer setup dmaengine: dw: Make error prints unique. Part #1 KVM: PPC: Fix ONE_REG AltiVec support parisc: Fix __ARCH_SI_PREAMBLE_SIZE virtio_balloon: fix race between migration and ballooning Input: elantech - mark protocols v2 and v3 as semi-mt xfs: handle dquot buffer readahead in log recovery correctly xfs: inode recovery readahead can race with inode buffer creation s390: fix normalization bug in exception table sorting drm/nouveau/kms: take mode_config mutex in connector hotplug path uml: flush stdout before forking uml: fix hostfs mknod() dm snapshot: fix hung bios when copy error occurs locks: fix unlock when fcntl_setlk races with a close locks: update comments that refer to inode->i_flock iwlwifi: update and fix 7265 series PCI IDs PCI: host: Mark PCIe/PCI (MSI) IRQ cascade handlers as IRQF_NO_THREAD PCI: imx6: Use tabs for indentation PCI: Fix minimum allocation address overwrite drm/dp/mst: fix in RAD element access gpu: drm: drm_dp_mst_topology.c: Fix improper use of strncat drm/dp/mst: fix in MSTB RAD initialization drm/dp/mst: process broadcast messages correctly udf: Check output buffer length when converting name to CS0 udf: Prevent buffer overrun with multi-byte characters Input: i8042 - add Fujitsu Lifebook U745 to the nomux list wlcore/wl12xx: spi: fix NULL pointer dereference (Oops) bcache: Change refill_dirty() to always scan entire disk if necessary bcache: prevent crash on changing writeback_running bcache: allows use of register in udev to avoid "device_busy" error. bcache: unregister reboot notifier if bcache fails to unregister device bcache: fix a leak in bch_cached_dev_run() bcache: clear BCACHE_DEV_UNLINK_DONE flag when attaching a backing device bcache: Add a cond_resched() call to gc bcache: fix a livelock when we cause a huge number of cache misses rtlwifi: rtl_pci: Fix kernel panic NFS: Fix attribute cache revalidation NFS: Remove the "NFS_CAP_CHANGE_ATTR" capability rtlwifi: rtl8192cu: Add missing parameter setup rtlwifi: rtl8192ce: Fix handling of module parameters rtlwifi: rtl8192se: Fix module parameter initialization rtlwifi: rtl8192de: Fix incorrect module parameter descriptions rtlwifi: rtl8188ee: Fix module parameter initialization posix-clock: Fix return code on the poll method's error path Thermal: do thermal zone update after a cooling device registered Thermal: handle thermal zone device properly during system sleep Thermal: initialize thermal zone device correctly nfs: Fix race in __update_open_stateid() udf: limit the maximum number of indirect extents in a row mmc: sdhci: Fix sdhci_runtime_pm_bus_on/off() mmc: sdio: Fix invalid vdd in voltage switch power cycle drm/radeon: clean up fujitsu quirks drm/radeon: Fix off-by-one errors in radeon_vm_bo_set_addr android: recommended.cfg: enable taskstats Revert "usb: gadget: composite: Fix corruption when changing configuration" selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tables drm/radeon: fence PT updates manually v2 futex: Drop refcount if requeue_pi() acquired the rtmutex dm thin: fix race condition when destroying thin pool workqueue EDAC: Robustify workqueues destruction ovl: check dentry positiveness in ovl_cleanup_whiteouts() wlcore/wl12xx: spi: fix oops on firmware load rtlwifi: fix memory leak for USB device Bluetooth: Add support of Toshiba Broadcom based devices ovl: root: copy attr KVM: PPC: Fix emulation of H_SET_DABR/X on POWER8 time: Avoid signed overflow in timekeeping_get_ns() drm/radeon: call hpd_irq_event on resume tools lib traceevent: Fix output of %llu for 64 bit values read on 32 bit machines [media] media: dvb-core: Don't force CAN_INVERSION_AUTO in oneshot mode [media] gspca: ov534/topro: prevent a division by 0 [media] vb2: fix a regression in poll() behavior for output,streams ovl: use a minimal buffer in ovl_copy_xattr ovl: allow zero size xattr Revert "net: wireless: Add CONFIG_WIFI_CONTROL_FUNC option" neigh: Better handling of transition to NUD_PROBE state net: diag: support v4mapped sockets in inet_diag_find_one_icsk() net: tcp: deal with listen sockets properly in tcp_abort. net: diag: Support destroying TCP sockets. net: diag: Support SOCK_DESTROY for inet sockets. net: diag: Add the ability to destroy a socket. net: diag: split inet_diag_dump_one_icsk into two ipv6: inet6_sk() should use sk_fullsock() net: add sk_fullsock() helper Linux 3.18.26 Revert "workqueue: make sure delayed work run in local cpu" KEYS: Fix keyring ref leak in join_session_keyring() KEYS: Fix race between read and revoke net: check both type and procotol for tcp sockets usb: Use the USB_SS_MULT() macro to decode burst multiplier for log message usb: core : hub: Fix BOS 'NULL pointer' kernel panic usb: musb: USB_TI_CPPI41_DMA requires dmaengine support usb: gadget: pxa27x: fix suspend callback USB: whci-hcd: add check for dma mapping error USB: add quirk for devices with broken LPM USB: cp210x: Remove CP2110 ID from compatibility list USB: serial: Another Infineon flash loader USB ID USB: cdc_acm: Ignore Infineon Flash Loader utility rbd: don't leak parent_spec in rbd_dev_probe_parent() RDS: verify the underlying transport exists before creating a connection iwlwifi: bump firmware API for mvm devices to 12 iwlwifi: 7000: fix reported firmware name for 7265D ALSA: hda/hdmi - apply Skylake fix-ups to Broxton display codec ceph: fix message length computation ocfs2: fix umask ignored issue nfs: if we have no valid attrs, then don't declare the attribute cache valid nfs4: start callback_ident at idr 1 nfsd: serialize state seqid morphing operations firewire: ohci: fix JMicron JMB38x IT context discovery ext4, jbd2: ensure entering into panic after recording an error in superblock rbd: don't put snap_context twice in rbd_queue_workfn() Btrfs: fix race when listing an inode's xattrs Btrfs: fix race leading to BUG_ON when running delalloc for nodatacow Btrfs: fix race leading to incorrect item deletion when dropping extents Btrfs: fix file corruption and data loss after cloning inline extents RDS: fix race condition when sending a message on unbound socket UPSTREAM: selinux: fix bug in conditional rules handling UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring() ion: fix page pool cache policy UPSTREAM: memcg: Only free spare array when readers are done unix: avoid use-after-free in ep_remove_wait_queue af_unix: Revert 'lock_interruptible' in stream receive code fou: clean up socket with kfree_rcu bluetooth: Validate socket address length in sco_sock_bind(). pptp: verify sockaddr_len in pptp_bind() and pptp_connect() skbuff: Fix offset error in skb_reorder_vlan_header vlan: Fix untag operations of stacked vlans with REORDER_HEADER off net: fix IP early demux races sh_eth: fix kernel oops in skb_put() net: add validation for the socket syscall protocol argument ipv6: sctp: clone options to avoid use after free net: qca_spi: fix transmit queue timeout handling sctp: also copy sk_tsflags when copying the socket sctp: update the netstamp_needed counter when copying sockets sctp: use the same clock as if sock source timestamps were on atl1c: Improve driver not to do order 4 GFP_ATOMIC allocation gre6: allow to update all parameters via rtnl arm64: Add dtb files to archclean rule UPSTREAM: seccomp: cap SECCOMP_RET_ERRNO data to MAX_ERRNO Input: xpad - fix clash of presence handling with LED setting Input: xpad - query wireless controller state at init Input: xpad - move the input device creation to a new function Input: xpad - x360w: report dpad as buttons and axes Input: xpad - factor out URB submission in xpad_play_effect Input: xpad - remove needless bulk out URB used for LED setup Input: xpad - use ida() for finding the pad_nr Input: xpad - clarify LED enumeration Input: xpad - fix Razer Atrox Arcade Stick button mapping Input: xpad - add Covert Forces edition of the Xbox One controller Input: xpad - re-send LED command on present event Input: xpad - set the LEDs properly on XBox Wireless controllers Input: xpad - add rumble support for Xbox One controller Input: initialize device counter variables with -1 xt_qtaguid: fix a race condition in if_tag_stat_update FROMLIST: x86: mm: support ARCH_MMAP_RND_BITS. FROMLIST: arm64: mm: support ARCH_MMAP_RND_BITS. FROMLIST: arm: mm: support ARCH_MMAP_RND_BITS. FROMLIST: mm: mmap: Add new /proc tunable for mmap_base ASLR. Revert "mm: mmap: Add new /proc tunable for mmap_base ASLR." Revert "arm: mm: support ARCH_MMAP_RND_BITS." UPSTREAM: HID: hid-input: allow input_configured callback return errors Revert "HID: Add input_register callback." usb: gadget: rndis: use %z format specifier for size_t of: Fix build warnings UPSTREAM: include/linux/poison.h: fix LIST_POISON{1,2} offset UPSTREAM: mm: more aggressive page stealing for UNMOVABLE allocations UPSTREAM: mm: always steal split buddies in fallback allocations UPSTREAM: mm: when stealing freepages, also take pages created by splitting buddy page ANDROID: rtc-palmas: correct for bcd year UPSTREAM: proc: actually make proc_fd_permission() thread-friendly ANDROID: android: base-cfg: enable CONFIG_DM_VERITY_FEC UPSTREAM: dm verity: add ignore_zero_blocks feature UPSTREAM: dm verity: add support for forward error correction UPSTREAM: dm verity: factor out verity_for_bv_block() UPSTREAM: dm verity: factor out structures and functions useful to separate object UPSTREAM: dm verity: move dm-verity.c to dm-verity-target.c UPSTREAM: dm verity: separate function for parsing opt args UPSTREAM: dm verity: clean up duplicate hashing code ANDROID: dm verity: port upstream changes to 3.18 BACKPORT: mm: /proc/pid/smaps:: show proportional swap share of the mapping of: handle both '/' and ':' in path strings of: unittest: Add option string test case with longer path of: unittest: Add options string testcase variants of: fix handling of '/' in options for of_find_node_by_path() of/unittest: Fix the wrong expected value in of_selftest_property_string of/unittest: remove the duplicate of_changeset_init of/overlay: Remove unused variable of/overlay: Directly include idr.h of: Drop superfluous dependance for OF_OVERLAY of: Add prompt for OF_OVERLAY config of/pci: Remove duplicate kfree in of_pci_get_host_bridge_resources() of/fdt: fix sparse warning of: EXPORT_SYMBOL_GPL of_property_read_u64_array of/unittest: Overlays with sub-devices tests of/unittest: Remove obsolete code of/platform: Handle of_populate drivers in notifier of/overlay: Do not generate duplicate nodes Removes OF_UNITTEST dependency on OF_DYNAMIC config symbol drivers: of: Export of_reserved_mem_device_{init,release} of: Delete unnecessary check before calling "of_node_put()" of: Drop ->next pointer from struct device_node of: support passing console options with stdout-path of: add optional options parameter to of_find_node_by_path() of: Remove unneeded and incorrect MODULE_DEVICE_TABLE of: base, fix of_property_read_string_helper kernel-doc of: remove select of non-existant OF_DEVICE config symbol of/overlay: Add overlay unittests of/overlay: Introduce DT overlay support of/reconfig: Add OF_DYNAMIC notifier for platform_bus_type of/reconfig: Always use the same structure for notifiers of/reconfig: Add debug output for OF_RECONFIG notifiers of/reconfig: Add empty stubs for the of_reconfig methods of/reconfig: Add of_reconfig_get_state_change() of notifier helper. of/resolver: Switch to new local fixups format. of: Refactor __of_node_alloc() into __of_node_dup() of: Use vargs in __of_node_alloc of: Properly set the OF_POPULATED_BUS flag on root node of/fdt: export fdt blob as /sys/firmware/fdt of: Change of_device_is_available() to return bool of.h: Keep extern declaration of of_* variables when !CONFIG_OF of/irq: Export of_irq_get() of/platform: Move platform devices under /sys/devices/platform of: check for size < 0 after rounding in early_init_dt_add_memory_arch of/fdt: Don't clear initial_boot_params if fdt_check_header() fails of/unittest: Remove test devices after adding them of: Fix padding in _OF_DECLARE macro definition of: Request and map make argument name constant of/unittest: Rename selftest.c to unittest.c of: Eliminate of_allnodes list of: introduce of_property_read_s32 Linux 3.18.25 ipv6: sctp: implement sctp_v6_destroy_sock() net/neighbour: fix crash at dumping device-agnostic proxy entries ipv6: add complete rcu protection around np->opt ipv6: distinguish frag queues by device for multicast and link-local packets broadcom: fix PHY_ID_BCM5481 entry in the id table net: ip6mr: fix static mfc/dev leaks on table destruction net: ipmr: fix static mfc/dev leaks on table destruction net, scm: fix PaX detected msg_controllen overflow in scm_detach_fds tcp: initialize tp->copied_seq in case of cross SYN connection tcp: fix potential huge kmalloc() calls in TCP_REPAIR tcp: md5: fix lockdep annotation net: qmi_wwan: add XS Stick W100-2 from 4G Systems snmp: Remove duplicate OUTMCAST stat increment ip_tunnel: disable preemption when updating per-cpu tstats sctp: translate host order to network order when setting a hmacid packet: fix tpacket_snd max frame len packet: infer protocol from ethernet header if unset packet: only allow extra vlan len on ethernet devices packet: tpacket_snd(): fix signed/unsigned comparison packet: always probe for transport header packet: do skb_probe_transport_header when we actually have data tools/net: Use include/uapi with __EXPORTED_HEADERS__ Revert "net: Fix skb_set_peeked use-after-free bug" ipv6: addrconf: validate new MTU before applying it KVM: x86: Use new is_noncanonical_address in _linearize KVM: x86: work around infinite loop in microcode when #AC is delivered ARM: orion: Fix DSA platform device after mvmdio conversion RDS: verify the underlying transport exists before creating a connection packet: race condition in packet_bind ipv4: disable BH when changing ip local port range ipv6: clean up dev_snmp6 proc entry when we fail to initialize inet6_dev sfc: push partner queue for skb->xmit_more sit: fix sit0 percpu double allocations mmc: Extend wakelock if bus is dead Revert "mmc: mmcblk: Add support for deferred SD bus resume" Revert "mmc: block: Remove call to mmc_blk_set_blksize" ipv6: gre: support SIT encapsulation qmi_wwan: add Sierra Wireless MC74xx/EM74xx virtio-net: drop NETIF_F_FRAGLIST net: fix a race in dst_release() net: avoid NULL deref in inet_ctl_sock_destroy() qmi_wwan: fix entry for HP lt4112 LTE/HSPA+ Gobi 4G Module ipmr: fix possible race resulting from improper usage of IP_INC_STATS_BH() in preemptible context. stmmac: Correctly report PTP capabilities. net/mlx4: Copy/set only sizeof struct mlx4_eqe bytes RDS-TCP: Recover correctly from pskb_pull()/pksb_trim() failure in rds_tcp_data_recv ppp: fix pppoe_dev deletion condition in pppoe_release() macvtap: unbreak receiving of gro skb with frag list irda: precedence bug in irlmp_seq_hb_idx() audit: create private file name copies when auditing inodes audit: correctly record file names with different path name types mptfusion: prevent some memory corruption mfd: wm5110: Add register patch for rev E and above [media] gscpa_m5602: use msecs_to_jiffies for conversions [media] v4l: vsp1: Fix VI6_WPF_SZCLIP_SIZE_MASK macro [media] v4l: vsp1: Fix VI6_DPR_ROUTE_FP_MASK macro [media] v4l: vsp1: Fix VI6_DPR_ROUTE_FXA_MASK macro [media] usbvision: fix locking error Input: zhenhua - ensure we have BITREVERSE Input: omap4-keypad - fix memory leak Input: serio - fix blocking of parport Input: psmouse - add small delay for IBM trackpoint pass-through mode HID: quirks: add QUIRK_NOGET for an other TPV touchscreen HID: apple: Add support for the 2015 Macbook Pro usb: musb: fix cppi channel teardown for isoch transfer usb: musb: cppi41: improve rx channel abort routine USB: symbolserial: Correct transferred data size usb: chipidea: debug: add runtime pm for register access s390/3270: redraw screen on unsolicited device end iommu/amd: Handle integer overflow in dma_ops_area_alloc client MUST ignore EncryptionKeyLength if CAP_EXTENDED_SECURITY is set USB: usbtmc: add device quirk for Rigol DS6104 sched: Fix cpu_active_mask/cpu_online_mask race PCI: Add VPD function 0 quirk for Intel Ethernet devices PCI: Add dev_flags bit to access VPD through function 0 PCI: Add flag for devices that don't reset on D3hot->D0 transition KEYS: Fix crash when attempt to garbage collect an uninstantiated keyring KEYS: Fix race between key destruction and finding a keyring by name ext4: fix loss of delalloc extent info in ext4_zero_range() ext4: allocate entire range in zero range vhost/scsi: potential memory corruption serial: 8250_pci: Add support for 12 port Exar boards serial: 8250_pci: Add support for 16 port Exar boards md/raid5: fix locking in handle_stripe_clean_event() IB/cm: Fix rb-tree duplicate free and use-after-free mvsas: Fix NULL pointer dereference in mvs_slot_task_free Revert "md: allow a partially recovered device to be hot-added to an array." md/raid10: submit_bio_wait() returns 0 on success md/raid1: submit_bio_wait() returns 0 on success crypto: api - Only abort operations on fatal signal module: Fix locking in symbol_put_addr() xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing) xhci: Add spurious wakeup quirk for LynxPoint-LP controllers xhci: handle no ping response error properly dm btree: fix leak of bufio-backed block in btree_split_beneath error path dm btree remove: fix a bug when rebalancing nodes after removal Revert "ARM64: unwind: Fix PC calculation" rbd: require stable pages if message data CRCs are enabled iio: mxs-lradc: Fix temperature offset drm/radeon: don't try to recreate sysfs entries on resume ... Conflicts: Makefile android/configs/android-recommended.cfg arch/Kconfig arch/arm/mm/mmap.c arch/arm64/Kconfig arch/arm64/include/asm/kasan.h arch/arm64/include/asm/pgalloc.h arch/arm64/kernel/setup.c arch/arm64/lib/memcpy.S arch/arm64/lib/memmove.S arch/arm64/lib/memset.S arch/arm64/mm/kasan_init.c arch/arm64/mm/mmap.c arch/mips/mm/mmap.c arch/powerpc/mm/mmap.c arch/x86/mm/kasan_init_64.c arch/x86/mm/mmap.c drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c drivers/firmware/efi/libstub/Makefile drivers/hid/hid-logitech-hidpp.c drivers/hid/hid-magicmouse.c drivers/hid/hid-ntrig.c drivers/hid/hid-rmi.c drivers/hid/hid-sony.c drivers/mmc/card/Kconfig drivers/mmc/card/block.c drivers/mmc/card/queue.c drivers/mmc/card/queue.h drivers/mmc/core/core.c drivers/mmc/core/core.h drivers/net/wireless/Kconfig drivers/of/Kconfig drivers/of/Makefile drivers/scsi/sd.c drivers/staging/android/ion/ion_system_heap.c drivers/usb/dwc3/gadget.c drivers/usb/gadget/Kconfig drivers/usb/gadget/function/f_fs.c drivers/usb/gadget/function/f_mtp.c drivers/usb/gadget/function/u_ether.c drivers/usb/serial/option.c drivers/usb/serial/qcserial.c include/linux/compiler-gcc.h include/linux/kasan.h include/linux/vmalloc.h kernel/module.c kernel/sysctl.c lib/Kconfig.kasan lib/radix-tree.c lib/test_kasan.c mm/kasan/Makefile mm/kasan/kasan.c mm/kasan/kasan.h mm/kasan/kasan_init.c mm/kasan/report.c mm/mempool.c mm/page_alloc.c mm/slub.c scripts/Makefile.lib scripts/module-common.lds sound/core/compress_offload.c USB and MMC related changes were ignored completely as suggested by respective teams. Changes related to DM-VERITY were skipped in this upmerge as they will be pulled in by corresponding team on need basis. Change-Id: I3e94c43cf595440299c91562e1226b1e4c77abeb Signed-off-by: Imran Khan <kimran@codeaurora.org>
| * \ \ Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidAlex Shi2016-04-211-0/+7
| |\ \ \ | | |/ / | |/| / | | |/ | | | Conflicts: keep -fno-pic flag in arch/arm64/Makefile
| | * efi: Make efivarfs entries immutable by defaultPeter Jones2016-04-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit ed8b0de5a33d2a2557dce7f9429dca8cb5bc5879 ] "rm -rf" is bricking some peoples' laptops because of variables being used to store non-reinitializable firmware driver data that's required to POST the hardware. These are 100% bugs, and they need to be fixed, but in the mean time it shouldn't be easy to *accidentally* brick machines. We have to have delete working, and picking which variables do and don't work for deletion is quite intractable, so instead make everything immutable by default (except for a whitelist), and make tools that aren't quite so broad-spectrum unset the immutable flag. Signed-off-by: Peter Jones <pjones@redhat.com> Tested-by: Lee, Chun-Yi <jlee@suse.com> Acked-by: Matthew Garrett <mjg59@coreos.com> Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| * | BACKPORT: mm: /proc/pid/smaps:: show proportional swap share of the mappingMinchan Kim2015-12-161-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to know per-process workingset size for smart memory management on userland and we use swap(ex, zram) heavily to maximize memory efficiency so workingset includes swap as well as RSS. On such system, if there are lots of shared anonymous pages, it's really hard to figure out exactly how many each process consumes memory(ie, rss + wap) if the system has lots of shared anonymous memory(e.g, android). This patch introduces SwapPss field on /proc/<pid>/smaps so we can get more exact workingset size per process. Bongkyu tested it. Result is below. 1. 50M used swap SwapTotal: 461976 kB SwapFree: 411192 kB $ adb shell cat /proc/*/smaps | grep "SwapPss:" | awk '{sum += $2} END {print sum}'; 48236 $ adb shell cat /proc/*/smaps | grep "Swap:" | awk '{sum += $2} END {print sum}'; 141184 2. 240M used swap SwapTotal: 461976 kB SwapFree: 216808 kB $ adb shell cat /proc/*/smaps | grep "SwapPss:" | awk '{sum += $2} END {print sum}'; 230315 $ adb shell cat /proc/*/smaps | grep "Swap:" | awk '{sum += $2} END {print sum}'; 1387744 [akpm@linux-foundation.org: simplify kunmap_atomic() call] Signed-off-by: Minchan Kim <minchan@kernel.org> Reported-by: Bongkyu Kim <bongkyu.kim@lge.com> Tested-by: Bongkyu Kim <bongkyu.kim@lge.com> Cc: Hugh Dickins <hughd@google.com> Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Jerome Marchand <jmarchan@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Bug: 26190646 Change-Id: Idf92d682fdef432bdd66e530a7e7cdff8f375db1 Signed-off-by: Thierry Strudel <tstrudel@google.com>
* | | Merge tag 'lsk-v3.18-15.12-android' into 'msm-3.18'Kaushal Kumar2016-02-111-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LSK Android 15.12 v3.18 * origin/tmp-3169cab: arm: enable ARCH_MMAP_RND_BITS only for MMU platforms Revert "mmc: block: Remove call to mmc_blk_set_blksize" UPSTREAM: zram: fix possible use after free in zcomp_create() UPSTREAM: zsmalloc: fix a null pointer dereference in destroy_handle_cache() UPSTREAM: zram: clear disk io accounting when reset zram device UPSTREAM: zram: fix error return code UPSTREAM: zsmalloc: remove extra cond_resched() in __zs_compact UPSTREAM: zsmalloc: fix fatal corruption due to wrong size class selection UPSTREAM: zsmalloc: remove unnecessary insertion/removal of zspage in compaction UPSTREAM: zsmalloc: micro-optimize zs_object_copy() UPSTREAM: zsmalloc: remove synchronize_rcu from zs_compact() UPSTREAM: zram: deprecate zram attrs sysfs nodes UPSTREAM: zram: export new 'mm_stat' sysfs attrs UPSTREAM: zram: export new 'io_stat' sysfs attrs UPSTREAM: zram: describe device attrs in documentation UPSTREAM: zram: remove `num_migrated' device attr UPSTREAM: mm/zsmalloc.c: fix comment for get_pages_per_zspage UPSTREAM: zsmalloc: zsmalloc documentation UPSTREAM: zsmalloc: add fullness into stat UPSTREAM: zsmalloc: record handle in page->private for huge object UPSTREAM: zram: support compaction UPSTREAM: zsmalloc: adjust ZS_ALMOST_FULL UPSTREAM: zsmalloc: support compaction UPSTREAM: zsmalloc: factor out obj_[malloc|free] UPSTREAM: zsmalloc: decouple handle and object UPSTREAM: zram: use proper type to update max_used_pages UPSTREAM: mm/zsmalloc: add statistics support UPSTREAM: mm/zpool: add name argument to create zpool UPSTREAM: zram: remove request_queue from struct zram UPSTREAM: zram: remove init_lock in zram_make_request UPSTREAM: zram: check bd_openers instead of bd_holders UPSTREAM: zram: rework reset and destroy path UPSTREAM: zram: fix umount-reset_store-mount race condition UPSTREAM: zram: free meta table in zram_meta_free UPSTREAM: zram: clean up zram_meta_alloc() UPSTREAM: mm/zsmalloc: adjust order of functions UPSTREAM: zram: use DEVICE_ATTR_[RW|RO|WO] to define zram sys device attribute UPSTREAM: mm/zsmalloc: allocate exactly size of struct zs_pool UPSTREAM: mm/zsmalloc: avoid duplicate assignment of prev_class UPSTREAM: mm/zram: correct ZRAM_ZERO flag bit position UPSTREAM: mm/zsmalloc: support allocating obj with size of ZS_MAX_ALLOC_SIZE UPSTREAM: zsmalloc: correct fragile [kmap|kunmap]_atomic use UPSTREAM: zsmalloc: fix zs_init cpu notifier error handling UPSTREAM: zram: implement rw_page operation of zram UPSTREAM: zram: change parameter from vaild_io_request() UPSTREAM: zram: remove bio parameter from zram_bvec_rw() UPSTREAM: zsmalloc: merge size_class to reduce fragmentation arm64: kernel: Add support for Privileged Access Never arm64: Generalise msr_s/mrs_s operations arm64: kernel: Add cpufeature 'enable' callback arm64: kernel: Add cpuid_feature_extract_field() for 4bit sign extension arm64: kernel: Add min_field_value and use '>=' for feature detection arm64: kernel: Add optional CONFIG_ parameter to ALTERNATIVE() arm64: alternative: Provide if/else/endif assembler macros arm64: alternative: Work around .inst assembler bugs arm64: alternative: Merge alternative-asm.h into alternative.h arm64: Add AArch32 instruction set condition code checks arm64: lib: use pair accessors for copy_*_user routines arm64/uaccess: fix sparse errors arm64: kernel: Move config_sctlr_el1 arm64: Emulate SETEND for AArch32 tasks arm64: kconfig: move emulation option under kernel features arm64: Consolidate hotplug notifier for instruction emulation arm64: fix return code check when changing emulation handler arm64: Trace emulation of AArch32 legacy instructions arm64: Emulate CP15 Barrier instructions arm64: Port SWP/SWPB emulation support from arm arm64: Add support for hooks to handle undefined instructions arm64: Add framework for legacy instruction emulation arm64: alternative: Introduce feature for GICv3 CPU interface arm64: Extract feature parsing code from cpu_errata.c arm64: alternatives: fix pr_fmt string for consistency arm64: Track system support for mixed endian EL0 arm64: Provide a namespace to NCAPS tracing/sched: Add trace events to track cpu hotplug. trace: cpufreq: Add tracing for min/max cpufreq sched: add sched blocked tracepoint which dumps out context of sleep. ANDROID: android: base-cfg: disable CONFIG_SYSVIPC ANDROID: exec_domains: Disable request_module() call for personalities UPSTREAM: pagemap: do not leak physical addresses to non-privileged userspace configs/vexpress64: add SATA_SIL24 and SKY2 configure for Juno PCIe ARM: imx6sx: add imx6sx iomux-gpr field define ARM: imx6: correct i.MX6 PCIe interrupt routing ARM: imx6: allow booting with old DT ARM: imx6: Warn when an old DT is detected ARM: imx6: Allow GPC interrupts affinity to be changed ARM: imx6: convert GPC to stacked domains ARM: imx6: gpc: Add PU power domain for GPU/VPU ARM i.MX6q: unmap memory mapped at imx6q_opp_check_speed_grading() ARM: imx: support arm power off in cpuidle for i.mx6sx ARM: imx6: fix bogus use of irq_get_irq_data ARM: imx: irq: fix buggy usage of irq_data irq field ARM: imx: add enet init for i.mx6sx ARM: dts: imx6: phyFLEX: Add CAN support ARM: dts: imx6: phyFLEX: Add PCIe ARM: dts: imx6: phyFLEX: Set correct interrupt for pmic ARM: dts: imx6: phyFLEX: Enable gpmi in module file ARM: dts: imx6: phyFLEX: set nodes in alphabetical order ARM: dts: pbab01: enable I2S audio on phyFLEX-i.MX6 boards ARM: dts: pbab01: move i2c pins and frequency configuration into pfla02 ARM: imx: Remove unneeded .map_io initialization ARM: dts: imx6qdl-sabresd: Fix the microphone route ARM: imx: refactor mxc_iomux_mode() ARM: imx: simplify clk_pllv3_prepare() ARM: imx: clean up machine mxc_arch_reset_init_dt reset init ARM: dts: imx6qdl-rex: Remove unneeded 'fsl,mode' property ARM: dts: imx6qdl-gw5x: Remove unneeded 'fsl,mode' property ARM: dts: imx6qdl-sabresd: Use IMX6QDL_CLK_CKO define PCI: Assign resources before drivers claim devices (pci_scan_root_bus()) PCI: Assign resources before drivers claim devices (pci_scan_bus()) wakeup: Add the guard condition for len in pm_get_active_wakeup_sources irqchip/gic-v3-its: Silence warning when its_lpi_alloc_chunks gets inlined irqchip/gic-v3-its: Add missing cache flushes arm64: defconfig: Enable PCI generic host bridge by default arm64: Juno: Add support for the PCIe host bridge on Juno R1 Documentation: of: Document the bindings used by Juno R1 PCIe host bridge Documentation: bindings: Add DT bindings for ARM Juno boards. arm64: Add DT support for Juno r1 board. arm64: Juno: Add GICv2m support in device tree. arm64: Juno: Add memory mapped timer node arm64: Juno: Split juno.dts into juno-base.dtsi and juno.dts. arm64: Juno: Fix the GIC node address label and the frequency of FAXI clock. arm64: dts: add interrupt-affinity property to pmu node for juno arm64: juno: Fix misleading name of UART reference clock arm64: Add L2 cache topology to ARM Ltd boards/models arm64: ARM: Fix the Generic Timers interrupt active level description arm64: Add Juno board device tree. arm64: Create link to include/dt-bindings to enable C preprocessor use. dts, arm64: Move dts files to vendor subdirs PCI/MSI: Drop domain field from msi_controller irqchip/GICv2m: Get rid of struct msi_controller irqchip/gicv3-its: Make the PCI/MSI code standalone irqchip/gicv3-its: Get rid of struct msi_controller irqchip/gicv3-its: Register irq domain with NEXUS token irqchip/gicv3-its: Split PCI/MSI code from the core ITS driver genirq: Add DOMAIN_BUS_NEXUS irqdomain property of/platform: Assign MSI domain to platform device PCI: exynos: Fix INTx enablement statement termination error PCI: Fail pci_ioremap_bar() on unassigned resources PCI: Show driver, BAR#, and resource on pci_ioremap_bar() failure PCI: Mark invalid BARs as unassigned PNP: Don't check for overlaps with unassigned PCI BARs of: Calculate device DMA masks based on DT dma-range size PCI: Update DMA configuration from DT of/pci: Add of_pci_dma_configure() to update DMA configuration PCI: Add helper functions pci_get[put]_host_bridge_device() of: Fix size when dma-range is not used MFD/OF: document MFD devices and handle simple-mfd of: Move of_dma_configure() to device.c to help re-use of: iommu: Add ptr to OF node arg to of_iommu_configure() of/platform: teardown DMA mappings on device destruction dma-mapping: fix debug print to display correct dma_pfn_offset dma-mapping: detect and configure IOMMU in of_dma_configure dma-mapping: replace set_arch_dma_coherent_ops with arch_setup_dma_ops iommu: add new iommu_ops callback for adding an OF device iommu: store DT-probed IOMMU data privately iommu: provide helper function to configure an IOMMU for an of master iommu: provide early initialisation hook for IOMMU drivers irqchip/gicv3-its: Fix mapping of LPIs to collections irqchip/gicv3-its: ITS table size should not be smaller than PSZ irqchip: gicv3-its: Use non-cacheable accesses when no shareability irqchip: gicv3-its: Fix PROP/PEND and BASE/CBASE confusion irqchip: gicv3-its: Fix device ID encoding irqchip: gicv3-its: Fix encoding of collection's target redistributor irqchip: gicv3-its: Support safe initialization irqchip: gicv3-its: Define macros for GITS_CTLR fields irqchip: gicv3-its: Add limitation to page order irqchip: gicv3-its: Use 64KB page as default granule irqchip: gicv3-its: Zero itt before handling to hardware irqchip: gic-v3: Fix out of bounds access to cpu_logical_map irqchip: gic: Fix unsafe locking reported by lockdep irqchip: gic: Allow interrupt level to be set for PPIs irqchip: gicv3-its: Fix unsafe locking reported by lockdep irqchip: gicv3-its: Iterate over PCI aliases to generate ITS configuration irqchip: gicv3-its: Allocate enough memory for the full range of DeviceID irqchip: gicv3-its: Fix ITS CPU init irqchip: gic: Remove warning by including linux/irqdomain.h irqchip: gic-v2m: Add DT bindings for GICv2m irqchip: gic-v2m: Add support for ARM GICv2m MSI(-X) doorbell irqchip: mtk-sysirq: dt-bindings: Add bindings for mediatek sysirq irqchip: mtk-sysirq: Add sysirq interrupt polarity support irqchip: gic: Support hierarchy irq domain. genirq: Generic chip: Add big endian I/O accessors ARM: orion: convert the irq_reg_{readl,writel} calls to the new API genirq: Generic chip: Allow irqchip drivers to override irq_reg_{readl,writel} genirq: Generic chip: Change irq_reg_{readl,writel} arguments CHROMIUM: android: Unconditionally remove callbacks in sync_fence_free() CHROMIUM: android: fix warning when releasing active sync point PCI/MSI: pci-xgene-msi: Get rid of struct msi_controller PCI: xgene: Add APM X-Gene v1 PCIe MSI/MSIX termination driver PCI: generic: Add arm64 support PCI: Build setup-irq.o for arm64 PCI: generic: Remove dependency on ARM-specific struct hw_pci PCI: generic: Convert to use generic config accessors PCI: Add generic config accessors PCI: generic: Convert to DT resource parsing API PCI: generic: Allocate config space windows after limiting bus number range pci: host: drop owner assignment from platform_drivers PCI/MSI: Let pci_msi_get_domain use struct device::msi_domain PCI/MSI: Allow msi_domain lookup using the host bridge node PCI/MSI: Add support for OF-provided msi_domain PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF PCI/MSI: Add hooks to populate the msi_domain field PCI/MSI: Register irq domain with specific token device core: Introduce per-device MSI domain pointer genirq/irqdomain: Allow irq domain aliasing PCI: Use helper functions to access fields in struct msi_desc PCI: Add helper function msi_desc_to_pci_sysdata() genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc() PCI/keystone: Use irq_data_get_msi_desc() to avoid redundant lookup of irq_data PCI/MSI: Disable MSI at enumeration even if kernel doesn't support MSI PCI/MSI: Export pci_msi_set_enable(), pci_msix_clear_and_set_ctrl() PCI/MSI: Rename msi_set_enable(), msix_clear_and_set_ctrl() genirq: Work around __irq_set_handler vs stacked domains ordering issues PCI/MSI: Rename mask/unmask_msi_irq treewide PCI/MSI: Kill redundant call of irq_set_msi_desc() for MSI-X interrupts PCI/MSI: Simplify PCI MSI code by initializing msi_desc.nvec_used earlier PCI/MSI: Remove unnecessary braces around single statements ARM/PCI: Remove unused pcibios_add_bus() and pcibios_remove_bus() PCI: xilinx: Save MSI controller in pci_sys_data PCI: mvebu: Save MSI controller in pci_sys_data PCI: rcar: Save MSI controller in pci_sys_data PCI: designware: Save MSI controller in pci_sys_data PCI: tegra: Save MSI controller in pci_sys_data ARM/PCI: Save MSI controller in pci_sys_data PCI/MSI: Add weak pcibios_msi_controller() mm: reorder can_do_mlock to fix audit denial staging: ion: debugfs to shrink pool usb: gadget: configfs: handle gadget reset request for android Enable adb with android-pipe in IA image PM / OPP: Fix typo modifcation -> modification PM / OPP: of_property_count_u32_elems() can return errors cpufreq-dt: add suspend frequency support PM / OPP: add dev_pm_opp_get_suspend_opp() helper cpufreq: dt: Tolerance applies on both sides of target voltage cpufreq: dt: Print error on failing to mark OPPs as shared cpufreq: dt: Check OPP count before marking them shared PM / OPP: Drop unlikely before IS_ERR(_OR_NULL) PM / OPP: Fix static checker warning (broken 64bit big endian systems) PM / OPP: Free resources and properly return error on failure cpufreq-dt: make scaling_boost_freqs sysfs attr available when boost is enabled cpufreq: dt: Add support for turbo/boost mode cpufreq: dt: Add support for operating-points-v2 bindings cpufreq: Allow drivers to enable boost support after registering driver Linux 3.18.24 tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c Revert "tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c" selinux: Android kernel compatibility with M userspace selinux: extended permissions for ioctls security: add ioctl specific auditing to lsm_audit selinux: remove unnecessary pointer reassignment Revert "security: lsm_audit: add ioctl specific auditing" Revert "SELinux: per-command whitelisting of ioctls" Revert "SELinux: use deletion-safe iterator to free list" Revert "SELinux: ss: Fix policy write for ioctl operations" Linux 3.18.23 x86: Init per-cpu shadow copy of CR4 on 32-bit CPUs too arm: mm: support ARCH_MMAP_RND_BITS. mm: mmap: Add new /proc tunable for mmap_base ASLR. 3w-9xxx: don't unmap bounce buffered commands fib_rules: Fix dump_rules() not to exit early Don't kill IPv4 sockets when killing IPv6 sockets was requested. PM / OPP: add dev_pm_opp_is_turbo() helper PM / OPP: Add helpers for initializing CPU OPPs PM / OPP: Add support for opp-suspend PM / OPP: Add OPP sharing information to OPP library PM / OPP: Add clock-latency-ns support PM / OPP: Add support to parse "operating-points-v2" bindings PM / OPP: Break _opp_add_dynamic() into smaller functions PM / OPP: Allocate dev_opp from _add_device_opp() PM / OPP: Create _remove_device_opp() for freeing dev_opp PM / OPP: Relocate few routines PM / OPP: Create a directory for opp bindings cpufreq: Update boost flag while initializing freq table from OPPs cpufreq: dt: allow driver to boot automatically PM / OPP / clk: Remove unnecessary OOM message cpufreq-dt: Drop unnecessary check before cpufreq_cooling_unregister() invocation PM / OPP: Assert RCU lock in exported functions PM / OPP: Update kernel documentation PM / OPP: Ensure consistent naming of static functions PM / OPP: export dev_pm_opp_get_notifier cpufreq-dt: defer probing if OPP table is not ready PM / OPP: take RCU lock in dev_pm_opp_get_opp_count PM / OPP: fix warning in of_free_opp_table() PM / OPP: add some lockdep annotations PM / OPP: do error handling at the bottom of dev_pm_opp_add_dynamic() PM / OPP: handle allocation of device_opp in a separate routine PM / OPP: reuse find_device_opp() instead of duplicating code PM / OPP: Staticize __dev_pm_opp_remove() PM / OPP: replace kfree with kfree_rcu while freeing 'struct device_opp' PM / OPP: remove double calls to find_device_opp() PM / OPP: set new_opp->dev_opp to a valid dev_opp cpufreq-dt: free OPP table created during ->init() PM / OPP replace kfree_rcu() with call_srcu() in opp_set_availability() PM / OPP Introduce APIs to remove OPPs PM / OPP rename 'head' as 'rcu_head' or 'srcu_head' based on its type PM / OPP mark OPPs as 'static' or 'dynamic' PM / OPP don't match for existing OPPs when list is empty cpufreq-dt: register cooling device from ->ready() callback cpufreq: Introduce ->ready() callback for cpufreq drivers cpufreq-dt: pass 'policy->related_cpus' to of_cpufreq_cooling_register() cpufreq: Fix formatting issues in 'struct cpufreq_driver' cpufreq: cpufreq-dt: Move newline to end of error message cpufreq: cpufreq-dt: Handle regulator_get_voltage() failure cpufreq: cpufreq-dt: Improve debug about matching OPP cpufreq: drop owner assignment from platform_drivers vfs: Test for and handle paths that are unreachable from their mnt_root md: flush ->event_work before stopping array. x86/nmi/64: Fix a paravirt stack-clobbering bug in the NMI code Revert "iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required" net: Fix skb_set_peeked use-after-free bug mm: check if section present during memory block registering hpfs: update ctime and mtime on directory modification drivercore: Fix unregistration path of platform devices ARM: OMAP2+: DRA7: clockdomain: change l4per2_7xx_clkdm to SW_WKUP of/address: Don't loop forever in of_find_matching_node_by_address(). auxdisplay: ks0108: fix refcount Doc: ABI: testing: configfs-usb-gadget-sourcesink Doc: ABI: testing: configfs-usb-gadget-loopback devres: fix devres_get() xtensa: fix kernel register spilling xtensa: fix threadptr reload on return to userspace KVM: MMU: fix validation of mmio page fault HID: usbhid: Fix the check for HID_RESET_PENDING in hid_io_error crypto: ghash-clmulni: specify context size for ghash async algorithm serial: 8250: don't bind to SMSC IrCC IR port usb: host: ehci-sys: delete useless bus_to_hcd conversion usb: dwc3: ep0: Fix mem corruption on OUT transfers of more than 512 bytes USB: ftdi_sio: Added custom PID for CustomWare products USB: symbolserial: Use usb_get_serial_port_data PCI: Fix TI816X class code quirk clk: versatile: off by one in clk_sp810_timerclken_of_get() staging: comedi: adl_pci7x3x: fix digital output on PCI-7230 iio: adis16480: Fix scale factors iio: Add inverse unit conversion macros iio: industrialio-buffer: Fix iio_buffer_poll return value iio: event: Remove negative error code from iio_event_poll iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required s390/sclp: fix compile error drm/qxl: validate monitors config modes drm/amdgpu: Don't link train DisplayPort on HPD until we get the dpcd mm/slab: fix unexpected index mapping result of kmalloc_size(INDEX_NODE+1) intel_pstate: Fix overflow in busy_scaled due to long delay tty: fix stall caused by missing memory barrier in drivers/tty/n_tty.c staging: speakup: fix speakup-r regression dm cache: fix NULL pointer when switching from cleaner policy clk: ti: fix dual-registration of uart4_ick nfs/filelayout: Fix NULL reference caused by double freeing of fh_array fix a braino in ovl_d_select_inode() overlayfs: Make f_path always point to the overlay and f_inode to the underlay VFS: Introduce inode-getting helpers for layered/unioned fs environments overlay: Call ovl_drop_write() earlier in ovl_dentry_open() genirq: Fix race in register_irq_proc() igb: do not re-init SR-IOV during probe net/xen-netfront: only napi_synchronize() if running m68k: Define asmlinkage_protect arm64: readahead: fault retry breaks mmap file read random detection arm64: ftrace: fix function_graph tracer panic dcache: Handle escaped paths in prepend_path UBI: return ENOSPC if no enough space available UBI: Validate data_size powerpc/MSI: Fix race condition in tearing down MSI interrupts tools lib traceevent: Fix string handling in heterogeneous arch environments batman-adv: Fix potentially broken skb network header access batman-adv: Make TT capability changes atomic batman-adv: Make NC capability changes atomic MIPS: dma-default: Fix 32-bit fall back to GFP_DMA cpufreq: dt: Tolerance applies on both sides of target voltage USB: Add reset-resume quirk for two Plantronics usb headphones. usb: Add device quirk for Logitech PTZ cameras usb: musb: cppi41: allow it to work again usb: Use the USB_SS_MULT() macro to get the burst multiplier. usb: chipidea: udc: using the correct stall implementation security: fix typo in security_task_prctl regmap: debugfs: Don't bother actually printing when calculating max length regmap: debugfs: Ensure we don't underflow when printing access masks PM / AVS: rockchip-io: depend on CONFIG_POWER_AVS mtd: pxa3xx_nand: add a default chunk size docs: update HOWTO for 3.x -> 4.x versioning cifs: use server timestamp for ntlmv2 authentication dts: imx25: fix sd card gpio polarity specified in device tree dts: imx53: fix sd card gpio polarity specified in device tree dts: imx51: fix sd card gpio polarity specified in device tree batman-adv: Make DAT capability changes atomic batman-adv: protect tt_local_entry from concurrent delete events fbdev: select versatile helpers for the integrator ipvs: fix crash with sync protocol v0 and FTP ipvs: skb_orphan in case of forwarding ipvs: fix crash if scheduler is changed ipvs: do not use random local source address for tunnels sched/fair: Prevent throttling in early pick_next_task_fair() Initialize msg/shm IPC objects before doing ipc_addid() usb: xhci: Add support for URB_ZERO_PACKET to bulk/sg transfers xhci: init command timeout timer earlier to avoid deleting it uninitialized xhci: change xhci 1.0 only restrictions to support xhci 1.1 usb: xhci: exit early in xhci_setup_device() if we're halted or dying usb: xhci: Clear XHCI_STATE_DYING on start USB: whiteheat: fix potential null-deref at probe drm/amdgpu: Restore LCD backlight level on resume drm: Reject DRI1 hw lock ioctl functions for kms drivers drm/i915/bios: handle MIPI Sequence Block v3+ gracefully drm/qxl: recreate the primary surface when the bo is not primary drm/qxl: only report first monitor as connected if we have no state [SMB3] Do not fall back to SMBWriteX in set_file_size error cases disabling oplocks/leases via module parm enable_oplocks broken for SMB3 nfs: fix pg_test page count calculation netfilter: nf_log: don't zap all loggers on unregister netfilter: nf_log: Introduce nft_log_dereference() macro netfilter: nft_compat: skip family comparison in case of NFPROTO_UNSPEC netfilter: nf_log: wait for rcu grace after logger unregistration netfilter: ctnetlink: put back references to master ct and expect objects netfilter: nf_conntrack: Support expectations in different zones netfilter: nfnetlink: work around wrong endianess in res_id field dm raid: fix round up of default region size USB: option: add ZTE PIDs staging: ion: fix corruption of ion_import_dma_buf dm btree: add ref counting ops for the leaves of top level btrees svcrdma: Fix send_reply() scatter/gather set-up ath10k: fix dma_mapping_error() handling Btrfs: update fix for read corruption of compressed and shared extents Btrfs: fix read corruption of compressed and shared extents btrfs: skip waiting on ordered range for special files ASoC: dwc: correct irq clear method ASoC: fix broken pxa SoC support ASoC: pxa: pxa2xx-ac97: fix dma requestor lines ALSA: hda - Apply SPDIF pin ctl to MacBookPro 12,1 ALSA: hda: Add dock support for ThinkPad T550 ALSA: synth: Fix conflicting OSS device registration on AWE32 mm: hugetlbfs: skip shared VMAs when unmapping private pages to satisfy a fault ocfs2/dlm: fix deadlock when dispatch assert master spi: spi-pxa2xx: Check status register to determine if SSSR_TINT is disabled spi: xtensa-xtfpga: fix register endianness spi: Fix documentation of spi_alloc_master() s390/boot/decompression: disable floating point in decompressor s390/compat: correct uc_sigmask of the compat signal frame sched/core: Fix TASK_DEAD race in finish_task_switch() x86/xen: Support kexec/kdump in HVM guests by doing a soft reset x86/mm: Set NX on gap between __ex_table and rodata x86/process: Add proper bound checks in 64bit get_wchan() x86/asm/entry: Create and use a 'TOP_OF_KERNEL_STACK_PADDING' macro x86/kexec: Fix kexec crash in syscall kexec_file_load() x86/efi: Fix boot crash by mapping EFI memmap entries bottom-up at runtime, instead of top-down Use WARN_ON_ONCE for missing X86_FEATURE_NRIPS x86/paravirt: Replace the paravirt nop with a bona fide empty function x86/platform: Fix Geode LX timekeeping in the generic x86 build x86/apic: Serialize LVTT and TSC_DEADLINE writes dmaengine: dw: properly read DWC_PARAMS register ARM: dts: fix usb pin control for imx-rex dts ARM: dts: omap3-beagle: make i2c3, ddc and tfp410 gpio work again ARM: dts: omap5-uevm.dts: fix i2c5 pinctrl offsets windfarm: decrement client count when unregistering ARM: 8429/1: disable GCC SRA optimization ARM: fix Thumb2 signal handling when ARMv6 is enabled hwmon: (nct6775) Swap STEP_UP_TIME and STEP_DOWN_TIME registers for most chips sched: access local runqueue directly in single_task_running watchdog: sunxi: fix activation of system reset perf header: Fixup reading of HEADER_NRCPUS feature perf stat: Get correct cpu id for print_aggr perf report: Add support for srcfile sort key perf tools: Fix copying of /proc/kcore iser-target: remove command with state ISTATE_REMOVE scsi: fix scsi_error_handler vs. scsi_host_dev_release race target/iscsi: Fix np_ip bracket issue by removing np_ip time: Fix timekeeping_freqadjust()'s incorrect use of abs() instead of abs64() kvm: fix double free for fast mmio eventfd kvm: factor out core eventfd assign/deassign logic kvm: fix zero length mmio searching kvm: don't try to register to KVM_FAST_MMIO_BUS for non mmio eventfd arm: KVM: Fix incorrect device to IPA mapping hp-wmi: limit hotkey enable zram: fix possible use after free in zcomp_create() of_mdio: add new DT property 'managed' to specify the PHY management type net: dsa: bcm_sf2: Do not override speed settings tcp: add proper TS val into RST packets net: dsa: bcm_sf2: Fix 64-bits register writes net: eth: altera: fix napi poll_list corruption ext4: don't manipulate recovery flag when freezing no-journal fs cxl: Fix unbalanced pci_dev_get in cxl_probe igb: Fix oops caused by missing queue pairing rtlwifi: rtl8821ae: Fix an expression that is always false x86/nmi/64: Use DF to avoid userspace RSP confusing nested NMI detection x86/nmi/64: Reorder nested NMI checks x86/nmi/64: Improve nested NMI comments bna: fix interrupts storm caused by erroneous packets udp: fix dst races with multicast early demux packet: missing dev_put() in packet_do_bind() fib_rules: fix fib rule dumps across multiple skbs openvswitch: Zero flows on allocation. sctp: fix race on protocol/netns initialization netlink, mmap: transform mmap skb into full skb on taps net/ipv6: Correct PIM6 mrt_lock handling ipv6: fix exthdrs offload registration in out_rt path usbnet: Get EVENT_NO_RUNTIME_PM bit before it is cleared ip6_gre: release cached dst on tunnel removal rtnetlink: verify IFLA_VF_INFO attributes before passing them to driver if_link: Add an additional parameter to ifla_vf_info for RSS querying uid_cputime: Check for the range while removing range of UIDs. linaro-base.conf: remove CONFIG_NFS_V2 is not set usb: gadget: Remove circular dependency on Config android: drivers: workaround debugfs race in binder staging: ion: Add X86 dependency for ION_POOL_CACHE_POLICY staging: ion: fix corruption of ion_import_dma_buf Revert "staging: binder: Change binder mutex to rtmutex." UPSTREAM: arm64: add better page protections to arm64 UPSTREAM: arm64: use fixmap for text patching UPSTREAM: arm64: remove the unnecessary arm64_swiotlb_init() UPSTREAM: arm64/efi: remove idmap manipulations from UEFI code UPSTREAM: arm64/efi: add missing call to early_ioremap_reset() UPSTREAM: arm64/efi: remove free_boot_services() and friends UPSTREAM: arm64/efi: move SetVirtualAddressMap() to UEFI stub UPSTREAM: arm64/efi: set EFI_ALLOC_ALIGN to 64 KB UPSTREAM: efi: efistub: allow allocation alignment larger than EFI_PAGE_SIZE UPSTREAM: efi: split off remapping code from efi_config_init() UPSTREAM: arm64/mm: add create_pgd_mapping() to create private page tables UPSTREAM: arm64/mm: add explicit struct_mm argument to __create_mapping() UPSTREAM: efi: efi-stub: notify on DTB absence UPSTREAM: arm64: dmi: set DMI string as dump stack arch description UPSTREAM: arm64: dmi: Add SMBIOS/DMI support UPSTREAM: dmi: add support for SMBIOS 3.0 64-bit entry point UPSTREAM: efi: dmi: add support for SMBIOS 3.0 UEFI configuration table UPSTREAM: arm64/efi: drop redundant set_bit(EFI_CONFIG_TABLES) UPSTREAM: arm64/efi: invert UEFI memory region reservation logic UPSTREAM: arm64/efi: set PE/COFF file alignment to 512 bytes UPSTREAM: arm64/efi: set PE/COFF section alignment to 4 KB UPSTREAM: arm64/efi: efistub: jump to 'stext' directly, not through the header UPSTREAM: arm64: Move some head.text functions to executable section UPSTREAM: arm64: jump labels: NOP out NOP -> NOP replacement UPSTREAM: arm64: add support to dump the kernel page tables UPSTREAM: arm64: Add FIX_HOLE to permanent fixed addresses UPSTREAM: arm64: Factor out fixmap initialization from ioremap UPSTREAM: arm64: Move cpu_resume into the text section UPSTREAM: arm64: Switch to adrp for loading the stub vectors UPSTREAM: arm64: Treat handle_arch_irq as a function pointer hfs,hfsplus: cache pages correctly between bnode_create and bnode_free IB/mlx4: Use correct SL on AH query under RoCE IB/mlx4: Forbid using sysfs to change RoCE pkeys IB/uverbs: Fix race between ib_uverbs_open and remove_one IB/uverbs: reject invalid or unknown opcodes IB/qib: Change lkey table allocation to support more MRs hfs: fix B-tree corruption after insertion at position 0 md/raid10: always set reshape_safe when initializing reshape_position. mmc: core: fix race condition in mmc_wait_data_done fs: if a coredump already exists, unlink and recreate with O_EXCL vmscan: fix increasing nr_isolated incurred by putback unevictable pages parisc: Filter out spurious interrupts in PA-RISC irq handler parisc: Use double word condition in 64bit CAS operation NFS: nfs_set_pgio_error sometimes misses errors NFS: Fix a NULL pointer dereference of migration recovery ops for v4.2 client NFSv4: don't set SETATTR for O_RDONLY|O_EXCL Btrfs: check if previous transaction aborted to avoid fs corruption [media] v4l: omap3isp: Fix sub-device power management code [media] rc-core: fix remove uevent generation x86/mm: Initialize pmd_idx in page_table_range_init_count() Add radeon suspend/resume quirk for HP Compaq dc5750. CIFS: fix type confusion in copy offload ioctl powerpc/mm: Recompute hash value after a failed update powerpc/rtas: Introduce rtas_get_sensor_fast() for IRQ handlers powerpc/mm: Fix pte_pagesize_index() crash on 4K w/64K hash ALSA: hda - Use ALC880_FIXUP_FUJITSU for FSC Amilo M1437 ALSA: hda - Enable headphone jack detect on old Fujitsu laptops Input: evdev - do not report errors form flush() arm64: KVM: Disable virtual timer even if the guest is not using it arm64: errata: add module build workaround for erratum #843419 arm64: head.S: initialise mdcr_el2 in el2_setup arm64: compat: fix vfp save/restore across signal handlers in big-endian arm64: kconfig: Move LIST_POISON to a safe value mac80211: enable assoc check for mesh interfaces tg3: Fix temperature reporting unshare: Unsharing a thread does not require unsharing a vm blk-mq: fix buffer overflow when reading sysfs file of 'pending' Squashfs: Add LZ4 compression configuration option Squashfs: add LZ4 compression support lz4: fix system halt at boot kernel on x86_64 lib/lz4: Pull out constant tables LZ4 : fix the data abort issue arm64: pass return address to dma_common_contiguous_remap Initialize msg/shm IPC objects before doing ipc_addid() Linux 3.18.22 lowmemorykiller: trace kill events. selinux: do not check open perm on ftruncate call Revert "HACK: usb: gadget: Fix enumeration on boot" ipv6: sysctl to restrict candidate source addresses ipv6: Remove unused arguments for __ipv6_dev_get_saddr(). ipv6: Fix finding best source address in ipv6_dev_get_saddr(). ipv6: Do not iterate over all interfaces when finding source address on specific interface. net: ipv6: allow explicitly choosing optimistic addresses net: ipv6: Add a sysctl to make optimistic addresses useful candidates Revert "net: ipv6: Add a sysctl to make optimistic addresses useful candidates" Revert "net: ipv6: allow choosing optimistic addresses with use_optimistic" net: ping: Return EAFNOSUPPORT when appropriate. net: core: fix UID-based routing build android: configs: base: enable IPV6 Handle 'sk' being NULL in UID-based routing. net: call rcu_read_lock early in process_backlog lpfc: Fix scsi prep dma buf error. rds: fix an integer overflow test in rds_info_getsockopt() net/mlx4_core: Fix wrong index in propagating port change event to VFs netlink: don't hold mutex in rcu callback when releasing mmapd ring inet: frags: fix defragmented packet's IP header for af_packet bonding: correct the MAC address for "follow" fail_over_mac policy bonding: fix destruction of bond with devices different from arphrd_ether ipv6: lock socket in ip6_datagram_connect() isdn/gigaset: reset tty->receive_room when attaching ser_gigaset bridge: mdb: fix double add notification net: Fix skb csum races when peeking net: do not process device backlog during unregistration net: pktgen: fix race between pktgen_thread_worker() and kthread_stop() bridge: mdb: zero out the local br_ip variable before use net/tipc: initialize security state for new connection socket ip_tunnel: fix ipv4 pmtu check to honor inner ip header df net: graceful exit from netif_alloc_netdev_queues() ipv6: Make MLD packets to only be processed locally drm/radeon: fix hotplug race at startup mfd: lpc_ich: Assign subdevice ids automatically x86/ldt: Correct LDT access in single stepping logic x86/ldt: Make modify_ldt synchronous rcu: Move lockless_dereference() out of rcupdate.h x86/nmi/64: Switch stacks on userspace NMI entry x86/nmi/64: Remove asm code that saves CR2 x86/nmi: Enable nested do_nmi() handling for 64-bit kernels HID: usbhid: add Chicony/Pixart usb optical mouse that needs QUIRK_ALWAYS_POLL SCSI: Fix NULL pointer dereference in runtime PM UPSTREAM: ARM: 8425/1: kgdb: Don't try to stop the machine when setting breakpoints UPSTREAM: ARM: mm: allow text and rodata sections to be read-only BACKPORT: ARM: mm: allow non-text sections to be non-executable UPSTREAM: arm: kgdb: Handle read-only text / modules UPSTREAM: ARM: kexec: Make .text R/W in machine_kexec UPSTREAM: arm: use fixmap for text patching when text is RO UPSTREAM: arm: fixmap: implement __set_fixmap() UPSTREAM: ARM: expand fixmap region to 3MB UPSTREAM: arm: use generic fixmap.h of/platform: Move platform devices under /sys/devices/platform ALSA: usb: Add native DSD support for Gustard DAC-X20U net: PPPoPNS: Remove length argument from data_ready dm-verity: Add modes and emit uevent on corrupted blocks ARM64 readahead: fault retry breaks mmap file read random detection x86/xen: make CONFIG_XEN depend on CONFIG_X86_LOCAL_APIC arm64: KVM: Fix host crash when injecting a fault into a 32bit guest Add factory recertified Crucial M500s to blacklist cpuset: use trialcs->mems_allowed as a temp variable crypto: caam - fix memory corruption in ahash_final_ctx sd: Fix maximum I/O size for BLOCK_PC requests libiscsi: Fix host busy blocking during connection teardown MIPS: Fix seccomp syscall argument for MIPS64 regmap: regcache-rbtree: Clean new present bits on present bitmap resize mfd: arizona: Fix initialisation of the PM runtime libfc: Fix fc_fcp_cleanup_each_cmd() libfc: Fix fc_exch_recv_req() error path drm/vmwgfx: Fix execbuf locking issues drm/radeon: add new OLAND pci id EDAC, ppc4xx: Access mci->csrows array elements properly localmodconfig: Use Kbuild files too dm thin metadata: delete btrees when releasing metadata snapshot x86/xen: build "Xen PV" APIC driver for domU as well rtlwifi: rtl8723be: Add module parameter for MSI interrupts perf: Fix PERF_EVENT_IOC_PERIOD migration race perf: Fix fasync handling on inherited events xen-blkback: replace work_pending with work_busy in purge_persistent_gnt() xen-blkfront: don't add indirect pages to list when !feature_persistent mm/hwpoison: fix fail isolate hugetlbfs page w/ refcount held mm: hugetlb: introduce page_huge_active mm/hwpoison: fix page refcount of unknown non LRU page ipc/sem.c: update/correct memory barriers ipc,sem: fix use after free on IPC_RMID after a task using same semaphore set exits crypto: arm/sha256 - Add optimized SHA-256/224 net: sysctl_net_core: delete unused variable usb: gadget: configfs: fix unused variable warnings net: PPPoPNS: Remove length argument from data_ready usb: gadget: function: fix unused function warnings android: configs: base: enable Android gadget functions usb: gadget: audio_source function depends on SND_PCM tcp: Silence warning: <E2><80><98>in<E2><80><99> may be used uninitialized drivers/base: cpu: fix CPU_AUTOPROBE of/fdt: fix build warnings in early_init_dt_scan_chosen() thermal: power_allocator: allocate with kcalloc what you free with kfree thermal: power_allocator: do not use devm* interfaces thermal: cpu_cooling: Check memory allocation of power_table net: fix crash in tcp_nuke_addr() net: xt_qtaguid/xt_socket: fix refcount underflow and crash net: fix iterating over hashtable in tcp_nuke_addr() nf: IDLETIMER: fix lockdep warning ANDROID: usb: gadget: create F_midi device usb: gadget: midi: avoid redundant f_midi_set_alt() call usb: gadget: f_midi: fix error recovery path usb: gadget: f_midi: fix segfault when reading empty id usb: gadget: fix misspelling of current function in string usb: gadget: midi: f_midi_alloc() can be static usb: gadget: f_midi: add configfs support usb: gadget: f_midi: use usb_gstrings_attach usb: gadget: f_midi: remove compatibility layer usb: gadget: f_midi: convert to new function interface with backward compatibility usb: gadget: f_midi: check kstrdup() return value usb: gadget: f_midi: enable use of the index parameter usb: gadget: configfs: Fix interfaces array NULL-termination usb: gadget: Add device attribute to determine gadget state x86/xen: Initialize cr4 shadow for 64-bit PV(H) guests usb: phy: fix dual role sysfs build if kernel modules are supported ion: Handle the memory mapping correctly on x86 usb: phy: Dual role sysfs class definition Linux 3.18.21 ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_input ip_vti/ip6_vti: Do not touch skb->mark on xmit libata: Do not blacklist M510DC libata: force disable trim for SuperSSpeed S238 libata: add ATA_HORKAGE_NOTRIM libata: Expose TRIM capability in sysfs libata: Do not blacklist Micron M500DC libata: Blacklist queued TRIM on all Samsung 800-series libata: Blacklist queued TRIM on Samsung SSD 850 Pro libata: Update Crucial/Micron blacklist libata: Whitelist SSDs that are known to properly return zeroes after TRIM Revert "libata: add ATA_HORKAGE_NOTRIM" hpfs: hpfs_error: Remove static buffer, use vsprintf extension %pV instead intel_idle: support additional Broadwell model kexec: allocate the kexec control page with KEXEC_CONTROL_MEMORY_GFP i2c: i801: Add DeviceIDs for SunrisePoint LP ALSA: hda/hdmi - apply Haswell fix-ups to Skylake display codec ALSA: hda - add codec ID for Skylake display audio codec iio: accel: hid-sensor-accel-3d: Fix memory leak in probe() iio: gyro: hid-sensor-gyro-3d: Fix memory leak in probe() iio: light: hid-sensor-als.c: Fix memory leak in probe() thermal: rcar: fix ENR register value arm64/mm: Remove hack in mmap randomize layout Bluetooth: ath3k: Add a new ID 0cf3:e006 to ath3k list HID: do not bind to Microchip Pick16F1454 [media] si4713: HID blacklist Si4713 USB development board HID: tivo: enable all buttons on the TiVo Slide Pro remote hpsa: fix a couple pci id table mistakes cpufreq: pcc: Enable autoload of pcc-cpufreq for ACPI processors usb: renesas_usbhs: Don't disable the pipe if Control write status stage usb: renesas_usbhs: Fix fifo unclear in usbhsf_prepare_pop btrfs: cleanup orphans while looking up default subvolume btrfs: incorrect handling for fiemap_fill_next_extent return iio: adc: twl6030-gpadc: Fix modalias md/bitmap: return an error when bitmap superblock is corrupt. sg_start_req(): make sure that there's not too many elements in iovec iscsi-target: Fix iscsit_start_kthreads failure OOPs ima: extend "mask" policy matching support ima: add support for new "euid" policy condition iscsi-target: Fix iser explicit logout TX kthread leak iscsi-target: Fix use-after-free during TPG session shutdown avr32: handle NULL as a valid clock object vhost: actually track log eventfd file rds: rds_ib_device.refcount overflow x86/efi: Use all 64 bit of efi_memmap in setup_e820() xhci: do not report PLC when link is in internal resume state xhci: prevent bus_suspend if SS port resuming in phase 1 xhci: Calculate old endpoints correctly on device reset usb-storage: ignore ZTE MF 823 card reader in mode 0x1225 ata: pmp: add quirk for Marvell 4140 SATA PMP blkcg: fix gendisk reference leak in blkg_conf_prep() Input: usbtouchscreen - avoid unresponsive TSC-30 touch screen tile: use free_bootmem_late() for initrd md/raid1: fix test for 'was read error from last working device'. mmc: sdhci-esdhc: Make 8BIT bus work mac80211: clear subdir_stations when removing debugfs st: null pointer dereference panic caused by use after kref_put by st_open ALSA: hda - Fix MacBook Pro 5,2 quirk ALSA: usb-audio: add dB range mapping for some devices ALSA: usb-audio: Add MIDI support for Steinberg MI2/MI4 genirq: Prevent resend to interrupts marked IRQ_NESTED_THREAD s390/sclp: clear upper register halves in _sclp_print_early freeing unlinked file indefinitely delayed ACPI / init: Switch over platform to the ACPI mode later nfsd: do nfs4_check_fh in nfs4_check_file instead of nfs4_check_olstateid nfsd: refactor nfs4_preprocess_stateid_op kvm: x86: fix kvm_apic_has_events to check for NULL pointer signal: fix information leak in copy_siginfo_from_user32 signal: fix information leak in copy_siginfo_to_user signalfd: fix information leak in signalfd_copyinfo mm, vmscan: Do not wait for page writeback for GFP_NOFS allocations mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict USB: qcserial: Add support for Dell Wireless 5809e 4G Modem USB: qcserial/option: make AT URCs work for Sierra Wireless MC7305/MC7355 usb: gadget: f_uac2: fix calculation of uac2->p_interval md/raid1: extend spinlock to protect raid1_end_read_request against inconsistencies PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition nfsd: Drop BUG_ON and ignore SECLABEL on absent filesystem ocfs2: fix BUG in ocfs2_downconvert_thread_do_work() ipc: modify message queue accounting to not take kernel data structures into account hwmon: (dell-smm) Blacklist Dell Studio XPS 8100 ALSA: fireworks/firewire-lib: add support for recent firmware quirk ALSA: hda - fix cs4210_spdif_automute() ARM: OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc ARM: dts: i.MX35: Fix can support. rbd: fix copyup completion race crypto: ixp4xx - Remove bogus BUG_ON on scattered dst buffer crypto: qat - Fix invalid synchronization between register/unregister sym algs hwrng: core - correct error check of kthread_run call xen/gntdevt: Fix race condition in gntdev_release() xen/gntdev: convert priv->lock to a mutex arm64 Kconfig: Move LIST_POISON to a safe value ion : In carveout heap, change minimum allocation order from 12 to PAGE_SHIFT, After this change each bit in bitmap (genalloc - General purpose special memory pool) x86/xen: Probe target addresses in set_aliased_prot() before the hypercall ASoC: dapm: Lock during userspace access ASoC: pcm1681: Fix setting de-emphasis sampling rate selection ARM: dts: keystone: fix dt bindings to use post div register for mainpll clk: keystone: add support for post divider register for main pll sparc64: Fix userspace FPU register corruptions. Fix for in kernel emergency remount when loop mounts are used md: use kzalloc() when bitmap is disabled phy: twl4030-usb: make runtime pm more reliable. pstore: pmsg: return -ENOMEM on vmalloc failure usb: udc: core: add device_del() call to error pathway USB: sierra: add 1199:68AB device ID drivers/usb: Delete XHCI command timer if necessary xhci: fix off by one error in TRB DMA address boundary check ipr: Fix invalid array indexing for HRRQ ipr: Fix incorrect trace indexing ipr: Fix locking for unit attention handling drm/dp-mst: Remove debug WARN_ON drm/radeon/combios: add some validation of lvds values drm/i915: Replace WARN inside I915_READ64_2x32 with retry loop fsnotify: fix oops in fsnotify_clear_marks_by_group_flags() MIPS: Make set_pte() SMP safe. MIPS: Flush RPS on kernel entry with EVA MIPS: show_stack: Fix stack trace with EVA MIPS: do_mcheck: Fix kernel code dump with EVA MIPS: Fix sched_getaffinity with MT FPAFF enabled MIPS: Malta: Don't reinitialise RTC wakeup_reason: use vsnprintf instead of snsprintf for vargs. The USB and Display related changes are skipped completely based on review by those teams. Certain memory, UBI and MMC related changes are not picked based on review by those teams. Certain missing parts of commit e7cf05db ("netfilter: xt_socket: add XT_SOCKET_RESTORESKMARK flag") are added back. Skip "android: add CONFIG_DEBUG_RODATA to recommended config". CONFIG_DEBUG_RODATA is only needed on perf so avoid mandating it for perf and debug. Conflicts: arch/arm/include/asm/cacheflush.h arch/arm/include/asm/fixmap.h arch/arm/kernel/kgdb.c arch/arm/kernel/vmlinux.lds.S arch/arm/mm/highmem.c arch/arm/mm/init.c arch/arm/mm/mmap.c arch/arm/mm/mmu.c arch/arm64/Kconfig.debug arch/arm64/include/asm/cacheflush.h arch/arm64/include/asm/cpufeature.h arch/arm64/include/asm/efi.h arch/arm64/include/asm/mmu.h arch/arm64/kernel/efi.c arch/arm64/kernel/head.S arch/arm64/kernel/setup.c arch/arm64/kernel/vmlinux.lds.S arch/arm64/lib/copy_from_user.S arch/arm64/lib/copy_in_user.S arch/arm64/lib/copy_to_user.S arch/arm64/mm/Makefile arch/arm64/mm/dma-mapping.c arch/arm64/mm/dump.c arch/arm64/mm/mm.h arch/arm64/mm/mmap.c arch/arm64/mm/mmu.c drivers/base/firmware_class.c drivers/base/power/opp.c drivers/block/zram/zram_drv.c drivers/irqchip/Kconfig drivers/irqchip/Makefile drivers/irqchip/irq-gic-common.c drivers/irqchip/irq-gic-common.h drivers/irqchip/irq-gic-v3-its.c drivers/irqchip/irq-gic-v3.c drivers/irqchip/irq-gic.c drivers/mmc/card/block.c drivers/mmc/core/core.c drivers/of/platform.c drivers/pci/msi.c drivers/scsi/scsi_pm.c drivers/staging/android/ion/Kconfig drivers/staging/android/ion/ion.c drivers/staging/android/ion/ion_page_pool.c drivers/staging/android/ion/ion_priv.h drivers/staging/android/ion/ion_system_heap.c drivers/staging/android/lowmemorykiller.c drivers/staging/android/sync.c drivers/usb/gadget/Kconfig drivers/usb/gadget/configfs.c drivers/usb/gadget/function/f_midi.c include/linux/iommu.h include/linux/ipv6.h include/linux/irqchip/arm-gic-v3.h include/linux/msi.h include/trace/events/power.h include/trace/events/sched.h include/uapi/linux/ipv6.h kernel/irq/proc.c kernel/sysctl.c net/ipv4/tcp.c net/ipv6/addrconf.c net/netfilter/xt_socket.c Change-Id: I91e89f6ccae8d06b7b6712590015236b35c6939c Signed-off-by: Kaushal Kumar <kaushalk@codeaurora.org>
| * | Squashfs: Add LZ4 compression configuration optionPhillip Lougher2015-10-051-4/+4
| | | | | | | | | | | | | | | | | | Add the glue code, and also update the documentation. Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
* | | add documentation about reclaim knob on proc.txtMinchan Kim2015-09-071-0/+20
|/ / | | | | | | | | | | | | | | | | | | | | This patch adds stuff about new reclaim field in proc.txt Change-Id: I1718fad12ec078e204e7a59769ce70fad7708756 Acked-by: Rob Landley <rob@landley.net> Signed-off-by: Minchan Kim <minchan@kernel.org> Patch-mainline: linux-mm @ 9 May 2013 16:21:29 [vinmenon@codeaurora.org: trivial merge conflict fixes] Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
* | fs/proc/task_mmu.c: add user-space support for resetting mm->hiwater_rss ↵Petr Cermak2015-04-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (peak RSS) Peak resident size of a process can be reset back to the process's current rss value by writing "5" to /proc/pid/clear_refs. The driving use-case for this would be getting the peak RSS value, which can be retrieved from the VmHWM field in /proc/pid/status, per benchmark iteration or test scenario. Origin: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=695f055936938c674473ea071ca7359a863551e7 [akpm@linux-foundation.org: clarify behaviour in documentation] Signed-off-by: Petr Cermak <petrcermak@chromium.org> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Primiano Tucci <primiano@chromium.org> Cc: Petr Cermak <petrcermak@chromium.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Change-Id: I6bc63fcd5f5cdcc1c92aeec8b5abc8e3108d92b1
* | mm: add a field to store names for private anonymous memoryColin Cross2015-02-031-0/+6
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Userspace processes often have multiple allocators that each do anonymous mmaps to get memory. When examining memory usage of individual processes or systems as a whole, it is useful to be able to break down the various heaps that were allocated by each layer and examine their size, RSS, and physical memory usage. This patch adds a user pointer to the shared union in vm_area_struct that points to a null terminated string inside the user process containing a name for the vma. vmas that point to the same address will be merged, but vmas that point to equivalent strings at different addresses will not be merged. Userspace can set the name for a region of memory by calling prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, start, len, (unsigned long)name); Setting the name to NULL clears it. The names of named anonymous vmas are shown in /proc/pid/maps as [anon:<name>] and in /proc/pid/smaps in a new "Name" field that is only present for named vmas. If the userspace pointer is no longer valid all or part of the name will be replaced with "<fault>". The idea to store a userspace pointer to reduce the complexity within mm (at the expense of the complexity of reading /proc/pid/mem) came from Dave Hansen. This results in no runtime overhead in the mm subsystem other than comparing the anon_name pointers when considering vma merging. The pointer is stored in a union with fieds that are only used on file-backed mappings, so it does not increase memory usage. Change-Id: Ie2ffc0967d4ffe7ee4c70781313c7b00cf7e3092 Signed-off-by: Colin Cross <ccross@android.com>
* ovl: rename filesystem type to "overlay"Miklos Szeredi2014-11-201-1/+1
| | | | | | | | | | | | | | | Some distributions carry an "old" format of overlayfs while mainline has a "new" format. The distros will possibly want to keep the old overlayfs alongside the new for compatibility reasons. To make it possible to differentiate the two versions change the name of the new one from "overlayfs" to "overlay". Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Reported-by: Serge Hallyn <serge.hallyn@ubuntu.com> Cc: Andy Whitcroft <apw@canonical.com>
* overlay: overlay filesystem documentationNeil Brown2014-10-241-0/+198
| | | | | | Document the overlay filesystem. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
* vfs: add i_op->dentry_open()Miklos Szeredi2014-10-242-0/+9
| | | | | | | Add a new inode operation i_op->dentry_open(). This is for stacked filesystems that want to return a struct file from a different filesystem. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
* NTFS: Remove changelog from Documentation/filesystems/ntfs.txt.Anton Altaparmakov2014-10-161-268/+0
| | | | | | Changelog is in git history, no need to have a copy in the documentation. Signed-off-by: Anton Altaparmakov <anton@tuxera.com>
* autofs: the documentation I wanted to readNeilBrown2014-10-141-0/+520
| | | | | | | | | | | | | | | This documents autofs from the perspective of what the module actually supports rather than how automount is expected to use it. It is formatted using "markdown" and works best with Markdown.pl (markdown_py doesn't like some constructs). [rdunlap@infradead.org: copy editing] Signed-off-by: NeilBrown <neilb@suse.de> Cc: Randy Dunlap <rdunlap@infradead.org> Acked-by: Ian Kent <raven@themaw.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'for-linus' of ↵Linus Torvalds2014-10-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull vfs updates from Al Viro: "The big thing in this pile is Eric's unmount-on-rmdir series; we finally have everything we need for that. The final piece of prereqs is delayed mntput() - now filesystem shutdown always happens on shallow stack. Other than that, we have several new primitives for iov_iter (Matt Wilcox, culled from his XIP-related series) pushing the conversion to ->read_iter()/ ->write_iter() a bit more, a bunch of fs/dcache.c cleanups and fixes (including the external name refcounting, which gives consistent behaviour of d_move() wrt procfs symlinks for long and short names alike) and assorted cleanups and fixes all over the place. This is just the first pile; there's a lot of stuff from various people that ought to go in this window. Starting with unionmount/overlayfs mess... ;-/" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (60 commits) fs/file_table.c: Update alloc_file() comment vfs: Deduplicate code shared by xattr system calls operating on paths reiserfs: remove pointless forward declaration of struct nameidata don't need that forward declaration of struct nameidata in dcache.h anymore take dname_external() into fs/dcache.c let path_init() failures treated the same way as subsequent link_path_walk() fix misuses of f_count() in ppp and netlink ncpfs: use list_for_each_entry() for d_subdirs walk vfs: move getname() from callers to do_mount() gfs2_atomic_open(): skip lookups on hashed dentry [infiniband] remove pointless assignments gadgetfs: saner API for gadgetfs_create_file() f_fs: saner API for ffs_sb_create_file() jfs: don't hash direct inode [s390] remove pointless assignment of ->f_op in vmlogrdr ->open() ecryptfs: ->f_op is never NULL android: ->f_op is never NULL nouveau: __iomem misannotations missing annotation in fs/file.c fs: namespace: suppress 'may be used uninitialized' warnings ...
| * vfs: fix typo in s_op->alloc_inode() documentationKirill Smelkov2014-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The function which calls s_op->alloc_inode() is not inode_alloc(), but instead alloc_inode() which lives in fs/inode.c . The typo was there from the beginning from 5ea626aa (VFS: update documentation, 2005) - there was no standalone inode_alloc() for the whole kernel history. Cc: Pekka Enberg <penberg@kernel.org> Signed-off-by: Kirill Smelkov <kirr@nexedi.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
* | Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linuxLinus Torvalds2014-10-112-8/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull file locking related changes from Jeff Layton: "This release is a little more busy for file locking changes than the last: - a set of patches from Kinglong Mee to fix the lockowner handling in knfsd - a pile of cleanups to the internal file lease API. This should get us a bit closer to allowing for setlease methods that can block. There are some dependencies between mine and Bruce's trees this cycle, and I based my tree on top of the requisite patches in Bruce's tree" * tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux: (26 commits) locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING locks: flock_make_lock should return a struct file_lock (or PTR_ERR) locks: set fl_owner for leases to filp instead of current->files locks: give lm_break a return value locks: __break_lease cleanup in preparation of allowing direct removal of leases locks: remove i_have_this_lease check from __break_lease locks: move freeing of leases outside of i_lock locks: move i_lock acquisition into generic_*_lease handlers locks: define a lm_setup handler for leases locks: plumb a "priv" pointer into the setlease routines nfsd: don't keep a pointer to the lease in nfs4_file locks: clean up vfs_setlease kerneldoc comments locks: generic_delete_lease doesn't need a file_lock at all nfsd: fix potential lease memory leak in nfs4_setlease locks: close potential race in lease_get_mtime security: make security_file_set_fowner, f_setown and __f_setown void return locks: consolidate "nolease" routines locks: remove lock_may_read and lock_may_write lockd: rip out deferred lock handling from testlock codepath NFSD: Get reference of lockowner when coping file_lock ...
| * | locks: move freeing of leases outside of i_lockJeff Layton2014-10-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was only one place where we still could free a file_lock while holding the i_lock -- lease_modify. Add a new list_head argument to the lm_change operation, pass in a private list when calling it, and fix those callers to dispose of the list once the lock has been dropped. Signed-off-by: Jeff Layton <jlayton@primarydata.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
| * | locks: move i_lock acquisition into generic_*_lease handlersJeff Layton2014-10-072-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have a saner internal API for managing leases, we no longer need to mandate that the inode->i_lock be held over most of the lease code. Push it down into generic_add_lease and generic_delete_lease. Signed-off-by: Jeff Layton <jlayton@primarydata.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
| * | locks: plumb a "priv" pointer into the setlease routinesJeff Layton2014-10-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In later patches, we're going to add a new lock_manager_operation to finish setting up the lease while still holding the i_lock. To do this, we'll need to pass a little bit of info in the fcntl setlease case (primarily an fasync structure). Plumb the extra pointer into there in advance of that. We declare this pointer as a void ** to make it clear that this is private info, and that the caller isn't required to set this unless the lm_setup specifically requires it. Signed-off-by: Jeff Layton <jlayton@primarydata.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
* | | Merge tag 'f2fs-for-3.18' of ↵Linus Torvalds2014-10-081-3/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs Pull f2fs updates from Jaegeuk Kim: "This patch-set introduces a couple of new features such as large sector size, FITRIM, and atomic/volatile writes. Several patches enhance power-off recovery and checkpoint routines. The fsck.f2fs starts to support fixing corrupted partitions with recovery hints provided by this patch-set. Summary: - retain some recovery information for fsck.f2fs - enhance checkpoint speed - enhance flush command management - bug fix for lseek - tune in-place-update policies - enhance roll-forward speed - revisit all the roll-forward and fsync rules - support larget sector size - support FITRIM - support atomic and volatile writes And several clean-ups and bug fixes are included" * tag 'f2fs-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (42 commits) f2fs: support volatile operations for transient data f2fs: support atomic writes f2fs: remove unused return value f2fs: clean up f2fs_ioctl functions f2fs: potential shift wrapping buf in f2fs_trim_fs() f2fs: call f2fs_unlock_op after error was handled f2fs: check the use of macros on block counts and addresses f2fs: refactor flush_nat_entries to remove costly reorganizing ops f2fs: introduce FITRIM in f2fs_ioctl f2fs: introduce cp_control structure f2fs: use more free segments until SSR is activated f2fs: change the ipu_policy option to enable combinations f2fs: fix to search whole dirty segmap when get_victim f2fs: fix to clean previous mount option when remount_fs f2fs: skip punching hole in special condition f2fs: support large sector size f2fs: fix to truncate blocks past EOF in ->setattr f2fs: update i_size when __allocate_data_block f2fs: use MAX_BIO_BLOCKS(sbi) f2fs: remove redundant operation during roll-forward recovery ...
| * | | f2fs: change the ipu_policy option to enable combinationsJaegeuk Kim2014-09-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the ipu_policy setting to use any combination of orthogonal policies. Signed-off-by: Changman Lee <cm224.lee@samsung.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| * | | f2fs: give an option to enable in-place-updates during fsync to usersJaegeuk Kim2014-09-161-1/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user wrote F2FS_IPU_FSYNC:4 in /sys/fs/f2fs/ipu_policy, f2fs_sync_file only starts to try in-place-updates. And, if the number of dirty pages is over /sys/fs/f2fs/min_fsync_blocks, it keeps out-of-order manner. Otherwise, it triggers in-place-updates. This may be used by storage showing very high random write performance. For example, it can be used when, Seq. writes (Data) + wait + Seq. writes (Node) is pretty much slower than, Rand. writes (Data) Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
* | | Documentation: update .gitignore filesPeter Foley2014-09-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add some missing files to .gitignore. Push Documentation/.gitignore down into subdirectories. Signed-off-by: Peter Foley <pefoley2@pefoley.com> Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | | Documentation: add makefiles for more targetsPeter Foley2014-09-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a bunch of previously unbuilt source files to the Documentation build machinery. Signed-off-by: Peter Foley <pefoley2@pefoley.com> Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | | Documentation: use subdir-y to avoid unnecessary built-in.o filesPeter Foley2014-09-261-3/+0
| |/ |/| | | | | | | | | | | | | | | | | | | Change the Documentation makefiles from obj-m to subdir-y to avoid generating unnecessary built-in.o files since nothing in Documentation/ is ever linked in to vmlinux. Signed-off-by: Peter Foley <pefoley2@pefoley.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | Documentation: NFS/RDMA: Document separate Kconfig symbolsPaul Bolle2014-09-071-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The NFS/RDMA Kconfig symbol was split into separate options for client and server in commit 2e8c12e1b765 ("xprtrdma: add separate Kconfig options for NFSoRDMA client and server support"). Update the documentation to reflect this split. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: "J. Bruce Fields" <bfields@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Documentation: seq_file: Document seq_open_private(), seq_release_private()Rob Jones2014-09-071-0/+33
|/ | | | | | | | | | | | | Despite the fact that these functions have been around for years, they are little used (only 15 uses in 13 files at the preseht time) even though many other files use work-arounds to achieve the same result. By documenting them, hopefully they will become more widely used. Signed-off-by: Rob Jones <rob.jones@codethink.co.uk> Acked-by: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linuxLinus Torvalds2014-08-161-1/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull file locking bugfixes from Jeff Layton: "Most of these patches are to fix a long-standing regression that crept in when the BKL was removed from the file-locking code. The code was converted to use a conventional spinlock, but some fl_release_private ops can block and you can end up sleeping inside the lock. There's also a patch to make /proc/locks show delegations as 'DELEG'" * tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux: locks: update Locking documentation to clarify fl_release_private behavior locks: move locks_free_lock calls in do_fcntl_add_lease outside spinlock locks: defer freeing locks in locks_delete_lock until after i_lock has been dropped locks: don't reuse file_lock in __posix_lock_file locks: don't call locks_release_private from locks_copy_lock locks: show delegations as "DELEG" in /proc/locks
| * locks: update Locking documentation to clarify fl_release_private behaviorJeff Layton2014-08-141-1/+5
| | | | | | | | | | Acked-by: J. Bruce Fields <bfields@fieldses.org> Signed-off-by: Jeff Layton <jlayton@primarydata.com>
* | Merge branch 'for-linus' of ↵Linus Torvalds2014-08-112-16/+25
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull vfs updates from Al Viro: "Stuff in here: - acct.c fixes and general rework of mnt_pin mechanism. That allows to go for delayed-mntput stuff, which will permit mntput() on deep stack without worrying about stack overflows - fs shutdown will happen on shallow stack. IOW, we can do Eric's umount-on-rmdir series without introducing tons of stack overflows on new mntput() call chains it introduces. - Bruce's d_splice_alias() patches - more Miklos' rename() stuff. - a couple of regression fixes (stable fodder, in the end of branch) and a fix for API idiocy in iov_iter.c. There definitely will be another pile, maybe even two. I'd like to get Eric's series in this time, but even if we miss it, it'll go right in the beginning of for-next in the next cycle - the tricky part of prereqs is in this pile" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (40 commits) fix copy_tree() regression __generic_file_write_iter(): fix handling of sync error after DIO switch iov_iter_get_pages() to passing maximal number of pages fs: mark __d_obtain_alias static dcache: d_splice_alias should detect loops exportfs: update Exporting documentation dcache: d_find_alias needn't recheck IS_ROOT && DCACHE_DISCONNECTED dcache: remove unused d_find_alias parameter dcache: d_obtain_alias callers don't all want DISCONNECTED dcache: d_splice_alias should ignore DCACHE_DISCONNECTED dcache: d_splice_alias mustn't create directory aliases dcache: close d_move race in d_splice_alias dcache: move d_splice_alias namei: trivial fix to vfs_rename_dir comment VFS: allow ->d_manage() to declare -EISDIR in rcu_walk mode. cifs: support RENAME_NOREPLACE hostfs: support rename flags shmem: support RENAME_EXCHANGE shmem: support RENAME_NOREPLACE btrfs: add RENAME_NOREPLACE ...
| * exportfs: update Exporting documentationJ. Bruce Fields2014-08-071-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | Minor documentation updates: - refer to d_obtain_alias rather than d_alloc_anon - explain when to use d_splice_alias and when d_materialise_unique. - cut some details of d_splice_alias/d_materialise_unique implementation. Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>