On 03/05/2018 10:51 AM, Bruce Ashfield wrote:
> On 2018-03-04 7:34 PM, Armin Kuster wrote:
>> This series includes the lsb runqemu kvm boot issue [ Yocto #12570 ],
>> Spectre v1 and misc bug fixes 4.4 backports.
>>
>> The following changes since commit
>> 1368b7448d693cedb384f6e0b9a0237adb1b8259:
>>
>>    kaiser: x86: Fix NMI handling (2018-02-22 12:18:09 -0800)
>>
>> are available in the git repository at:
>>
>>   
>> https://github.com/MontaVista-OpenSourceTechnology/linux-nonlts-secfix
>> linux-4.1.y-lts
>
> I'm getting conflicts when I try and merge this into linux-yocto-4.1
> standard/base

> yow-bashfiel-d4 [/home/bruc...to-4.1.git]> git merge   linux-4.1.y-lts

I just noticed this. "git merge" wont work.

We had our metldown changes in before the sync to 4.1.49 so the order is
off. You will need to cherry-pick.


I doubled checked via:

git checkout standard/base
git fetch 
https://github.com/MontaVista-OpenSourceTechnology/linux-nonlts-secfix
linux-4.1.y-lts
git cherry-pick 07369b8
git cherry-pick 07369b8..ee7eeb3

sorry for making things more complicated.

- armin

> Auto-merging mm/vmstat.c
> Auto-merging mm/mmap.c
> Auto-merging kernel/module.c
> Auto-merging include/linux/cred.h
> Auto-merging arch/x86/mm/kaiser.c
> CONFLICT (add/add): Merge conflict in arch/x86/mm/kaiser.c
> Auto-merging arch/x86/mm/init.c
> Auto-merging arch/x86/lib/checksum_32.S
> Auto-merging arch/x86/kvm/x86.c
> Auto-merging arch/x86/kvm/vmx.c
> Auto-merging arch/x86/kernel/entry_64.S
> CONFLICT (content): Merge conflict in arch/x86/kernel/entry_64.S
> Auto-merging arch/x86/kernel/entry_32.S
> Auto-merging arch/x86/kernel/cpu/common.c
> Removing arch/x86/kernel/cpu/bugs_64.c
> Auto-merging arch/x86/kernel/cpu/bugs.c
> Auto-merging arch/x86/include/uapi/asm/msr-index.h
> Auto-merging arch/x86/include/asm/processor.h
> Auto-merging arch/x86/include/asm/kaiser.h
> CONFLICT (add/add): Merge conflict in arch/x86/include/asm/kaiser.h
> Auto-merging arch/x86/include/asm/cpufeature.h
> Auto-merging arch/x86/Makefile
> Auto-merging Documentation/kernel-parameters.txt
> CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
> Recorded preimage for 'Documentation/kernel-parameters.txt'
> Recorded preimage for 'arch/x86/include/asm/kaiser.h'
> Recorded preimage for 'arch/x86/kernel/entry_64.S'
> Recorded preimage for 'arch/x86/mm/kaiser.c'
> Automatic merge failed; fix conflicts and then commit the result.
> yow-bashfiel-d4 [/home/bruc...to-4.1.git]>
>
> Judging by the conflicts, it looks like the first round of Meltdown
> fixes are being merged twice .. i.e. git isn't picking them up as the
> same commits.
>
> In case I'm doing something odd (I'm merging a LOT of kernel changes
> today). Can you look at this and see if you see the same thing ?
>
> Bruce
>
>>
>> for you to fetch changes up to ee7eeb3742f1a024b30ebcf98525871cad5a328c:
>>
>>    x86/vdso: Get pvclock data from the vvar VMA instead of the fixmap
>> (2018-03-01 15:14:04 -0800)
>>
>> ----------------------------------------------------------------
>> Adam Borowski (1):
>>        x86/kbuild: enable modversions for symbols exported from asm
>>
>> Al Viro (1):
>>        EXPORT_SYMBOL() for asm
>>
>> Alexey Dobriyan (1):
>>        proc: much faster /proc/vmstat
>>
>> Andi Kleen (3):
>>        x86/retpoline/irq32: Convert assembler indirect jumps
>>        module: Add retpoline tag to VERMAGIC
>>        x86/retpoline: Optimize inline assembler for vmexit_fill_RSB
>>
>> Andrew Honig (1):
>>        KVM: x86: Add memory barrier on vmcs field lookup
>>
>> Andrey Ryabinin (7):
>>        mm/page-writeback: fix dirty_ratelimit calculation
>>        x86/asm: Use register variable to get stack pointer value
>>        x86/kasan: Add message about KASAN being initialized
>>        x86/kasan, mm: Introduce generic kasan_populate_zero_shadow()
>>        x86/kasan: Fix boot with KASAN=y and PROFILE_ANNOTATED_BRANCHES=y
>>        x86/kasan: Clear kasan_zero_page after TLB flush
>>        x86/kasan: Write protect kasan zero shadow
>>
>> Andy Lutomirski (8):
>>        x86/cpu: Factor out application of forced CPU caps
>>        selftests/x86: Add test_vsyscall
>>        x86/mm/32: Move setup_clear_cpu_cap(X86_FEATURE_PCID) earlier
>>        x86/asm: Make asm/alternative.h safe from assembly
>>        x86/asm: Re-add parts of the manual CFI infrastructure
>>        x86/asm/32: Make sync_core() handle missing CPUID on all
>> 32-bit kernels
>>        x86, vdso, pvclock: Simplify and speed up the vdso pvclock reader
>>        x86/vdso: Get pvclock data from the vvar VMA instead of the
>> fixmap
>>
>> Ani Sinha (1):
>>        sysrq: Fix warning in sysrq generated crash.
>>
>> Arnd Bergmann (1):
>>        gcov: disable for COMPILE_TEST
>>
>> Ben Hutchings (2):
>>        x86/microcode/intel: Fix BDW late-loading revision check
>>        vsyscall: Fix permissions for emulate mode with KAISER/PTI
>>
>> Borislav Petkov (3):
>>        Map the vsyscall page with _PAGE_USER
>>        x86/cpu: Merge bugs.c and bugs_64.c
>>        x86/alternatives: Fix optimize_nops() checking
>>
>> Dave Hansen (3):
>>        x86/Documentation: Add PTI description
>>        x86/cpu/intel: Introduce macros for Intel family numbers
>>        x86/pti: Make unpoison of pgd for trusted boot work for real
>>
>> David Woodhouse (13):
>>        x86/cpufeatures: Add X86_BUG_SPECTRE_V[12]
>>        sysfs/cpu: Fix typos in vulnerability documentation
>>        x86/alternatives: Add missing '\n' at end of ALTERNATIVE
>> inline asm
>>        x86/retpoline: Add initial retpoline support
>>        x86/spectre: Add boot time option to select Spectre v2 mitigation
>>        x86/retpoline/crypto: Convert crypto assembler indirect jumps
>>        x86/retpoline/entry: Convert entry assembler indirect jumps
>>        x86/retpoline/ftrace: Convert ftrace assembler indirect jumps
>>        x86/retpoline/hyperv: Convert assembler indirect jumps
>>        x86/retpoline/xen: Convert Xen hypercall indirect jumps
>>        x86/retpoline/checksum32: Convert assembler indirect jumps
>>        x86/retpoline: Fill return stack buffer on vmexit
>>        x86/retpoline: Fill RSB on context switch for affected CPUs
>>
>> Eric Biggers (1):
>>        x86/kaiser: fix build error with KASAN && !FUNCTION_GRAPH_TRACER
>>
>> Hugh Dickins (2):
>>        kaiser: fix intel_bts perf crashes
>>        kaiser: fix compile error without vsyscall
>>
>> Jeff Layton (1):
>>        locks: don't check for race with close when setting OFD lock
>>
>> Jia Zhang (1):
>>        x86/microcode/intel: Extend BDW late-loading with a revision
>> check
>>
>> Jim Mattson (1):
>>        kvm: vmx: Scrub hardware GPRs at VM-exit
>>
>> Joe Lawrence (1):
>>        pipe: avoid round_pipe_size() nr_pages overflow on 32-bit
>>
>> Joonsoo Kim (2):
>>        mm/compaction: fix invalid free_pfn and compact_cached_free_pfn
>>        mm/compaction: pass only pageblock aligned range to
>> pageblock_pfn_to_page
>>
>> Lepton Wu (1):
>>        kaiser: Set _PAGE_NX only if supported
>>
>> Li Jinyue (1):
>>        futex: Prevent overflow by strengthen input validation
>>
>> Libor Pechacek (1):
>>        module: Issue warnings when tainting kernel
>>
>> Liran Alon (3):
>>        KVM: x86: emulator: Return to user-mode on L1 CPL=0 emulation
>> failure
>>        KVM: x86: Don't re-execute instruction when not passing CR2 value
>>        KVM: nVMX: Fix races when sending nested PI while dest
>> enters/leaves L2
>>
>> Maciej W. Rozycki (7):
>>        MIPS: Validate PR_SET_FP_MODE prctl(2) requests against the
>> ABI of the task
>>        MIPS: Factor out NT_PRFPREG regset access helpers
>>        MIPS: Guard against any partial write attempt with
>> PTRACE_SETREGSET
>>        MIPS: Consistently handle buffer counter with PTRACE_SETREGSET
>>        MIPS: Fix an FCSR access API regression with NT_PRFPREG and MSA
>>        MIPS: Also verify sizeof `elf_fpreg_t' with PTRACE_SETREGSET
>>        MIPS: Disallow outsized PTRACE_SETREGSET NT_PRFPREG regset
>> accesses
>>
>> Marc Zyngier (1):
>>        arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls
>>
>> Masahiro Yamada (1):
>>        kconfig.h: use __is_defined() to check if MODULE is defined
>>
>> Masami Hiramatsu (3):
>>        retpoline: Introduce start/end markers of indirect thunk
>>        kprobes/x86: Blacklist indirect thunk functions for kprobes
>>        kprobes/x86: Disable optimizing on the function jumps to
>> indirect thunk
>>
>> Michal Hocko (1):
>>        mm/mmap.c: do not blow on PROT_NONE MAP_FIXED holes in the stack
>>
>> Michal Marek (1):
>>        genksyms: Handle string literals with spaces in reference files
>>
>> Miroslav Benes (1):
>>        module: keep percpu symbols in module's symtab
>>
>> Nicholas Piggin (1):
>>        kbuild: modversions for EXPORT_SYMBOL() for asm
>>
>> Oleg Nesterov (4):
>>        kernel/acct.c: fix the acct->needcheck check in
>> check_free_space()
>>        kernel/signal.c: protect the traced SIGNAL_UNKILLABLE tasks
>> from SIGKILL
>>        kernel/signal.c: protect the SIGNAL_UNKILLABLE tasks from
>> !sig_kernel_only() signals
>>        kernel/signal.c: remove the no longer needed SIGNAL_UNKILLABLE
>> check in complete_signal()
>>
>> Pavel Tatashin (1):
>>        x86/pti/efi: broken conversion from efi to kernel page table
>>
>> Thiago Rafael Becker (1):
>>        kernel: make groups_sort calling a responsibility group_info
>> allocators
>>
>> Thomas Gleixner (8):
>>        x86/tlb: Drop the _GPL from the cpu_tlbstate export
>>        x86/cpufeatures: Make CPU bugs sticky
>>        x86/cpufeatures: Add X86_BUG_CPU_INSECURE
>>        x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN
>>        sysfs/cpu: Add vulnerability folder
>>        x86/cpu: Implement CPU vulnerabilites sysfs functions
>>        x86/retpoline: Remove compile time warning
>>        x86/mce: Make machine check speculation protected
>>
>> Tom Lendacky (5):
>>        x86/microcode/AMD: Add support for fam17h microcode loading
>>        x86/cpu/AMD: Make LFENCE a serializing instruction
>>        x86/cpu/AMD: Use LFENCE_RDTSC in preference to MFENCE_RDTSC
>>        x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB macros
>>        x86/cpu, x86/pti: Do not enable PTI on AMD processors
>>
>> Vlastimil Babka (1):
>>        fs/select: add vmalloc fallback for select(2)
>>
>> Wanpeng Li (2):
>>        KVM: X86: Fix operand/address-size during instruction decoding
>>        KVM: VMX: Fix rflags cache during vCPU reset
>>
>> zhenwei.pi (1):
>>        x86/pti: Document fix wrong index
>>
>>   Documentation/ABI/testing/sysfs-devices-system-cpu |  16 +
>>   Documentation/kernel-parameters.txt                |  49 +-
>>   Documentation/x86/pti.txt                          | 186 ++++++++
>>   arch/arm64/kvm/handle_exit.c                       |   4 +-
>>   arch/mips/kernel/process.c                         |  12 +
>>   arch/mips/kernel/ptrace.c                          | 147 ++++--
>>   arch/s390/kernel/compat_linux.c                    |   1 +
>>   arch/x86/Kconfig                                   |  14 +
>>   arch/x86/Makefile                                  |  18 +-
>>   arch/x86/crypto/aesni-intel_asm.S                  |   5 +-
>>   arch/x86/crypto/camellia-aesni-avx-asm_64.S        |   3 +-
>>   arch/x86/crypto/camellia-aesni-avx2-asm_64.S       |   3 +-
>>   arch/x86/crypto/crc32c-pcl-intel-asm_64.S          |   3 +-
>>   arch/x86/include/asm/alternative.h                 |   8 +-
>>   arch/x86/include/asm/asm-prototypes.h              |  41 ++
>>   arch/x86/include/asm/asm.h                         |  11 +
>>   arch/x86/include/asm/cpufeature.h                  |   8 +
>>   arch/x86/include/asm/dwarf2.h                      | 170 +++++++
>>   arch/x86/include/asm/intel-family.h                |  68 +++
>>   arch/x86/include/asm/kaiser.h                      |  10 +
>>   arch/x86/include/asm/kvm_host.h                    |   3 +-
>>   arch/x86/include/asm/nospec-branch.h               | 198 ++++++++
>>   arch/x86/include/asm/processor.h                   |   6 +-
>>   arch/x86/include/asm/pvclock.h                     |   9 +
>>   arch/x86/include/asm/switch_to.h                   |  38 ++
>>   arch/x86/include/asm/thread_info.h                 |  11 -
>>   arch/x86/include/asm/traps.h                       |   1 +
>>   arch/x86/include/asm/vdso.h                        |   1 +
>>   arch/x86/include/asm/vsyscall.h                    |   3 +
>>   arch/x86/include/asm/xen/hypercall.h               |   5 +-
>>   arch/x86/include/uapi/asm/msr-index.h              |   3 +
>>   arch/x86/kernel/alternative.c                      |   7 +-
>>   arch/x86/kernel/cpu/Makefile                       |   4 +-
>>   arch/x86/kernel/cpu/amd.c                          |  28 +-
>>   arch/x86/kernel/cpu/bugs.c                         | 255 ++++++++++-
>>   arch/x86/kernel/cpu/bugs_64.c                      |  33 --
>>   arch/x86/kernel/cpu/common.c                       |  45 +-
>>   arch/x86/kernel/cpu/mcheck/mce.c                   |   5 +
>>   arch/x86/kernel/cpu/microcode/amd.c                |   4 +
>>   arch/x86/kernel/cpu/microcode/intel.c              |  13 +-
>>   arch/x86/kernel/cpu/perf_event_intel_bts.c         |  44 +-
>>   arch/x86/kernel/entry_32.S                         |  11 +-
>>   arch/x86/kernel/entry_64.S                         |  16 +-
>>   arch/x86/kernel/head64.c                           |   1 +
>>   arch/x86/kernel/irq_32.c                           |  15 +-
>>   arch/x86/kernel/kprobes/opt.c                      |  23 +-
>>   arch/x86/kernel/kvmclock.c                         |   5 +
>>   arch/x86/kernel/mcount_64.S                        |  13 +-
>>   arch/x86/kernel/tboot.c                            |  10 +
>>   arch/x86/kernel/traps.c                            |   2 +-
>>   arch/x86/kernel/vmlinux.lds.S                      |   7 +
>>   arch/x86/kernel/vsyscall_64.c                      |  14 +-
>>   arch/x86/kvm/emulate.c                             |   7 +
>>   arch/x86/kvm/svm.c                                 |  23 +
>>   arch/x86/kvm/vmx.c                                 |  39 +-
>>   arch/x86/kvm/x86.c                                 |   2 +-
>>   arch/x86/lib/Makefile                              |   1 +
>>   arch/x86/lib/checksum_32.S                         |   7 +-
>>   arch/x86/lib/retpoline.S                           |  49 ++
>>   arch/x86/mm/init.c                                 |   2 +-
>>   arch/x86/mm/kaiser.c                               |  38 +-
>>   arch/x86/mm/kasan_init_64.c                        | 142 +-----
>>   arch/x86/realmode/init.c                           |   4 +-
>>   arch/x86/realmode/rm/trampoline_64.S               |   3 +-
>>   arch/x86/vdso/vclock_gettime.c                     | 101 +++--
>>   arch/x86/vdso/vdso-layout.lds.S                    |   3 +-
>>   arch/x86/vdso/vdso2c.c                             |   3 +
>>   arch/x86/vdso/vma.c                                |  13 +
>>   drivers/base/Kconfig                               |   3 +
>>   drivers/base/cpu.c                                 |  48 ++
>>   drivers/hv/hv.c                                    |  11 +-
>>   drivers/tty/sysrq.c                                |   6 +
>>   fs/locks.c                                         |  16 +-
>>   fs/nfsd/auth.c                                     |   3 +
>>   fs/pipe.c                                          |  18 +-
>>   fs/select.c                                        |  14 +-
>>   include/asm-generic/asm-prototypes.h               |   7 +
>>   include/asm-generic/export.h                       |  94 ++++
>>   include/linux/cpu.h                                |   8 +
>>   include/linux/cred.h                               |   1 +
>>   include/linux/kasan.h                              |   9 +
>>   include/linux/kconfig.h                            |  11 +-
>>   include/linux/vermagic.h                           |   8 +-
>>   kernel/acct.c                                      |   2 +-
>>   kernel/futex.c                                     |   3 +
>>   kernel/gcov/Kconfig                                |   1 +
>>   kernel/groups.c                                    |   5 +-
>>   kernel/module.c                                    |  26 +-
>>   kernel/signal.c                                    |  18 +-
>>   kernel/uid16.c                                     |   1 +
>>   mm/compaction.c                                    |  51 ++-
>>   mm/kasan/Makefile                                  |   2 +-
>>   mm/kasan/kasan_init.c                              | 152 +++++++
>>   mm/mmap.c                                          |   6 +-
>>   mm/page-writeback.c                                |  11 +-
>>   mm/vmstat.c                                        |   4 +-
>>   net/sunrpc/auth_gss/gss_rpc_xdr.c                  |   1 +
>>   net/sunrpc/auth_gss/svcauth_gss.c                  |   1 +
>>   net/sunrpc/svcauth_unix.c                          |   2 +
>>   scripts/Makefile.build                             |  87 +++-
>>   scripts/genksyms/genksyms.c                        |   6 +-
>>   tools/testing/selftests/x86/Makefile               |   3 +-
>>   tools/testing/selftests/x86/test_vsyscall.c        | 500
>> +++++++++++++++++++++
>>   103 files changed, 2771 insertions(+), 415 deletions(-)
>>   create mode 100644 Documentation/x86/pti.txt
>>   create mode 100644 arch/x86/include/asm/asm-prototypes.h
>>   create mode 100644 arch/x86/include/asm/dwarf2.h
>>   create mode 100644 arch/x86/include/asm/intel-family.h
>>   create mode 100644 arch/x86/include/asm/nospec-branch.h
>>   delete mode 100644 arch/x86/kernel/cpu/bugs_64.c
>>   create mode 100644 arch/x86/lib/retpoline.S
>>   create mode 100644 include/asm-generic/asm-prototypes.h
>>   create mode 100644 include/asm-generic/export.h
>>   create mode 100644 mm/kasan/kasan_init.c
>>   create mode 100644 tools/testing/selftests/x86/test_vsyscall.c
>>
>

-- 
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto

Reply via email to