Commits · 1c507e2029c63b446baec3978280a51bf25550b4 · Kirill Smelkov / linux

07 Oct, 2004 7 commits

Merge bk://kernel.bkbits.net/davem/sparc-2.6 · 1c507e20
Linus Torvalds authored Oct 07, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
1c507e20
Merge bk://kernel.bkbits.net/davem/net-2.6 · 9ad5c920
Linus Torvalds authored Oct 07, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
9ad5c920
Merge nuts.davemloft.net:/disk1/BK/acme-2.6 · aa59d2c8
David S. Miller authored Oct 06, 2004
```
into nuts.davemloft.net:/disk1/BK/net-2.6
```
aa59d2c8
[SUNGEM]: Use NETDEV_TX_foo instead of magic constants. · c57512a6
David S. Miller authored Oct 06, 2004
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
c57512a6

[PATCH] Fix ide-cs resource management · 627771b0

Russell King authored Oct 06, 2004

PCMCIA resource management is no longer brain dead, and acts just like
any other bus subsystem.  Therefore, there's no need to play games with
the resource subsystem anymore.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

627771b0

[PATCH] APIC physical broadcast for i82489DX · 9cd64149

Maciej W. Rozycki authored Oct 06, 2004

The physical broadcast ID is determined incorrectly for the i82489DX,
which uses 8-bit physical addressing (32-bit logical).
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

9cd64149

[PATCH] ppc64: update g5_defconfig · 57e762e0

Benjamin Herrenschmidt authored Oct 06, 2004

This updates the g5_defconfig, among others, it adds irq stacks,
hugetlbfs and cramfs (later is needed for ppl trying to install fedora,
and so often forgotten that I prefer adding it to the defconfig).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

57e762e0

06 Oct, 2004 33 commits

[PATCH] ppc64: Fix find_udbg_vterm() · 8fc0532a

Benjamin Herrenschmidt authored Oct 06, 2004

The find_udbg_vterm() used to initialize the early boot console
on LPAR machines will not work properly on some recent pSeries
because the firmware is playing tricks with the "phandle" values
used to identify firmware nodes. This patch fixes that by using
the full path instead.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

8fc0532a

[SPARC64]: Missing __user annotations for asm/checksum.h · b19e1a0d
David S. Miller authored Oct 06, 2004
```
Also, while we are here, s/__inline__/inline/
Signed-off-by: David S. Miller <davem@davemloft.net>
```
b19e1a0d

[PATCH] PCI Hotplug: Use before NULL check in shpchp_ctrl · 9e7e5ae0

Dave Jones authored Oct 06, 2004

More fun found with the coverity checker.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

9e7e5ae0

[PATCH] NX: fix read_implies_exec() related noexec-fs breakage · ea7f7a07

Ingo Molnar authored Oct 06, 2004

mmap() done from older !pt_gnu_stack binaries on noexec mounted filesystems
could fail due to the extra PROT_EXEC bit.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ea7f7a07

Merge bk://bk.arm.linux.org.uk/linux-2.6-serial · 658591af
Linus Torvalds authored Oct 06, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
658591af

[ARM PATCH] 2127/1: S3C2410 - fix compile error in serial driver · a7e062c8

Ben Dooks authored Oct 06, 2004

Patch from Ben Dooks

Fixes compile error in serial driver for S3C2410
until the new serial driver can be finished

Signed-off-by: Ben Dooks

a7e062c8

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk · 3a895e95
Linus Torvalds authored Oct 06, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
3a895e95

[ARM PATCH] 2133/1: params_phys is not available on PXA and apears to be ARCH_RPM specific anyway · 5e108b76

Ian Campbell authored Oct 07, 2004

Patch from Ian Campbell

Arecent changeset[0] that changed params into an asm function call
broke the PXA build since PXA does not define PARAMS_PHYS therefore
the params_phys variable is never defined and linking arch/arm/boot/compressed/head.S fails.

The function is defined in include/asm-arm/arch-rpc/uncompress.h 
and so I assume it is dependendant on CONFIG_ARCH_RPC. I can't find 
any use of it outside this file.

Signed-off-by: Ian Campbell

5e108b76

[ARM PATCH] 2130/1: PXA255 Errata #31 fix for sleep.S · 792ba218

Ben Dooks authored Oct 06, 2004

Patch from Ben Dooks

Fix Intel Errata #31 for PXA CPUs, where the 
state of some external lines can be indeterminate
over sleep if PXBus >=133MHz on suspend

Signed-off-by: Ben Dooks

792ba218

[ARM PATCH] 2129/1: S3C2410 - fix set_irq_type() for EINT0..EINT3 · dd8c5287

Ben Dooks authored Oct 06, 2004

Patch from Ben Dooks

Fix the set_irq_type() for EINTs 0 through 3

Cleaned up the inital clearing of any pending IRQs

Signed-off-by: Klaus Fetscher 
Signed-off-by: Ben Dooks

dd8c5287

Merge bk://kernel.bkbits.net/acme/sk_buff-2.6 · 95e8c633
David S. Miller authored Oct 06, 2004
```
into nuts.davemloft.net:/disk1/BK/acme-2.6
```
95e8c633

[LLC] set mac.raw if tr_source_route is called · eed14b47

Arnaldo Carvalho de Melo authored Oct 06, 2004

Thanks to Thomas Graf for spotting this.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@redhat.com>

eed14b47

[SKBUFF] introduce tr_hdr(skb) · 1b0fdcb4

Arnaldo Carvalho de Melo authored Oct 06, 2004

The token ring code in the kernel is bitrotting (no surprise :) ),
it uses skb->data all around... I have an assortment of token ring
cards but no MAU, can anybody send me one, please? I promise to
make ssh work over LLC over Token Ring networks! Duh... :o)
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@redhat.com>

1b0fdcb4

[SKBUFF] use eth_hdr(skb), skb->mac.raw cases · a4165571

Arnaldo Carvalho de Melo authored Oct 06, 2004

Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@redhat.com>

a4165571

[SPARC64]: Add __user annontation to ELF_CORE_COPY_REGS(). · 53eec5df
David S. Miller authored Oct 06, 2004
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
53eec5df
[SPARC64]: Add missing __user annotation to sys_sparc32.c · bc771636
David S. Miller authored Oct 06, 2004
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
bc771636
[SPARC64]: Use __iomem in chmc.c · a81d1659
David S. Miller authored Oct 06, 2004
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
a81d1659
[SPARC64]: Kill sparse warning in power.c · 3bb07787
David S. Miller authored Oct 06, 2004
```
Signed-off-by: David S. Miller <davem@davemloft.net>
```
3bb07787
Merge bk://kernel.bkbits.net/acme/sk_buff-2.6 · f62f4705
David S. Miller authored Oct 05, 2004
```
into nuts.davemloft.net:/disk1/BK/acme-2.6
```
f62f4705
Fix up signed one-bit bitfields in core sound code · 66c9a93b
Linus Torvalds authored Oct 05, 2004

66c9a93b
Merge nuts.davemloft.net:/disk1/BK/acme-2.6 · 1ee2a94c
David S. Miller authored Oct 05, 2004
```
into nuts.davemloft.net:/disk1/BK/net-2.6
```
1ee2a94c
Merge bk://linux-dj.bkbits.net/agpgart · 6586bafd
Linus Torvalds authored Oct 05, 2004
```
into ppc970.osdl.org:/home/torvalds/v2.6/linux
```
6586bafd

[AGPGART] Really add Intel i915 AGPGART Support. · 1afee222

Dave Jones authored Oct 06, 2004

Whoops. Missing entry in the PCI ID tables.

Spotted and fixed by someone at SuSE.
Fished out of SuSE's kernel tree by Christoph Hellwig
Signed-off-by: Dave Jones <davej@redhat.com>

1afee222

[AGPGART] Fix sign extension bug in amd64 gart driver. · f009649d
Dave Jones authored Oct 06, 2004
```
From Terrence Ripperda at NVidia.
Signed-off-by: Dave Jones <davej@redhat.com>
```
f009649d
Merge bk://kernel.bkbits.net/acme/sk_buff-2.6 · 2e21fda8
David S. Miller authored Oct 05, 2004
```
into nuts.davemloft.net:/disk1/BK/acme-2.6
```
2e21fda8

[IPV6]: Set skb->dev in ip6_pkt_discard_out. · bab1d1a2

Dave Craig authored Oct 05, 2004

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

bab1d1a2

Remove rest of legacy arch/m32r/drivers directory · b203e95a
Linus Torvalds authored Oct 05, 2004

b203e95a

$Paolo \'Blaisorblade\' Giarrusso's avatar$

[PATCH] uml: makefile whitespace fix · ef8932e3

Paolo \'Blaisorblade\' Giarrusso authored Oct 05, 2004

Change the spacing for this command to fix alignment on output.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ef8932e3

$Paolo \'Blaisorblade\' Giarrusso's avatar$

[PATCH] uml: makefile fix for .lds scripts. · 58e3e21e

Paolo \'Blaisorblade\' Giarrusso authored Oct 05, 2004

Remove uml.lds and dyn.lds from extra-y; this was a relict from the recent
past.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

58e3e21e

[PATCH] m32r: remove arch/m32r/drivers · 9e71e98d

Hirokazu Takata authored Oct 05, 2004

Remove obsolete m32r-specific driver files, which are no longer used.
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

9e71e98d

[PATCH] m32r: remove unused arch/m32r/m32700ut/m32r-flash.c · 8fa0273f

Hirokazu Takata authored Oct 05, 2004

Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

8fa0273f

[PATCH] m32r: remove unused arch/m32r/kernel/io_m32102.c · 7e44f90d

Hirokazu Takata authored Oct 05, 2004

Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

7e44f90d

[PATCH] m32r: remove arch/m32r/drivers/cs_internal.h · debe65b7

Christoph Hellwig authored Oct 05, 2004

completely unused wrapper
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

debe65b7