mbox series

[GIT,PULL] arm64 fixes for 4.20-rc4

Message ID 20181124123637.matxo4anfxj5q5vm@mbp
State New
Headers show
Series [GIT,PULL] arm64 fixes for 4.20-rc4 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux tags/arm64-fixes

Message

Catalin Marinas Nov. 24, 2018, 12:36 p.m. UTC 
Hi Linus,

Please pull the arm64 fixes below. Thanks.

The following changes since commit 9ff01193a20d391e8dbce4403dd5ef87c7eaaca6:

  Linux 4.20-rc3 (2018-11-18 13:33:44 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux tags/arm64-fixes

for you to fetch changes up to 4f9f49646a5733c0c2bd49940673dde89a9c5add:

  arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block (2018-11-23 18:44:16 +0000)

----------------------------------------------------------------
arm64 fixes:

- Fix wrong conflict resolution around CONFIG_ARM64_SSBD

- Fix sparse warning on unsigned long constant

----------------------------------------------------------------
Sergey Matyukevich (1):
      arm64: sysreg: fix sparse warnings

Will Deacon (1):
      arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block

 arch/arm64/include/asm/sysreg.h | 4 ++--
 arch/arm64/kernel/cpufeature.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

pr-tracker-bot@kernel.org Nov. 24, 2018, 5:55 p.m. UTC | #1 
The pull request you sent on Sat, 24 Nov 2018 12:36:40 +0000:

> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux tags/arm64-fixes

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

Thank you!