Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1600927 > unrolled thread
| Started by | Linus Torvalds <torvalds@linux-foundation.org> |
|---|---|
| First post | 2017-03-14 22:50 +0100 |
| Last post | 2017-03-17 09:00 +0100 |
| Articles | 5 — 4 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: [PATCH v15 6/9] x86/arch_prctl: Add ARCH_[GET|SET]_CPUID Linus Torvalds <torvalds@linux-foundation.org> - 2017-03-14 22:50 +0100
Re: [PATCH v15 6/9] x86/arch_prctl: Add ARCH_[GET|SET]_CPUID Michael Ellerman <mpe@ellerman.id.au> - 2017-03-16 12:20 +0100
Re: [PATCH v15 6/9] x86/arch_prctl: Add ARCH_[GET|SET]_CPUID Kyle Huey <me@kylehuey.com> - 2017-03-16 16:10 +0100
Re: [PATCH v15 6/9] x86/arch_prctl: Add ARCH_[GET|SET]_CPUID Linus Torvalds <torvalds@linux-foundation.org> - 2017-03-16 19:30 +0100
Re: [PATCH v15 6/9] x86/arch_prctl: Add ARCH_[GET|SET]_CPUID Geert Uytterhoeven <geert@linux-m68k.org> - 2017-03-17 09:00 +0100
| From | Linus Torvalds <torvalds@linux-foundation.org> |
|---|---|
| Date | 2017-03-14 22:50 +0100 |
| Subject | Re: [PATCH v15 6/9] x86/arch_prctl: Add ARCH_[GET|SET]_CPUID |
| Message-ID | <tl2ul-6hH-3@gated-at.bofh.it> |
Kyle,
your patch format is really odd.
You seem to have *eight* lines of context rather than the regular 3.
Is there any reason for that oddity?
It basically means that a one-line hunk ends up being 17 lines of
unified diff rather than 7.
Example appended,
Linus
On Sat, Mar 11, 2017 at 11:46 AM, Kyle Huey <me@kylehuey.com> wrote:
>
> diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
> index ad6f5eb07a95..9fc44b95f7cb 100644
> --- a/arch/x86/include/asm/thread_info.h
> +++ b/arch/x86/include/asm/thread_info.h
> @@ -82,16 +82,17 @@ struct thread_info {
> #define TIF_SIGPENDING 2 /* signal pending */
> #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
> #define TIF_SINGLESTEP 4 /* reenable singlestep on user return*/
> #define TIF_SYSCALL_EMU 6 /* syscall emulation active */
> #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
> #define TIF_SECCOMP 8 /* secure computing */
> #define TIF_USER_RETURN_NOTIFY 11 /* notify kernel of userspace return */
> #define TIF_UPROBE 12 /* breakpointed or singlestepping */
> +#define TIF_NOCPUID 15 /* CPUID is not accessible in userland */
> #define TIF_NOTSC 16 /* TSC is not accessible in userland */
> #define TIF_IA32 17 /* IA32 compatibility process */
> #define TIF_NOHZ 19 /* in adaptive nohz mode */
> #define TIF_MEMDIE 20 /* is terminating due to OOM killer */
> #define TIF_POLLING_NRFLAG 21 /* idle is polling for TIF_NEED_RESCHED */
> #define TIF_IO_BITMAP 22 /* uses I/O bitmap */
> #define TIF_FORCED_TF 24 /* true if TF in eflags artificially */
> #define TIF_BLOCKSTEP 25 /* set when we want DEBUGCTLMSR_BTF */
[toc] | [next] | [standalone]
| From | Michael Ellerman <mpe@ellerman.id.au> |
|---|---|
| Date | 2017-03-16 12:20 +0100 |
| Message-ID | <tlBBM-5Uw-17@gated-at.bofh.it> |
| In reply to | #1600927 |
Linus Torvalds <torvalds@linux-foundation.org> writes: > Kyle, > your patch format is really odd. > > You seem to have *eight* lines of context rather than the regular 3. > Is there any reason for that oddity? > > It basically means that a one-line hunk ends up being 17 lines of > unified diff rather than 7. Presumably he's done: $ git config diff.context 8 Which I also did at one point because I thought it might help for reading diffs, but reverted after realising it also affects the diffs that are generated by format-patch etc. cheers
[toc] | [prev] | [next] | [standalone]
| From | Kyle Huey <me@kylehuey.com> |
|---|---|
| Date | 2017-03-16 16:10 +0100 |
| Message-ID | <tlFcp-97-83@gated-at.bofh.it> |
| In reply to | #1602189 |
On Thu, Mar 16, 2017 at 4:09 AM, Michael Ellerman <mpe@ellerman.id.au> wrote: > Linus Torvalds <torvalds@linux-foundation.org> writes: > >> Kyle, >> your patch format is really odd. >> >> You seem to have *eight* lines of context rather than the regular 3. >> Is there any reason for that oddity? >> >> It basically means that a one-line hunk ends up being 17 lines of >> unified diff rather than 7. > > Presumably he's done: > > $ git config diff.context 8 > > > Which I also did at one point because I thought it might help for > reading diffs, but reverted after realising it also affects the diffs > that are generated by format-patch etc. > > cheers Indeed. In my case it dates back to my days hacking on Firefox, which wants 8 lines of context for patches. I'll remove it. - Kyle
[toc] | [prev] | [next] | [standalone]
| From | Linus Torvalds <torvalds@linux-foundation.org> |
|---|---|
| Date | 2017-03-16 19:30 +0100 |
| Message-ID | <tlIjV-2f6-55@gated-at.bofh.it> |
| In reply to | #1602484 |
On Thu, Mar 16, 2017 at 7:30 AM, Kyle Huey <me@kylehuey.com> wrote:
> On Thu, Mar 16, 2017 at 4:09 AM, Michael Ellerman <mpe@ellerman.id.au> wrote:
>>
>> Presumably he's done:
>>
>> $ git config diff.context 8
>
> Indeed. In my case it dates back to my days hacking on Firefox, which
> wants 8 lines of context for patches. I'll remove it.
You can make those kinds of options per-repository rather than
user-global, so you can keep the 8-line thing for firefox without
having it for the kernel.
Not that it *hurts* for the kernel, but it just looked odd to me
because the patch looked so much bigger. More context lines can
obviously help with ambiguous cases, but we very seldom have that kind
of ambiguity.
I'm assuming firefox has files that have lots and lots of repeated
lines (or things like autogenerated content with a lot of common
boilerplate or whatever), which is why they like lots of context?
Linus
[toc] | [prev] | [next] | [standalone]
| From | Geert Uytterhoeven <geert@linux-m68k.org> |
|---|---|
| Date | 2017-03-17 09:00 +0100 |
| Message-ID | <tlUXM-314-11@gated-at.bofh.it> |
| In reply to | #1602750 |
Hi Linus,
On Thu, Mar 16, 2017 at 7:23 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Thu, Mar 16, 2017 at 7:30 AM, Kyle Huey <me@kylehuey.com> wrote:
>> On Thu, Mar 16, 2017 at 4:09 AM, Michael Ellerman <mpe@ellerman.id.au> wrote:
>>>
>>> Presumably he's done:
>>>
>>> $ git config diff.context 8
>>
>> Indeed. In my case it dates back to my days hacking on Firefox, which
>> wants 8 lines of context for patches. I'll remove it.
>
> You can make those kinds of options per-repository rather than
> user-global, so you can keep the 8-line thing for firefox without
> having it for the kernel.
>
> Not that it *hurts* for the kernel, but it just looked odd to me
> because the patch looked so much bigger. More context lines can
> obviously help with ambiguous cases, but we very seldom have that kind
> of ambiguity.
Having a larger default for DTS source files could be a good idea, though.
I regularly use -U10 to verify DTS patches were applied correctly.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web