linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Haber <mh+linux-kernel@zugschlus.de>
To: "Kirill A. Shutemov" <kirill@shutemov.name>
Cc: "Dr. David Alan Gilbert" <dave@treblig.org>,
	Borislav Petkov <bp@alien8.de>,
	Paolo Bonzini <pbonzini@redhat.com>,
	linux-kernel@vger.kernel.org, kvm ML <kvm@vger.kernel.org>,
	Andrea Arcangeli <aarcange@redhat.com>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: Re: transparent huge pages breaks KVM on AMD.
Date: Fri, 13 May 2016 07:23:34 +0200	[thread overview]
Message-ID: <20160513052334.GE9143@torres.zugschlus.de> (raw)
In-Reply-To: <20160512204216.GA22695@node.shutemov.name>

On Thu, May 12, 2016 at 11:42:16PM +0300, Kirill A. Shutemov wrote:
> But I guess it should apply cleanly to v4.5. Or at least without major
> conflicts.

[11/511]mh@fan:~/linux/debug/linux$ curl 'http://marc.info/?l=linux-rdma&m=146307074800836&w=2' | patch -p1
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100 12529    0 12529    0     0   9844      0 --:--:--  0:00:01 --:--:--  9849
patching file include/linux/mm.h
Hunk #1 succeeded at 456 with fuzz 1 (offset -44 lines).
patching file include/linux/swap.h
Hunk #2 FAILED at 513.
1 out of 2 hunks FAILED -- saving rejects to file include/linux/swap.h.rej
patching file mm/huge_memory.c
Hunk #1 FAILED at 1298.
Hunk #2 FAILED at 2079.
Hunk #3 succeeded at 3340 (offset 117 lines).
2 out of 3 hunks FAILED -- saving rejects to file mm/huge_memory.c.rej
patching file mm/memory.c
Hunk #1 FAILED at 2373.
Hunk #2 succeeded at 2331 with fuzz 2 (offset -56 lines).
Hunk #3 FAILED at 2622.
2 out of 3 hunks FAILED -- saving rejects to file mm/memory.c.rej
patching file mm/swapfile.c
Hunk #1 FAILED at 922.
1 out of 1 hunk FAILED -- saving rejects to file mm/swapfile.c.rej
[12/512]mh@fan:~/linux/debug/linux$

It doesn't, and it doesn't apply to 4.6-rc3 as well:

[17/517]mh@fan:~/linux/debug/linux$ git checkout v4.6-rc3
Checking out files: 100% (9945/9945), done.
Previous HEAD position was b562e44... Linux 4.5
HEAD is now at bf16200... Linux 4.6-rc3
[18/518]mh@fan:~/linux/debug/linux$ curl 'http://marc.info/?l=linux-rdma&m=146307074800836&w=2' | patch -p1
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100 12529    0 12529    0     0   9692      0 --:--:--  0:00:01 --:--:--  9697
patching file include/linux/mm.h
patching file include/linux/swap.h
Hunk #2 FAILED at 513.
1 out of 2 hunks FAILED -- saving rejects to file include/linux/swap.h.rej
patching file mm/huge_memory.c
Hunk #1 FAILED at 1298.
Hunk #2 FAILED at 2079.
Hunk #3 succeeded at 3225 (offset 2 lines).
2 out of 3 hunks FAILED -- saving rejects to file mm/huge_memory.c.rej
patching file mm/memory.c
Hunk #1 FAILED at 2373.
Hunk #2 succeeded at 2354 (offset -33 lines).
Hunk #3 FAILED at 2622.
2 out of 3 hunks FAILED -- saving rejects to file mm/memory.c.rej
patching file mm/swapfile.c
Hunk #1 FAILED at 922.
1 out of 1 hunk FAILED -- saving rejects to file mm/swapfile.c.rej
[19/519]mh@fan:~/linux/debug/linux$

How do I apply this?

Greetings
Marc

-- 
-----------------------------------------------------------------------------
Marc Haber         | "I don't trust Computers. They | Mailadresse im Header
Leimen, Germany    |  lose things."    Winona Ryder | Fon: *49 6224 1600402
Nordisch by Nature |  How to make an American Quilt | Fax: *49 6224 1600421

  reply	other threads:[~2016-05-13  5:23 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-17 16:54 Major KVM issues with kernel 4.5 on the host Marc Haber
2016-03-17 18:11 ` Borislav Petkov
2016-03-18 10:01   ` Paolo Bonzini
2016-04-13 18:37     ` Marc Haber
2016-04-13 20:36       ` Paolo Bonzini
2016-04-13 20:52         ` Marc Haber
2016-04-13 22:29         ` Marc Haber
2016-04-14  1:16           ` Paolo Bonzini
2016-04-14  5:22             ` Marc Haber
2016-04-21  8:39               ` Marc Haber
2016-04-21 12:37                 ` Borislav Petkov
2016-04-21 14:50                   ` Marc Haber
2016-04-21 16:51                     ` Borislav Petkov
2016-04-21 20:04                       ` Marc Haber
2016-04-23 16:04                         ` Borislav Petkov
2016-04-23 18:43                           ` Marc Haber
2016-04-23 18:52                             ` Dr. David Alan Gilbert
2016-05-12 20:20                               ` transparent huge pages breaks KVM on AMD Marc Haber
2016-05-12 20:24                                 ` Kirill A. Shutemov
2016-05-12 20:34                                   ` Marc Haber
2016-05-12 20:42                                     ` Kirill A. Shutemov
2016-05-13  5:23                                       ` Marc Haber [this message]
2016-05-13  8:07                                         ` Borislav Petkov
2016-05-13  8:09                                           ` Borislav Petkov
2016-05-13 13:21                                             ` Marc Haber
2016-05-13 16:08                                               ` Borislav Petkov
2016-05-14  6:19                                             ` Marc Haber
2016-05-13  9:08                                           ` Marc Haber
2016-05-13  9:19                                             ` Borislav Petkov
2016-05-13 14:59                                           ` Marc Haber
2016-05-13  8:35                                 ` Dr. David Alan Gilbert
2016-05-13 14:03                                   ` Marc Haber
2016-04-23 23:57                             ` Major KVM issues with kernel 4.5 on the host Borislav Petkov
2016-04-14  6:07             ` Marc Haber
2016-04-14 16:47             ` Marc Haber
2016-04-14 17:30               ` Paolo Bonzini
2016-04-14 17:47                 ` Marc Haber
2016-03-18 18:49   ` Marc Haber
2016-03-18 22:04     ` Borislav Petkov
2016-03-19  0:08       ` Marc Haber
2016-03-20 13:31         ` Borislav Petkov
2016-03-20 17:14           ` Andrey Korolyov
2016-03-20 18:25             ` Borislav Petkov
2016-03-20 18:42               ` Andrey Korolyov
2016-03-20 18:58                 ` Borislav Petkov
2016-04-13 18:22                   ` Marc Haber
2016-04-13 20:37                     ` Paolo Bonzini
2016-04-13 18:20           ` Marc Haber
2016-03-21  9:08         ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160513052334.GE9143@torres.zugschlus.de \
    --to=mh+linux-kernel@zugschlus.de \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=bp@alien8.de \
    --cc=dave@treblig.org \
    --cc=kirill@shutemov.name \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).