From: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Morris <jmorris@namei.org>,
Andrew Morton <akpm@linux-foundation.org>,
linux-security-module@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH v2] tomoyo: Don't check open/getattr permission on sockets.
Date: Wed, 11 Dec 2019 20:19:39 +0900 [thread overview]
Message-ID: <b4594e06-197d-630b-c2da-923ec1c512b9@i-love.sakura.ne.jp> (raw)
In-Reply-To: <20191211100215.2c0aec54@canb.auug.org.au>
Hello, Stephen Rothwell.
Thank you for the command line.
I was wondering why "git push -f" does not work. But I finally found
there is denyNonFastforwards option, and I was able to clean up.
$ git format-patch -1
0001-tomoyo-Don-t-use-nifty-names-on-sockets.patch
$ git reset --hard v5.5-rc1
$ git push -f origin master
$ git pull upstream master
$ git am 0001-tomoyo-Don-t-use-nifty-names-on-sockets.patch
$ git push origin master
On 2019/12/11 8:02, Stephen Rothwell wrote:
> Having done that, you should just do this (and forget the cleanups
> above):
>
> $ git checkout master
> $ git remote update upstream
> $ git reset --hard upstream/master
> $ git cherry-pick a5f9bda81cb4
> $ git push -f origin master
>
> After that you will have a nice clean tree (based on Linus' tree) to
> continue development on that just contains the one patch "tomoyo: Don't
> check open/getattr permission on sockets."
Now the history looks like below.
6f7c41374b62 (HEAD -> master, origin/master) tomoyo: Don't use nifty names on sockets.
6794862a16ef (upstream/master) Merge tag 'for-5.5-rc1-kconfig-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
184b8f7f91ca Merge tag 'printk-for-5.5-pr-warning-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk
316eaf170252 Merge tag 'thermal-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux
78f926f72e43 btrfs: add Kconfig dependency for BLAKE2B
e42617b825f8 (tag: v5.5-rc1) Linux 5.5-rc1
>
> If, however, you intend to only send patche via James tree, then you
> should be using his tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
> branch next-testing) as your upstream tree, not Linus' tree. Then you
> can ask him to merge your tree before the merge window opens during
> each cycle. You may want to rebase your tree on top of James tree
> after he applies your patch from above.
>
I was previously using linux-security.git . But after experiencing confusion of
linux-security.git management, LSM users (including me) were suggested to have
their own git tree and were suggested to directly send patches to Linus.
And I am currently experiencing confusion of my tree management (because I have
never maintained a tree for "git push" purpose)...
Next step is how to create a pull request. If I recall correctly, I need a
GPG key for signing my request? I have a GPG key but I have never attended
key signing party.
next prev parent reply other threads:[~2019-12-11 11:20 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-05 18:42 KASAN: use-after-free Read in tomoyo_realpath_from_path syzbot
2019-06-05 22:09 ` Tetsuo Handa
2019-06-06 2:08 ` Tetsuo Handa
2019-06-06 5:20 ` Tetsuo Handa
2019-06-09 6:41 ` [PATCH] tomoyo: Don't check open/getattr permission on sockets Tetsuo Handa
2019-06-16 6:49 ` Tetsuo Handa
2019-06-18 20:49 ` Al Viro
2019-06-22 4:45 ` [PATCH v2] " Tetsuo Handa
2019-07-04 11:58 ` Tetsuo Handa
2019-07-07 2:44 ` James Morris
2019-07-07 2:50 ` James Morris
2019-08-09 15:51 ` Tetsuo Handa
2019-09-03 6:52 ` Tetsuo Handa
2019-09-13 13:41 ` Tetsuo Handa
[not found] ` <A9CE5147-4047-4C42-B772-F0ED510FA283@canb.auug.org.au>
2019-10-02 10:50 ` Tetsuo Handa
2019-10-02 22:25 ` Stephen Rothwell
2019-10-03 9:59 ` Tetsuo Handa
2019-11-13 13:49 ` Tetsuo Handa
2019-11-21 7:21 ` James Morris
2019-11-21 10:18 ` Tetsuo Handa
2019-11-21 13:59 ` Tetsuo Handa
2019-12-04 12:50 ` Tetsuo Handa
2019-12-09 21:37 ` James Morris
2019-12-10 10:21 ` Tetsuo Handa
2019-12-10 23:02 ` Stephen Rothwell
2019-12-11 11:19 ` Tetsuo Handa [this message]
2019-10-02 22:22 ` Stephen Rothwell
2019-08-22 6:30 ` Eric Biggers
2019-08-22 6:55 ` Tetsuo Handa
2019-08-22 7:01 ` Eric Biggers
2019-08-22 7:42 ` Tetsuo Handa
2019-08-22 15:47 ` Eric Biggers
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=b4594e06-197d-630b-c2da-923ec1c512b9@i-love.sakura.ne.jp \
--to=penguin-kernel@i-love.sakura.ne.jp \
--cc=akpm@linux-foundation.org \
--cc=jmorris@namei.org \
--cc=linux-security-module@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.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.