From: "Tobin C. Harding" <me@tobin.cc>
To: Kaiwan N Billimoria <kaiwan.billimoria@gmail.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"kernel-hardening@lists.openwall.com"
<kernel-hardening@lists.openwall.com>
Subject: [kernel-hardening] Re: [PATCH 2/2] scripts: leaking_addresses: help screen updates
Date: Fri, 24 Nov 2017 21:16:59 +1100 [thread overview]
Message-ID: <20171124101659.GE17858@eros> (raw)
In-Reply-To: <CAPDLWs8+cXShyCt_AH3WgSnn6-cEgGRjJookfqWZ-Lq1Jt72_Q@mail.gmail.com>
On Fri, Nov 24, 2017 at 12:51:34PM +0530, Kaiwan N Billimoria wrote:
> On Fri, Nov 24, 2017 at 11:29 AM, Tobin C. Harding <me@tobin.cc> wrote:
>
> > Neither of these patches applies to my tree. Are you editing the diff's
> > by hand? I noticed the patches don't end with the version signature, like this:
> >
> > ----
> > 2.7.4
>
> I cloned your tree from here: https://github.com/tcharding/linux/tree/leaks
> is that right?
If that gets you the tree and the branch then great. I've never done it
that way but hey if it works it works.
> One thing i can think of: i have to copy across the script to a
> cloud-based 32-bit system, work on it there, copy it back to your tree
> on my laptop manually,
That sounds fine. I'd personally work on it locally, `scp` to the remote
host and then run it there.
> then i do the 'git diff -r' and basically
> copy-paste that. Is this causing issues?
There's your problem. I'm no git expert but the format produced by that
command is not able to be applied by `git apply` or `git am`. No doubt
there is a command to apply it but in ten minutes playing around I
couldn't find it.
Patches can easily be generated using
git format-patch -X
where X is the number of commits to include in the patch. You can then
apply them to using `git am` or `git apply`. You can in this way verify
that your patches apply to the tree/branch of whichever maintainer you
are sending the patch to.
If you try to patch staging with patches that don't apply you get an
automated response saying so, I haven't got that sophisticated yet.
Hope this helps,
Tobin.
WARNING: multiple messages have this Message-ID (diff)
From: "Tobin C. Harding" <me@tobin.cc>
To: Kaiwan N Billimoria <kaiwan.billimoria@gmail.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"kernel-hardening@lists.openwall.com"
<kernel-hardening@lists.openwall.com>
Subject: Re: [PATCH 2/2] scripts: leaking_addresses: help screen updates
Date: Fri, 24 Nov 2017 21:16:59 +1100 [thread overview]
Message-ID: <20171124101659.GE17858@eros> (raw)
In-Reply-To: <CAPDLWs8+cXShyCt_AH3WgSnn6-cEgGRjJookfqWZ-Lq1Jt72_Q@mail.gmail.com>
On Fri, Nov 24, 2017 at 12:51:34PM +0530, Kaiwan N Billimoria wrote:
> On Fri, Nov 24, 2017 at 11:29 AM, Tobin C. Harding <me@tobin.cc> wrote:
>
> > Neither of these patches applies to my tree. Are you editing the diff's
> > by hand? I noticed the patches don't end with the version signature, like this:
> >
> > ----
> > 2.7.4
>
> I cloned your tree from here: https://github.com/tcharding/linux/tree/leaks
> is that right?
If that gets you the tree and the branch then great. I've never done it
that way but hey if it works it works.
> One thing i can think of: i have to copy across the script to a
> cloud-based 32-bit system, work on it there, copy it back to your tree
> on my laptop manually,
That sounds fine. I'd personally work on it locally, `scp` to the remote
host and then run it there.
> then i do the 'git diff -r' and basically
> copy-paste that. Is this causing issues?
There's your problem. I'm no git expert but the format produced by that
command is not able to be applied by `git apply` or `git am`. No doubt
there is a command to apply it but in ten minutes playing around I
couldn't find it.
Patches can easily be generated using
git format-patch -X
where X is the number of commits to include in the patch. You can then
apply them to using `git am` or `git apply`. You can in this way verify
that your patches apply to the tree/branch of whichever maintainer you
are sending the patch to.
If you try to patch staging with patches that don't apply you get an
automated response saying so, I haven't got that sophisticated yet.
Hope this helps,
Tobin.
next prev parent reply other threads:[~2017-11-24 10:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-23 5:15 [kernel-hardening] [PATCH 2/2] scripts: leaking_addresses: help screen updates kaiwan.billimoria
2017-11-23 5:15 ` kaiwan.billimoria
2017-11-24 5:59 ` [kernel-hardening] " Tobin C. Harding
2017-11-24 5:59 ` Tobin C. Harding
2017-11-24 7:21 ` [kernel-hardening] " Kaiwan N Billimoria
2017-11-24 7:21 ` Kaiwan N Billimoria
2017-11-24 10:16 ` Tobin C. Harding [this message]
2017-11-24 10:16 ` Tobin C. Harding
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=20171124101659.GE17858@eros \
--to=me@tobin.cc \
--cc=kaiwan.billimoria@gmail.com \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-kernel@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.