x86 fix
Subsystems (2)
Linus,
Please pull the latest x86/urgent git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-2020-04-02
# HEAD: 1651e700664b4597ddf4f8adfe435252a0d11277 x86: Fix bitops.h warning with a moved cast
A single fix addressing Sparse warnings. <asm/bitops.h> is changed non-trivially to avoid the warnings, but generated code is not supposed to be affected.
Hopefully I got the Git tagging and the scripting around it right. :-)
The only slightly annoying part for the scripting was to extract the contents of the signed tag into the draft email, which I did with this rather inelegant hack:
git tag -l --format='%(contents)' $TAG | gawk '/-----BEGIN PGP SIGNATURE-----/{exit;}//{print $0;}' | head -n -1
... but I couldn't find a better way.
I suspect Git is trying to gently tell me that I should be using 'git request-pull' instead of rolling my own, I guess? ;-)
Thanks,
Ingo
------------------>
Jesse Brandeburg (1):
x86: Fix bitops.h warning with a moved cast
arch/x86/include/asm/bitops.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/bitops.h +2 -2
@@ -54,7 +54,7 @@ arch_set_bit(long nr, volatile unsigned long *addr)if (__builtin_constant_p (nr)) { asm volatile(LOCK_PREFIX "orb %1,%0" : CONST_MASK_ADDR(nr, addr) - : "iq" ((u8)CONST_MASK(nr)) + : "iq" (CONST_MASK(nr) & 0xff) : "memory"); }else { asm volatile(LOCK_PREFIX __ASM_SIZE(bts) " %1,%0"
@@ -74,7 +74,7 @@ arch_clear_bit(long nr, volatile unsigned long *addr)if (__builtin_constant_p (nr)) { asm volatile(LOCK_PREFIX "andb %1,%0" : CONST_MASK_ADDR(nr, addr) - : "iq" ((u8)~CONST_MASK(nr))); + : "iq" (CONST_MASK(nr) ^ 0xff)); }else { asm volatile(LOCK_PREFIX __ASM_SIZE(btr) " %1,%0" : : RLONG_ADDR(addr), "Ir" (nr) : "memory");
Quoted 8 lines · Ingo Molnar
The only slightly annoying part for the scripting was to extract the contents of the signed tag into the draft email, which I did with this rather inelegant hack:
git tag -l --format='%(contents)' $TAG | gawk '/-----BEGIN PGP SIGNATURE-----/{exit;}//{print $0;}' | head -n -1
... but I couldn't find a better way.
Yeah, you're supposed to use the existing code, but I guess your approach works too.
I think git request-pull just uses "git cat-file" instead to show the tag contents, but yes, I guess you can use "git tag -l --format" too.
[ Goes and looks up ]
This is what git-request-pull does:
git cat-file tag "$head" |
sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
but admittedly "get cat-file" is a really low-level plumbing thing. It's basically how you get the raw data out of any git object.
Linus
The pull request you sent on Thu, 2 Apr 2020 11:51:26 +0200:
The pull request you sent on Thu, 2 Apr 2020 11:51:26 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitx86-urgent-2020-04-02
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f14a9532ee30c68a56ff502c382860f674cc180c
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker