aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* kbuild: rename prepare to archprepare to fix dependency chainSam Ravnborg2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When introducing the generic asm-offsets.h support the dependency chain for the prepare targets was changed. All build scripts expecting include/asm/asm-offsets.h to be made when using the prepare target would broke. With the limited number of prepare targets left in arch Makefiles the trivial solution was to introduce a new arch specific target: archprepare The dependency chain looks like this now: prepare | +--> prepare0 | +--> archprepare | +--> scripts_basic +--> prepare1 | +---> prepare2 | +--> prepare3 So prepare 3 is processed before prepare2 etc. This guaantees that the asm symlink, version.h, scripts_basic are all updated before archprepare is processed. prepare0 which build the asm-offsets.h file will need the actions performed by archprepare. The head target is now named prepare, because users scripts will most likely use that target, but prepare-all has been kept for compatibility. Updated Documentation/kbuild/makefiles.txt. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband Linus Torvalds2005-09-11
|\
| * [PATCH] IB: fix CM use-after-freeRoland Dreier2005-09-09
| | | | | | | | | | | | | | | | | | | | | | If the CM REQ handling function gets to error2, then it frees cm_id_priv->timewait_info. But the next line goes through ib_destroy_cm_id() -> ib_send_cm_rej() -> cm_reset_to_idle(), which ends up calling cm_cleanup_timewait(), which dereferences the pointer we just freed. Make sure we clear cm_id_priv->timewait_info after freeing it, so that doesn't happen. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * [PATCH] IB CM: support CM redirJohn Kingman2005-09-09
| | | | | | | | | | | | | | | | Changes to CM to support CM and port redirection (REJ reason 24). Signed-off-by: John Kingman <kingman <at> storagegear.com> Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * Make sure that userspace does not retrieve stale asynchronous orRoland Dreier2005-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion events after destroying a CQ, QP or SRQ. We do this by sweeping the event lists before returning from a destroy calls, and then return the number of events already reported before the destroy call. This allows userspace wait until it has processed all events for an object returned from the kernel before it frees its context for the object. The ABI of the destroy CQ, destroy QP and destroy SRQ commands has to change to return the event count, so bump the ABI version from 1 to 2. The userspace libibverbs library has already been updated to handle both the old and new ABI versions. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * [PATCH] IB: Add struct for ClassPortInfoRoland Dreier2005-09-09
| | | | | | | | | | | | | | Add structure definition for ClassPortInfo format. This is needed for (at least) handling CM redirects. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * [PATCH] IB: Move SA attributes to ib_sa.hHal Rosenstock2005-09-09
| | | | | | | | | | | | | | | | SA: Move SA attributes to ib_sa.h so are accessible to more than sa_query.c. Also, remove deprecated attributes and add one missing one. Signed-off-by: Hal Rosenstock <halr@voltaire.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * [PATCH] IB: Define more SA methodsHal Rosenstock2005-09-09
| | | | | | | | | | | | | | ib_sa.h: Define more SA methods (initially for madeye decode) Signed-off-by: Hal Rosenstock <halr@voltaire.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * [PATCH] IB: clean up user access config optionsJames Lentini2005-09-07
| | | | | | | | | | | | | | | | | | Add a new config option INFINIBAND_USER_MAD to control whether we build ib_umad. Change INFINIBAND_USER_VERBS to INFINIBAND_USER_ACCESS, and have it control ib_ucm and ib_uat as well as ib_uverbs. Signed-off-by: James Lentini <jlentini@netapp.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * [PATCH] IB: RMPP fixesHal Rosenstock2005-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix payload length of middle RMPP sent segments. Middle payload lengths should be 0 on the send side. (This is perhaps a compliance and should not be an interop issue as middle payload lengths are supposed to be ignored on receive). - Fix length in first segment of multipacket sends (This is a compliance issue but does not affect at least OpenIB to OpenIB RMPP transfers). Signed-off-by: Hal Rosenstock <halr@voltaire.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * [PATCH] IB: Initialize qp->waitMichael S. Tsirkin2005-09-07
| | | | | | | | | | | | | | Add missing call to init_waitqueue_head(). Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * [PATCH] IB: really reset QPsRoland Dreier2005-09-07
| | | | | | | | | | | | | | When we modify a QP to the RESET state, completely clean up the QP so that it is really and truly reset. Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * [PATCH] IB: Add user-supplied context to userspace CM ABISean Hefty2005-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | - Add user specified context to all uCM events. Users will not retrieve any events associated with the context after destroying the corresponding cm_id. - Provide the ib_cm_init_qp_attr() call to userspace clients of the CM. This call may be used to set QP attributes properly before modifying the QP. - Fixes some error handling synchonization and cleanup issues. - Performs some minor code cleanup. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * [PATCH] IB/sa_query: avoid unnecessary list scanMichael S. Tsirkin2005-09-07
| | | | | | | | | | | | | | | | Using ib_get_client_data in SA event handler performs a list scan. It's better to use container_of to get the sa device directly. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
| * [PATCH] IPoIB: fix memory leakMichael S. Tsirkin2005-09-07
| | | | | | | | | | | | | | Fix IPoIB memory leak on device removal. Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
* | Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manuallyLinus Torvalds2005-09-11
|\ \ | | | | | | | | | | | | | | | | | | Clash due to new delete_inode behavior (the filesystem now needs to do the truncate_inode_pages() call itself). Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | JFS: Implement jfs_init_securityDave Kleikamp2005-09-01
| | | | | | | | | | | | | | | | | | This atomically initializes the security xattr when an object is created Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
| * | JFS: allow extended attributes to be set within a existing transactionDave Kleikamp2005-09-01
| | | | | | | | | | | | Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
| * | JFS: jfs_delete_inode should always call clear_inode.Dave Kleikamp2005-08-30
| | | | | | | | | | | | Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
* | | [PATCH] Sun HME: enable and map PCI ROM properlyWilly Tarreau2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ports the Sun GEM ROM mapping/enable fixes it sunhme (which used the same PCI ROM mapping code). Without this, I get NULL MAC addresses for all 4 ports (it's a SUN QFE). With it, I get the correct addresses (the ones printed on the label on the card). Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Sun GEM ethernet: enable and map PCI ROM properlyLinus Torvalds2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | This same patch was reported to fix the MAC address detection on sunhme (next patch). Most people seem to be running this on Sparcs or PPC machines, where we get the MAC address from their respective firmware rather than from the (previously broken) ROM mapping routines. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | hpt366: write the full 4 bytes of ROM address, not just low 1 byteLinus Torvalds2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is one heck of a confused driver. It uses a byte write to a dword register to enable a ROM resource that it doesn't even seem to be using. "Lost and wandering in the desert of confusion" Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Merge master.kernel.org:/home/rmk/linux-2.6-mmc Linus Torvalds2005-09-11
|\ \ \
| * | | [MMC] Add mmc_detect_change() delay support for wbsd driverRussell King2005-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert wbsd to use the new delay functionality in mmc_detect_change() rather than implementing its own timer. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | [MFD] Cleanups suggested by Dmitri, Vojtech and lists.Pavel Machek2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are small ucb1x00-ts cleanups, as suggested by Vojtech, Dmitri and the lists. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | [MFD] Add code UCB1200/UCB1300 assabet platform supportRussell King2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Intel assabet specific board support for UCB1200/UCB1300 devices. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | [MFD] Add code UCB1200/UCB1300 touchscreen supportRussell King2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Philips UCB1200 and UCB1300 touchscreen interfaces found on ARM devices. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | [MFD] Add code UCB1200/UCB1300 device supportRussell King2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the core device support code for the Philips UCB1200 and UCB1300 devices. Also includes the following from Pavel: This fixes u32 vs. pm_message_t confusion and uses cleaner try_to_freeze() [fixing compilation as a side-effect on newer kernels.] Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Linus Torvalds2005-09-10
|\ \ \ \
| * | | | [TCP]: Fix double adjustment of tp->{lost,left}_out in tcp_fragment().Herbert Xu2005-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is an extra left_out/lost_out adjustment in tcp_fragment which means that the lost_out accounting is always wrong. This patch removes that chunk of code. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | Merge davem@outer-richmond.davemloft.net:src/GIT/net-2.6/ David S. Miller2005-09-10
| |\ \ \ \
| | * | | | [IPV6]: Bring Type 0 routing header in-line with rfc3542.Brian Haley2005-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Brian Haley <brian.haley@hp.com> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | | | Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542 David S. Miller2005-09-10
| | |\ \ \ \
| | | * | | | [IPV6]: Note values allocated for ip6_tables.YOSHIFUJI Hideaki2005-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid future conflicts, add a note values allocated for ip6_tables. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
| | | * | | | [IPV6]: rearrange constants for new advanced API to solve conflicts.YOSHIFUJI Hideaki2005-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64, 65 are already used in ip6_tables. Pointed out by Patrick McHardy <kaber@trash.net>. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
| | * | | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 David S. Miller2005-09-10
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | [CCID3] Cleanup ccid3 debug callsArnaldo Carvalho de Melo2005-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use some BUG_ON where appropriate and use LIMIT_NETDEBUG for the unlikely cases where we, at this stage, want to know about, that in my tests hasn't appeared in the radar. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
| | | * | | | [DCCP] Only call the HC _exit() routines in dccp_v4_destroy_sockArnaldo Carvalho de Melo2005-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
| | | * | | | [CCID3] Initialize ccid3hctx_t_ipi to 250msArnaldo Carvalho de Melo2005-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To match more closely what is described in RFC 3448. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: Ian McDonald <iam4@cs.waikato.ac.nz>
* | | | | | | [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID"Alexey Dobriyan2005-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix drivers/video/nvidia/nv_of.c:34: error: conflicting types for 'nvidia_probe_i2c_connector' drivers/video/nvidia/nv_proto.h:38: error: previous declaration of 'nvidia_probe_i2c_connector' was here Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: Al Viro <viro@ZenIV.linux.org.uk> Acked-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | | | [PATCH] uml spinlock breakageAl Viro2005-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingo missed that one... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input Linus Torvalds2005-09-10
|\ \ \ \ \ \ \
| * | | | | | | Input: i8042 - use kzalloc instead of kcallocDmitry Torokhov2005-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | | | Input: clean up whitespace and formatting in drivers/char/keyboard.cDmitry Torokhov2005-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | | | Manual merge with LinusDmitry Torokhov2005-09-09
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Input: HIDDEV - make HIDIOCSREPORT wait IO completionStefan Nickl2005-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to make the hiddev driver issue several Set_Report control transfers to a custom device with 2.6.13-rc6, only the first transfer in a row is carried out, while others immediately following it are silently dropped. This happens where hid_submit_report() (in hid-core.c) tests for HID_CTRL_RUNNING, which seems to be still set because the first transfer is not finished yet. As a workaround, inserting a delay between the two calls to ioctl(HIDIOCSREPORT) in userspace "solves" the problem. The straightforward fix is to add a call to hid_wait_io() to the implementation of HIDIOCSREPORT (in hiddev.c), just like for HIDIOCGREPORT. Works fine for me. Apparently, this issue has some history: http://marc.theaimsgroup.com/?l=linux-usb-users&m=111100670105558&w=2 Signed-off-by: Stefan Nickl <Stefan.Nickl@kontron.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | | | Input: HID - add Wireless Security Lock to HID blacklistBrian Schau2005-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The device is a Wireless Security Lock (WSL). The device identifies itself as a Cypress Ultra Mouse. It is, however, not a mouse at all and as such, shouldn't be handled as one. Signed-off-by: Brian Schau <brian@schau.com> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | | | Input: HID - add mapping for Powerbook USB keyboardStelian Pop2005-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map custom HID events (such as the ones generated by some Logitech and Apple Powerbooks USB keyboards) to the FN keycode. Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | | | Input: HID - add the Trust Predator TH 400 gamepad to the badpad listVojtech Pavlik2005-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported-by: Karl Relton <karllinuxtest.relton@ntlworld.com> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | | | Input: HID - add a quirk for the Apple PowermouseVojtech Pavlik2005-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a quirk for the Apple Powermouse, remapping GenericDesktop.Z to Rel.HWheel, to allow horizontal scrolling in Linux. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-23 20:40:05 -0500