Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

into nuts.davemloft.net:/disk1/BK/net-2.6

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>

Signed-Off-By: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>

Signed-off-by: Masahide Nakmura <nakam@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Tommi Virtanen <tv@tv.debian.net>
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@redhat.com>

Rtnetlink has some macro's that are relics from earlier locking.
They are only used a couple of places so are easy to kill.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

This qdisc code has several inline functions for locking that is only
used when adding/deleting queuing disciplines; so make them functions
instead.  The new qdisc_lock_tree encapsulates the locking used throughout
this code.

Also qdisc_run() is only called from net/core/dev.c so it should be
defined there.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Re: [AH6] Disable mutable bits after AH header

Unfortunately I broke ah6_input() in that patch.  Thanks to Miyazawa-san
for notifying me of the problem.

In that patch I removed the nh_offset parameter to ipv6_clear_mutable_options.
That broke ah6_input() because it relies on that variable to set the nexthdr.

The following patch fixes this by moving this work out to the caller
xfrm6_rcv() where the information is already available.  It also removes
an unnecessary call to ip6_find_1stfragopt() in xfrm6_rcv() since nhoffp
already points to the nexthdr preceding the current header.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@redhat.com>

into nuts.davemloft.net:/disk1/BK/net-2.6

Signed-off-by: Con Kolivas <kernel@kolivas.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Use msleep() instead of schedule_timeout() to guarantee the task
delays at least the desired time amount.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

The message "Timeout, retransmitting 1 pkts" is not an error and so
change this into a debug message.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

This fixes several small but serious x86-64 bugs in 2.6.8rc2:

 - Fix array overflow in PCI bus checking (Travis Betak) 
 - Fix broken pci_map_sg in swiotlb (Suresh B. Siddha)
 - Remove bogus bus check in IOMMU code
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

* prism54_get/set_debug_oid are missing checks for a null pointer.
  Reported in Bugzilla number 100.

* In the card initialization routine, we try to set the
  output power. For firmware < 1.0.4.3, this leads to a
  worrying "mgt_commit has failed .." in the log although
  the device continues to react normally.
  Fix is simple, do not try to configure output power.
  (which I believe we should not be doing anyway as it is
   probably against local country regulations)

* Reintroduce pushing 0 into the TRDY_TIMEOUT and RETRY_TIMEOUT
  registers. Make this configurable with module parameter
  init_pcitm.

* We now have the ludicrous situation that some hardware setups
  require this (not even pushing 0xFF helps), whilst others
  don't care either way (the majority), and yet others bork
  if anything is pushed into these regs.
  If anybody can explain this (including Conexant :-) ), my ears
  are open.

* oid_mgt.c is calling islpci_mgt_transaction passing the address
  of a pointer to the management frame. This is not being
  initialized by the caller. The callee only updates this
  pointer when successful. When not, boom.

* Being ultracautious again, not only initialize in the caller,
  also null out the pointer unconditionally in the callee.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

	Wrong ifdef around ppc nvram_read_byte() - it should be
CONFIG_GENERIC_NVRAM.

[that's it for today; there's more (fb stuff), but I'd rather make that
a separate series]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	compile fixes in open_pic.c - it missed cpumask conversion in several
places.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	usual "shift definition of inlines before their uses" in a couple of
places in drivers/*
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	a couple of "replace char with explicit s8 to make sure it's really
signed" fixes.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	a) ppc KGDB builds only on two subarch; say so in Kconfig
	b) ide-pmac.c can't be a module; make it dependent on IDE=y.
	c) a bunch of isdn drivers is broken on ppc; marked as such
	d) oaknet is broken; marked as such (includes on files that do not
exist, etc.)
	e) buslogic and cyber2000 are broken on sparc64
	f) s3trio framebuffer is broken
	g) usual 8250-based serial is broken on sparc64; in principle it might
be worth supporting (there are PCI cards of that sort), for now marked as
broken (no asm/serial.h, to start with).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Usual foo ? void : non-void  in reiserfs; gets triggered on big-endian
platforms.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

	asm-ppc/reg.h defines pollutes namespace like there's no tomorrow;
among other things there are
	LR
	SR0...SR15
	DEC
etc.

That breaks quite a few drivers that should otherwise work on ppc.  SR...
and LR were never used by ppc code; commented out in reg.h (note that
they are just aliases for SPRN_SR... and SPRN_LR).  RPA commented out and
its instances in ppc code (all four of them) replaced with SPRN_RPA.  Ditto
for DEC.  The rest of the offenders (DAR and PVR) are left alone for now and
#undef'ed in drivers in question.

We probably want to rip all these guys out of reg.h and convert ppc users
to SPRN_... forms - file ends up included in alot of places and namespace
pollution like that is a Bad Thing(tm).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Assorted pointer-to-int fixes:
	a) some places want to take pointer modulo alignment or extract
integer that was cast to pointer (which is legitimate), but do that via
wrong cast, triggering sparse warnings.
	b) usual %x (int)ptr -> %p ptr fixes
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Either it got missed back when if_mii() was introduced, or it got merged
that way later.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>