Home » Mailing list archives » linux-kernel » 2008 » July » 15

Re: [GIT pull] x86 updates

Previous thread: [PATCH] RDMA/ucm: BKL is not needed for ib_ucm_open() by Roland Dreier on Tuesday, July 15, 2008 - 4:57 pm. (1 message)

Next thread: [Git pull] timer updates by Thomas Gleixner on Tuesday, July 15, 2008 - 5:04 pm. (1 message)
[view original message]
From: Thomas Gleixner <tglx@...>
To: Linus Torvalds <torvalds@...>
Cc: Andrew Morton <akpm@...>, LKML <linux-kernel@...>, Ingo Molnar <mingo@...>
Subject: [GIT pull] x86 updates
Date: Tuesday, July 15, 2008 - 5:01 pm

Linus,


Please pull the latest x86/urgent git tree from:


   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86/urgent


Thanks,


	tglx


------------------>


Thomas Gleixner (1):

      x86: fix TSC build error on 32bit


 arch/x86/kernel/tsc.c |    2 ++

 1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c

index 3c36f92..7603c05 100644

--- a/arch/x86/kernel/tsc.c

+++ b/arch/x86/kernel/tsc.c

@@ -358,6 +358,7 @@ static cycle_t read_tsc(void)

 		ret : clocksource_tsc.cycle_last;

 }


+#ifdef CONFIG_X86_64

 static cycle_t __vsyscall_fn vread_tsc(void)

 {

 	cycle_t ret = (cycle_t)vget_cycles();

@@ -365,6 +366,7 @@ static cycle_t __vsyscall_fn vread_tsc(void)

 	return ret >= __vsyscall_gtod_data.clock.cycle_last ?

 		ret : __vsyscall_gtod_data.clock.cycle_last;

 }

+#endif


 static struct clocksource clocksource_tsc = {

 	.name                   = "tsc",

--
[view original message]
From: Linus Torvalds <torvalds@...>
To: Thomas Gleixner <tglx@...>
Cc: Andrew Morton <akpm@...>, LKML <linux-kernel@...>, Ingo Molnar <mingo@...>
Subject: Re: [GIT pull] x86 updates
Date: Tuesday, July 15, 2008 - 5:20 pm

Hmm> "Already up-to-date"?


Also, your other tree seems to also have added annoying warnings:


  arch/x86/kernel/acpi/boot.c: In function ‘acpi_parse_fadt’:

  arch/x86/kernel/acpi/boot.c:747: warning: format ‘%#x’ expects type ‘unsigned int’, but argument 2 has type ‘long unsigned int’


Grr.


Guys, stop sending me crap. A _little_ bit of testing would be good.


		Linus

--
[view original message]
From: Thomas Gleixner <tglx@...>
To: Linus Torvalds <torvalds@...>
Cc: Andrew Morton <akpm@...>, LKML <linux-kernel@...>, Ingo Molnar <mingo@...>
Subject: Re: [GIT pull] x86 updates
Date: Tuesday, July 15, 2008 - 5:43 pm

Strange,


http://git.kernel.org/?p=linux/kernel/git/tip/linux-2.6-tip.git;a=shortl...


has a commit on top of your tree. 


commit	     431ceb83f703a343bdd14350480a2224fa4bfedf

tree	     2f4644aec0d326e23327ed2297a4a4f52b1d830e

parent	     b9d2252c1e44fa83a4e65fdc9eb93db6297c55af


I waited with the pull request until it showed up there.


Thanks,


	tglx

--
[view original message]
From: Linus Torvalds <torvalds@...>
To: Thomas Gleixner <tglx@...>
Cc: Andrew Morton <akpm@...>, LKML <linux-kernel@...>, Ingo Molnar <mingo@...>
Subject: Re: [GIT pull] x86 updates
Date: Tuesday, July 15, 2008 - 6:00 pm

I'd say it's a mirroring issue, but:


[torvalds@woody linux]$ git ls-remote ssh://master.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git | grep x86/urgent

b9d2252c1e44fa83a4e65fdc9eb93db6297c55af	refs/heads/x86/urgent

b9d2252c1e44fa83a4e65fdc9eb93db6297c55af	refs/heads/x86/urgent-undo-ioapic

41b7aafd3ea22fcd6cbb062da39d5c757d6c09ca	refs/remotes/origin/x86/urgent


ie it looks like even master has b9d2252c1 as tip (which is the one you

say is the parent).


I wonder if Ingo overwrote it. You both push to the same tree, don't you?

And maybe somebody used "-f" to force an over-push?


			Linus

--
[view original message]
From: Ingo Molnar <mingo@...>
To: Linus Torvalds <torvalds@...>
Cc: Thomas Gleixner <tglx@...>, Andrew Morton <akpm@...>, LKML <linux-kernel@...>
Subject: Re: [GIT pull] x86 updates
Date: Tuesday, July 15, 2008 - 6:05 pm

sorry, my fault - i have reset it back to -git because i wanted to get

rid of the local merge commit that we created over

include/asm-x86/dwarf2.h. That coincided with Thomas pushing an urgent

fix out. We rarely push out via -f but this was an exception.


Thomas, could you please push it again?


	Ingo

--
[view original message]
From: Thomas Gleixner <tglx@...>
To: Ingo Molnar <mingo@...>
Cc: Linus Torvalds <torvalds@...>, Andrew Morton <akpm@...>, LKML <linux-kernel@...>
Subject: Re: [GIT pull] x86 updates
Date: Tuesday, July 15, 2008 - 6:14 pm

Done so.


Linus,


can you please pull again from


   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86/urgent


Thanks,


	tglx

--
[view original message]
From: Linus Torvalds <torvalds@...>
To: Thomas Gleixner <tglx@...>
Cc: Ingo Molnar <mingo@...>, Andrew Morton <akpm@...>, LKML <linux-kernel@...>
Subject: Re: [GIT pull] x86 updates
Date: Tuesday, July 15, 2008 - 7:29 pm

Worked now.


		Linus

--
[view original message]
From: Ingo Molnar <mingo@...>
To: Linus Torvalds <torvalds@...>
Cc: Thomas Gleixner <tglx@...>, Andrew Morton <akpm@...>, LKML <linux-kernel@...>
Subject: Re: [GIT pull] x86 updates
Date: Tuesday, July 15, 2008 - 5:25 pm

i've got dhowell's -Werr debug feature that allows us to integrate

checks for warnings into our automated tests. (checking for warnings

automatically is rather hard to do otherwise - gcc will mix it all up

especially in make -j200 alike output)


i just need one free day add it and to cleanse the kernel from spurious

warnings, so that we can catch all warnings from that point on :)


	Ingo

--
Previous thread: [PATCH] RDMA/ucm: BKL is not needed for ib_ucm_open() by Roland Dreier on Tuesday, July 15, 2008 - 4:57 pm. (1 message)

Next thread: [Git pull] timer updates by Thomas Gleixner on Tuesday, July 15, 2008 - 5:04 pm. (1 message)