aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* sony-laptop: fit input devices into sysfs treeDmitry Torokhov2007-11-21
| | | | | | | Properly set up parent on input devices registered by sony-laptop. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Acked-by: Mattia Dongili <malattia@linux.it>
* Input: linux-input mailing list moved to vger.kernel.orgDmitry Torokhov2007-11-02
| | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Acked-by: Jiri Kosina <jkosina@suse.cz> Acked-by: Johannes Berg <johannes@sipsolutions.net>
* Input: inport, logibm - use KERN_INFO when reporting missing mouseHelge Deller2007-11-01
| | | | | | | | | | | | Many mouse drivers are often compiled (e.g. in Linux distributions) into the kernel at the same time just to make sure that at least one driver will suceed in find it's mouse device. Nevertheless, only the inport and logitech busmouse mouse drivers report with KERN_ERR log level if the mouse wasn't found. They should use KERN_INFO instead, because it's not an error if the mouse isn't attached at all. Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: appletouch - idle reset logic broke older FountainsDmitry Torokhov2007-11-01
| | | | | | | | | | | | | | Fountains do not support change mode request and therefore should be excluded from idle reset attempts. Also: - do not re-submit URB when we decide that touchpad needs to be reinicialized - do not repeat size detection when reinitializing the touchpad - Add missing KERN_* prefixes to messages Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Acked-by: Johannes Berg <johannes@sipsolutions.net>
* Input: hp_sdc.c - fix section mismatchAdrian Bunk2007-10-27
| | | | | | | | hp_sdc_exit() mustn't be __exit since it's called from the __init hp_sdc_register(). Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: appletouch - add Johannes Berg as maintainerJohannes Berg2007-10-27
| | | | | | | | | After the last patch that broke appletouch for powerbooks again I'd like to take over maintainership of this driver to make sure it doesn't break again in the future. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: Add Euro and Dollar key codesCarlos Corbacho2007-10-27
| | | | | | | | | Most newer Acer laptops (from 2005 onwards) now ship with an extra Dollar and Euro key either side of the 'Up' arrow. These cannot be mapped in the traditional way, since they are not combination keys. Signed-off-by: Carlos Corbacho <cathectic@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: xpad - add more USB IDsJoshua J Bowman2007-10-27
| | | | | | | | Add USB IDs of Mad Catz Wired Xbox 360 Controller and Pelican 'TSZ' Wired Xbox 360 Controller. Signed-off-by: Joshua J Bowman <bowmanj@augsburg.edu> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Merge git://git.infradead.org/mtd-2.6Linus Torvalds2007-10-27
|\ | | | | | | | | | | * git://git.infradead.org/mtd-2.6: [JFFS2] Update MAINTAINERS entry -- the jffs-dev list is dead [JFFS2] Prevent return of initialised variable in jffs2_init_acl_post()
| * [JFFS2] Update MAINTAINERS entry -- the jffs-dev list is deadDavid Woodhouse2007-10-27
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * [JFFS2] Prevent return of initialised variable in jffs2_init_acl_post()David Woodhouse2007-10-27
| | | | | | | | | | | | Spotted by the Coverity checker, and pointed out by Adrian Bunk. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
* | Merge branch 'for-linus' of ↵Linus Torvalds2007-10-27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: mmc_spi: Fix mmc-over-spi regression mmc: use common byte swap macros mmc: fix cid and csd byte order at91_mci: Fix bad reference
| * | mmc_spi: Fix mmc-over-spi regressionDavid Brownell2007-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch 49dce689ad4ef0fd1f970ef762168e4bd46f69a3 changed the sysfs data structures for SPI in a way which broke the MMC-over-SPI host driver. This patch fixes that regression by changing the scheme used to keep from knowingly trying to use a shared bus segment, and updates the adjacent comments slightly to better explain the issue. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
| * | mmc: use common byte swap macrosPierre Ossman2007-10-27
| | | | | | | | | | | | | | | | | | Use the more generic byte swapping macros instead of the socket variants. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
| * | mmc: fix cid and csd byte orderPierre Ossman2007-10-27
| | | | | | | | | | | | | | | | | | | | | | | | MMC over SPI sends the CID and CSD registers as data, not responses, which means that the host driver won't do the necessary byte flipping for us. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
| * | at91_mci: Fix bad referencePierre Ossman2007-10-27
| | | | | | | | | | | | | | | | | | | | | The flags parameter got removed in a previous commit, but some references were overlooked. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
* | | Merge branch 'master' of ↵Linus Torvalds2007-10-27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC32]: Fix build-warning in io-unit.c [SPARC64]: Fix BACKOFF_SPIN on non-SMP. [SPARC32]: __inline__ --> inline [SPARC64]: __inline__ --> inline
| * | | [SPARC32]: Fix build-warning in io-unit.cDavid S. Miller2007-10-27
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Fix BACKOFF_SPIN on non-SMP.David S. Miller2007-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It can't be just empty, it has to at least branch back to 'label'. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC32]: __inline__ --> inlineDavid S. Miller2007-10-27
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: __inline__ --> inlineDavid S. Miller2007-10-27
| | |/ | |/| | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Merge branch 'master' of ↵Linus Torvalds2007-10-27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [CRYPTO] users: Fix up scatterlist conversion errors [CRYPTO] tcrypt: Move sg_init_table out of timing loops [NETNS]: Fix get_net_ns_by_pid [NET]: Marking struct pernet_operations __net_initdata was inappropriate [INET] ESP: Must #include <linux/scatterlist.h> [TCP] IPV6: fix softnet build breakage
| * | | [CRYPTO] users: Fix up scatterlist conversion errorsHerbert Xu2007-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the errors made in the users of the crypto layer during the sg_init_table conversion. It also adds a few conversions that were missing altogether. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [CRYPTO] tcrypt: Move sg_init_table out of timing loopsHerbert Xu2007-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves the sg_init_table out of the timing loops for hash algorithms so that it doesn't impact on the speed test results. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETNS]: Fix get_net_ns_by_pidEric W. Biederman2007-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pid namespace patches changed the semantics of find_task_by_pid without breaking the compile resulting in get_net_ns_by_pid doing the wrong thing. So switch to using the intended find_task_by_vpid. Combined with Denis' earlier patch to make netlink traffic fully synchronous the inadvertent race I introduced with accessing current is actually removed. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NET]: Marking struct pernet_operations __net_initdata was inappropriateEric W. Biederman2007-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not safe to to place struct pernet_operations in a special section. We need struct pernet_operations to last until we call unregister_pernet_subsys. Which doesn't happen until module unload. So marking struct pernet_operations is a disaster for modules in two ways. - We discard it before we call the exit method it points to. - Because I keep struct pernet_operations on a linked list discarding it for compiled in code removes elements in the middle of a linked list and does horrible things for linked insert. So this looks safe assuming __exit_refok is not discarded for modules. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [INET] ESP: Must #include <linux/scatterlist.h>Adrian Bunk2007-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the following compile errors in some configurations: <-- snip --> ... CC net/ipv4/esp4.o /home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv4/esp4.c: In function 'esp_output': /home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv4/esp4.c:113: error: implicit declaration of function 'sg_init_table' make[3]: *** [net/ipv4/esp4.o] Error 1 ... /home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv6/esp6.c: In function 'esp6_output': /home/bunk/linux/kernel-2.6/git/linux-2.6/net/ipv6/esp6.c:112: error: implicit declaration of function 'sg_init_table' make[3]: *** [net/ipv6/esp6.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TCP] IPV6: fix softnet build breakageJeff Garzik2007-10-27
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | net/ipv6/tcp_ipv6.c: In function 'tcp_v6_rcv': net/ipv6/tcp_ipv6.c:1736: error: implicit declaration of function 'get_softnet_dma' net/ipv6/tcp_ipv6.c:1736: warning: assignment makes pointer from integer without a cast Signed-off-by: Jeff Garzik <jgarzik@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Merge branch 'for-linus' of ↵Linus Torvalds2007-10-26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup: x86 setup: sizeof() is unsigned, unbreak comparisons x86 setup: handle boot loaders which set up the stack incorrectly
| * | | x86 setup: sizeof() is unsigned, unbreak comparisonsH. Peter Anvin2007-10-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use signed values for limit checking since the values can go negative under certain circumstances. However, sizeof() is unsigned and forces the comparison to be unsigned, so move the comparison into the heap_free() macros so we can ensure it is a signed comparison. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| * | | x86 setup: handle boot loaders which set up the stack incorrectlyH. Peter Anvin2007-10-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently some specific versions of LILO enter the kernel with a stack pointer that doesn't match the rest of the segments. Make our best attempt at untangling the resulting mess. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86Linus Torvalds2007-10-26
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86: x86: kill the old i386 and x86_64 directories x86: move i386 and x86_64 Kconfig files to x86 directory kconfig: small code refactoring in kconfig Makefile x86: unification of i386 and x86_64 Kconfig.debug x86: move defconfig files for i386 and x86_64 to x86 x86: move i386 and x86_64 Makefiles to arch/x86
| * | | x86: kill the old i386 and x86_64 directoriesSam Ravnborg2007-10-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The last remaining bits were two .gitignore files. Deleting them and the directories are history. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | x86: move i386 and x86_64 Kconfig files to x86 directorySam Ravnborg2007-10-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After a small change in kconfig Makefile we could move all x86 Kconfig files to x86 directory. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | kconfig: small code refactoring in kconfig MakefileSam Ravnborg2007-10-25
| | | | | | | | | | | | | | | | | | | | | | | | Do not hardcode the arch/$(ARCH)/Kconfig name all over Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | x86: unification of i386 and x86_64 Kconfig.debugRandy Dunlap2007-10-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding proper dependencies so the two Kconfig.debug files are now identical and move the result file to x86. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | x86: move defconfig files for i386 and x86_64 to x86Sam Ravnborg2007-10-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With some small changes to kconfig makefile we can now locate the defconfig files for i386 and x86_64 in the configs/ subdirectory under x86. make ARCH=i386 defconfig and make defconfig works as expected also after this change. But arch maintainers shall now update a defconfig file in the configs/ directory. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * | | x86: move i386 and x86_64 Makefiles to arch/x86Sam Ravnborg2007-10-25
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving the ARCH specific Makefiles for i386 and x86_64 required a litle bit tweaking in the top-lvel Makefile. SRCARCH is now set in the top-level Makefile because we need this info to include the correct arch Makefile. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* | | Merge branch 'master' of ↵Linus Torvalds2007-10-26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits) [NetLabel]: correct usage of RCU locking [TCP]: fix D-SACK cwnd handling [NET] napi: use non-interruptible sleep in napi_disable [SCTP] net/sctp/auth.c: make 3 functions static [TCP]: Add missing I/O AT code to ipv6 side. [SCTP]: #if 0 sctp_update_copy_cksum() [INET]: Unexport icmpmsg_statistics [NET]: Unexport sock_enable_timestamp(). [TCP]: Make tcp_match_skb_to_sack() static. [IRDA]: Make ircomm_tty static. [NET] fs/proc/proc_net.c: make a struct static [NET] dev_change_name: ignore changes to same name [NET]: Document some simple rules for actions [NET_CLS_ACT]: Use skb_act_clone [NET_CLS_ACT]: Introduce skb_act_clone [TCP]: Fix scatterlist handling in MD5 signature support. [IPSEC]: Fix scatterlist handling in skb_icv_walk(). [IPSEC]: Add missing sg_init_table() calls to ESP. [CRYPTO]: Initialize TCRYPT on-stack scatterlist objects correctly. [CRYPTO]: HMAC needs some more scatterlist fixups. ...
| * | | [NetLabel]: correct usage of RCU lockingPaul Moore2007-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes some awkward, and perhaps even problematic, RCU lock usage in the NetLabel code as well as some other related trivial cleanups found when looking through the RCU locking. Most of the changes involve removing the redundant RCU read locks wrapping spinlocks in the case of a RCU writer. Signed-off-by: Paul Moore <paul.moore@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TCP]: fix D-SACK cwnd handlingRyousei Takano2007-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current net-2.6 kernel, handling FLAG_DSACKING_ACK is broken. The flag is cleared to 1 just after FLAG_DSACKING_ACK is set. if (found_dup_sack) flag |= FLAG_DSACKING_ACK; : flag = 1; To fix it, this patch introduces a part of the tcp_sacktag_state patch: http://marc.info/?l=linux-netdev&m=119210560431519&w=2 Signed-off-by: Ryousei Takano <takano-ryousei@aist.go.jp> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NET] napi: use non-interruptible sleep in napi_disableBenjamin Herrenschmidt2007-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current napi_disable() uses msleep_interruptible() but doesn't (and can't) exit in case there's a signal, thus ending up doing a hot spin without a cpu_relax. Use uninterruptible sleep instead. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SCTP] net/sctp/auth.c: make 3 functions staticAdrian Bunk2007-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes three needlessly global functions static. Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TCP]: Add missing I/O AT code to ipv6 side.David S. Miller2007-10-26
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SCTP]: #if 0 sctp_update_copy_cksum()Adrian Bunk2007-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sctp_update_copy_cksum() is no longer used. Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [INET]: Unexport icmpmsg_statisticsAdrian Bunk2007-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the unused EXPORT_SYMBOL(icmpmsg_statistics). Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NET]: Unexport sock_enable_timestamp().Adrian Bunk2007-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sock_enable_timestamp() no longer has any modular users. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TCP]: Make tcp_match_skb_to_sack() static.Adrian Bunk2007-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | tcp_match_skb_to_sack() can become static. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [IRDA]: Make ircomm_tty static.Adrian Bunk2007-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ircomm_tty can now become static. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NET] fs/proc/proc_net.c: make a struct staticAdrian Bunk2007-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Struct proc_net_ns_ops can become static. Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>