Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1450944 > unrolled thread
| Started by | Michal Marek <mmarek@suse.cz> |
|---|---|
| First post | 2016-07-27 00:20 +0200 |
| Last post | 2016-07-27 10:00 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
Re: linux-next: duplicate patches in the kspp and kbuild trees Michal Marek <mmarek@suse.cz> - 2016-07-27 00:20 +0200
Re: linux-next: duplicate patches in the kspp and kbuild trees Kees Cook <keescook@google.com> - 2016-07-27 01:10 +0200
Re: linux-next: duplicate patches in the kspp and kbuild trees Michal Marek <mmarek@suse.cz> - 2016-07-27 10:00 +0200
| From | Michal Marek <mmarek@suse.cz> |
|---|---|
| Date | 2016-07-27 00:20 +0200 |
| Subject | Re: linux-next: duplicate patches in the kspp and kbuild trees |
| Message-ID | <rZiRI-7L4-7@gated-at.bofh.it> |
Dne 14.6.2016 v 18:39 Kees Cook napsal(a): > On Tue, Jun 14, 2016 at 7:13 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: >> Hi Michal, >> >> On Tue, 14 Jun 2016 15:01:42 +0200 Michal Marek <mmarek@suse.cz> wrote: >>> >>> I won't :). Kees, are you going to keep the patch in your tree and send >>> it to Linus once kbuild is in? Or shall I take it (which would >>> temporarily result in another duplication...). >> >> Or Kees could send you a pull request ... > > My head hurts. :) How about this: since a pull request would (I think) > end up pulling the other unrelated kspp patches, how about you take > the patch into kbuild, and once it's there, I'll just remove it from > my tree (since it's on top). Sorry, I forgot about this one. It's cherry-picked onto my kbuild branch now. Michal
[toc] | [next] | [standalone]
| From | Kees Cook <keescook@google.com> |
|---|---|
| Date | 2016-07-27 01:10 +0200 |
| Message-ID | <rZjE5-8mI-3@gated-at.bofh.it> |
| In reply to | #1450944 |
On Tue, Jul 26, 2016 at 3:19 PM, Michal Marek <mmarek@suse.cz> wrote: > Dne 14.6.2016 v 18:39 Kees Cook napsal(a): >> On Tue, Jun 14, 2016 at 7:13 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: >>> Hi Michal, >>> >>> On Tue, 14 Jun 2016 15:01:42 +0200 Michal Marek <mmarek@suse.cz> wrote: >>>> >>>> I won't :). Kees, are you going to keep the patch in your tree and send >>>> it to Linus once kbuild is in? Or shall I take it (which would >>>> temporarily result in another duplication...). >>> >>> Or Kees could send you a pull request ... >> >> My head hurts. :) How about this: since a pull request would (I think) >> end up pulling the other unrelated kspp patches, how about you take >> the patch into kbuild, and once it's there, I'll just remove it from >> my tree (since it's on top). > > Sorry, I forgot about this one. It's cherry-picked onto my kbuild branch > now. Okay, no worries. I've removed it from my tree and merged your kbuild/for-next branch into my for-next/kspp branch. Let me know once you've sent the kbuild/for-next pull request, and I can follow it up with the the entropy plugin pull request. Thanks! -Kees -- Kees Cook Brillo & Chrome OS Security
[toc] | [prev] | [next] | [standalone]
| From | Michal Marek <mmarek@suse.cz> |
|---|---|
| Date | 2016-07-27 10:00 +0200 |
| Message-ID | <rZrUZ-4X3-7@gated-at.bofh.it> |
| In reply to | #1450966 |
On 2016-07-27 01:09, Kees Cook wrote: > On Tue, Jul 26, 2016 at 3:19 PM, Michal Marek <mmarek@suse.cz> wrote: >> Dne 14.6.2016 v 18:39 Kees Cook napsal(a): >>> On Tue, Jun 14, 2016 at 7:13 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: >>>> Hi Michal, >>>> >>>> On Tue, 14 Jun 2016 15:01:42 +0200 Michal Marek <mmarek@suse.cz> wrote: >>>>> >>>>> I won't :). Kees, are you going to keep the patch in your tree and send >>>>> it to Linus once kbuild is in? Or shall I take it (which would >>>>> temporarily result in another duplication...). >>>> >>>> Or Kees could send you a pull request ... >>> >>> My head hurts. :) How about this: since a pull request would (I think) >>> end up pulling the other unrelated kspp patches, how about you take >>> the patch into kbuild, and once it's there, I'll just remove it from >>> my tree (since it's on top). >> >> Sorry, I forgot about this one. It's cherry-picked onto my kbuild branch >> now. > > Okay, no worries. I've removed it from my tree and merged your > kbuild/for-next branch into my for-next/kspp branch. > > Let me know once you've sent the kbuild/for-next pull request, and I > can follow it up with the the entropy plugin pull request. I actually send the individual branches of kbuild.git: "kbuild", "kconfig" and "misc". for-next is just a convenience for linux-next integration. Michal
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web