20 Jan, 2008
3 commits
-
The i386 and x86_64 arch directories contain nothing but a generated symlink
to arch/x86/boot/bzImage when a tree a built.Cc: Thomas Gleixner
Cc: Ingo Molnar
Cc: Peter Anvin
Signed-off-by: Josef 'Jeff' Sipek
Signed-off-by: Linus Torvalds -
The PDC202xx older devices do not support ATAPI DMA via the usual
interfaces. What documentation I have isn't sufficient to support DMA and
it isn't clear if the Windows drivers do this or it is possible at all.
(Neither do the drivers/ide old drivers)So turn it ATAPI DMA off, these are disk optimised controllers.
Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/ipath: Fix receiving UD messages with immediate data
19 Jan, 2008
31 commits
-
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (31 commits)
Replace cpmac fix
dl2k: the rest
dl2k: MSCR, MSSR, ESR, PHY_SCR fixes
dl2k: BMSR fixes
dl2k: ANAR, ANLPAR fixes
dl2k: BMCR_t fixes
3c574, 3c515 bitfields abuse
sbni endian fixes
wan/lmc bitfields fixes
dscc4 endian fixes
S2io: Fixed synchronization between scheduling of napi with card reset and close
atl1: fix frame length bug
Documentation: add a guideline for hard_start_xmit method
Revert "sky2: remove check for PCI wakeup setting from BIOS"
e1000e Kconfig: remove ref to nonexistant docs
bonding: Don't hold lock when calling rtnl_unlock
bonding: fix lock ordering for rtnl and bonding_rwsem
bonding: Fix up parameter parsing
bonding: release slaves when master removed via sysfs
bonding: fix locking during alb failover and slave removal
... -
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] clarify watchdog operation in documentation
[WATCHDOG] Revert "Stop looking for device as soon as one is found" -
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: add support for the latest Intel processors to Oprofile -
There's currently no way to turn on Lguest guest support; the planned
Kconfig virtualization reorg didn't get into 2.6.25.This was unnoticed because if you already had CONFIG_LGUEST_GUEST=y in
your config, it worked. Too bad about new users...Also, the Kconfig help was wrong now the virtio drivers are merged.
Signed-off-by: Rusty Russell
Signed-off-by: Linus Torvalds -
The latest Intel processors (the 45nm ones) have a model number of 23
(old ones had 15); they're otherwise compatible on the oprofile side.
This patch adds the new model number to the oprofile code.Signed-off-by: Arjan van de Ven
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
It was not clear what the difference is/was between the
nowayout feature and the Magic Close feature.Signed-off-by: "Andrew Dyer"
Signed-off-by: Wim Van Sebroeck -
This reverts commit 3ff6eb4a2fe5757cbe7c5d57c8eb60ab0775f2f0.
the !found check in the for loop allready made sure that only one
device was found.Signed-Off-By: Pádraig Brady
Signed-Off-By: Wim Van Sebroeck -
Please apply this patch since i reverted by mistake
the commit 4e3ab47a547616e583c7a5458beced6aa34c8ef3
in 6cd043d99dcf5d252fcc682958541f449113f7b3Signed-off-by: Matteo Croce
Signed-off-by: Jeff Garzik -
remove an unused union-with-bitfield of the same sort,
add missing conversions in debugging printkSigned-off-by: Al Viro
Signed-off-by: Jeff Garzik -
Signed-off-by: Al Viro
Signed-off-by: Jeff Garzik -
Signed-off-by: Al Viro
Signed-off-by: Jeff Garzik -
same story, different registers...
Signed-off-by: Al Viro
Signed-off-by: Jeff Garzik -
broken use of bitfields; FUBAR on big-endian (and not valid C,
strictly speaking).Signed-off-by: Al Viro
Signed-off-by: Jeff Garzik -
wn3_config is shared by these cards; the way we deal with it is both bad C
(union abuse) and broken on big-endian. For 3c515 it's less serious (ISA
cards are quite rare outside of little-endian boxen), but 3c574 is a pcmcia
one and that'd better be endian-independent... Fix is the same in both
cases.Signed-off-by: Al Viro
Signed-off-by: Jeff Garzik -
Signed-off-by: Al Viro
Signed-off-by: Jeff Garzik -
Signed-off-by: Al Viro
Signed-off-by: Jeff Garzik -
Signed-off-by: Al Viro
Signed-off-by: Jeff Garzik -
- Fixed synchronization between scheduling of napi with card reset and close
by moving the enabling and disabling of napi to card up and card down
functions respectively instead of open and close.Signed-off-by: Surjit Reang
Signed-off-by: Ramkrishna Vepa
Signed-off-by: Jeff Garzik -
The driver sets up the hardware to accept a frame with max length
equal to MTU + Ethernet header + FCS + VLAN tag, but we neglect to
add the VLAN tag size to the ingress buffer. When a VLAN-tagged
frame arrives, the hardware passes it, but bad things happen
because the buffer is too small. This patch fixes that.Thanks to David Harris for reporting the bug and testing the fix.
Tested-by: David Harris
Signed-off-by: Jay Cliburn
Signed-off-by: Jeff Garzik -
Add a guideline not to modify SKBs.
Signed-off-by: Matti Linnanvuori
Signed-off-by: Jeff Garzik -
This reverts commit 84cd2dfb04d23a961c5f537baa243fa54d0987ac.
Some BIOS's break if Wake On Lan is enabled, and the machine
can't boot. Better to have some user's have to call ethtool to
enable WOL than to break a single user's boot.Signed-off-by: Stephen Hemminger
Signed-off-by: Jeff Garzik -
…nville/wireless-2.6 into upstream-fixes
-
There is no Documentation/networking/e1000e.txt.
Signed-off-by: Jason Uhlenkott
Cc: Auke Kok
Signed-off-by: Jeff Garzik -
…/netdev-2.6 into upstream-fixes
-
Change bond_mii_monitor to not hold any locks when calling rtnl_unlock,
as rtnl_unlock can sleep (when acquring another mutex in netdev_run_todo).Bug reported by Makito SHIOKAWA , who
included a different patch.Signed-off-by: Jay Vosburgh
Signed-off-by: Jeff Garzik -
Fix the handling of rtnl and the bonding_rwsem to always be acquired
in a consistent order (rtnl, then bonding_rwsem).The existing code sometimes acquired them in this order, and sometimes
in the opposite order, which opens a window for deadlock between ifenslave
and sysfs.Signed-off-by: Jay Vosburgh
Signed-off-by: Jeff Garzik -
A recent change to add an additional hash policy modified
bond_parse_parm, but it now does not correctly match parameters passed in
via sysfs.Rewrote bond_parse_parm to handle (a) parameter matches that
are substrings of one another and (b) user input with whitespace (e.g.,
sysfs input often has a trailing newline).Signed-off-by: Jay Vosburgh
Signed-off-by: Jeff Garzik -
Add a call to bond_release_all in the bonding netdev event
handler for the master. This releases the slaves for the case of, e.g.,
"echo -bond0 > /sys/class/net/bonding_masters", which otherwise will spin
forever waiting for references to be released.Signed-off-by: Jay Vosburgh
Signed-off-by: Jeff Garzik -
alb_fasten_mac_swap (actually rlb_teach_disabled_mac_on_primary)
requries RTNL and no other locks. This could cause dev_set_promiscuity
and/or dev_set_mac_address to be called with improper locking.Changed callers to hold only RTNL during calls to alb_fasten_mac_swap
or functions calling it. Updated header comments in affected functions to
reflect proper reality of locking requirements.Signed-off-by: Jay Vosburgh
Signed-off-by: Jeff Garzik -
Move an ASSERT_RTNL down to where we should hold only RTNL;
the existing check produces spurious warnings because we hold additional
locks at _bh, tripping a debug warning in spin_lock_mutex().Signed-off-by: Jay Vosburgh
Signed-off-by: Jeff Garzik -
Fix the functions that store the primary and active slave
options via sysfs to hold the correct locks in the correct order.The bond_change_active_slave and bond_select_active_slave
functions both require rtnl, bond->lock for read and curr_slave_lock for
write_bh, and no other locks. This is so that the lower level
mode-specific functions (notably for balance-alb mode) can release locks
down to just rtnl in order to call, e.g., dev_set_mac_address with the
locks it expects (rtnl only).Signed-off-by: Jay Vosburgh
Signed-off-by: Andy Gospodarek
Signed-off-by: Jeff Garzik
18 Jan, 2008
6 commits
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ALPS - fix sync loss on Acer Aspire 5720ZG
Input: psmouse - fix input_dev leak in lifebook driver
Input: psmouse - fix potential memory leak in psmouse_connect()
Input: usbtouchscreen - fix buffer overflow, make more egalax work
Input: mousedev - handle mice that use absolute coordinates -
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
[NIU]: Fix 1G PHY link state handling.
[NET]: Fix TX timeout regression in Intel drivers. -
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix hypervisor TLB operation error reporting. -
Correct wrong sized spinlock flags, form int to unsigned long.
Signed-off-by: Daniel Walker
Signed-off-by: Linus Torvalds -
call_usermodehelper_exec() has an exit path that can leave the
helper_lock() call at the top of the routine unbalanced. The attached
patch fixes this issue.Signed-off-by: Nigel Cunningham
Cc:
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
This reverts commit e1265205c0ee3919c3f2c750662630154c8faab2.
It's a duplicate commit of commit 74beb9db77930be476b267ec8518a642f39a04bf,
resulting in a duplicate section.Signed-off-by: Li Zefan
Acked-by: Mathieu Desnoyers
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
