Merge v4.4.168 into chromeos-4.4 |
|||
Issue descriptionMerge v4.4.168 into chromeos-4.4
,
Dec 19
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/a3f2d9ab0bdc8d8d9ebbcc0ea1f3ac20a0fcf31d commit a3f2d9ab0bdc8d8d9ebbcc0ea1f3ac20a0fcf31d Author: Guenter Roeck <groeck@chromium.org> Date: Wed Dec 19 05:33:15 2018 CHROMIUM: Revert "goldfish_bus: switch GOLDFISH_BUS config back to bool" This reverts commit 3d0980eef5e2c7e72d5ba2205f732ac332c7a011. Goldfish is not enabled in ChromeOS configurations. Changes against upstream stable may result in unnecessary and sometimes complex conflicts. Revert local changes to avoid the problem. BUG= chromium:915706 TEST=Build allmodconfig Change-Id: I71b66ab0d7c8db0a84c62d8472f5b306859f0706 Signed-off-by: Guenter Roeck <groeck@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1382599 Reviewed-by: Dmitry Torokhov <dtor@chromium.org> [modify] https://crrev.com/a3f2d9ab0bdc8d8d9ebbcc0ea1f3ac20a0fcf31d/drivers/platform/goldfish/Kconfig
,
Dec 19
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/b71546c5d1cf53e6ea4e8514cd5c2f9572b7d9d7 commit b71546c5d1cf53e6ea4e8514cd5c2f9572b7d9d7 Author: Guenter Roeck <groeck@chromium.org> Date: Wed Dec 19 05:33:16 2018 CHROMIUM: Revert "goldfish: pipe: fix platform_no_drv_owner.cocci warnings" This reverts commit d39445d1008644a5699cceedb9199e5ba3592883. Goldfish is not enabled in ChromeOS configurations. Changes against upstream stable may result in unnecessary and sometimes complex conflicts. Revert local changes to avoid the problem. BUG= chromium:915706 TEST=Build allmodconfig Change-Id: I4eb59e2b9023a5ce08138fbedb97f731978ae37b Signed-off-by: Guenter Roeck <groeck@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1382600 Reviewed-by: Dmitry Torokhov <dtor@chromium.org> [modify] https://crrev.com/b71546c5d1cf53e6ea4e8514cd5c2f9572b7d9d7/drivers/platform/goldfish/goldfish_pipe.c
,
Dec 19
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/986e7ef03f9c27591899d478154c8fe70c8890c3 commit 986e7ef03f9c27591899d478154c8fe70c8890c3 Author: Guenter Roeck <groeck@chromium.org> Date: Wed Dec 19 05:33:17 2018 CHROMIUM: Revert "Enable adb with android-pipe in IA image" This reverts commit 78674acc3dc24cf9aabd194c884f4b8637999699. Goldfish is not enabled in ChromeOS configurations. Changes against upstream stable may result in unnecessary and sometimes complex conflicts. Revert local changes to avoid the problem. BUG= chromium:915706 TEST=Build allmodconfig Change-Id: I937d2d43921cc3c38992865c201fd03a5df59c9a Signed-off-by: Guenter Roeck <groeck@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1382601 Reviewed-by: Dmitry Torokhov <dtor@chromium.org> [modify] https://crrev.com/986e7ef03f9c27591899d478154c8fe70c8890c3/drivers/platform/goldfish/Kconfig [modify] https://crrev.com/986e7ef03f9c27591899d478154c8fe70c8890c3/drivers/platform/Kconfig [modify] https://crrev.com/986e7ef03f9c27591899d478154c8fe70c8890c3/drivers/platform/goldfish/goldfish_pipe.c [modify] https://crrev.com/986e7ef03f9c27591899d478154c8fe70c8890c3/drivers/platform/goldfish/Makefile
,
Dec 20
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/28b634e269ee6b794482c53254cb6192b98fd84f commit 28b634e269ee6b794482c53254cb6192b98fd84f Author: Guenter Roeck <groeck@chromium.org> Date: Wed Dec 19 21:48:52 2018 CHROMIUM: Merge 'v4.4.168' into chromeos-4.4 Merge of v4.4.168 into chromeos-4.4 Conflicts: drivers/gpu/drm/i915/i915_gem_userptr.c arch/x86/include/asm/uaccess_64.h arch/x86/include/asm/uaccess.h Changelog: ---------------------------------------------------------------- Aaro Koskinen (4): USB: omap_udc: use devm_request_irq() USB: omap_udc: fix crashes on probe error and module removal USB: omap_udc: fix omap_udc_start() on 15xx machines USB: omap_udc: fix USB gadget functionality on Palm Tungsten E Alexei Starovoitov (2): bpf: support 8-byte metafield access bpf: Prevent memory disambiguation attack Arnd Bergmann (2): media: dvb-frontends: fix i2c access helpers for KASAN rocker: fix rocker_tlv_put_* functions for KASAN Ashok Raj (1): KVM/x86: Add IBPB support Ben Hutchings (3): bpf/verifier: Add spi variable to check_stack_write() bpf/verifier: Pass instruction index to check_mem_access() and check_xadd() mm/nommu.c: Switch __get_user_pages_unlocked() to use __get_user_pages() Borislav Petkov (1): x86/speculation: Use synthetic bits for IBRS/IBPB/STIBP Christoph Paasch (1): net: Prevent invalid access to skb->prev in __qdisc_drop_all Colin Ian King (1): fscache, cachefiles: remove redundant variable 'cache' Dan Williams (3): x86: Introduce __uaccess_begin_nospec() and uaccess_try_nospec x86/usercopy: Replace open coded stac/clac with __uaccess_{begin, end} x86/uaccess: Use __uaccess_begin_nospec() and uaccess_try_nospec David Matlack (1): KVM: nVMX: mark vmcs12 pages dirty on L2 exit Eric Dumazet (1): rtnetlink: ndo_dflt_fdb_dump() only work for ARPHRD_ETHER devices Greg Kroah-Hartman (1): Linux 4.4.168 Guenter Roeck (2): staging: speakup: Replace strncpy with memcpy Merge remote-tracking branch 'origin/linux/v4.4.168' into merge/chromeos-4.4-v4.4.168 Heiner Kallweit (1): net: phy: don't allow __set_phy_supported to add unsupported modes Huacai Chen (1): hwmon: (w83795) temp4_type has writable permission Janusz Krzysztofik (1): ARM: OMAP1: ams-delta: Fix possible use of uninitialized field Jens Axboe (1): sr: pass down correctly sized SCSI sense buffer Jim Mattson (1): KVM: nVMX: Eliminate vmcs02 pool Josh Elsasser (1): ixgbe: recognize 1000BaseLX SFP modules as 1Gbps KarimAllah Ahmed (3): KVM/VMX: Emulate MSR_IA32_ARCH_CAPABILITIES KVM/VMX: Allow direct access to MSR_IA32_SPEC_CTRL KVM/SVM: Allow direct access to MSR_IA32_SPEC_CTRL Kees Cook (1): swiotlb: clean up reporting Konrad Rzeszutek Wilk (2): x86/bugs, KVM: Support the combination of guest and host IBRS x86/KVM/VMX: Expose SPEC_CTRL Bit(2) to the guest Larry Chen (1): ocfs2: fix deadlock caused by ocfs2_defrag_extent() Linus Torvalds (3): x86: reorganize SMAP handling in user space accesses x86: fix SMAP in 32-bit environments proc: don't use FOLL_FORCE for reading cmdline and environment Lior David (1): wil6210: missing length check in wmi_set_ie Lorenzo Bianconi (1): net: thunderx: fix NULL pointer dereference in nic_remove Lorenzo Stoakes (8): mm: remove write/force parameters from __get_user_pages_locked() mm: remove write/force parameters from __get_user_pages_unlocked() mm: replace get_user_pages_unlocked() write/force parameters with gup_flags mm: replace get_user_pages_locked() write/force parameters with gup_flags mm: replace get_vaddr_frames() write/force parameters with gup_flags mm: replace get_user_pages() write/force parameters with gup_flags mm: replace __access_remote_vm() write parameter with gup_flags mm: replace access_remote_vm() write parameter with gup_flags Martynas Pumputis (1): bpf: fix check of allowed specifiers in bpf_trace_printk Mike Kravetz (4): mm/hugetlb.c: don't call region_abort if region_chg fails hugetlbfs: fix offset overflow in hugetlbfs mmap hugetlbfs: check for pgoff value overflow hugetlbfs: fix bug in pgoff overflow checking Namhyung Kim (1): pstore: Convert console write to use ->write_buf Nathan Chancellor (1): ARM: OMAP2+: prm44xx: Fix section annotation on omap44xx_prm_enable_io_wakeup NeilBrown (1): fscache: fix race between enablement and dropping of object Nicolas Dichtel (1): tun: forbid iface creation with rtnl ops Nicolin Chen (1): hwmon: (ina2xx) Fix current value calculation Pan Bian (5): exportfs: do not read dentry after free net: hisilicon: remove unexpected free_netdev hfs: do not free node before using hfsplus: do not free node before using ocfs2: fix potential use after free Paolo Bonzini (3): KVM: VMX: introduce alloc_loaded_vmcs KVM: VMX: make MSR bitmaps per-VCPU KVM/x86: Remove indirect MSR op calls from SPEC_CTRL Peter Ujfalusi (2): ASoC: omap-mcpdm: Add pm_qos handling to avoid under/overruns with CPU_IDLE ASoC: omap-dmic: Add pm_qos handling to avoid overruns with CPU_IDLE Qian Cai (1): debugobjects: avoid recursive calls with kmemleak Radim Krčmář (1): KVM: nVMX: fix msr bitmaps to prevent L2 from accessing L0 x2APIC Robbie Ko (1): Btrfs: send, fix infinite loop due to directory rename dependencies Shuah Khan (1): selftests: Move networking/timestamping from Documentation Srikanth Boddepalli (1): xen: xlate_mmu: add missing header to fix 'W=1' warning Stefano Brivio (2): ipv6: Check available headroom in ip6_xmit() even without options neighbour: Avoid writing before skb->head in neigh_hh_output() Su Yanjun (1): net: 8139cp: fix a BUG triggered by changing mtu with network traffic Sudip Mukherjee (1): matroxfb: fix size of memcpy Takashi Sakamoto (1): ALSA: pcm: remove SNDRV_PCM_IOCTL1_INFO internal command Thomas Gleixner (3): KVM: SVM: Move spec control call after restore of GS x86/bugs, KVM: Extend speculation control for VIRT_SPEC_CTRL posix-timers: Sanitize overrun handling Thomas Richter (1): s390/cpum_cf: Reject request for sampling in event initialization Tom Lendacky (1): KVM: SVM: Implement VIRT_SPEC_CTRL support for SSBD Tzung-Bi Shih (1): ASoC: dapm: Recalculate audio map forcely when card instantiated Willy Tarreau (1): proc: do not access cmdline nor environ from file-backed areas Y.C. Chen (1): drm/ast: fixed reading monitor EDID not stable issue Yi Wang (1): KVM: x86: fix empty-body warnings Yuchung Cheng (1): tcp: fix NULL ref in tail loss probe YueHaibing (1): sysv: return 'err' instead of 0 in __sysv_write_inode Documentation/Makefile | 3 +- Documentation/networking/Makefile | 1 - Documentation/networking/timestamping/Makefile | 14 - Makefile | 2 +- arch/arm/mach-omap1/board-ams-delta.c | 3 + arch/arm/mach-omap2/prm44xx.c | 2 +- arch/cris/arch-v32/drivers/cryptocop.c | 4 +- arch/ia64/kernel/err_inject.c | 2 +- arch/mips/mm/gup.c | 2 +- arch/s390/kernel/perf_cpum_cf.c | 2 + arch/s390/mm/gup.c | 2 +- arch/sh/mm/gup.c | 3 +- arch/sparc/mm/gup.c | 3 +- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/include/asm/uaccess.h | 15 +- arch/x86/include/asm/uaccess_32.h | 26 + arch/x86/include/asm/uaccess_64.h | 20 +- arch/x86/kernel/cpu/common.c | 3 +- arch/x86/kvm/cpuid.c | 31 +- arch/x86/kvm/cpuid.h | 40 ++ arch/x86/kvm/lapic.c | 2 +- arch/x86/kvm/svm.c | 143 +++- arch/x86/kvm/vmx.c | 741 ++++++++++++--------- arch/x86/kvm/x86.c | 14 +- arch/x86/lib/usercopy_32.c | 20 +- arch/x86/mm/gup.c | 2 +- arch/x86/mm/mpx.c | 3 +- drivers/gpu/arm/midgard/mali_kbase_mem.c | 8 +- drivers/gpu/arm/midgard/mali_kbase_mem_linux.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +- drivers/gpu/drm/ast/ast_mode.c | 36 +- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 3 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 6 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/via/via_dmablit.c | 4 +- drivers/hwmon/ina2xx.c | 2 +- drivers/hwmon/w83795.c | 2 +- drivers/infiniband/core/umem.c | 6 +- drivers/infiniband/core/umem_odp.c | 7 +- drivers/infiniband/hw/mthca/mthca_memfree.c | 4 +- drivers/infiniband/hw/qib/qib_user_pages.c | 3 +- drivers/infiniband/hw/usnic/usnic_uiom.c | 5 +- drivers/media/dvb-frontends/ascot2e.c | 4 +- drivers/media/dvb-frontends/cxd2841er.c | 4 +- drivers/media/dvb-frontends/horus3a.c | 4 +- drivers/media/dvb-frontends/itd1000.c | 5 +- drivers/media/dvb-frontends/mt312.c | 5 +- drivers/media/dvb-frontends/stb0899_drv.c | 3 +- drivers/media/dvb-frontends/stb6100.c | 6 +- drivers/media/dvb-frontends/stv0367.c | 4 +- drivers/media/dvb-frontends/stv090x.c | 4 +- drivers/media/dvb-frontends/stv6110x.c | 4 +- drivers/media/dvb-frontends/zl10039.c | 4 +- drivers/media/pci/ivtv/ivtv-udma.c | 3 +- drivers/media/pci/ivtv/ivtv-yuv.c | 8 +- drivers/media/platform/omap/omap_vout.c | 2 +- drivers/media/v4l2-core/videobuf-dma-sg.c | 7 +- drivers/media/v4l2-core/videobuf2-memops.c | 6 +- drivers/misc/mic/scif/scif_rma.c | 3 +- drivers/misc/sgi-gru/grufault.c | 2 +- drivers/net/ethernet/cavium/thunder/nic_main.c | 3 + drivers/net/ethernet/hisilicon/hip04_eth.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 4 +- drivers/net/ethernet/realtek/8139cp.c | 5 + drivers/net/ethernet/rocker/rocker.c | 24 +- drivers/net/phy/phy_device.c | 19 +- drivers/net/tun.c | 6 +- drivers/net/wireless/ath/wil6210/wmi.c | 8 +- drivers/scsi/sr_ioctl.c | 21 +- drivers/scsi/st.c | 5 +- drivers/staging/rdma/hfi1/user_pages.c | 2 +- drivers/staging/rdma/ipath/ipath_user_pages.c | 2 +- drivers/staging/speakup/kobjects.c | 4 +- drivers/usb/gadget/udc/omap_udc.c | 87 +-- drivers/video/fbdev/pvr2fb.c | 2 +- drivers/virt/fsl_hypervisor.c | 4 +- drivers/xen/xlate_mmu.c | 1 + fs/btrfs/send.c | 11 +- fs/cachefiles/rdwr.c | 3 - fs/exec.c | 9 +- fs/exportfs/expfs.c | 2 +- fs/fscache/object.c | 3 + fs/hfs/btree.c | 3 +- fs/hfsplus/btree.c | 3 +- fs/hugetlbfs/inode.c | 30 +- fs/ocfs2/export.c | 2 +- fs/ocfs2/move_extents.c | 47 +- fs/proc/base.c | 19 +- fs/proc/task_mmu.c | 2 +- fs/sysv/inode.c | 2 +- include/linux/mm.h | 15 +- include/linux/posix-timers.h | 4 +- include/net/neighbour.h | 28 +- include/sound/pcm.h | 2 +- kernel/bpf/verifier.c | 98 ++- kernel/events/uprobes.c | 4 +- kernel/time/posix-cpu-timers.c | 2 +- kernel/time/posix-timers.c | 29 +- kernel/trace/bpf_trace.c | 8 +- lib/debugobjects.c | 3 +- lib/swiotlb.c | 20 +- mm/frame_vector.c | 9 +- mm/gup.c | 42 +- mm/hugetlb.c | 12 +- mm/memory.c | 18 +- mm/mempolicy.c | 2 +- mm/nommu.c | 42 +- mm/process_vm_access.c | 6 +- mm/util.c | 2 +- net/ceph/pagevec.c | 2 +- net/core/rtnetlink.c | 3 + net/ipv4/tcp_output.c | 12 +- net/ipv6/ip6_output.c | 42 +- net/sched/sch_netem.c | 3 + security/tomoyo/domain.c | 3 +- sound/core/pcm_lib.c | 2 - sound/core/pcm_native.c | 6 +- sound/soc/omap/omap-dmic.c | 9 + sound/soc/omap/omap-mcpdm.c | 43 +- .../selftests}/networking/timestamping/.gitignore | 0 .../selftests/networking/timestamping/Makefile | 8 + .../networking/timestamping/hwtstamp_config.c | 0 .../networking/timestamping/timestamping.c | 0 .../networking/timestamping/txtimestamp.c | 0 virt/kvm/async_pf.c | 2 +- virt/kvm/kvm_main.c | 11 +- 126 files changed, 1351 insertions(+), 761 deletions(-) delete mode 100644 Documentation/networking/Makefile delete mode 100644 Documentation/networking/timestamping/Makefile rename {Documentation => tools/testing/selftests}/networking/timestamping/.gitignore (100%) create mode 100644 tools/testing/selftests/networking/timestamping/Makefile rename {Documentation => tools/testing/selftests}/networking/timestamping/hwtstamp_config.c (100%) rename {Documentation => tools/testing/selftests}/networking/timestamping/timestamping.c (100%) rename {Documentation => tools/testing/selftests}/networking/timestamping/txtimestamp.c (100%) BUG= chromium:915706 TEST=Build and test on various affected systems Change-Id: I4e6679e25541138f40c9b8fb9dd599020db977c6 Signed-off-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/28b634e269ee6b794482c53254cb6192b98fd84f/arch/x86/include/asm/uaccess.h [modify] https://crrev.com/28b634e269ee6b794482c53254cb6192b98fd84f/arch/x86/include/asm/uaccess_64.h [modify] https://crrev.com/28b634e269ee6b794482c53254cb6192b98fd84f/drivers/gpu/arm/midgard/mali_kbase_mem_linux.c [modify] https://crrev.com/28b634e269ee6b794482c53254cb6192b98fd84f/drivers/gpu/drm/i915/i915_gem_userptr.c [modify] https://crrev.com/28b634e269ee6b794482c53254cb6192b98fd84f/drivers/gpu/arm/midgard/mali_kbase_mem.c [modify] https://crrev.com/28b634e269ee6b794482c53254cb6192b98fd84f/fs/proc/task_mmu.c
,
Dec 20
|
|||
►
Sign in to add a comment |
|||
Comment 1 by groeck@chromium.org
, Dec 18