* [GIT PULL] arch/microblaze patches for 5.6-rc1
@ 2020-02-04 11:08 Michal Simek
2020-02-04 13:22 ` Linus Torvalds
2020-02-04 13:25 ` pr-tracker-bot
0 siblings, 2 replies; 5+ messages in thread
From: Michal Simek @ 2020-02-04 11:08 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML
[-- Attachment #1.1: Type: text/plain, Size: 2415 bytes --]
Hi Linus,
please pull the following patches to your tree. I have also including my
patch for dma-contiguous.h suggested by Christoph and acked by others
with Microblaze CMA wiring.
Thanks,
Michal
The following changes since commit e42617b825f8073569da76dc4510bfa019b1c35a:
Linux 5.5-rc1 (2019-12-08 14:57:55 -0800)
are available in the Git repository at:
git://git.monstr.eu/linux-2.6-microblaze.git tags/microblaze-v5.6-rc1
for you to fetch changes up to 6aa71ef9bcf9d8688c777dfbff340348cb89a5b4:
microblaze: Add ID for Microblaze v11 (2020-02-04 11:38:59 +0100)
----------------------------------------------------------------
Microblaze patches for 5.6-rc1
- Enable CMA
- Add support for MB v11
- Defconfig updates
- Minor fixes
----------------------------------------------------------------
Manish Narani (1):
microblaze: defconfig: Disable EXT2 driver and Enable EXT3 & EXT4
drivers
Michal Simek (5):
microblaze: Align comments with register usage
microblaze: Sync defconfig with latest Kconfig layout
asm-generic: Make dma-contiguous.h a mandatory include/asm header
microblaze: Wire CMA allocator
microblaze: Add ID for Microblaze v11
Shubhrajyoti Datta (1):
microblaze: Prevent the overflow of the start
arch/arm64/include/asm/Kbuild | 1 -
arch/csky/include/asm/Kbuild | 1 -
arch/microblaze/Kconfig | 1 +
arch/microblaze/configs/mmu_defconfig | 10 ++++++----
arch/microblaze/configs/nommu_defconfig | 2 +-
arch/microblaze/kernel/cpu/cache.c | 3 ++-
arch/microblaze/kernel/cpu/cpuinfo.c | 1 +
arch/microblaze/kernel/head.S | 8 ++++----
arch/microblaze/mm/init.c | 4 ++++
arch/mips/include/asm/Kbuild | 1 -
arch/riscv/include/asm/Kbuild | 1 -
arch/s390/include/asm/Kbuild | 1 -
arch/x86/include/asm/Kbuild | 1 -
arch/xtensa/include/asm/Kbuild | 1 -
include/asm-generic/Kbuild | 1 +
15 files changed, 20 insertions(+), 17 deletions(-)
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [GIT PULL] arch/microblaze patches for 5.6-rc1
2020-02-04 11:08 [GIT PULL] arch/microblaze patches for 5.6-rc1 Michal Simek
@ 2020-02-04 13:22 ` Linus Torvalds
2020-02-04 17:37 ` Michal Simek
2020-02-04 13:25 ` pr-tracker-bot
1 sibling, 1 reply; 5+ messages in thread
From: Linus Torvalds @ 2020-02-04 13:22 UTC (permalink / raw)
To: Michal Simek; +Cc: LKML
On Tue, Feb 4, 2020 at 11:08 AM Michal Simek <monstr@monstr.eu> wrote:
>
> please pull the following patches to your tree.
Ugh. I only noticed after doing a couple of other pulls that you
*just* rebased or created most of the commits in here.
Why was this done? Why are you sending me stuff that was done minutes ago?
The merge window is not for doing development. It's for asking me to
merge stuff that was ready *before* the merge window.
I've pulled it and since it's just microblaze I'm not going to do the
work to reset and re-do the other pulls I've done, but if this happens
again and I notice in time, I will stop pulling from you.
Because no, this is not acceptable.
Linus
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [GIT PULL] arch/microblaze patches for 5.6-rc1
2020-02-04 13:22 ` Linus Torvalds
@ 2020-02-04 17:37 ` Michal Simek
2020-02-04 22:04 ` Linus Torvalds
0 siblings, 1 reply; 5+ messages in thread
From: Michal Simek @ 2020-02-04 17:37 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML
[-- Attachment #1.1: Type: text/plain, Size: 1400 bytes --]
On 04. 02. 20 14:22, Linus Torvalds wrote:
> On Tue, Feb 4, 2020 at 11:08 AM Michal Simek <monstr@monstr.eu> wrote:
>>
>> please pull the following patches to your tree.
>
> Ugh. I only noticed after doing a couple of other pulls that you
> *just* rebased or created most of the commits in here.
>
> Why was this done? Why are you sending me stuff that was done minutes ago?
>
> The merge window is not for doing development. It's for asking me to
> merge stuff that was ready *before* the merge window.
>
> I've pulled it and since it's just microblaze I'm not going to do the
> work to reset and re-do the other pulls I've done, but if this happens
> again and I notice in time, I will stop pulling from you.
>
> Because no, this is not acceptable.
Sorry about it. All that patches has been sent and done till the mid of
January. Some of them even earlier.
I just needed to remove one patch from queue which we found is causing
the issue. That's why instead of revert I completely remove it and
rebase the rest of the tree.
I will handle that differently next time.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] arch/microblaze patches for 5.6-rc1
2020-02-04 17:37 ` Michal Simek
@ 2020-02-04 22:04 ` Linus Torvalds
0 siblings, 0 replies; 5+ messages in thread
From: Linus Torvalds @ 2020-02-04 22:04 UTC (permalink / raw)
To: Michal Simek; +Cc: LKML
On Tue, Feb 4, 2020 at 5:37 PM Michal Simek <monstr@monstr.eu> wrote:
>
> Sorry about it. All that patches has been sent and done till the mid of
> January. Some of them even earlier.
> I just needed to remove one patch from queue which we found is causing
> the issue. That's why instead of revert I completely remove it and
> rebase the rest of the tree.
> I will handle that differently next time.
Note that if this happens again, and you have a really good reason to
rebase, please _mention_ that reason.
The whole taking me by surprise when I notice after-the-fact that I've
pulled something that was committed just hours before is about the
worst thing that can happen (always excepting obviously untested code
- me finding that the code doesn't even compile is even worse, of
course, even if it wasn't recently committed).
So if there's a good reason why something is very recent, and you
mention it, and it's not a common pattern, I get much less upset.
Linus
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] arch/microblaze patches for 5.6-rc1
2020-02-04 11:08 [GIT PULL] arch/microblaze patches for 5.6-rc1 Michal Simek
2020-02-04 13:22 ` Linus Torvalds
@ 2020-02-04 13:25 ` pr-tracker-bot
1 sibling, 0 replies; 5+ messages in thread
From: pr-tracker-bot @ 2020-02-04 13:25 UTC (permalink / raw)
To: Michal Simek; +Cc: Linus Torvalds, LKML
The pull request you sent on Tue, 4 Feb 2020 12:08:25 +0100:
> git://git.monstr.eu/linux-2.6-microblaze.git tags/microblaze-v5.6-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/153b5c566d30fb984827acb12fd93c3aa6c147d3
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-02-04 22:04 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-04 11:08 [GIT PULL] arch/microblaze patches for 5.6-rc1 Michal Simek
2020-02-04 13:22 ` Linus Torvalds
2020-02-04 17:37 ` Michal Simek
2020-02-04 22:04 ` Linus Torvalds
2020-02-04 13:25 ` pr-tracker-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).