25 Sep, 2006
4 commits
-
Signed-off-by: Sam Ravnborg
-
This patch contains a raw copy of unifdef.c
Next patch will modify it and add infrastructure to use it
Adding unifdef to the kernel is acked by the author.The reason to add unifdef as part of the kernel source is that it is not
yet a common utility on most distributions.Signed-off-by: Sam Ravnborg
-
Consistently decide when to rebuild a target across all of
if_changed, if_changed_dep, if_changed_rule.
PHONY targets are now treated alike (ignored) for all targetsWhile add it make Kbuild.include almost readable by factoring out a few
bits to some common variables and reuse this in Makefile.build.Signed-off-by: Sam Ravnborg
-
Kconfig doesn't currently handle config files with DOS line endings.
While these are, of course, an abomination, etc, etc, it can be handy
to not have to convert them first. It's also a tiny patch and even adds
support for lines ending in just \r or even \n\r.Signed-off-by: Matthew Wilcox
Signed-off-by: Sam Ravnborg
24 Sep, 2006
36 commits
-
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
[SCSI] scsi_transport_fc: fixup netlink arguments -
nlmsg_multicast now takes an extra allocation flag, so add it to
the use in the fibre channel transport class.Signed-off-by: James Bottomley
-
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (94 commits)
[SCSI] SPI transport class: misc DV fixes
[SCSI] Switch some more scsi drivers to pci_get_device and refcounted pci structures
[SCSI] eata_pio cleanup and PCI fix
[SCSI] aacraid: README update
[SCSI] aacraid: remove scsi_remove_device
[SCSI] aacraid: merge rx and rkt code
[SCSI] aacraid: expose physical devices
[SCSI] aacraid: misc cleanup
[SCSI] zfcp: update maintainers file
[SCSI] zfcp: update maintainers file
[SCSI] zfcp: fix: avoid removal of fsf reqs before qdio queues are down
[SCSI] zfcp: introduce struct timer_list in struct zfcp_fsf_req
[SCSI] zfcp: fix: use correct req_id in eh_abort_handler
[SCSI] zfcp: create private slab caches to guarantee proper data alignment
[SCSI] zfcp: remove zfcp_ccw_unregister function
[SCSI] aic7xxx: pause sequencer before touching SBLKCTL
[SCSI] aic7xxx: avoid checking SBLKCTL register for certain cards
[SCSI] scsi_debug version 1.80
[SCSI] megaraid: Make megaraid_ioctl() check copy_to_user() return value
[SCSI] aha152x: remove static host array
... -
Conflicts:
include/linux/blkdev.h
Trivial merge to incorporate tag prototypes.
-
Key more of the domain validation settings off the inquiry data from
the disk (in particular, don't try IU or DT unless the disk claims to
support them.Also add a new dv_in_progress flag to prevent recursive DV.
Signed-off-by: James Bottomley
-
Signed-off-by: David S. Miller
-
Unfortunately, sparc64 doesn't have an easy way to do a "64 X 64 -->
128" bit multiply like PowerPC and IA64 do. We were doing a
"64 X 64 --> 64" bit multiple which causes overflow very quickly with
a 30-bit quotient shift.So use a quotientshift count of 10 instead of 30, just like x86 and
ARM do.This also fixes the wrapping of printk timestamp values every ~17
seconds.Signed-off-by: David S. Miller
-
Signed-off-by: Alan Cox
Signed-off-by: James Bottomley -
This started as a PCI reference fixup but to do that I need to build it,
to build it I need to fix it and its full of 32bitisms and uglies.It has been resurrected, I'm not sure if this is a thank you for the
work on the license stuff or punishment for some unknown misdeed however
8). I've also fixed a memory scribble in the init code.One oddity - the changes from HZ * to constants are deliberate. Whoever
originally wrote the code (or cleaned it up) used HZ for a cycle timing
loop even though is not HZ related. I've put it back to the counts used
in the old days when the driver was most used.Signed-off-by: Alan Cox
Signed-off-by: James Bottomley -
Received from Mark Salyzyn:
This patch to the driver's documentation adds a few new product entries,
sorts the entries on OEM lines first for easy searching, followed by
product id order to make it easier to compare against the open source
pci list. The driver has 'family match' so is somewhat future proof, no
code changes are required to recognize the new products.Signed-off-by: Mark Haverkamp
Signed-off-by: James Bottomley -
Received from Mark Salyzyn:
Until the system is stabilized, I am suggesting the enclosed
modification to prevent the driver from tickling the panic. Once sysfs
and friends are stabilized, the patch may be backed out. We have yet to
evaluate if we really want to relinquish existing Scsi Devices in any
case, holding on to them as configuration of arrays comes and goes makes
some sense as well. As a result, we have opted to pull the lines rather
than comment them in legacy.Signed-off-by: Mark Haverkamp
Signed-off-by: James Bottomley -
Received from Mark Salyzyn:
The only real difference between the rkt and rx platform modules is the
offset of the message registers. This patch recognizes this similarity
and simplifies the driver to reduce it's code footprint and to improve
maintainability by reducing the code duplication.Visibly, the 'rkt.c' portion of this patch looks more complicated than
it really is. View it as retaining the rkt-only specifics of the
interface.Signed-off-by: Mark Haverkamp
Signed-off-by: James Bottomley -
Received from Mark Salyzyn:
I am placing this functionality into an insmod parameter. Normally the physical
components are exported to sg, and are blocked from showing up in sd.Note that the pass-through I/O path via the driver through the Firmware to the
physical disks is not an optimized path, the card is designed for Hardware
RAID, elevator sorting and caching. This should not be used as a means for
utilizing the aacraid based controllers as a generic scsi/SATA/SAS controller,
performance should suck by a few percentage points, any RAID meta-data on the
drives will confuse the controller about who owns the drives and there is a
high risk of destroying content in both directions. Unreliable and for
experimentation or strange controlled circumstances only.Signed-off-by: Mark Haverkamp
Signed-off-by: James Bottomley -
Received from Mark Salyzyn:
Basically cleanup, nothing here will have an affect. Adjusting some
error codes, removing superfluous definitions and code fragments.Signed-off-by: Mark Haverkamp
Signed-off-by: James Bottomley -
* git://git.infradead.org/mtd-2.6:
[MTD] Whitespace cleanup in SSFDC driver.
[MTD] SSFDC translation layer minor cleanup
[MTD] Fix dependencies with CONFIG_MTD=m -
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (148 commits)
[ALSA] intel8x0m - Free irq in suspend
[ALSA] Move CONFIG_SND_AC97_POWER_SAVE to pci/Kconfig
[ALSA] usb-audio: add mixer control names for the Aureon 5.1 MkII
[ALSA] ES1938: remove duplicate field initialization
[ALSA] usb-audio: increase number of packets per URB
[ALSA] hda-codec - Fix headphone auto-toggle on sigmatel codec
[ALSA] hda-intel - A slight cleanup of timeout check in azx_get_response()
[ALSA] hda-codec - Fix mic input with STAC92xx codecs
[ALSA] mixart: Use SEEK_{SET,CUR,END} instead of hardcoded values
[ALSA] gus: Use SEEK_{SET,CUR,END} instead of hardcoded values
[ALSA] opl4: Use SEEK_{SET,CUR,END} instead of hardcoded values
[ALSA] sound core: Use SEEK_{SET,CUR,END} instead of hardcoded values
[ALSA] hda-codec - Support multiple headphone pins
[ALSA] hda_intel prefer 24bit instead of 20bit
[ALSA] hda-codec - Add vendor ids for Motorola and Conexant
[ALSA] hda-codec - Add device id for Motorola si3054-compatible codec
[ALSA] Add missing compat ioctls for ALSA control API
[ALSA] powermac - Fix Oops when conflicting with aoa driver
[ALSA] aoa: add locking to tas codec
[ALSA] hda-intel - Fix suspend/resume with MSI
... -
* git://git.linux-nfs.org/pub/linux/nfs-2.6: (74 commits)
NFS: unmark NFS direct I/O as experimental
NFS: add comments clarifying the use of nfs_post_op_update()
NFSv4: rpc_mkpipe creating socket inodes w/out sk buffers
NFS: Use SEEK_END instead of hardcoded value
NFSv4: When mounting with a port=0 argument, substitute port=2049
NFSv4: Poll more aggressively when handling NFS4ERR_DELAY
NFSv4: Handle the condition NFS4ERR_FILE_OPEN
NFSv4: Retry lease recovery if it failed during a synchronous operation.
NFS: Don't invalidate the symlink we just stuffed into the cache
NFS: Make read() return an ESTALE if the file has been deleted
NFSv4: It's perfectly legal for clp to be NULL here....
NFS: nfs_lookup - don't hash dentry when optimising away the lookup
SUNRPC: Fix Oops in pmap_getport_done
SUNRPC: Add refcounting to the struct rpc_xprt
SUNRPC: Clean up soft task error handling
SUNRPC: Handle ENETUNREACH, EHOSTUNREACH and EHOSTDOWN socket errors
SUNRPC: rpc_delay() should not clobber the rpc_task->tk_status
Fix a referral error Oops
NFS: NFS_ROOT should use the new rpc_create API
NFS: Fix up compiler warnings on 64-bit platforms in client.c
...Manually resolved conflict in net/sunrpc/xprtsock.c
-
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (353 commits)
[IPV6] ADDRCONF: Mobile IPv6 Home Address support.
[IPV6] ADDRCONF: Allow non-DAD'able addresses.
[IPV6] NDISC: Fix is_router flag setting.
[IPV6] ADDRCONF: Convert addrconf_lock to RCU.
[IPV6] NDISC: Add proxy_ndp sysctl.
[IPV6] NDISC: Set per-entry is_router flag in Proxy NA.
[IPV6] NDISC: Avoid updating neighbor cache for proxied address in receiving NA.
[IPV6]: Don't forward packets to proxied link-local address.
[IPV6] NDISC: Handle NDP messages to proxied addresses.
[NETFILTER]: PPTP conntrack: fix another GRE keymap leak
[NETFILTER]: PPTP conntrack: fix GRE keymap leak
[NETFILTER]: PPTP conntrack: fix PPTP_IN_CALL message types
[NETFILTER]: PPTP conntrack: check call ID before changing state
[NETFILTER]: PPTP conntrack: clean up debugging cruft
[NETFILTER]: PPTP conntrack: consolidate header parsing
[NETFILTER]: PPTP conntrack: consolidate header size checks
[NETFILTER]: PPTP conntrack: simplify expectation handling
[NETFILTER]: PPTP conntrack: remove unnecessary cid/pcid header pointers
[NETFILTER]: PPTP conntrack: fix header definitions
[NETFILTER]: PPTP conntrack: remove more dead code
... -
The error return values are truncated by unlikely so we need to
save it first. Thanks to Kyle Moffett for spotting this.Signed-off-by: Herbert Xu
Signed-off-by: Linus Torvalds -
As Andreas stated he will not maintain the zfcp driver anymore.
Instead I will take over the responsibility.Signed-off-by: Swen Schillig
Signed-off-by: James Bottomley -
Removed myself as maintainer of the s390 zfcp driver --
I will not maintain it any longer.Signed-off-by: Andreas Herrmann
Signed-off-by: James Bottomley -
Fix the fix ... One of my previous fixes introduced removal of all fsf
requests in zfcp's eh_host_reset_handler. But this must not happen
before qdio queues are shut down. So, I revert the changes of
zfcp_scsi_eh_host_reset_handler.Signed-off-by: Andreas Herrmann
Signed-off-by: James Bottomley -
This instance will be used whenever a timer is needed for
a request by zfcp.Signed-off-by: Andreas Herrmann
Signed-off-by: James Bottomley -
zfcp's eh_abort_handler used the wrong request ID to
identify the request to be aborted. The bug was introduced
with commit fea9d6c7bcd8ff1d60ff74f27ba483b3820b18a3
for improved management of request IDs. The bug is
fixed with this patch.Signed-off-by: Andreas Herrmann
Signed-off-by: James Bottomley -
Create private slab caches in order to guarantee proper alignment of
data structures that get passed to hardware.Sidenote: with this patch slab cache debugging will finally work on s390
(at least no known problems left).Furthermore this patch does some minor cleanups:
- store ptr for transport template in struct zfcp_dataSigned-off-by: Heiko Carstens
Signed-off-by: Andreas Herrmann
Compile fix ups and
Signed-off-by: James Bottomley -
Remove unused zfcp_ccw_unregister function (leftover from zfcp's
module_exit era).Signed-off-by: Heiko Carstens
Signed-off-by: Andreas Herrmann
Signed-off-by: James Bottomley -
Some cards need to pause the sequencer before the SBLKCTL register is
touched. This fixes a PCI related oops seen on powerpc macs with this
card caused by trying to ascertain the bus signalling before beginning
domain validation.Signed-off-by: James Bottomley
-
For cards that don't support LVD, checking the SBLKCTL register to
determine the bus singalling doesn't work. So, check that the card
supports LVD first (AHC_ULTRA2) before checking the register.Signed-off-by: James Bottomley
-
See http://www.torque.net/sg/sdebug26.html for more
information on the scsi_debug driver.ChangeLog:
- add 'vpd_use_hostno' parameter to allow simulated hosts
to see the same set of targets (and luns). For testing
multipath software.
- add 'fake_rw' parameter to ignore the data in READ and
WRITE commands
- add support for log subpages (new in SPC-4)
- yield appropriate block descriptor for MODE SENSE
commands (only for pdt=0 (i.e. disks))
- REQUEST SENSE response no longer shows the stopped
power condition (SAT changed to agree with SPC-3)Signed-off-by: Douglas Gilbert
Signed-off-by: James Bottomley -
Conflicts:
drivers/scsi/iscsi_tcp.c
drivers/scsi/iscsi_tcp.hPretty horrible merge between crypto hash consolidation
and crypto_digest_...->crypto_hash_... conversionSigned-off-by: James Bottomley
-
Signed-off-by: Al Viro
Signed-off-by: Linus Torvalds -
annotated, fixed a roothole in ->write(). Dereferencing user-supplied pointer
is a Bad Idea(tm)...Signed-off-by: Al Viro
Signed-off-by: Linus Torvalds -
#elif CONFIG_44x
in ibm4xx.h should've been
#elif defined(CONFIG_44x)Signed-off-by: Al Viro
Signed-off-by: Linus Torvalds -
Signed-off-by: Al Viro
Signed-off-by: Linus Torvalds -
indirect chains of includes are arch-specific and can't
be relied upon... (hell, even attempt to build it for
itanic would trigger vmalloc.h ones; err.h triggers
on e.g. alpha).Signed-off-by: Al Viro
Signed-off-by: Linus Torvalds -
The crypto_hash_update call in hmac_init gave the number 1
instead of the length of the sg list in bytes. This is a
missed conversion from the digest => hash change.As tcrypt only tests crypto_hash_digest it didn't catch this.
Signed-off-by: Herbert Xu
Signed-off-by: Linus Torvalds
