2019-01-09 14:52:52

by Guo Ren

[permalink] [raw]
Subject: [GIT PULL] csky fixup for linux-5.0-rc1

The following changes since commit bfeffd155283772bbe78c6a05dec7c0128ee500c:

Linux 5.0-rc1 (2019-01-06 17:08:20 -0800)

are available in the git repository at:

[email protected]:c-sky/csky-linux.git tags/csky-for-linus-5.0-rc1

for you to fetch changes up to 56752b21755aef598709d143684cb363db98a7d2:

irqchip/csky: fixup handle_irq_perbit break irq (2019-01-09 00:18:46 +0800)

----------------------------------------------------------------
arch/csky patches for 5.0-rc1

Here is some fixup patches for 5.0-rc1:

- fixup compile error with pte_alloc
- fixup handle_irq_perbit break irq flow
- fixup CACHEV1 store instruction fast retire
- fixup module relocation error with 807 & 860
- add csky kernel features

----------------------------------------------------------------
Guo Ren (5):
Documentation/features: Add csky kernel features
csky: fixup relocation error with 807 & 860
csky: fixup CACHEV1 store instruction fast retire
csky: fixup compile error with pte_alloc
irqchip/csky: fixup handle_irq_perbit break irq

.../features/core/cBPF-JIT/arch-support.txt | 1 +
.../features/core/eBPF-JIT/arch-support.txt | 1 +
.../core/generic-idle-thread/arch-support.txt | 1 +
.../features/core/jump-labels/arch-support.txt | 1 +
.../features/core/tracehook/arch-support.txt | 1 +
.../features/debug/KASAN/arch-support.txt | 1 +
.../debug/gcov-profile-all/arch-support.txt | 1 +
Documentation/features/debug/kgdb/arch-support.txt | 1 +
.../debug/kprobes-on-ftrace/arch-support.txt | 1 +
.../features/debug/kprobes/arch-support.txt | 1 +
.../features/debug/kretprobes/arch-support.txt | 1 +
.../features/debug/optprobes/arch-support.txt | 1 +
.../features/debug/stackprotector/arch-support.txt | 1 +
.../features/debug/uprobes/arch-support.txt | 1 +
.../debug/user-ret-profiler/arch-support.txt | 1 +
.../features/io/dma-contiguous/arch-support.txt | 1 +
.../locking/cmpxchg-local/arch-support.txt | 1 +
.../features/locking/lockdep/arch-support.txt | 1 +
.../locking/queued-rwlocks/arch-support.txt | 1 +
.../locking/queued-spinlocks/arch-support.txt | 1 +
.../locking/rwsem-optimized/arch-support.txt | 1 +
.../features/perf/kprobes-event/arch-support.txt | 1 +
.../features/perf/perf-regs/arch-support.txt | 1 +
.../features/perf/perf-stackdump/arch-support.txt | 1 +
.../sched/membarrier-sync-core/arch-support.txt | 1 +
.../features/sched/numa-balancing/arch-support.txt | 1 +
.../seccomp/seccomp-filter/arch-support.txt | 1 +
.../time/arch-tick-broadcast/arch-support.txt | 1 +
.../features/time/clockevents/arch-support.txt | 1 +
.../time/context-tracking/arch-support.txt | 1 +
.../features/time/irq-time-acct/arch-support.txt | 1 +
.../time/modern-timekeeping/arch-support.txt | 1 +
.../features/time/virt-cpuacct/arch-support.txt | 1 +
.../features/vm/ELF-ASLR/arch-support.txt | 1 +
.../features/vm/PG_uncached/arch-support.txt | 1 +
Documentation/features/vm/THP/arch-support.txt | 1 +
Documentation/features/vm/TLB/arch-support.txt | 1 +
.../features/vm/huge-vmap/arch-support.txt | 1 +
.../features/vm/ioremap_prot/arch-support.txt | 1 +
.../features/vm/numa-memblock/arch-support.txt | 1 +
.../features/vm/pte_special/arch-support.txt | 1 +
arch/csky/include/asm/io.h | 25 +++++++
arch/csky/include/asm/pgalloc.h | 43 +++++-------
arch/csky/kernel/module.c | 38 ++++++-----
drivers/irqchip/irq-csky-apb-intc.c | 77 ++++++++++++----------
45 files changed, 148 insertions(+), 76 deletions(-)


2019-01-09 20:46:22

by Linus Torvalds

[permalink] [raw]
Subject: Re: [GIT PULL] csky fixup for linux-5.0-rc1

On Wed, Jan 9, 2019 at 10:30 AM Konstantin Ryabitsev
<[email protected]> wrote:
>
> On Wed, Jan 09, 2019 at 06:05:01PM +0000, [email protected] wrote:
> > The pull request you sent on Wed, 9 Jan 2019 22:49:57 +0800:
> >
> > > (unable to parse the git remote)
>
> I just committed a fix for this. We weren't expecting URLs without ://
> in them.

Side note: I do wish people would use the proper _public_ access.
Maybe the pr-tracker-bot might even send the person who did a pull
request a (private) notice that there is something odd when that isn't
the case?

Pull requests shouldn't use the ssh address. Yes, it may be where you
_push_ things to, and yes, I can pull from it too (since I have ssh
access to both github and kernel.org), but it's still not the proper
"public-facing" repository address. Not everybody can use those
addresses.

When I remember, I actually end up editing these things up by hand as
I do the pull, because I want the git history to show the publicly
accessible tree. I don't always remember (but I did for the csky
case).

[ In fact, for the ssh://gitolite.kernel.org case, the fixup is
automatic in my git hooks, but for github I have to do it manually ]

Linus

2019-01-09 21:07:14

by Konstantin Ryabitsev

[permalink] [raw]
Subject: Re: [GIT PULL] csky fixup for linux-5.0-rc1

On Wed, Jan 09, 2019 at 10:40:20AM -0800, Linus Torvalds wrote:
> Side note: I do wish people would use the proper _public_ access.

I'm wondering if this largely happens due to people's insteadOf rules.
We've established that git-request-pull will quietly substitute URLs in
the emails it generates if a matching insteadOf rule is found. I started
a discussion related to this on the git list, but it veered a bit
sideways:

https://public-inbox.org/git/[email protected]/T/#u

> Maybe the pr-tracker-bot might even send the person who did a pull
> request a (private) notice that there is something odd when that isn't
> the case?

I'm not sure that would be very effective. Folks tend to ignore bots,
and with this one we're specifically recommending "add it to your ignore
list if you don't want notifications." I think an email from you for
such (rare) cases would be a better way to indicate that something in
the pull request needs to be changed.

-K


2019-01-09 21:20:04

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [GIT PULL] csky fixup for linux-5.0-rc1

The pull request you sent on Wed, 9 Jan 2019 22:49:57 +0800:

> (unable to parse the git remote)

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4064e47c82810586975b4304b105056389beaa06

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

2019-01-09 21:20:31

by Konstantin Ryabitsev

[permalink] [raw]
Subject: Re: [GIT PULL] csky fixup for linux-5.0-rc1

On Wed, Jan 09, 2019 at 06:05:01PM +0000, [email protected] wrote:
> The pull request you sent on Wed, 9 Jan 2019 22:49:57 +0800:
>
> > (unable to parse the git remote)

I just committed a fix for this. We weren't expecting URLs without ://
in them.

-K

2019-01-10 08:13:17

by Guo Ren

[permalink] [raw]
Subject: Re: [GIT PULL] csky fixup for linux-5.0-rc1

Sorry Linus,

This pull-request is wrong on the patch:
"csky: fixup module relocation error with 807 & 860".
diff --git a/arch/csky/kernel/module.c b/arch/csky/kernel/module.c
- uint16_t location_tmp = (uint16_t *)location;
+ uint16_t *location_tmp = (uint16_t *)location;

Please drop it if possible and I'll send another [GIT PULL].

Best Regards
Guo Ren

On Wed, Jan 09, 2019 at 10:49:57PM +0800, [email protected] wrote:
> The following changes since commit bfeffd155283772bbe78c6a05dec7c0128ee500c:
>
> Linux 5.0-rc1 (2019-01-06 17:08:20 -0800)
>
> are available in the git repository at:
>
> [email protected]:c-sky/csky-linux.git tags/csky-for-linus-5.0-rc1
>
> for you to fetch changes up to 56752b21755aef598709d143684cb363db98a7d2:
>
> irqchip/csky: fixup handle_irq_perbit break irq (2019-01-09 00:18:46 +0800)
>
> ----------------------------------------------------------------
> arch/csky patches for 5.0-rc1
>
> Here is some fixup patches for 5.0-rc1:
>
> - fixup compile error with pte_alloc
> - fixup handle_irq_perbit break irq flow
> - fixup CACHEV1 store instruction fast retire
> - fixup module relocation error with 807 & 860
> - add csky kernel features
>
> ----------------------------------------------------------------
> Guo Ren (5):
> Documentation/features: Add csky kernel features
> csky: fixup relocation error with 807 & 860
> csky: fixup CACHEV1 store instruction fast retire
> csky: fixup compile error with pte_alloc
> irqchip/csky: fixup handle_irq_perbit break irq
>
> .../features/core/cBPF-JIT/arch-support.txt | 1 +
> .../features/core/eBPF-JIT/arch-support.txt | 1 +
> .../core/generic-idle-thread/arch-support.txt | 1 +
> .../features/core/jump-labels/arch-support.txt | 1 +
> .../features/core/tracehook/arch-support.txt | 1 +
> .../features/debug/KASAN/arch-support.txt | 1 +
> .../debug/gcov-profile-all/arch-support.txt | 1 +
> Documentation/features/debug/kgdb/arch-support.txt | 1 +
> .../debug/kprobes-on-ftrace/arch-support.txt | 1 +
> .../features/debug/kprobes/arch-support.txt | 1 +
> .../features/debug/kretprobes/arch-support.txt | 1 +
> .../features/debug/optprobes/arch-support.txt | 1 +
> .../features/debug/stackprotector/arch-support.txt | 1 +
> .../features/debug/uprobes/arch-support.txt | 1 +
> .../debug/user-ret-profiler/arch-support.txt | 1 +
> .../features/io/dma-contiguous/arch-support.txt | 1 +
> .../locking/cmpxchg-local/arch-support.txt | 1 +
> .../features/locking/lockdep/arch-support.txt | 1 +
> .../locking/queued-rwlocks/arch-support.txt | 1 +
> .../locking/queued-spinlocks/arch-support.txt | 1 +
> .../locking/rwsem-optimized/arch-support.txt | 1 +
> .../features/perf/kprobes-event/arch-support.txt | 1 +
> .../features/perf/perf-regs/arch-support.txt | 1 +
> .../features/perf/perf-stackdump/arch-support.txt | 1 +
> .../sched/membarrier-sync-core/arch-support.txt | 1 +
> .../features/sched/numa-balancing/arch-support.txt | 1 +
> .../seccomp/seccomp-filter/arch-support.txt | 1 +
> .../time/arch-tick-broadcast/arch-support.txt | 1 +
> .../features/time/clockevents/arch-support.txt | 1 +
> .../time/context-tracking/arch-support.txt | 1 +
> .../features/time/irq-time-acct/arch-support.txt | 1 +
> .../time/modern-timekeeping/arch-support.txt | 1 +
> .../features/time/virt-cpuacct/arch-support.txt | 1 +
> .../features/vm/ELF-ASLR/arch-support.txt | 1 +
> .../features/vm/PG_uncached/arch-support.txt | 1 +
> Documentation/features/vm/THP/arch-support.txt | 1 +
> Documentation/features/vm/TLB/arch-support.txt | 1 +
> .../features/vm/huge-vmap/arch-support.txt | 1 +
> .../features/vm/ioremap_prot/arch-support.txt | 1 +
> .../features/vm/numa-memblock/arch-support.txt | 1 +
> .../features/vm/pte_special/arch-support.txt | 1 +
> arch/csky/include/asm/io.h | 25 +++++++
> arch/csky/include/asm/pgalloc.h | 43 +++++-------
> arch/csky/kernel/module.c | 38 ++++++-----
> drivers/irqchip/irq-csky-apb-intc.c | 77 ++++++++++++----------
> 45 files changed, 148 insertions(+), 76 deletions(-)

2019-01-10 08:25:59

by Guo Ren

[permalink] [raw]
Subject: Re: [GIT PULL] csky fixup for linux-5.0-rc1

Can I take back this pull request and send a new pull request with
https:// URLs ?

On Wed, Jan 09, 2019 at 01:29:55PM -0500, Konstantin Ryabitsev wrote:
> On Wed, Jan 09, 2019 at 06:05:01PM +0000, [email protected] wrote:
> > The pull request you sent on Wed, 9 Jan 2019 22:49:57 +0800:
> >
> > > (unable to parse the git remote)
>
> I just committed a fix for this. We weren't expecting URLs without ://
> in them.
>
> -K

2019-01-10 11:25:04

by Arnd Bergmann

[permalink] [raw]
Subject: Re: [GIT PULL] csky fixup for linux-5.0-rc1

On Thu, Jan 10, 2019 at 9:11 AM Guo Ren <[email protected]> wrote:
>
> Sorry Linus,
>
> This pull-request is wrong on the patch:
> "csky: fixup module relocation error with 807 & 860".
> diff --git a/arch/csky/kernel/module.c b/arch/csky/kernel/module.c
> - uint16_t location_tmp = (uint16_t *)location;
> + uint16_t *location_tmp = (uint16_t *)location;
>
> Please drop it if possible and I'll send another [GIT PULL].

It's already pulled into mainline, so it can't be undone, you have
to send a separate pull request, based on top of the patches
that got pulled.

Arnd

2019-01-10 12:08:21

by Linus Torvalds

[permalink] [raw]
Subject: Re: [GIT PULL] csky fixup for linux-5.0-rc1

On Thu, Jan 10, 2019 at 12:11 AM Guo Ren <[email protected]> wrote:
>
> This pull-request is wrong on the patch:
> "csky: fixup module relocation error with 807 & 860".
> diff --git a/arch/csky/kernel/module.c b/arch/csky/kernel/module.c
> - uint16_t location_tmp = (uint16_t *)location;
> + uint16_t *location_tmp = (uint16_t *)location;
>
> Please drop it if possible and I'll send another [GIT PULL].

Too late, already pulled.

Send a patch, and I'll apply it. Or send a pull request with updates
if there's more than that oneliner..

Linus

2019-01-10 12:35:26

by Guo Ren

[permalink] [raw]
Subject: Re: [GIT PULL] csky fixup for linux-5.0-rc1

On Thu, Jan 10, 2019 at 12:22:46PM +0100, Arnd Bergmann wrote:
> On Thu, Jan 10, 2019 at 9:11 AM Guo Ren <[email protected]> wrote:
> >
> > Sorry Linus,
> >
> > This pull-request is wrong on the patch:
> > "csky: fixup module relocation error with 807 & 860".
> > diff --git a/arch/csky/kernel/module.c b/arch/csky/kernel/module.c
> > - uint16_t location_tmp = (uint16_t *)location;
> > + uint16_t *location_tmp = (uint16_t *)location;
> >
> > Please drop it if possible and I'll send another [GIT PULL].
>
> It's already pulled into mainline, so it can't be undone, you have
> to send a separate pull request, based on top of the patches
> that got pulled.

Thx for the reply, I've sent a patch for it.

Best Regards
Guo Ren

2019-01-10 12:38:47

by Guo Ren

[permalink] [raw]
Subject: Re: [GIT PULL] csky fixup for linux-5.0-rc1

On Thu, Jan 10, 2019 at 03:59:22AM -0800, Linus Torvalds wrote:
> On Thu, Jan 10, 2019 at 12:11 AM Guo Ren <[email protected]> wrote:
> >
> > This pull-request is wrong on the patch:
> > "csky: fixup module relocation error with 807 & 860".
> > diff --git a/arch/csky/kernel/module.c b/arch/csky/kernel/module.c
> > - uint16_t location_tmp = (uint16_t *)location;
> > + uint16_t *location_tmp = (uint16_t *)location;
> >
> > Please drop it if possible and I'll send another [GIT PULL].
>
> Too late, already pulled.
>
> Send a patch, and I'll apply it. Or send a pull request with updates
> if there's more than that oneliner..
Thx, I've sent a patch for you:
"[PATCH V2] csky: fixup compile error with CPU 810."

Best Regards
Guo Ren

2019-01-10 13:29:29

by Konstantin Ryabitsev

[permalink] [raw]
Subject: Re: [GIT PULL] csky fixup for linux-5.0-rc1

On Thu, Jan 10, 2019 at 04:02:03PM +0800, Guo Ren wrote:
> Can I take back this pull request and send a new pull request with
> https:// URLs ?

It's not necessary at this point, as the pull request has already been
processed. However, your future emails should have the public URL of the
git repository.

Best,
-K

2019-01-10 13:30:51

by Guo Ren

[permalink] [raw]
Subject: Re: [GIT PULL] csky fixup for linux-5.0-rc1

On Thu, Jan 10, 2019 at 08:26:13AM -0500, Konstantin Ryabitsev wrote:
> On Thu, Jan 10, 2019 at 04:02:03PM +0800, Guo Ren wrote:
> > Can I take back this pull request and send a new pull request with
> > https:// URLs ?
>
> It's not necessary at this point, as the pull request has already been
> processed. However, your future emails should have the public URL of the
> git repository.
OK

Best Regards
Guo Ren