Menu
▾
▴
linux-vax-k25-commit — Notifications of CVS commits to kernel 2.5 tree
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(11) |
Jun
(66) |
Jul
(16) |
Aug
(2) |
Sep
(7) |
Oct
(17) |
Nov
(1) |
Dec
(220) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(154) |
Feb
(167) |
Mar
(159) |
Apr
(172) |
May
(35) |
Jun
(58) |
Jul
(97) |
Aug
(285) |
Sep
(139) |
Oct
(252) |
Nov
(8) |
Dec
(3) |
| 2004 |
Jan
(13) |
Feb
(159) |
Mar
(136) |
Apr
(33) |
May
(50) |
Jun
(42) |
Jul
(140) |
Aug
(42) |
Sep
(199) |
Oct
(31) |
Nov
(55) |
Dec
|
| 2005 |
Jan
|
Feb
(12) |
Mar
(214) |
Apr
(119) |
May
(21) |
Jun
(2) |
Jul
(127) |
Aug
(10) |
Sep
(3) |
Oct
(24) |
Nov
(1) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(45) |
May
(13) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(26) |
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(35) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-07 06:54:15
|
arch/mips/gt64120/common/time.c | 4 arch/mips/gt64120/ev64120/setup.c | 2 arch/mips/gt64120/momenco_ocelot/setup.c | 3 arch/mips/kernel/irq.c | 42 +++ arch/mips/mm/c-sb1.c | 2 arch/mips/momentum/ocelot_3/Makefile | 2 arch/mips/momentum/ocelot_3/ocelot_3_fpga.h | 6 arch/mips/momentum/ocelot_3/platform.c | 235 ++++++++++++++++++++++ arch/mips/momentum/ocelot_3/prom.c | 58 ----- arch/mips/momentum/ocelot_3/setup.c | 2 arch/mips/momentum/ocelot_c/Makefile | 2 arch/mips/momentum/ocelot_c/ocelot_c_fpga.h | 6 arch/mips/momentum/ocelot_c/platform.c | 201 ++++++++++++++++++ arch/mips/momentum/ocelot_c/prom.c | 60 ----- arch/mips/momentum/ocelot_c/setup.c | 23 -- arch/mips/pci/Makefile | 2 arch/mips/pci/fixup-ev64120.c | 34 --- arch/mips/pci/pci-ev64120.c | 21 + arch/mips/sgi-ip27/ip27-irq.c | 23 -- arch/mips/sgi-ip27/ip27-timer.c | 2 drivers/media/common/saa7146_i2c.c | 10 drivers/media/dvb/dvb-usb/Kconfig | 12 - drivers/media/dvb/frontends/Kconfig | 2 drivers/media/dvb/frontends/bcm3510.h | 2 drivers/media/dvb/frontends/cx22700.h | 2 drivers/media/dvb/frontends/cx22702.h | 2 drivers/media/dvb/frontends/cx24110.h | 2 drivers/media/dvb/frontends/cx24123.h | 2 drivers/media/dvb/frontends/dib3000.h | 2 drivers/media/dvb/frontends/dib3000mc.h | 2 drivers/media/dvb/frontends/isl6421.h | 2 drivers/media/dvb/frontends/l64781.h | 2 drivers/media/dvb/frontends/lgdt330x.h | 2 drivers/media/dvb/frontends/lnbp21.h | 2 drivers/media/dvb/frontends/mt2060.h | 8 drivers/media/dvb/frontends/mt312.h | 2 drivers/media/dvb/frontends/mt352.h | 2 drivers/media/dvb/frontends/nxt200x.h | 2 drivers/media/dvb/frontends/nxt6000.h | 2 drivers/media/dvb/frontends/or51132.h | 2 drivers/media/dvb/frontends/or51211.h | 2 drivers/media/dvb/frontends/s5h1420.h | 2 drivers/media/dvb/frontends/sp8870.h | 2 drivers/media/dvb/frontends/sp887x.h | 2 drivers/media/dvb/frontends/stv0297.h | 2 drivers/media/dvb/frontends/stv0299.h | 2 drivers/media/dvb/frontends/tda10021.h | 2 drivers/media/dvb/frontends/tda1004x.h | 2 drivers/media/dvb/frontends/tda10086.h | 2 drivers/media/dvb/frontends/tda8083.h | 2 drivers/media/dvb/frontends/tda826x.h | 2 drivers/media/dvb/frontends/tua6100.h | 2 drivers/media/dvb/frontends/ves1820.h | 2 drivers/media/dvb/frontends/ves1x93.h | 2 drivers/media/dvb/frontends/zl10353.h | 2 drivers/media/dvb/ttpci/budget-ci.c | 10 drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 drivers/media/video/saa7134/saa7134-dvb.c | 2 include/asm-mips/irq.h | 4 60 files changed, 594 insertions(+), 254 deletions(-) New commits: commit c836b7716a97021128da43e6fdb61096d5c4156d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c836b7716a97021128da43e6fdb61096d5c4156d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c836b7716a97021128da43e6fdb61096d5c4156d Merge: 846cf85e7137320ea59c29353071f9cdd97b92bc 73f4388aedade209650ed629ab767d3e2b636f7b Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 6 19:53:12 2006 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix EV64120 and Ocelot builds by providing a plat_timer_setup(). [MIPS] EV64120: Fix PCI interrupt allocation. [MIPS] Make irq number allocator generally available for fixing EV64120. [MIPS] EV64120: Fix timer initialization for HZ != 100. [MIPS] Ocelot 3: Fix MAC address detection after platform_device conversion. [MIPS] Ocelot C: Fix MAC address detection after platform_device conversion. [MIPS] SB1: On bootup only flush cache on local CPU. [MIPS] Ocelot 3: Fix large number of warnings. [MIPS] Ocelot C: Fix mapping of ioport address range. [MIPS] Ocelot C: Fix warning about missmatching format string. [MIPS] Ocelot C: fix eth registration after conversion to platform_device [MIPS] Ocelot C: Fix large number of warnings. commit 846cf85e7137320ea59c29353071f9cdd97b92bc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=846cf85e7137320ea59c29353071f9cdd97b92bc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=846cf85e7137320ea59c29353071f9cdd97b92bc Merge: 64651309a1f0de3da131c8dc1d279c932fa979c7 c5dec9fb248e3318f30a26f9984b3b064053a77f Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 6 19:52:29 2006 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines V4L/DVB (4770): Fix mode switch of Compro Videomate T300 V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T V4L/DVB (4786): Pvrusb2: use NULL instead of 0 V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060 commit 73f4388aedade209650ed629ab767d3e2b636f7b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=73f4388aedade209650ed629ab767d3e2b636f7b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=73f4388aedade209650ed629ab767d3e2b636f7b Author: Ralf Baechle <ra...@li...> Date: Mon Nov 6 18:17:35 2006 +0000 [MIPS] Fix EV64120 and Ocelot builds by providing a plat_timer_setup(). Signed-off-by: Ralf Baechle <ra...@li...> commit 4e5852f31a22094a19bbc305e42651b6c92f3008 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4e5852f31a22094a19bbc305e42651b6c92f3008 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4e5852f31a22094a19bbc305e42651b6c92f3008 Author: Ralf Baechle <ra...@li...> Date: Mon Nov 6 18:05:08 2006 +0000 [MIPS] EV64120: Fix PCI interrupt allocation. Signed-off-by: Ralf Baechle <ra...@li...> commit 4a4cf77923eeb3cec40a302656d6ab5ced04ba48 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4a4cf77923eeb3cec40a302656d6ab5ced04ba48 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4a4cf77923eeb3cec40a302656d6ab5ced04ba48 Author: Ralf Baechle <ra...@li...> Date: Mon Nov 6 17:41:06 2006 +0000 [MIPS] Make irq number allocator generally available for fixing EV64120. Signed-off-by: Ralf Baechle <ra...@li...> commit 325d08d1a44b601fbf70c259fb61c38d2af7d309 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=325d08d1a44b601fbf70c259fb61c38d2af7d309 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=325d08d1a44b601fbf70c259fb61c38d2af7d309 Author: Ralf Baechle <ra...@li...> Date: Mon Nov 6 13:32:39 2006 +0000 [MIPS] EV64120: Fix timer initialization for HZ != 100. Signed-off-by: Ralf Baechle <ra...@li...> commit ff28cbd2804105b144a7054e0302615e1da6749f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ff28cbd2804105b144a7054e0302615e1da6749f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ff28cbd2804105b144a7054e0302615e1da6749f Author: Ralf Baechle <ra...@li...> Date: Sun Nov 5 01:18:43 2006 +0000 [MIPS] Ocelot 3: Fix MAC address detection after platform_device conversion. Signed-off-by: Ralf Baechle <ra...@li...> commit 907c51b2d1705b022c3fb65b66cb4e5e09346433 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=907c51b2d1705b022c3fb65b66cb4e5e09346433 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=907c51b2d1705b022c3fb65b66cb4e5e09346433 Author: Ralf Baechle <ra...@li...> Date: Sun Nov 5 01:18:11 2006 +0000 [MIPS] Ocelot C: Fix MAC address detection after platform_device conversion. Signed-off-by: Ralf Baechle <ra...@li...> commit d6b861c6402307e30c7df24dcda911df64a5f9d6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d6b861c6402307e30c7df24dcda911df64a5f9d6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d6b861c6402307e30c7df24dcda911df64a5f9d6 Author: Ralf Baechle <ra...@li...> Date: Sat Nov 4 23:26:27 2006 +0000 [MIPS] SB1: On bootup only flush cache on local CPU. This fixes a warning on bootup warning in smp_call_function. Signed-off-by: Ralf Baechle <ra...@li...> commit d19f7befe929d400df89699eb51b8d7f4ef1b2d8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d19f7befe929d400df89699eb51b8d7f4ef1b2d8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d19f7befe929d400df89699eb51b8d7f4ef1b2d8 Author: Ralf Baechle <ra...@li...> Date: Sat Nov 4 13:02:46 2006 +0000 [MIPS] Ocelot 3: Fix large number of warnings. Signed-off-by: Ralf Baechle <ra...@li...> commit ad0b365573718a4a83266f98c9a49305c8eaf0b8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ad0b365573718a4a83266f98c9a49305c8eaf0b8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ad0b365573718a4a83266f98c9a49305c8eaf0b8 Author: Ralf Baechle <ra...@li...> Date: Fri Nov 3 18:06:33 2006 +0000 [MIPS] Ocelot C: Fix mapping of ioport address range. o Fix warnings o 768MB worth of I/O ports were insane o 64-bit kernels don't need special handling because ioremap does the magic Signed-off-by: Ralf Baechle <ra...@li...> commit 2002d2bde1a9ad10e2521b8b117c11abfbc2ee93 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2002d2bde1a9ad10e2521b8b117c11abfbc2ee93 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2002d2bde1a9ad10e2521b8b117c11abfbc2ee93 Author: Ralf Baechle <ra...@li...> Date: Fri Nov 3 17:48:17 2006 +0000 [MIPS] Ocelot C: Fix warning about missmatching format string. CC arch/mips/momentum/ocelot_c/setup.o arch/mips/momentum/ocelot_c/setup.c: In function 'momenco_time_init': arch/mips/momentum/ocelot_c/setup.c:223: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int' Change data type to match format string; a 32-bit type better suits our needs. Signed-off-by: Ralf Baechle <ra...@li...> commit 9c422e2ad6a1d8bd03e2e9d49e5c63b82165d596 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9c422e2ad6a1d8bd03e2e9d49e5c63b82165d596 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9c422e2ad6a1d8bd03e2e9d49e5c63b82165d596 Author: Ralf Baechle <ra...@li...> Date: Fri Nov 3 17:45:25 2006 +0000 [MIPS] Ocelot C: fix eth registration after conversion to platform_device Signed-off-by: Ralf Baechle <ra...@li...> commit cca72333e71e348995859b88628c1abcb58b759e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cca72333e71e348995859b88628c1abcb58b759e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cca72333e71e348995859b88628c1abcb58b759e Author: Ralf Baechle <ra...@li...> Date: Fri Nov 3 17:42:47 2006 +0000 [MIPS] Ocelot C: Fix large number of warnings. Signed-off-by: Ralf Baechle <ra...@li...> commit c5dec9fb248e3318f30a26f9984b3b064053a77f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c5dec9fb248e3318f30a26f9984b3b064053a77f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c5dec9fb248e3318f30a26f9984b3b064053a77f Author: Trent Piepho <xy...@sp...> Date: Sat Oct 14 15:44:44 2006 -0300 V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel When a front-end is disabled, card drivers that use it are compiled with a stub version of the front-end's attach function. This way they have no references to the front-end's code and don't need it to be loaded. If a card driver is compiled into the kernel, and a front-end is a module, then that front-end is effectively disabled wrt the card driver. In this case, the card driver should get the stub version. This was not happening. The stub vs real attach function selection is changed so that when the front-end is a module the real attach function is only used if the card driver is a module as well. This means a module front-end will be supported by card drivers that are modules and not supported by card drivers compiled into the kernel. Signed-off-by: Trent Piepho <xy...@sp...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit 9bb6e2593ad4cb94944f547154baee64b4734598 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9bb6e2593ad4cb94944f547154baee64b4734598 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9bb6e2593ad4cb94944f547154baee64b4734598 Author: Oliver Endriss <o.e...@gm...> Date: Fri Oct 27 18:02:01 2006 -0300 V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines TT DVB-C 2300 runs at 137 kHz I2C speed. short_delay mode did not work reliably on fast machines with that speed. Increased max loop count from 20 to 50. Moved dummy access out of the loop. Signed-off-by: Oliver Endriss <o.e...@gm...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit 588f98312c7fd1d86290583189d2eb24da70f752 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=588f98312c7fd1d86290583189d2eb24da70f752 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=588f98312c7fd1d86290583189d2eb24da70f752 Author: Hartmut Hackmann <har...@t-...> Date: Wed Oct 18 17:30:42 2006 -0300 V4L/DVB (4770): Fix mode switch of Compro Videomate T300 The board did not return to analog mode since the board specific "demod sleep" function was not called. Signed-off-by: Hartmut Hackmann <har...@t-...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit 9e741b74afc975da51ec60c5a8147b2ebcf7e33a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9e741b74afc975da51ec60c5a8147b2ebcf7e33a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9e741b74afc975da51ec60c5a8147b2ebcf7e33a Author: Raymond Mantchala <ray...@st...> Date: Mon Oct 30 23:20:50 2006 -0300 V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T Technotrend 1500 T card have "inverted inversion". This patch fixes that. Many thanks to Martin Zwickel from Technotrend for his confirmation and correction proposal. Signed-off-by: Raymond Mantchala <ray...@st...> Signed-off-by: Perceval Anichini <per...@st...> Signed-off-by: Oliver Endriss <o.e...@gm...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit c2625bff997f195e067ae11c9b0aa7217fb32991 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c2625bff997f195e067ae11c9b0aa7217fb32991 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c2625bff997f195e067ae11c9b0aa7217fb32991 Author: Randy Dunlap <ran...@or...> Date: Sun Oct 29 11:12:27 2006 -0300 V4L/DVB (4786): Pvrusb2: use NULL instead of 0 Fix sparse NULL usage warnings: drivers/media/video/pvrusb2/pvrusb2-v4l2.c:714:14: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:715:16: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:1079:10: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c:224:58: warning: Using plain integer as NULL pointer Signed-off-by: Randy Dunlap <ran...@or...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit ecba77f246011344f0b8f46eb25ae01ab4ae282d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ecba77f246011344f0b8f46eb25ae01ab4ae282d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ecba77f246011344f0b8f46eb25ae01ab4ae282d Author: David Härdeman <da...@ha...> Date: Fri Oct 27 20:56:51 2006 -0300 V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default The IR chip has no address decoding, so the IR data is always present in the high byte when doing a read from the saa7146 chip. This means that the DEBI address used is irrelevant to the IR decoding logic. DEBI addresses 0x1XXX are mapped to the registers on the CI module itself, but only the lowest two bits are actually used (see EN50221, section A.2.2.1), meaning that 0x1234 is equivalent to 0x1000 which maps to register 0 (the data register). A read from the data register is supposed to be preceded by a read from the size register, so some CI modules will be confused (the AlphaCrypt CAM will hang completely). The attached patch changes the address used when reading the IR data to use 0x4000 instead. This is the CI version address, which is a safer default, works with the AlphaCrypt CAM and matches the behaviour of the Windows driver (AFAIK). Signed-off-by: David Härdeman <da...@ha...> Signed-off-by: Oliver Endriss <o.e...@gm...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit 6c8c21b9119cfe68a99825085014bba4f9c0c768 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6c8c21b9119cfe68a99825085014bba4f9c0c768 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6c8c21b9119cfe68a99825085014bba4f9c0c768 Author: Trent Piepho <xy...@sp...> Date: Sat Oct 14 16:21:02 2006 -0300 V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060 Let the MT2060 be customized like most of the other DVB PLLs/front-ends. Also, add a missing dependency on I2C. Signed-off-by: Trent Piepho <xy...@sp...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-07 06:54:15
|
arch/mips/gt64120/common/time.c | 4 arch/mips/gt64120/ev64120/setup.c | 2 arch/mips/gt64120/momenco_ocelot/setup.c | 3 arch/mips/kernel/irq.c | 42 +++ arch/mips/mm/c-sb1.c | 2 arch/mips/momentum/ocelot_3/Makefile | 2 arch/mips/momentum/ocelot_3/ocelot_3_fpga.h | 6 arch/mips/momentum/ocelot_3/platform.c | 235 ++++++++++++++++++++++ arch/mips/momentum/ocelot_3/prom.c | 58 ----- arch/mips/momentum/ocelot_3/setup.c | 2 arch/mips/momentum/ocelot_c/Makefile | 2 arch/mips/momentum/ocelot_c/ocelot_c_fpga.h | 6 arch/mips/momentum/ocelot_c/platform.c | 201 ++++++++++++++++++ arch/mips/momentum/ocelot_c/prom.c | 60 ----- arch/mips/momentum/ocelot_c/setup.c | 23 -- arch/mips/pci/Makefile | 2 arch/mips/pci/fixup-ev64120.c | 34 --- arch/mips/pci/pci-ev64120.c | 21 + arch/mips/sgi-ip27/ip27-irq.c | 23 -- arch/mips/sgi-ip27/ip27-timer.c | 2 drivers/media/common/saa7146_i2c.c | 10 drivers/media/dvb/dvb-usb/Kconfig | 12 - drivers/media/dvb/frontends/Kconfig | 2 drivers/media/dvb/frontends/bcm3510.h | 2 drivers/media/dvb/frontends/cx22700.h | 2 drivers/media/dvb/frontends/cx22702.h | 2 drivers/media/dvb/frontends/cx24110.h | 2 drivers/media/dvb/frontends/cx24123.h | 2 drivers/media/dvb/frontends/dib3000.h | 2 drivers/media/dvb/frontends/dib3000mc.h | 2 drivers/media/dvb/frontends/isl6421.h | 2 drivers/media/dvb/frontends/l64781.h | 2 drivers/media/dvb/frontends/lgdt330x.h | 2 drivers/media/dvb/frontends/lnbp21.h | 2 drivers/media/dvb/frontends/mt2060.h | 8 drivers/media/dvb/frontends/mt312.h | 2 drivers/media/dvb/frontends/mt352.h | 2 drivers/media/dvb/frontends/nxt200x.h | 2 drivers/media/dvb/frontends/nxt6000.h | 2 drivers/media/dvb/frontends/or51132.h | 2 drivers/media/dvb/frontends/or51211.h | 2 drivers/media/dvb/frontends/s5h1420.h | 2 drivers/media/dvb/frontends/sp8870.h | 2 drivers/media/dvb/frontends/sp887x.h | 2 drivers/media/dvb/frontends/stv0297.h | 2 drivers/media/dvb/frontends/stv0299.h | 2 drivers/media/dvb/frontends/tda10021.h | 2 drivers/media/dvb/frontends/tda1004x.h | 2 drivers/media/dvb/frontends/tda10086.h | 2 drivers/media/dvb/frontends/tda8083.h | 2 drivers/media/dvb/frontends/tda826x.h | 2 drivers/media/dvb/frontends/tua6100.h | 2 drivers/media/dvb/frontends/ves1820.h | 2 drivers/media/dvb/frontends/ves1x93.h | 2 drivers/media/dvb/frontends/zl10353.h | 2 drivers/media/dvb/ttpci/budget-ci.c | 10 drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 drivers/media/video/saa7134/saa7134-dvb.c | 2 include/asm-mips/irq.h | 4 60 files changed, 594 insertions(+), 254 deletions(-) New commits: commit 0533f6bbe2c15dc5d18c7d06bbfea40de6c0d42d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0533f6bbe2c15dc5d18c7d06bbfea40de6c0d42d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0533f6bbe2c15dc5d18c7d06bbfea40de6c0d42d Merge: 17b784e7fa4c4a5a8de3b62cc7fa659b6b64a1f4 c836b7716a97021128da43e6fdb61096d5c4156d Author: Jan-Benedict Glaw <jb...@d2...> Date: Tue Nov 7 07:53:49 2006 +0100 Merge branch 'master' into getuptodate commit c836b7716a97021128da43e6fdb61096d5c4156d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c836b7716a97021128da43e6fdb61096d5c4156d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c836b7716a97021128da43e6fdb61096d5c4156d Merge: 846cf85e7137320ea59c29353071f9cdd97b92bc 73f4388aedade209650ed629ab767d3e2b636f7b Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 6 19:53:12 2006 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix EV64120 and Ocelot builds by providing a plat_timer_setup(). [MIPS] EV64120: Fix PCI interrupt allocation. [MIPS] Make irq number allocator generally available for fixing EV64120. [MIPS] EV64120: Fix timer initialization for HZ != 100. [MIPS] Ocelot 3: Fix MAC address detection after platform_device conversion. [MIPS] Ocelot C: Fix MAC address detection after platform_device conversion. [MIPS] SB1: On bootup only flush cache on local CPU. [MIPS] Ocelot 3: Fix large number of warnings. [MIPS] Ocelot C: Fix mapping of ioport address range. [MIPS] Ocelot C: Fix warning about missmatching format string. [MIPS] Ocelot C: fix eth registration after conversion to platform_device [MIPS] Ocelot C: Fix large number of warnings. commit 846cf85e7137320ea59c29353071f9cdd97b92bc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=846cf85e7137320ea59c29353071f9cdd97b92bc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=846cf85e7137320ea59c29353071f9cdd97b92bc Merge: 64651309a1f0de3da131c8dc1d279c932fa979c7 c5dec9fb248e3318f30a26f9984b3b064053a77f Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 6 19:52:29 2006 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines V4L/DVB (4770): Fix mode switch of Compro Videomate T300 V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T V4L/DVB (4786): Pvrusb2: use NULL instead of 0 V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060 commit 73f4388aedade209650ed629ab767d3e2b636f7b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=73f4388aedade209650ed629ab767d3e2b636f7b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=73f4388aedade209650ed629ab767d3e2b636f7b Author: Ralf Baechle <ra...@li...> Date: Mon Nov 6 18:17:35 2006 +0000 [MIPS] Fix EV64120 and Ocelot builds by providing a plat_timer_setup(). Signed-off-by: Ralf Baechle <ra...@li...> commit 4e5852f31a22094a19bbc305e42651b6c92f3008 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4e5852f31a22094a19bbc305e42651b6c92f3008 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4e5852f31a22094a19bbc305e42651b6c92f3008 Author: Ralf Baechle <ra...@li...> Date: Mon Nov 6 18:05:08 2006 +0000 [MIPS] EV64120: Fix PCI interrupt allocation. Signed-off-by: Ralf Baechle <ra...@li...> commit 4a4cf77923eeb3cec40a302656d6ab5ced04ba48 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4a4cf77923eeb3cec40a302656d6ab5ced04ba48 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4a4cf77923eeb3cec40a302656d6ab5ced04ba48 Author: Ralf Baechle <ra...@li...> Date: Mon Nov 6 17:41:06 2006 +0000 [MIPS] Make irq number allocator generally available for fixing EV64120. Signed-off-by: Ralf Baechle <ra...@li...> commit 325d08d1a44b601fbf70c259fb61c38d2af7d309 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=325d08d1a44b601fbf70c259fb61c38d2af7d309 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=325d08d1a44b601fbf70c259fb61c38d2af7d309 Author: Ralf Baechle <ra...@li...> Date: Mon Nov 6 13:32:39 2006 +0000 [MIPS] EV64120: Fix timer initialization for HZ != 100. Signed-off-by: Ralf Baechle <ra...@li...> commit ff28cbd2804105b144a7054e0302615e1da6749f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ff28cbd2804105b144a7054e0302615e1da6749f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ff28cbd2804105b144a7054e0302615e1da6749f Author: Ralf Baechle <ra...@li...> Date: Sun Nov 5 01:18:43 2006 +0000 [MIPS] Ocelot 3: Fix MAC address detection after platform_device conversion. Signed-off-by: Ralf Baechle <ra...@li...> commit 907c51b2d1705b022c3fb65b66cb4e5e09346433 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=907c51b2d1705b022c3fb65b66cb4e5e09346433 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=907c51b2d1705b022c3fb65b66cb4e5e09346433 Author: Ralf Baechle <ra...@li...> Date: Sun Nov 5 01:18:11 2006 +0000 [MIPS] Ocelot C: Fix MAC address detection after platform_device conversion. Signed-off-by: Ralf Baechle <ra...@li...> commit d6b861c6402307e30c7df24dcda911df64a5f9d6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d6b861c6402307e30c7df24dcda911df64a5f9d6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d6b861c6402307e30c7df24dcda911df64a5f9d6 Author: Ralf Baechle <ra...@li...> Date: Sat Nov 4 23:26:27 2006 +0000 [MIPS] SB1: On bootup only flush cache on local CPU. This fixes a warning on bootup warning in smp_call_function. Signed-off-by: Ralf Baechle <ra...@li...> commit d19f7befe929d400df89699eb51b8d7f4ef1b2d8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d19f7befe929d400df89699eb51b8d7f4ef1b2d8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d19f7befe929d400df89699eb51b8d7f4ef1b2d8 Author: Ralf Baechle <ra...@li...> Date: Sat Nov 4 13:02:46 2006 +0000 [MIPS] Ocelot 3: Fix large number of warnings. Signed-off-by: Ralf Baechle <ra...@li...> commit ad0b365573718a4a83266f98c9a49305c8eaf0b8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ad0b365573718a4a83266f98c9a49305c8eaf0b8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ad0b365573718a4a83266f98c9a49305c8eaf0b8 Author: Ralf Baechle <ra...@li...> Date: Fri Nov 3 18:06:33 2006 +0000 [MIPS] Ocelot C: Fix mapping of ioport address range. o Fix warnings o 768MB worth of I/O ports were insane o 64-bit kernels don't need special handling because ioremap does the magic Signed-off-by: Ralf Baechle <ra...@li...> commit 2002d2bde1a9ad10e2521b8b117c11abfbc2ee93 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2002d2bde1a9ad10e2521b8b117c11abfbc2ee93 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2002d2bde1a9ad10e2521b8b117c11abfbc2ee93 Author: Ralf Baechle <ra...@li...> Date: Fri Nov 3 17:48:17 2006 +0000 [MIPS] Ocelot C: Fix warning about missmatching format string. CC arch/mips/momentum/ocelot_c/setup.o arch/mips/momentum/ocelot_c/setup.c: In function 'momenco_time_init': arch/mips/momentum/ocelot_c/setup.c:223: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int' Change data type to match format string; a 32-bit type better suits our needs. Signed-off-by: Ralf Baechle <ra...@li...> commit 9c422e2ad6a1d8bd03e2e9d49e5c63b82165d596 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9c422e2ad6a1d8bd03e2e9d49e5c63b82165d596 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9c422e2ad6a1d8bd03e2e9d49e5c63b82165d596 Author: Ralf Baechle <ra...@li...> Date: Fri Nov 3 17:45:25 2006 +0000 [MIPS] Ocelot C: fix eth registration after conversion to platform_device Signed-off-by: Ralf Baechle <ra...@li...> commit cca72333e71e348995859b88628c1abcb58b759e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cca72333e71e348995859b88628c1abcb58b759e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cca72333e71e348995859b88628c1abcb58b759e Author: Ralf Baechle <ra...@li...> Date: Fri Nov 3 17:42:47 2006 +0000 [MIPS] Ocelot C: Fix large number of warnings. Signed-off-by: Ralf Baechle <ra...@li...> commit c5dec9fb248e3318f30a26f9984b3b064053a77f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c5dec9fb248e3318f30a26f9984b3b064053a77f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c5dec9fb248e3318f30a26f9984b3b064053a77f Author: Trent Piepho <xy...@sp...> Date: Sat Oct 14 15:44:44 2006 -0300 V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel When a front-end is disabled, card drivers that use it are compiled with a stub version of the front-end's attach function. This way they have no references to the front-end's code and don't need it to be loaded. If a card driver is compiled into the kernel, and a front-end is a module, then that front-end is effectively disabled wrt the card driver. In this case, the card driver should get the stub version. This was not happening. The stub vs real attach function selection is changed so that when the front-end is a module the real attach function is only used if the card driver is a module as well. This means a module front-end will be supported by card drivers that are modules and not supported by card drivers compiled into the kernel. Signed-off-by: Trent Piepho <xy...@sp...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit 9bb6e2593ad4cb94944f547154baee64b4734598 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9bb6e2593ad4cb94944f547154baee64b4734598 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9bb6e2593ad4cb94944f547154baee64b4734598 Author: Oliver Endriss <o.e...@gm...> Date: Fri Oct 27 18:02:01 2006 -0300 V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines TT DVB-C 2300 runs at 137 kHz I2C speed. short_delay mode did not work reliably on fast machines with that speed. Increased max loop count from 20 to 50. Moved dummy access out of the loop. Signed-off-by: Oliver Endriss <o.e...@gm...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit 588f98312c7fd1d86290583189d2eb24da70f752 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=588f98312c7fd1d86290583189d2eb24da70f752 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=588f98312c7fd1d86290583189d2eb24da70f752 Author: Hartmut Hackmann <har...@t-...> Date: Wed Oct 18 17:30:42 2006 -0300 V4L/DVB (4770): Fix mode switch of Compro Videomate T300 The board did not return to analog mode since the board specific "demod sleep" function was not called. Signed-off-by: Hartmut Hackmann <har...@t-...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit 9e741b74afc975da51ec60c5a8147b2ebcf7e33a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9e741b74afc975da51ec60c5a8147b2ebcf7e33a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9e741b74afc975da51ec60c5a8147b2ebcf7e33a Author: Raymond Mantchala <ray...@st...> Date: Mon Oct 30 23:20:50 2006 -0300 V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T Technotrend 1500 T card have "inverted inversion". This patch fixes that. Many thanks to Martin Zwickel from Technotrend for his confirmation and correction proposal. Signed-off-by: Raymond Mantchala <ray...@st...> Signed-off-by: Perceval Anichini <per...@st...> Signed-off-by: Oliver Endriss <o.e...@gm...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit c2625bff997f195e067ae11c9b0aa7217fb32991 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c2625bff997f195e067ae11c9b0aa7217fb32991 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c2625bff997f195e067ae11c9b0aa7217fb32991 Author: Randy Dunlap <ran...@or...> Date: Sun Oct 29 11:12:27 2006 -0300 V4L/DVB (4786): Pvrusb2: use NULL instead of 0 Fix sparse NULL usage warnings: drivers/media/video/pvrusb2/pvrusb2-v4l2.c:714:14: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:715:16: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-v4l2.c:1079:10: warning: Using plain integer as NULL pointer drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c:224:58: warning: Using plain integer as NULL pointer Signed-off-by: Randy Dunlap <ran...@or...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit ecba77f246011344f0b8f46eb25ae01ab4ae282d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ecba77f246011344f0b8f46eb25ae01ab4ae282d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ecba77f246011344f0b8f46eb25ae01ab4ae282d Author: David Härdeman <da...@ha...> Date: Fri Oct 27 20:56:51 2006 -0300 V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default The IR chip has no address decoding, so the IR data is always present in the high byte when doing a read from the saa7146 chip. This means that the DEBI address used is irrelevant to the IR decoding logic. DEBI addresses 0x1XXX are mapped to the registers on the CI module itself, but only the lowest two bits are actually used (see EN50221, section A.2.2.1), meaning that 0x1234 is equivalent to 0x1000 which maps to register 0 (the data register). A read from the data register is supposed to be preceded by a read from the size register, so some CI modules will be confused (the AlphaCrypt CAM will hang completely). The attached patch changes the address used when reading the IR data to use 0x4000 instead. This is the CI version address, which is a safer default, works with the AlphaCrypt CAM and matches the behaviour of the Windows driver (AFAIK). Signed-off-by: David Härdeman <da...@ha...> Signed-off-by: Oliver Endriss <o.e...@gm...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> commit 6c8c21b9119cfe68a99825085014bba4f9c0c768 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6c8c21b9119cfe68a99825085014bba4f9c0c768 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6c8c21b9119cfe68a99825085014bba4f9c0c768 Author: Trent Piepho <xy...@sp...> Date: Sat Oct 14 16:21:02 2006 -0300 V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060 Let the MT2060 be customized like most of the other DVB PLLs/front-ends. Also, add a missing dependency on I2C. Signed-off-by: Trent Piepho <xy...@sp...> Signed-off-by: Mauro Carvalho Chehab <mc...@in...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-06 22:42:05
|
New branch 'getuptodate' available with the following commits: commit 17b784e7fa4c4a5a8de3b62cc7fa659b6b64a1f4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=17b784e7fa4c4a5a8de3b62cc7fa659b6b64a1f4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=17b784e7fa4c4a5a8de3b62cc7fa659b6b64a1f4 Merge: babdd5b2a4f95715d5965115f3ed0889dcd100a8 64651309a1f0de3da131c8dc1d279c932fa979c7 Author: Jan-Benedict Glaw <jb...@d2...> Date: Mon Nov 6 23:41:35 2006 +0100 Merge branch 'master' into getuptodate This is the initial merge. It won't compile yet. Signed-off-my: Jan-Benedict Glaw <jb...@lu...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-06 22:11:42
|
arch/avr32/boards/atstk1000/setup.c | 9 ---- arch/avr32/kernel/head.S | 3 - arch/avr32/kernel/syscall-stubs.S | 9 ++++ arch/avr32/kernel/syscall_table.S | 1 arch/avr32/lib/findbit.S | 3 + arch/avr32/lib/io-readsb.S | 2 + arch/s390/Kconfig | 3 - arch/s390/defconfig | 1 arch/s390/kernel/setup.c | 55 +++++++++++++++++++++------- arch/s390/mm/init.c | 32 +++++++++++----- drivers/isdn/gigaset/common.c | 2 - drivers/misc/lkdtm.c | 8 ++-- drivers/net/Kconfig | 4 +- drivers/net/ehea/ehea.h | 5 -- drivers/net/ehea/ehea_ethtool.c | 2 - drivers/net/ehea/ehea_main.c | 26 ++++++------- drivers/net/ehea/ehea_phyp.c | 2 - drivers/net/ehea/ehea_phyp.h | 6 ++- drivers/net/ehea/ehea_qmr.c | 17 ++++---- drivers/net/wireless/bcm43xx/bcm43xx_leds.c | 7 +++ drivers/net/wireless/bcm43xx/bcm43xx_leds.h | 6 +++ drivers/net/wireless/bcm43xx/bcm43xx_main.c | 16 +++++++- drivers/net/wireless/hostap/hostap_plx.c | 4 +- fs/dlm/lockspace.c | 14 ++++++- fs/gfs2/inode.c | 3 + fs/gfs2/main.c | 4 +- fs/gfs2/ops_super.c | 44 ++++++++++++++-------- fs/lockd/svc.c | 3 - fs/nfs/sysctl.c | 5 -- include/asm-avr32/unistd.h | 3 + include/linux/sysctl.h | 23 ++++++++--- kernel/cpu.c | 2 - kernel/delayacct.c | 15 ++++--- kernel/sysctl.c | 30 +++++++++++++-- net/ieee80211/ieee80211_rx.c | 12 +++--- net/sunrpc/svcauth.c | 1 36 files changed, 251 insertions(+), 131 deletions(-) New commits: commit 64651309a1f0de3da131c8dc1d279c932fa979c7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=64651309a1f0de3da131c8dc1d279c932fa979c7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=64651309a1f0de3da131c8dc1d279c932fa979c7 Merge: b7651030a56b9aa80e9cb43b4c8bb28b89c42359 e2de7f565521a76fbbb927f701c5a1d381c71a93 Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 6 09:10:25 2006 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: [DLM] fix oops in kref_put when removing a lockspace [DLM] Fix kref_put oops [GFS2] Fix OOM error handling [GFS2] Fix incorrect fs sync behaviour. [GFS2] don't panic needlessly commit b7651030a56b9aa80e9cb43b4c8bb28b89c42359 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b7651030a56b9aa80e9cb43b4c8bb28b89c42359 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b7651030a56b9aa80e9cb43b4c8bb28b89c42359 Merge: bee42f626e2fee83cb7b51be9dc658c4f4046e77 6af0f5f83169ef215b4579834ddfb2691e8a7bff Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 6 09:07:19 2006 -0800 Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 * 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32: AVR32: Add missing return instruction in __raw_writesb AVR32: Wire up sys_epoll_pwait AVR32: Fix thinko in generic_find_next_zero_le_bit() AVR32: Get rid of board_early_init commit bee42f626e2fee83cb7b51be9dc658c4f4046e77 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bee42f626e2fee83cb7b51be9dc658c4f4046e77 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bee42f626e2fee83cb7b51be9dc658c4f4046e77 Merge: 64cb104e9d52f60cc18b9ed0d17edb34110a46b2 c4972f33169e3e1ce06ad00917ddaf2c3b49b36a Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 6 09:06:53 2006 -0800 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] IRQs too early enabled. [S390] revert add_active_range() usage patch. commit e2de7f565521a76fbbb927f701c5a1d381c71a93 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e2de7f565521a76fbbb927f701c5a1d381c71a93 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e2de7f565521a76fbbb927f701c5a1d381c71a93 Author: Patrick Caulfield <pca...@re...> Date: Mon Nov 6 08:53:28 2006 +0000 [DLM] fix oops in kref_put when removing a lockspace Now that the lockspace struct is freed when the last sysfs object is released this patch prevents use of that lockspace by sysfs. We attempt to re-get the lockspace from the lockspace list and fail the request if it has been removed. Signed-Off-By: Patrick Caulfield <pca...@re...> Signed-off-by: Steven Whitehouse <swh...@re...> commit ba542e3b92f9ea7c482ae56b68b9122eebc53a39 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ba542e3b92f9ea7c482ae56b68b9122eebc53a39 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ba542e3b92f9ea7c482ae56b68b9122eebc53a39 Author: Patrick Caulfield <pca...@re...> Date: Thu Nov 2 14:41:23 2006 +0000 [DLM] Fix kref_put oops This patch fixes the recounting on the lockspace kobject. Previously the lockspace was freed while userspace could have had a reference to one of its sysfs files, causing an oops in kref_put. Now the lockspace kfree is moved into the kobject release() function Signed-Off-By: Patrick Caulfield <pca...@re...> Signed-off-by: Steven Whitehouse <swh...@re...> commit 26d83dedf61d26d85f10bc34b92f4de7660fd746 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=26d83dedf61d26d85f10bc34b92f4de7660fd746 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=26d83dedf61d26d85f10bc34b92f4de7660fd746 Author: Steven Whitehouse <swh...@re...> Date: Mon Oct 30 16:59:08 2006 -0500 [GFS2] Fix OOM error handling Fix the OOM error handling in inode.c where it was possible for a NULL pointer to be dereferenced. Signed-off-by: Steven Whitehouse <swh...@re...> commit 4a221953ed121692aa25998451a57c7f4be8b4f6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4a221953ed121692aa25998451a57c7f4be8b4f6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4a221953ed121692aa25998451a57c7f4be8b4f6 Author: Steven Whitehouse <swh...@re...> Date: Wed Nov 1 09:57:57 2006 -0500 [GFS2] Fix incorrect fs sync behaviour. This adds a sync_fs superblock operation for GFS2 and removes the journal flush from write_super in favour of sync_fs where it ought to be. This is more or less identical to the way in which ext3 does this. This bug was pointed out by Russell Cattelan <cat...@re...> Cc: Russell Cattelan <cat...@re...> Signed-off-by: Steven Whitehouse <swh...@re...> commit eb1dc33aa235b0e44ada6716cda385883c6e6bff gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=eb1dc33aa235b0e44ada6716cda385883c6e6bff gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=eb1dc33aa235b0e44ada6716cda385883c6e6bff Author: Alexey Dobriyan <ado...@gm...> Date: Sat Oct 28 03:03:48 2006 +0400 [GFS2] don't panic needlessly First, SLAB_PANIC is unjustified. Second, all error propagating and backing out is in place. Signed-off-by: Alexey Dobriyan <ado...@gm...> Signed-off-by: Steven Whitehouse <swh...@re...> commit 6af0f5f83169ef215b4579834ddfb2691e8a7bff gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6af0f5f83169ef215b4579834ddfb2691e8a7bff gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6af0f5f83169ef215b4579834ddfb2691e8a7bff Author: Haavard Skinnemoen <hsk...@at...> Date: Mon Nov 6 14:06:45 2006 +0100 AVR32: Add missing return instruction in __raw_writesb __raw_writesb ends with a conditional branch, which is obviously wrong. It should return after the last loop terminates. Signed-off-by: Haavard Skinnemoen <hsk...@at...> commit bbfd2bf9028a55cb85ff51eb34dc663b7e49ed55 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bbfd2bf9028a55cb85ff51eb34dc663b7e49ed55 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bbfd2bf9028a55cb85ff51eb34dc663b7e49ed55 Author: Haavard Skinnemoen <hsk...@at...> Date: Mon Nov 6 14:02:44 2006 +0100 AVR32: Wire up sys_epoll_pwait Signed-off-by: Haavard Skinnemoen <hsk...@at...> commit c4972f33169e3e1ce06ad00917ddaf2c3b49b36a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c4972f33169e3e1ce06ad00917ddaf2c3b49b36a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c4972f33169e3e1ce06ad00917ddaf2c3b49b36a Author: Heiko Carstens <hei...@de...> Date: Mon Nov 6 10:49:02 2006 +0100 [S390] IRQs too early enabled. setup_lowcore() calls ctl_set_bit() which returns withs interrupts enabled. The setup arch code is not supposed to enable interrupts that early. Therefore use the __ctl_set_bit() variant. This fixes the not working lock dependency validator on non 64 bit systems. Signed-off-by: Heiko Carstens <hei...@de...> Signed-off-by: Martin Schwidefsky <sch...@de...> commit bcc8bcb1f0cc51c0042497d5de2d79743050e3bb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bcc8bcb1f0cc51c0042497d5de2d79743050e3bb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bcc8bcb1f0cc51c0042497d5de2d79743050e3bb Author: Heiko Carstens <hei...@de...> Date: Mon Nov 6 10:49:00 2006 +0100 [S390] revert add_active_range() usage patch. Commit 7676bef9c183fd573822cac9992927ef596d584c breaks DCSS support on s390. DCSS needs initialized struct pages to work. With the usage of add_active_range() only the struct pages for physically present pages are initialized. This could be fixed if the DCSS driver would initiliaze the struct pages itself, but this doesn't work too. This is because the mem_map array does not include holes after the last present memory area and therefore there is nothing that could be initialized. To fix this and to avoid some dirty hacks revert this patch for now. Will be added later when we move to a virtual mem_map. Cc: Carsten Otte <co...@de...> Cc: Adrian Bunk <bu...@st...> Signed-off-by: Heiko Carstens <hei...@de...> Signed-off-by: Martin Schwidefsky <sch...@de...> commit 64cb104e9d52f60cc18b9ed0d17edb34110a46b2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=64cb104e9d52f60cc18b9ed0d17edb34110a46b2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=64cb104e9d52f60cc18b9ed0d17edb34110a46b2 Merge: 0c7bb31db0e35d4b772fac452b722460ca368acf 78eb77a9cc3af73e3cd86a197b7c1f28fd840978 Author: Linus Torvalds <tor...@g5...> Date: Mon Nov 6 01:46:43 2006 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] Kconfig: remove redundant NETDEVICES depends [PATCH] ehea: 64K page support fix [PATCH] ehea: Removed redundant define [PATCH] ehea: Nullpointer dereferencation fix [PATCH] bcm43xx: fix unexpected LED control values in BCM4303 sprom [PATCH] bcm43xx: Fix low-traffic netdev watchdog TX timeouts [PATCH] hostap_plx: fix CIS verification [PATCH] ieee80211: don't flood log with errors commit 0c7bb31db0e35d4b772fac452b722460ca368acf gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0c7bb31db0e35d4b772fac452b722460ca368acf gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0c7bb31db0e35d4b772fac452b722460ca368acf Author: Akinobu Mita <aki...@gm...> Date: Sun Nov 5 23:52:13 2006 -0800 [PATCH] sunrpc: add missing spin_unlock auth_domain_put() forgot to unlock acquired spinlock. Cc: Olaf Kirch <ok...@mo...> Cc: Andy Adamson <an...@ci...> Cc: J. Bruce Fields <bf...@ci...> Acked-by: Trond Myklebust <Tro...@ne...> Signed-off-by: Akinobu Mita <aki...@gm...> Cc: Neil Brown <ne...@su...> Acked-by: Peter Zijlstra <a.p...@ch...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7cc13edc139108bb527b692f0548dce6bc648572 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7cc13edc139108bb527b692f0548dce6bc648572 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7cc13edc139108bb527b692f0548dce6bc648572 Author: Eric W. Biederman <ebi...@xm...> Date: Sun Nov 5 23:52:13 2006 -0800 [PATCH] sysctl: implement CTL_UNNUMBERED This patch takes the CTL_UNNUMBERD concept from NFS and makes it available to all new sysctl users. At the same time the sysctl binary interface maintenance documentation is updated to mention and to describe what is needed to successfully maintain the sysctl binary interface. Signed-off-by: Eric W. Biederman <ebi...@xm...> Acked-by: Alan Cox <al...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d99f160ac53e51090f015a8f0617cea25f81a191 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d99f160ac53e51090f015a8f0617cea25f81a191 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d99f160ac53e51090f015a8f0617cea25f81a191 Author: Eric W. Biederman <ebi...@xm...> Date: Sun Nov 5 23:52:12 2006 -0800 [PATCH] sysctl: allow a zero ctl_name in the middle of a sysctl table Since it is becoming clear that there are just enough users of the binary sysctl interface that completely removing the binary interface from the kernel will not be an option for foreseeable future, we need to find a way to address the sysctl maintenance issues. The basic problem is that sysctl requires one central authority to allocate sysctl numbers, or else conflicts and ABI breakage occur. The proc interface to sysctl does not have that problem, as names are not densely allocated. By not terminating a sysctl table until I have neither a ctl_name nor a procname, it becomes simple to add sysctl entries that don't show up in the binary sysctl interface. Which allows people to avoid allocating a binary sysctl value when not needed. I have audited the kernel code and in my reading I have not found a single sysctl table that wasn't terminated by a completely zero filled entry. So this change in behavior should not affect anything. I think this mechanism eases the pain enough that combined with a little disciple we can solve the reoccurring sysctl ABI breakage. Signed-off-by: Eric W. Biederman <ebi...@xm...> Acked-by: Alan Cox <al...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 0e009be8a0c2309f3696df70f72ef0075aa34c9c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0e009be8a0c2309f3696df70f72ef0075aa34c9c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0e009be8a0c2309f3696df70f72ef0075aa34c9c Author: Eric W. Biederman <ebi...@xm...> Date: Sun Nov 5 23:52:11 2006 -0800 [PATCH] Improve the removed sysctl warnings Don't warn about libpthread's access to kernel.version. When it receives -ENOSYS it will read /proc/sys/kernel/version. If anything else shows up print the sysctl number string. Signed-off-by: Eric W. Biederman <ebi...@xm...> Cc: Cal Peake <cp...@ab...> Cc: Alan Cox <al...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 64efade11cddc4237c1b95ea4ca18af122a7e19e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=64efade11cddc4237c1b95ea4ca18af122a7e19e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=64efade11cddc4237c1b95ea4ca18af122a7e19e Author: Peter Zijlstra <a.p...@ch...> Date: Sun Nov 5 23:52:10 2006 -0800 [PATCH] lockdep: fix delayacct locking bug Make the delayacct lock irqsave; this avoids the possible deadlock where an interrupt is taken while holding the delayacct lock which needs to take the delayacct lock. Signed-off-by: Peter Zijlstra <a.p...@ch...> Acked-by: Oleg Nesterov <ol...@tv...> Cc: Balbir Singh <ba...@in...> Cc: Shailabh Nagar <na...@wa...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit e5b9a335fd2180c6db1bcc4b24e83aff7481ebe3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e5b9a335fd2180c6db1bcc4b24e83aff7481ebe3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e5b9a335fd2180c6db1bcc4b24e83aff7481ebe3 Author: Tilman Schmidt <ti...@im...> Date: Sun Nov 5 23:52:08 2006 -0800 [PATCH] isdn/gigaset: convert warning message Make the failed-to-allocate-skb warning a non-debug message. Signed-off-by: Tilman Schmidt <ti...@im...> Cc: Hansjoerg Lipp <hj...@we...> Cc: Karsten Keil <kk...@su...> Cc: Kai Germaschewski <kai...@gm...> Cc: Akinobu Mita <aki...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 18a61e4adbc4dbe209e0d154df5cd37ce17dc314 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=18a61e4adbc4dbe209e0d154df5cd37ce17dc314 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=18a61e4adbc4dbe209e0d154df5cd37ce17dc314 Author: Ankita Garg <an...@in...> Date: Sun Nov 5 23:52:07 2006 -0800 [PATCH] Fix for LKDTM MEM_SWAPOUT crashpoint The MEM_SWAPOUT crashpoint in LKDTM could be broken as some compilers inline the call to shrink_page_list() and symbol lookup for this function name fails. Replacing it with the function shrink_inactive_list(), which is the only function calling shrink_page_list(). Signed-off-by: Ankita Garg <an...@in...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 4b96b1a10cb00c867103b21f0f2a6c91b705db11 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4b96b1a10cb00c867103b21f0f2a6c91b705db11 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4b96b1a10cb00c867103b21f0f2a6c91b705db11 Author: Gautham R Shenoy <eg...@in...> Date: Sun Nov 5 23:52:04 2006 -0800 [PATCH] Fix the spurious unlock_cpu_hotplug false warnings Cpu-hotplug locking has a minor race case caused because of setting the variable "recursive" to NULL *after* releasing the cpu_bitmask_lock in the function unlock_cpu_hotplug,instead of doing so before releasing the cpu_bitmask_lock. This was the cause of most of the recent false spurious lock_cpu_unlock warnings. This should fix the problem reported by Martin Lorenz reported in http://lkml.org/lkml/2006/10/29/127. Thanks to Srinivasa DS for pointing it out. Signed-off-by: Gautham R Shenoy <eg...@in...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 168c8fa32ff40d6caf7226a5abf2a0096f3393bf gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=168c8fa32ff40d6caf7226a5abf2a0096f3393bf gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=168c8fa32ff40d6caf7226a5abf2a0096f3393bf Author: Haavard Skinnemoen <hsk...@at...> Date: Tue Oct 31 20:01:11 2006 +0100 AVR32: Fix thinko in generic_find_next_zero_le_bit() The existing implementation of this function seems to be looking for a one although it should be looking for a zero. This causes trouble for the ext2 filesystem, which tends to report -ENOSPC without this patch. Fix this by complementing each word before scanning. Signed-off-by: Haavard Skinnemoen <hsk...@at...> commit e9a43850e6a99e335c8120579749389b376bc204 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e9a43850e6a99e335c8120579749389b376bc204 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e9a43850e6a99e335c8120579749389b376bc204 Author: Haavard Skinnemoen <hsk...@at...> Date: Mon Oct 30 09:31:27 2006 +0100 AVR32: Get rid of board_early_init board_early_init() is left over from some early prototyping work where we had to initialize the SDRAM controller ourselves. This depends on the kernel being loaded into static RAM, which just isn't possible on any commercially available products today. In order to run without a boot loader, we need to create a zImage stub or have the debugger initialize the SDRAM for us (for really low-level debugging) Signed-off-by: Haavard Skinnemoen <hsk...@at...> commit 78eb77a9cc3af73e3cd86a197b7c1f28fd840978 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=78eb77a9cc3af73e3cd86a197b7c1f28fd840978 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=78eb77a9cc3af73e3cd86a197b7c1f28fd840978 Merge: a81c52a81d6dbe6a36bce18112da04f20b175192 df6d7c94b0c3ae6a1185c9e5fa8ee3368e4a5efb Author: Jeff Garzik <je...@ga...> Date: Mon Nov 6 02:58:09 2006 -0500 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit a81c52a81d6dbe6a36bce18112da04f20b175192 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a81c52a81d6dbe6a36bce18112da04f20b175192 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a81c52a81d6dbe6a36bce18112da04f20b175192 Author: Randy Dunlap <ran...@or...> Date: Wed Nov 1 21:18:58 2006 -0800 [PATCH] Kconfig: remove redundant NETDEVICES depends drivers/net/Kconfig says: # All the following symbols are dependent on NETDEVICES - do not repeat # that for each of the symbols. so remove duplicate 'depends' uses of NETDEVICES. Signed-off-by: Randy Dunlap <ran...@or...> Signed-off-by: Jeff Garzik <je...@ga...> commit a1d261c561522151cb96c75f1dd1a51cf17665cf gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a1d261c561522151cb96c75f1dd1a51cf17665cf gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a1d261c561522151cb96c75f1dd1a51cf17665cf Author: Thomas Klein <oss...@de...> Date: Fri Nov 3 17:48:23 2006 +0100 [PATCH] ehea: 64K page support fix This patch fixes 64k page support by using PAGE_MASK and appropriate pagesize defines in several places. Signed-off-by: Thomas Klein <tk...@de...> Signed-off-by: Jeff Garzik <je...@ga...> commit 07fd06b3bc1589e44aefd02eb28700a51b3c9d12 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=07fd06b3bc1589e44aefd02eb28700a51b3c9d12 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=07fd06b3bc1589e44aefd02eb28700a51b3c9d12 Author: Thomas Klein <oss...@de...> Date: Fri Nov 3 17:47:52 2006 +0100 [PATCH] ehea: Removed redundant define Removed define H_CB_ALIGNMENT which is already defined in include/asm-powerpc/hvcall.h Signed-off-by: Thomas Klein <tk...@de...> Signed-off-by: Jeff Garzik <je...@ga...> commit 1b5135d9b922fdcf46e1e7383167d93d42635fb4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1b5135d9b922fdcf46e1e7383167d93d42635fb4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1b5135d9b922fdcf46e1e7383167d93d42635fb4 Author: Thomas Klein <oss...@de...> Date: Fri Nov 3 17:47:20 2006 +0100 [PATCH] ehea: Nullpointer dereferencation fix Fix: Must check for nullpointer before dereferencing it - not afterwards. Signed-off-by: Thomas Klein <tk...@de...> Signed-off-by: Jeff Garzik <je...@ga...> commit df6d7c94b0c3ae6a1185c9e5fa8ee3368e4a5efb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=df6d7c94b0c3ae6a1185c9e5fa8ee3368e4a5efb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=df6d7c94b0c3ae6a1185c9e5fa8ee3368e4a5efb Author: Larry Finger <Lar...@lw...> Date: Tue Oct 17 23:38:26 2006 -0500 [PATCH] bcm43xx: fix unexpected LED control values in BCM4303 sprom The bcm43xx driver uses 4 locations in the devices sprom to determine the behavior of the leds. Certain defaults are assigned if all bits are set in those locations. On at least one BCM4303 chip, the sprom contains values other than the default, which executes an assertion placed in the default case of a following switch statement. This patch makes the leds on the above mentioned interface behave correctly. In addition, it limits the number of logged messages to 20 for the case of unexpected values in the sprom locations. Signed-off-by: Larry Finger <Lar...@lw...> Signed-off-by: John W. Linville <lin...@tu...> commit 81e171b95d2d06a64465a1e6ab1e2fb864ea2448 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=81e171b95d2d06a64465a1e6ab1e2fb864ea2448 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=81e171b95d2d06a64465a1e6ab1e2fb864ea2448 Author: Michael Buesch <mb...@bu...> Date: Sat Oct 28 17:52:34 2006 -0500 [PATCH] bcm43xx: Fix low-traffic netdev watchdog TX timeouts This fixes a netdev watchdog timeout problem. The software needs to call netif_tx_disable before running the hardware calibration code. The problem condition can be shown by the following timegraph. |---5secs - ~10 jiffies time---|---|OOPS ^ ^ last real TX periodic work stops netif At OOPS, the following happens: The watchdog timer triggers, because the timeout of 5secs is over. The watchdog first checks for stopped TX. _Usually_ TX is only stopped from the TX handler to indicate a full TX queue. But this is different. We need to stop TX here, regardless of the TX queue state. So the watchdog recognizes the stopped device and assumes it is stopped due to full TX queues (Which is a _wrong_ assumption in this case). It then tests how far the last TX has been in the past. If it's more than 5secs (which is the case for low or no traffic), it will fire a TX timeout. Signed-off-by: Michael Buesch <mb...@bu...> Signed-off-by: Larry Finger <Lar...@lw...> Signed-off-by: John W. Linville <lin...@tu...> commit 115e222d538e7838bffa0f76409acd9816a0ef32 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=115e222d538e7838bffa0f76409acd9816a0ef32 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=115e222d538e7838bffa0f76409acd9816a0ef32 Author: Pavel Roskin <pr...@gn...> Date: Tue Oct 24 22:41:27 2006 -0400 [PATCH] hostap_plx: fix CIS verification The length of the manfid CIS should be at least 4, and it's normally 4. It's incorrect to require it to be at least 5. This breaks support for most (if not all) cards. The right place to ensure that we don't access beyond the CIS buffer is to strengthen another check. Make sure that the next tuple begins at least at the CIS buffer end (in which case we stop processing) or before that. Reported by ph...@fr... Signed-off-by: Pavel Roskin <pr...@gn...> Signed-off-by: John W. Linville <lin...@tu...> commit aec41a0d02342fc9e3b6bb278eae50fa29f04d1f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=aec41a0d02342fc9e3b6bb278eae50fa29f04d1f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=aec41a0d02342fc9e3b6bb278eae50fa29f04d1f Author: Jiri Benc <jb...@su...> Date: Wed Oct 18 19:34:40 2006 +0200 [PATCH] ieee80211: don't flood log with errors The "ieee80211: Workaround malformed 802.11 frames from AP" patch (see http://kernel.org/git/?p=linux/kernel/git/linville/wireless-2.6.git;a=commit;h=f09fc44d8c25f22c4d985bb93857338ed02feac6 ) fixes the problem with some buggy APs but also converts debug message into an error one. This floods the log with errors when you are near such AP (you get a message for every beacon). This patch reverts the error message back to the debug one. Signed-off-by: Jiri Benc <jb...@su...> Signed-off-by: John W. Linville <lin...@tu...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-06 09:11:23
|
arch/sparc/kernel/entry.S | 3 - arch/sparc/kernel/systbls.S | 5 +- arch/sparc64/kernel/entry.S | 3 - arch/sparc64/kernel/systbls.S | 8 ++- drivers/net/tg3.c | 8 +-- include/asm-sparc/unistd.h | 9 ++-- include/asm-sparc64/unistd.h | 10 +++- include/linux/ipx.h | 14 +++--- include/net/inet_ecn.h | 2 include/net/ipx.h | 26 ++++++------ net/Kconfig | 3 - net/core/pktgen.c | 30 ++++++++------ net/core/sock.c | 2 net/ipv6/ndisc.c | 1 net/ipv6/sit.c | 1 net/ipx/af_ipx.c | 85 +++++++++++++++++++++------------------- net/ipx/ipx_proc.c | 12 ++--- net/ipx/ipx_route.c | 14 +++--- net/netfilter/nfnetlink_log.c | 8 +-- net/netfilter/nfnetlink_queue.c | 2 net/netlabel/Kconfig | 2 21 files changed, 135 insertions(+), 113 deletions(-) New commits: commit d1ed6a3ea10aa7b199c434f6ffd1b6761896567a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d1ed6a3ea10aa7b199c434f6ffd1b6761896567a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d1ed6a3ea10aa7b199c434f6ffd1b6761896567a Merge: 59359ff87700f5e742c96a55da9cf0819984c128 38c94377a36f70e86665231c9f477e445c806618 Author: Linus Torvalds <tor...@g5...> Date: Sun Nov 5 19:10:04 2006 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NETLABEL]: Fix build failure. [IPV6]: Give sit driver an appropriate module alias. [IPV6]: Add ndisc_netdev_notifier unregister. [NET]: __alloc_pages() failures reported due to fragmentation [PKTGEN]: TCI endianness fixes [TG3]: Fix 2nd ifup failure on 5752M. [NETFILTER] bug: skb->protocol is already net-endian [NETFILTER] bug: nfulnl_msg_config_mode ->copy_range is 32bit [NETFILTER] bug: NFULA_CFG_QTHRESH uses 32bit [IPV6]: Fix ECN bug on big-endian [IPX]: Annotate and fix IPX checksum [IPX]: Trivial parts of endianness annotations commit 59359ff87700f5e742c96a55da9cf0819984c128 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=59359ff87700f5e742c96a55da9cf0819984c128 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=59359ff87700f5e742c96a55da9cf0819984c128 Author: David S. Miller <da...@da...> Date: Sun Nov 5 16:51:03 2006 -0800 [SPARC]: Fix robust futex syscalls and wire up migrate_pages. When I added the entries for the robust futex syscall entries, I forgot to bump NR_SYSCALLS. The current situation is error-prone because NR_SYSCALLS lives in entry.S where the system call limit checks are enforced. Move the definition to asm/unistd.h in order to make this mistake much more difficult to make. And wire up sys_migrate_pages since the powerpc folks implemented the compat wrapper for us. Signed-off-by: David S. Miller <da...@da...> commit 38c94377a36f70e86665231c9f477e445c806618 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=38c94377a36f70e86665231c9f477e445c806618 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=38c94377a36f70e86665231c9f477e445c806618 Author: Paul Moore <pau...@hp...> Date: Sun Nov 5 16:44:06 2006 -0800 [NETLABEL]: Fix build failure. > the build with the attached .config failed, make ends with: > ... > : undefined reference to `cipso_v4_sock_getattr' > net/built-in.o: In function `netlbl_socket_getattr': ... It looks like I was stupid and made NetLabel depend on CONFIG_NET and not CONFIG_INET, the patch below should fix this by making NetLabel depend on CONFIG_INET and CONFIG_SECURITY. Please review and apply for 2.6.19. Signed-off-by: Paul Moore <pau...@hp...> Signed-off-by: David S. Miller <da...@da...> commit daccff024ffeb21caa2cc479ccc33b2ec50705b1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=daccff024ffeb21caa2cc479ccc33b2ec50705b1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=daccff024ffeb21caa2cc479ccc33b2ec50705b1 Author: Patrick McHardy <ka...@tr...> Date: Sun Nov 5 15:47:04 2006 -0800 [IPV6]: Give sit driver an appropriate module alias. It would be nice to keep things working even with this built as a module, it took me some time to realize my IPv6 tunnel was broken because of the missing sit module. This module alias fixes things until distributions have added an appropriate alias to modprobe.conf. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 36f73d0c3b7efa72cd8b89f2d429ff39bc12f15c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=36f73d0c3b7efa72cd8b89f2d429ff39bc12f15c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=36f73d0c3b7efa72cd8b89f2d429ff39bc12f15c Author: Dmitry Mishin <di...@op...> Date: Fri Nov 3 16:08:19 2006 -0800 [IPV6]: Add ndisc_netdev_notifier unregister. If inet6_init() fails later than ndisc_init() call, or IPv6 module is unloaded, ndisc_netdev_notifier call remains in the list and will follows in oops later. Signed-off-by: Dmitry Mishin <di...@op...> Signed-off-by: David S. Miller <da...@da...> commit db38c179a759a9c4722525e8c9f09ac80e372377 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=db38c179a759a9c4722525e8c9f09ac80e372377 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=db38c179a759a9c4722525e8c9f09ac80e372377 Author: Larry Woodman <lwo...@re...> Date: Fri Nov 3 16:05:45 2006 -0800 [NET]: __alloc_pages() failures reported due to fragmentation We have seen a couple of __alloc_pages() failures due to fragmentation, there is plenty of free memory but no large order pages available. I think the problem is in sock_alloc_send_pskb(), the gfp_mask includes __GFP_REPEAT but its never used/passed to the page allocator. Shouldnt the gfp_mask be passed to alloc_skb() ? Signed-off-by: Larry Woodman <lwo...@re...> Signed-off-by: David S. Miller <da...@da...> commit 0f37c6057414fb68024793966b1dcb6a135cb844 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0f37c6057414fb68024793966b1dcb6a135cb844 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0f37c6057414fb68024793966b1dcb6a135cb844 Author: Al Viro <vi...@ze...> Date: Fri Nov 3 03:49:56 2006 -0800 [PKTGEN]: TCI endianness fixes open-coded variant there works only for little-endian Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: David S. Miller <da...@da...> commit 36da4d869f23bc7d1a70a3185218cb626537845c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=36da4d869f23bc7d1a70a3185218cb626537845c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=36da4d869f23bc7d1a70a3185218cb626537845c Author: Michael Chan <mc...@br...> Date: Fri Nov 3 01:01:03 2006 -0800 [TG3]: Fix 2nd ifup failure on 5752M. This fixes a bug reported in: http://bugzilla.kernel.org/show_bug.cgi?id=7438 tg3_close() turns off the PHY if WoL and ASF are both disabled. On the next tg3_open(), some devices such as the 5752M will not be brought up correctly without a PHY reset early in the reset sequence. The PHY clock is needed for some internal MAC blocks to function correctly. This problem is fixed by always resetting the PHY early in tg3_reset_hw() when it is called from tg3_open() or tg3_resume(). tg3_setup_phy() can then be called later in the sequence without the reset_phy parameter set to 1, since the PHY reset is already done. Update version to 3.68. Signed-off-by: Michael Chan <mc...@br...> Signed-off-by: David S. Miller <da...@da...> commit febf0a431e42f5a1fdb2b763273700610552ddcc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=febf0a431e42f5a1fdb2b763273700610552ddcc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=febf0a431e42f5a1fdb2b763273700610552ddcc Author: Al Viro <vi...@ze...> Date: Fri Nov 3 00:59:17 2006 -0800 [NETFILTER] bug: skb->protocol is already net-endian htons() is not needed (and no, it's not misspelled ntohs() - userland expects net-endian here). Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: David S. Miller <da...@da...> commit d1208b999dd367b72168cc3c7f8d8d2c95143c67 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d1208b999dd367b72168cc3c7f8d8d2c95143c67 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d1208b999dd367b72168cc3c7f8d8d2c95143c67 Author: Al Viro <vi...@ze...> Date: Fri Nov 3 00:58:41 2006 -0800 [NETFILTER] bug: nfulnl_msg_config_mode ->copy_range is 32bit Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: David S. Miller <da...@da...> commit 7ac00a24f379f8ab9d3c968fea3dc030a45956fd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7ac00a24f379f8ab9d3c968fea3dc030a45956fd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7ac00a24f379f8ab9d3c968fea3dc030a45956fd Author: Al Viro <vi...@ze...> Date: Fri Nov 3 00:58:17 2006 -0800 [NETFILTER] bug: NFULA_CFG_QTHRESH uses 32bit Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: David S. Miller <da...@da...> commit 95026cd242bd4188a036f2eba20994113ed5a5d7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=95026cd242bd4188a036f2eba20994113ed5a5d7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=95026cd242bd4188a036f2eba20994113ed5a5d7 Author: Al Viro <vi...@ze...> Date: Fri Nov 3 00:55:35 2006 -0800 [IPV6]: Fix ECN bug on big-endian __constant_htons(2<<4) is not a replacement for htonl(2<<20). Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: David S. Miller <da...@da...> commit 02e60370d4dac83f22d5ae75d5512bcb9a3f24b7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=02e60370d4dac83f22d5ae75d5512bcb9a3f24b7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=02e60370d4dac83f22d5ae75d5512bcb9a3f24b7 Author: Al Viro <vi...@ze...> Date: Fri Nov 3 00:28:23 2006 -0800 [IPX]: Annotate and fix IPX checksum Calculation of IPX checksum got buggered about 2.4.0. The old variant mangled the packet; that got fixed, but calculation itself got buggered. Restored the correct logics, fixed a subtle breakage we used to have even back then: if the sum is 0 mod 0xffff, we want to return 0, not 0xffff. The latter has special meaning for IPX (cheksum disabled). Observation (and obvious fix) nicked from history of FreeBSD ipx_cksum.c... Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: David S. Miller <da...@da...> commit 4833ed094097323f5f219820f6ebdc8dd66f501f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4833ed094097323f5f219820f6ebdc8dd66f501f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4833ed094097323f5f219820f6ebdc8dd66f501f Author: Al Viro <vi...@ze...> Date: Fri Nov 3 00:27:06 2006 -0800 [IPX]: Trivial parts of endianness annotations Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: David S. Miller <da...@da...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-05 08:22:15
|
fs/jfs/xattr.c | 9 +++++---- fs/splice.c | 26 ++++++++++++++++++++------ ipc/msg.c | 2 +- kernel/signal.c | 15 +++++++++++---- kernel/user.c | 11 +++++++++++ 5 files changed, 48 insertions(+), 15 deletions(-) New commits: commit 10b1fbdb0a0ca91847a534ad26d0bc250c25b74f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=10b1fbdb0a0ca91847a534ad26d0bc250c25b74f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=10b1fbdb0a0ca91847a534ad26d0bc250c25b74f Author: Linus Torvalds <tor...@g5...> Date: Sat Nov 4 13:03:00 2006 -0800 Make sure "user->sigpending" count is in sync The previous commit (45c18b0bb579b5c1b89f8c99f1b6ffa4c586ba08, aka "Fix unlikely (but possible) race condition on task->user access") fixed a potential oops due to __sigqueue_alloc() getting its "user" pointer out of sync with switch_user(), and accessing a user pointer that had been de-allocated on another CPU. It still left another (much less serious) problem, where a concurrent __sigqueue_alloc and swich_user could cause sigqueue_alloc to do signal pending reference counting for a _different_ user than the one it then actually ended up using. No oops, but we'd end up with the wrong signal accounting. Another case of Oleg's eagle-eyes picking up the problem. This is trivially fixed by just making sure we load whichever "user" structure we decide to use (it doesn't matter _which_ one we pick, we just need to pick one) just once. Acked-by: Oleg Nesterov <ol...@tv...> Cc: Andrew Morton <ak...@os...> Cc: Ingo Molnar <mi...@el...> Signed-off-by: Linus Torvalds <tor...@os...> commit 45c18b0bb579b5c1b89f8c99f1b6ffa4c586ba08 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=45c18b0bb579b5c1b89f8c99f1b6ffa4c586ba08 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=45c18b0bb579b5c1b89f8c99f1b6ffa4c586ba08 Author: Linus Torvalds <tor...@g5...> Date: Sat Nov 4 10:06:02 2006 -0800 Fix unlikely (but possible) race condition on task->user access There's a possible race condition when doing a "switch_uid()" from one user to another, which could race with another thread doing a signal allocation and looking at the old thread ->user pointer as it is freed. This explains an oops reported by Lukasz Trabinski: http://permalink.gmane.org/gmane.linux.kernel/462241 We fix this by delaying the (reference-counted) freeing of the user structure until the thread signal handler lock has been released, so that we know that the signal allocation has either seen the new value or has properly incremented the reference count of the old one. Race identified by Oleg Nesterov. Cc: Lukasz Trabinski <lu...@ws...> Cc: Oleg Nesterov <ol...@tv...> Cc: Andrew Morton <ak...@os...> Cc: Ingo Molnar <mi...@el...> Signed-off-by: Linus Torvalds <tor...@os...> commit 80491eb90c750fcd7d13830062f27ae9b7cc5f75 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=80491eb90c750fcd7d13830062f27ae9b7cc5f75 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=80491eb90c750fcd7d13830062f27ae9b7cc5f75 Author: Linus Torvalds <tor...@g5...> Date: Sat Nov 4 09:55:00 2006 -0800 Revert unintentional "volatile" changes in ipc/msg.c Commit 5a06a363ef48444186f18095ae1b932dddbbfa89 ("[PATCH] ipc/msg.c: clean up coding style") breaks fakeroot on Alpha (variously hangs or oopses), according to a report by Falk Hueffner. The fact that the code seems to rely on compiler access ordering through the use of "volatile" is a pretty certain sign that the code has locking problems, and we should fix those properly and then remove the whole "volatile" entirely. But in the meantime, the movement of "volatile" was unintentional, and should be reverted. Cc: Falk Hueffner <fa...@de...> Cc: Andrew Morton <ak...@os...> Acked-by: Ingo Molnar <mi...@el...> Signed-off-by: Linus Torvalds <tor...@os...> commit ddac0d39cf437d02fde9795ae57d9c4b4c146de9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ddac0d39cf437d02fde9795ae57d9c4b4c146de9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ddac0d39cf437d02fde9795ae57d9c4b4c146de9 Author: Jens Axboe <jen...@or...> Date: Sat Nov 4 12:49:32 2006 +0100 [PATCH] splice: fix problem introduced with inode diet After the inode slimming patch that unionised i_pipe/i_bdev/i_cdev, it's no longer enough to check for existance of ->i_pipe to verify that this is a pipe. Original patch from Eric Dumazet <da...@co...> Final solution suggested by Linus. Signed-off-by: Jens Axboe <jen...@or...> Signed-off-by: Linus Torvalds <tor...@os...> commit aaa9b971398f62ab97c1da4f7c352667eb3452c9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=aaa9b971398f62ab97c1da4f7c352667eb3452c9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=aaa9b971398f62ab97c1da4f7c352667eb3452c9 Merge: a0d2db26582a67b61f883d1469e561fbdef28419 d572b87946f8c598b3cad86a7913862dd48daadb Author: Linus Torvalds <tor...@g5...> Date: Sat Nov 4 08:11:20 2006 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: Remove redundant xattr permission checking commit d572b87946f8c598b3cad86a7913862dd48daadb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d572b87946f8c598b3cad86a7913862dd48daadb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d572b87946f8c598b3cad86a7913862dd48daadb Author: Dave Kleikamp <sh...@au...> Date: Thu Nov 2 10:50:40 2006 -0600 JFS: Remove redundant xattr permission checking The vfs handles most permissions for setting and retrieving xattrs. This patch removes a redundant and wrong check so that it won't override the correct behavior which is being fixed in the vfs. Signed-off-by: Dave Kleikamp <sh...@au...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-04 10:48:51
|
Documentation/ABI/testing/sysfs-power | 17 + Documentation/DocBook/Makefile | 2 Documentation/DocBook/filesystems.tmpl | 300 ++++++++++++++++++++++++++++ Documentation/DocBook/journal-api.tmpl | 333 -------------------------------- Documentation/accounting/getdelays.c | 2 Documentation/kernel-doc-nano-HOWTO.txt | 2 Documentation/power/interface.txt | 13 + Documentation/usb/usb-serial.txt | 6 arch/i386/kernel/acpi/boot.c | 2 arch/i386/pci/common.c | 1 arch/i386/pci/i386.c | 9 arch/i386/pci/pci.h | 1 arch/um/include/sysdep-i386/barrier.h | 9 arch/um/include/sysdep-x86_64/barrier.h | 7 arch/um/os-Linux/process.c | 1 arch/um/os-Linux/signal.c | 31 ++ arch/um/os-Linux/skas/process.c | 2 arch/um/os-Linux/tls.c | 2 block/ll_rw_blk.c | 9 drivers/char/ipmi/ipmi_si_intf.c | 2 drivers/edac/edac_mc.c | 45 ++-- drivers/ide/pci/amd74xx.c | 7 drivers/isdn/hysdn/hysdn_sched.c | 19 - drivers/md/md.c | 2 drivers/misc/lkdtm.c | 24 +- drivers/pci/Kconfig | 2 drivers/spi/spi.c | 1 drivers/usb/class/usblp.c | 3 drivers/usb/core/hub.c | 3 drivers/usb/input/hid-core.c | 63 ++++-- drivers/usb/input/usbtouchscreen.c | 2 drivers/usb/input/xpad.c | 41 +++ drivers/usb/net/Kconfig | 8 drivers/usb/net/usbnet.c | 58 +++-- drivers/usb/serial/Kconfig | 4 drivers/usb/serial/cp2101.c | 3 drivers/usb/serial/sierra.c | 3 drivers/usb/storage/unusual_devs.h | 9 fs/cifs/file.c | 23 -- fs/compat.c | 20 + fs/ecryptfs/crypto.c | 2 fs/fuse/file.c | 9 fs/gfs2/ops_address.c | 7 fs/nfsd/nfs4recover.c | 2 fs/reiserfs/super.c | 1 fs/xattr.c | 13 - include/asm-powerpc/systbl.h | 2 include/asm-powerpc/unistd.h | 2 include/linux/compat.h | 4 include/linux/kernel.h | 2 include/linux/pm.h | 4 include/linux/ufs_fs.h | 2 ipc/msg.c | 1 ipc/sem.c | 1 ipc/shm.c | 1 ipc/util.c | 2 ipc/util.h | 12 + kernel/compat.c | 33 +++ kernel/futex.c | 7 kernel/power/disk.c | 37 ++- kernel/printk.c | 21 ++ kernel/sys_ni.c | 1 mm/migrate.c | 3 mm/page_alloc.c | 2 mm/readahead.c | 2 mm/slab.c | 2 scripts/basic/docproc.c | 2 67 files changed, 740 insertions(+), 528 deletions(-) New commits: commit a0d2db26582a67b61f883d1469e561fbdef28419 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a0d2db26582a67b61f883d1469e561fbdef28419 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a0d2db26582a67b61f883d1469e561fbdef28419 Merge: ced3985faebc232deec0dd9cc375cb5a43d18391 bb44c308ee37c14ab63251e27d6d8b4dc73a10a4 Author: Linus Torvalds <tor...@g5...> Date: Fri Nov 3 12:28:45 2006 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: PCI: Let PCI_MULTITHREAD_PROBE depend on BROKEN PCI: Revert "PCI: i386/x86_84: disable PCI resource decode on device disable" commit ced3985faebc232deec0dd9cc375cb5a43d18391 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ced3985faebc232deec0dd9cc375cb5a43d18391 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ced3985faebc232deec0dd9cc375cb5a43d18391 Merge: f1f2d8713d16a1e198880bbc716eb24fae09c858 18ee91fa9815fa3bb4e51cdcb8229bd0a0f11a70 Author: Linus Torvalds <tor...@g5...> Date: Fri Nov 3 12:28:27 2006 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: use MII hooks only if CONFIG_MII is enabled USB Storage: unusual_devs.h entry for Sony Ericsson P990i USB: xpad: additional USB id's added USB: fix compiler issues with newer gcc versions USB: HID: add blacklist AIRcable USB, little beautification USB: usblp: fix system suspend for some systems USB: failure in usblp's error path usbtouchscreen: use endpoint address from endpoint descriptor USB: sierra: Fix id for Sierra Wireless MC8755 in new table USB: new VID/PID-combos for cp2101 hid-core: big-endian fix fix USB: usb-storage: Unusual_dev update USB: add another sierra wireless device id commit f1f2d8713d16a1e198880bbc716eb24fae09c858 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f1f2d8713d16a1e198880bbc716eb24fae09c858 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f1f2d8713d16a1e198880bbc716eb24fae09c858 Author: Andreas Gruenbacher <ag...@su...> Date: Thu Nov 2 22:07:29 2006 -0800 [PATCH] Fix user.* xattr permission check for sticky dirs The user.* extended attributes are only allowed on regular files and directories. Sticky directories further restrict write access to the owner and privileged users. (See the attr(5) man page for an explanation.) The original check in ext2/ext3 when user.* xattrs were merged was more restrictive than intended, and when the xattr permission checks were moved into the VFS, read access to user.* attributes on sticky directores ended up being denied in addition. Originally-from: Gerard Neil <xy...@de...> Signed-off-by: Andreas Gruenbacher <ag...@su...> Cc: Dave Kleikamp <sh...@au...> Cc: Jan Engelhardt <je...@li...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 8ce08464d2c749610a52c4d6c7c11080a7eaaef1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8ce08464d2c749610a52c4d6c7c11080a7eaaef1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8ce08464d2c749610a52c4d6c7c11080a7eaaef1 Author: Stephen Rothwell <sf...@ca...> Date: Thu Nov 2 22:07:28 2006 -0800 [PATCH] Fix sys_move_pages when a NULL node list is passed sys_move_pages() uses vmalloc() to allocate an array of structures that is fills with information passed from user mode and then passes to do_stat_pages() (in the case the node list is NULL). do_stat_pages() depends on a marker in the node field of the structure to decide how large the array is and this marker is correctly inserted into the last element of the array. However, vmalloc() doesn't zero the memory it allocates and if the user passes NULL for the node list, then the node fields are not filled in (except for the end marker). If the memory the vmalloc() returned happend to have a word with the marker value in it in just the right place, do_pages_stat will fail to fill the status field of part of the array and we will return (random) kernel data to user mode. Signed-off-by: Stephen Rothwell <sf...@ca...> Cc: Christoph Lameter <cla...@en...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit cda5e61a8e0b11826780b8e5a4155683f0557c8b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cda5e61a8e0b11826780b8e5a4155683f0557c8b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cda5e61a8e0b11826780b8e5a4155683f0557c8b Author: Peer Chen <pc...@nv...> Date: Thu Nov 2 22:07:27 2006 -0800 [PATCH] IDE: Add the support of nvidia PATA controllers of MCP67 to amd74xx.c Add support for PATA controllers of MCP67 to amd74xx.c. Signed-off-by: Peer Chen <pc...@nv...> Cc: Jeff Garzik <je...@ga...> Acked-by: Alan Cox <al...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 8804023061b3447fbaddbd286d78170ad88d1a43 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8804023061b3447fbaddbd286d78170ad88d1a43 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8804023061b3447fbaddbd286d78170ad88d1a43 Author: Oleg Nesterov <ol...@tv...> Date: Thu Nov 2 22:07:26 2006 -0800 [PATCH] fix Documentation/accounting/getdelays.c buf size getdelays reports a "fatal reply error, errno 258". We don't have enough room for multi-threaded exit (PID + TGID). Signed-off-by: Oleg Nesterov <ol...@tv...> Cc: Balbir Singh <ba...@in...> Cc: Shailabh Nagar <na...@wa...> Cc: Jay Lan <jl...@en...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 1f604c4bc078213aa1c4576efa0e8dad98522fa7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1f604c4bc078213aa1c4576efa0e8dad98522fa7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1f604c4bc078213aa1c4576efa0e8dad98522fa7 Author: Amol Lad <am...@ve...> Date: Thu Nov 2 22:07:25 2006 -0800 [PATCH] drivers/isdn/hysdn/hysdn_sched.c: sleep after taking spinlock fix spin_lock_irq{save,restore} is incorrectly called here (the function can sleep after acquring the lock). done the necessary corrections and removed unwanted cli/sti. Signed-off-by: Amol Lad <am...@ve...> Signed-off-by: Karsten Keil <kk...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 43530d2b04b63ac4bb4ac25deee5f1180ccedc2e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=43530d2b04b63ac4bb4ac25deee5f1180ccedc2e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=43530d2b04b63ac4bb4ac25deee5f1180ccedc2e Author: Stephen Rothwell <sf...@ca...> Date: Thu Nov 2 22:07:24 2006 -0800 [PATCH] powerpc: wire up sys_migrate_pages Signed-off-by: Stephen Rothwell <sf...@ca...> Cc: Christoph Lameter <cla...@sg...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3fd593979802f81ff6452596ac61e3840f917589 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3fd593979802f81ff6452596ac61e3840f917589 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3fd593979802f81ff6452596ac61e3840f917589 Author: Stephen Rothwell <sf...@ca...> Date: Thu Nov 2 22:07:24 2006 -0800 [PATCH] Create compat_sys_migrate_pages This is needed on bigendian 64bit architectures. Signed-off-by: Stephen Rothwell <sf...@ca...> Acked-by: Christoph Lameter <cla...@sg...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 1f6f61649d8c64d7a3a4d143405df9a7bdd4af10 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1f6f61649d8c64d7a3a4d143405df9a7bdd4af10 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1f6f61649d8c64d7a3a4d143405df9a7bdd4af10 Author: Jeff Dike <jd...@ad...> Date: Thu Nov 2 22:07:23 2006 -0800 [PATCH] uml: include tidying In order to get the __NR_* constants, we need sys/syscall.h. linux/unistd.h works as well since it includes syscall.h, however syscall.h is more parsimonious. We were inconsistent in this, and this patch adds syscall.h includes where necessary and removes linux/unistd.h includes where they are not needed. asm/unistd.h also includes the __NR_* constants, but these are not the glibc-sanctioned ones, so this also removes one such inclusion. Signed-off-by: Jeff Dike <jd...@ad...> Cc: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 53b173327d283b9bdbfb0c3b6de6f0eb197819d6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=53b173327d283b9bdbfb0c3b6de6f0eb197819d6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=53b173327d283b9bdbfb0c3b6de6f0eb197819d6 Author: Jeff Dike <jd...@ad...> Date: Thu Nov 2 22:07:22 2006 -0800 [PATCH] uml: fix I/O hang Fix a UML hang in which everything would just stop until some I/O happened - a ping, someone whacking the keyboard - at which point everything would start up again as though nothing had happened. The cause was gcc reordering some code which absolutely needed to be executed in the order in the source. When unblock_signals switches signals from off to on, it needs to see if any interrupts had happened in the critical section. The interrupt handlers check signals_enabled - if it is zero, then the handler adds a bit to the "pending" bitmask and returns. unblock_signals checks this mask to see if any signals need to be delivered. The crucial part is this: signals_enabled = 1; save_pending = pending; if(save_pending == 0) return; pending = 0; In order to avoid an interrupt arriving between reading pending and setting it to zero, in which case, the record of the interrupt would be erased, signals are enabled. What happened was that gcc reordered this so that 'save_pending = pending' came before 'signals_enabled = 1', creating a one-instruction window within which an interrupt could arrive, set its bit in pending, and have it be immediately erased. When the I/O workload is purely disk-based, the loss of a block device interrupt stops the entire I/O system because the next block request will wait for the current one to finish. Thus the system hangs until something else causes some I/O to arrive, such as a network packet or console input. The fix to this particular problem is a memory barrier between enabling signals and reading the pending signal mask. An xchg would also probably work. Looking over this code for similar problems led me to do a few more things: - make signals_enabled and pending volatile so that they don't get cached in registers - add an mb() to the return paths of block_signals and unblock_signals so that the modification of signals_enabled doesn't get shuffled into the caller in the event that these are inlined in the future. Signed-off-by: Jeff Dike <jd...@ad...> Cc: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d2c89a4284ea4ecfba77c6f2d7d6f96d52e801e5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d2c89a4284ea4ecfba77c6f2d7d6f96d52e801e5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d2c89a4284ea4ecfba77c6f2d7d6f96d52e801e5 Author: Jeff Mahoney <je...@su...> Date: Thu Nov 2 22:07:20 2006 -0800 [PATCH] reiserfs: reset errval after initializing bitmap cache Callers after reiserfs_init_bitmap_cache() expect errval to contain -EINVAL until much later. If a condition fails before errval is reset later, reiserfs_fill_super() will mistakenly return 0, causing an Oops in do_add_mount(). This patch resets errval to -EINVAL after the call. I view this as a temporary fix and real error codes should be used throughout reiserfs_fill_super(). Signed-off-by: Jeff Mahoney <je...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d3e5a938e7ed718f6d191e8b6b176fcfeb88a294 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d3e5a938e7ed718f6d191e8b6b176fcfeb88a294 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d3e5a938e7ed718f6d191e8b6b176fcfeb88a294 Author: Andrew Morton <ak...@os...> Date: Thu Nov 2 22:07:20 2006 -0800 [PATCH] spi section fix WARNING: vmlinux - Section mismatch: reference to .init.text:spi_register_board_info from __ksymtab_gpl between '__ksymtab_spi_register_board_info' (at offset 0xc032f7d0) and '__ksymtab_spi_alloc_master' Fix this by removing the export. Acked-by: David Brownell <da...@pa...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit b918f6e62cd46774f9fc0a3fbba6bd10ad85ee14 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b918f6e62cd46774f9fc0a3fbba6bd10ad85ee14 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b918f6e62cd46774f9fc0a3fbba6bd10ad85ee14 Author: Rafael J. Wysocki <rj...@si...> Date: Thu Nov 2 22:07:19 2006 -0800 [PATCH] swsusp: debugging Add a swsusp debugging mode. This does everything that's needed for a suspend except for actually suspending. So we can look in the log messages and work out a) what code is being slow and b) which drivers are misbehaving. (1) # echo testproc > /sys/power/disk # echo disk > /sys/power/state This should turn off the non-boot CPU, freeze all processes, wait for 5 seconds and then thaw the processes and the CPU. (2) # echo test > /sys/power/disk # echo disk > /sys/power/state This should turn off the non-boot CPU, freeze all processes, shrink memory, suspend all devices, wait for 5 seconds, resume the devices etc. Cc: Pavel Machek <pa...@uc...> Cc: Stefan Seyfried <se...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 90d53909443b3986569b38ef145f09ea2359af75 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=90d53909443b3986569b38ef145f09ea2359af75 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=90d53909443b3986569b38ef145f09ea2359af75 Author: Andrew Morton <ak...@os...> Date: Thu Nov 2 22:07:18 2006 -0800 [PATCH] acpi_noirq section fix WARNING: vmlinux - Section mismatch: reference to .init.data:acpi_noirq from .text between 'pcibios_penalize_isa_irq' (at offset 0xc026ffa1) and 'pirq_serverworks_get' Acked-by: "Brown, Len" <len...@in...> Cc: Andi Kleen <ak...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 19c6b6ed3f597a583f58e3fc99256cc01ae8c394 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=19c6b6ed3f597a583f58e3fc99256cc01ae8c394 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=19c6b6ed3f597a583f58e3fc99256cc01ae8c394 Author: Andrew Morton <ak...@os...> Date: Thu Nov 2 22:07:17 2006 -0800 [PATCH] schedule removal of FUTEX_FD Apparently FUTEX_FD is unfixably racy and nothing uses it (or if it does, it shouldn't). Add a warning printk, give any remaining users six months to migrate off it. Cc: Ulrich Drepper <dr...@re...> Cc: Ingo Molnar <mi...@el...> Acked-by: Thomas Gleixner <tg...@li...> Cc: Rusty Russell <ru...@ru...> Cc: Alan Cox <al...@lx...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit f46c483357c2d87606bbefb511321e3efd4baae0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f46c483357c2d87606bbefb511321e3efd4baae0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f46c483357c2d87606bbefb511321e3efd4baae0 Author: Andrew Morton <ak...@os...> Date: Thu Nov 2 22:07:16 2006 -0800 [PATCH] Add printk_timed_ratelimit() printk_ratelimit() has global state which makes it not useful for callers which wish to perform ratelimiting at a particular frequency. Add a printk_timed_ratelimit() which utilises caller-provided state storage to permit more flexibility. This function can in fact be used for things other than printk ratelimiting and is perhaps poorly named. Cc: Ulrich Drepper <dr...@re...> Cc: Ingo Molnar <mi...@el...> Cc: Thomas Gleixner <tg...@li...> Cc: Rusty Russell <ru...@ru...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7f6b8876c7e66b0d15af134e2a5b87e55514eb6d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7f6b8876c7e66b0d15af134e2a5b87e55514eb6d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7f6b8876c7e66b0d15af134e2a5b87e55514eb6d Author: Daniel Yeisley <dan...@un...> Date: Thu Nov 2 22:07:14 2006 -0800 [PATCH] init_reap_node() initialization fix It looks like there is a bug in init_reap_node() in slab.c that can cause multiple oops's on certain ES7000 configurations. The variable reap_node is defined per cpu, but only initialized on a single CPU. This causes an oops in next_reap_node() when __get_cpu_var(reap_node) returns the wrong value. Fix is below. Signed-off-by: Dan Yeisley <dan...@un...> Cc: Andi Kleen <ak...@su...> Acked-by: Christoph Lameter <cla...@en...> Cc: Pekka Enberg <pe...@cs...> Cc: Manfred Spraul <ma...@co...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d13adb604693374c5fce47cd1a2017bcf3178eae gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d13adb604693374c5fce47cd1a2017bcf3178eae gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d13adb604693374c5fce47cd1a2017bcf3178eae Author: Yvan Seth <bug...@ma...> Date: Thu Nov 2 22:07:13 2006 -0800 [PATCH] ipmi_si_intf.c sets bad class_mask with PCI_DEVICE_CLASS Taken from http://bugzilla.kernel.org/show_bug.cgi?id=7439 It looks like device registration in drivers/char/ipmi/ipmi_si_intf.c was cleaned up and a small error was made when setting the class_mask. The fix is simple as the correct mask value is defined in the code but is not used. Acked-by: Corey Minyard <mi...@ac...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7ef55b8a05c02db7c07d81827c69fe8f124e8654 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7ef55b8a05c02db7c07d81827c69fe8f124e8654 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7ef55b8a05c02db7c07d81827c69fe8f124e8654 Author: Srinivasa Ds <sri...@in...> Date: Thu Nov 2 22:07:12 2006 -0800 [PATCH] NFS4: fix for recursive locking problem When I was performing some operations on NFS, I got below error on server side. ============================================= [ INFO: possible recursive locking detected ] 2.6.19-prep #1 --------------------------------------------- nfsd4/3525 is trying to acquire lock: (&inode->i_mutex){--..}, at: [<c0611e5a>] mutex_lock+0x21/0x24 but task is already holding lock: (&inode->i_mutex){--..}, at: [<c0611e5a>] mutex_lock+0x21/0x24 other info that might help us debug this: 2 locks held by nfsd4/3525: #0: (client_mutex){--..}, at: [<c0611e5a>] mutex_lock+0x21/0x24 #1: (&inode->i_mutex){--..}, at: [<c0611e5a>] mutex_lock+0x21/0x24 stack backtrace: [<c04051ed>] show_trace_log_lvl+0x58/0x16a [<c04057fa>] show_trace+0xd/0x10 [<c0405913>] dump_stack+0x19/0x1b [<c043b6f1>] __lock_acquire+0x778/0x99c [<c043be86>] lock_acquire+0x4b/0x6d [<c0611ceb>] __mutex_lock_slowpath+0xbc/0x20a [<c0611e5a>] mutex_lock+0x21/0x24 [<c047fd7e>] vfs_rmdir+0x76/0xf8 [<f94b7ce9>] nfsd4_clear_clid_dir+0x2c/0x41 [nfsd] [<f94b7de9>] nfsd4_remove_clid_dir+0xb1/0xe8 [nfsd] [<f94b307b>] laundromat_main+0x9b/0x1c3 [nfsd] [<c04333d6>] run_workqueue+0x7a/0xbb [<c0433d0b>] worker_thread+0xd2/0x107 [<c0436285>] kthread+0xc3/0xf2 [<c0402005>] kernel_thread_helper+0x5/0xb =================================================================== Cause for this problem was,2 successive mutex_lock calls on 2 diffrent inodes ,as shown below static int nfsd4_clear_clid_dir(struct dentry *dir, struct dentry *dentry) { int status; /* For now this directory should already be empty, but we empty it of * any regular files anyway, just in case the directory was created by * a kernel from the future.... */ nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file); mutex_lock(&dir->d_inode->i_mutex); status = vfs_rmdir(dir->d_inode, dentry); ... int vfs_rmdir(struct inode *dir, struct dentry *dentry) { int error = may_delete(dir, dentry, 1); if (error) return error; if (!dir->i_op || !dir->i_op->rmdir) return -EPERM; DQUOT_INIT(dir); mutex_lock(&dentry->d_inode->i_mutex); ... So I have developed the patch to overcome this problem. Signed-off-by: Srinivasa DS <sri...@in...> Cc: Neil Brown <ne...@su...> Cc: Peter Zijlstra <a.p...@ch...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 77d6e1397a004c9376fed855e4164ca2b1dba2ed gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=77d6e1397a004c9376fed855e4164ca2b1dba2ed gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=77d6e1397a004c9376fed855e4164ca2b1dba2ed Author: Akinobu Mita <aki...@gm...> Date: Thu Nov 2 22:07:10 2006 -0800 [PATCH] edac_mc: fix error handling Call sysdev_class_unregister() on failure in edac_sysfs_memctrl_setup() and decrease identation level for clear logic. Acked-by: Doug Thompson <no...@xm...> Signed-off-by: Akinobu Mita <aki...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7011774db8afca43be466f0f0428434a9edf053e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7011774db8afca43be466f0f0428434a9edf053e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7011774db8afca43be466f0f0428434a9edf053e Author: OGAWA Hirofumi <hir...@ma...> Date: Thu Nov 2 22:07:10 2006 -0800 [PATCH] gfs2: ->readpages() fixes This just ignore the remaining pages, and remove unneeded unlock_pages(). Signed-off-by: OGAWA Hirofumi <hir...@ma...> Cc: Steven French <sf...@us...> Cc: Miklos Szeredi <mi...@sz...> Acked-by: Steven Whitehouse <swh...@re...> Cc: Trond Myklebust <tro...@fy...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 2e990021bfc65b1a3778479a9e6b4811f9c1ff0e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2e990021bfc65b1a3778479a9e6b4811f9c1ff0e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2e990021bfc65b1a3778479a9e6b4811f9c1ff0e Author: OGAWA Hirofumi <hir...@ma...> Date: Thu Nov 2 22:07:09 2006 -0800 [PATCH] fuse: ->readpages() cleanup This just ignore the remaining pages. Signed-off-by: OGAWA Hirofumi <hir...@ma...> Cc: Steven French <sf...@us...> Cc: Miklos Szeredi <mi...@sz...> Cc: Steven Whitehouse <swh...@re...> Cc: Trond Myklebust <tro...@fy...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 05ac9d4b3d7eac9e8542c83341a0e22d09aecf8f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=05ac9d4b3d7eac9e8542c83341a0e22d09aecf8f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=05ac9d4b3d7eac9e8542c83341a0e22d09aecf8f Author: OGAWA Hirofumi <hir...@ma...> Date: Thu Nov 2 22:07:08 2006 -0800 [PATCH] cifs: ->readpages() fixes This just ignore the remaining pages, and will fix a forgot put_pages_list(). Signed-off-by: OGAWA Hirofumi <hir...@ma...> Cc: Steven French <sf...@us...> Cc: Miklos Szeredi <mi...@sz...> Cc: Steven Whitehouse <swh...@re...> Cc: Trond Myklebust <tro...@fy...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 029e332ea717810172e965ec50f942755ad0c58a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=029e332ea717810172e965ec50f942755ad0c58a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=029e332ea717810172e965ec50f942755ad0c58a Author: OGAWA Hirofumi <hir...@ma...> Date: Thu Nov 2 22:07:06 2006 -0800 [PATCH] Cleanup read_pages() Current read_pages() assume ->readpages() frees the passed pages. This patch free the pages in ->read_pages(), if those were remaining in the pages_list. So, readpages() just can ignore the remaining pages in pages_list. Signed-off-by: OGAWA Hirofumi <hir...@ma...> Cc: Steven French <sf...@us...> Cc: Miklos Szeredi <mi...@sz...> Cc: Steven Whitehouse <swh...@re...> Cc: Trond Myklebust <tro...@fy...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 5d861d920a86523bbeb56c19b9906c3fb1b58048 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5d861d920a86523bbeb56c19b9906c3fb1b58048 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5d861d920a86523bbeb56c19b9906c3fb1b58048 Author: Randy Dunlap <ran...@or...> Date: Thu Nov 2 22:07:06 2006 -0800 [PATCH] lkdtm: cleanup headers and module_param/MODULE_PARM_DESC Fix module_param/sysfs file permission typo. Clean up MODULE_PARM_DESC strings to avoid fancy (and incorrect) formatting. Fix header includes for lkdtm; add some needed ones, remove unused ones; and fix this gcc warning: drivers/misc/lkdtm.c:150: warning: 'struct buffer_head' declared inside parameter list drivers/misc/lkdtm.c:150: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: Randy Dunlap <ran...@or...> Cc: Ankita Garg <an...@in...> Cc: Vivek Goyal <vg...@in...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 86f4f0f9ba6e35fbbc409dfc3d8615c1a9822482 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=86f4f0f9ba6e35fbbc409dfc3d8615c1a9822482 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=86f4f0f9ba6e35fbbc409dfc3d8615c1a9822482 Author: Eric Sandeen <sa...@re...> Date: Thu Nov 2 22:07:05 2006 -0800 [PATCH] fix UFS superblock alignment issues ufs2 fails to mount on x86_64, claiming bad magic. This is because ufs_super_block_third's fs_un1 member is padded out by 4 bytes for 8-byte alignment, pushing down the rest of the struct. Forcing this to be packed solves it. I took a quick look over other on-disk structures and didn't immediately find other problems. I was able to mount & ls a populated ufs2 filesystem w/ this change. Signed-off-by: Eric Sandeen <sa...@re...> Cc: Evgeniy Dushistov <dus...@ma...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 941c7105dc4f4961727acc518e18e00b9a03cbf3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=941c7105dc4f4961727acc518e18e00b9a03cbf3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=941c7105dc4f4961727acc518e18e00b9a03cbf3 Author: nkalmala <nka...@gm...> Date: Thu Nov 2 22:07:04 2006 -0800 [PATCH] mm: un-needed add-store operation wastes a few bytes Un-needed add-store operation wastes a few bytes. 8 bytes wasted with -O2, on a ppc. Signed-off-by: nkalmala <nka...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit c7e12b838989b0e432c7a1cdf1e6c6fd936007f6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c7e12b838989b0e432c7a1cdf1e6c6fd936007f6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c7e12b838989b0e432c7a1cdf1e6c6fd936007f6 Author: Pavel Emelianov <xe...@op...> Date: Thu Nov 2 22:07:03 2006 -0800 [PATCH] Fix ipc entries removal Fix two issuses related to ipc_ids->entries freeing. 1. When freeing ipc namespace we need to free entries allocated with ipc_init_ids(). 2. When removing old entries in grow_ary() ipc_rcu_putref() may be called on entries set to &ids->nullentry earlier in ipc_init_ids(). This is almost impossible without namespaces, but with them this situation becomes possible. Found during OpenVZ testing after obvious leaks in beancounters. Signed-off-by: Pavel Emelianov <xe...@op...> Cc: Kirill Korotaev <de...@op...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 733b72c31efb0d6b29577655939ccfe835381b52 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=733b72c31efb0d6b29577655939ccfe835381b52 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=733b72c31efb0d6b29577655939ccfe835381b52 Author: Randy Dunlap <ran...@or...> Date: Thu Nov 2 22:07:02 2006 -0800 [PATCH] docbook: merge journal-api into filesystems.tmpl Move journal-api into filesystems.tmpl as a Chapter. Applies on top of the previous docbook: make a filesystems book patch. Remove trailing whitespace from journal-api chapter. Align some of the tags. Signed-off-by: Randy Dunlap <ran...@or...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit c6120938365df9976dc07c536e1c14190ead48e3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c6120938365df9976dc07c536e1c14190ead48e3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c6120938365df9976dc07c536e1c14190ead48e3 Author: Randy Dunlap <ran...@or...> Date: Thu Nov 2 22:07:01 2006 -0800 [PATCH] update some docbook comments Correct a few comments in kernel-doc Doc and source files. (akpm: note: the patch removes a non-ascii character and might have to be applied by hand..) Signed-off-by: Randy Dunlap <ran...@or...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 87c2b7c045a44f6c1c7af23e64f2b286e6f7130a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=87c2b7c045a44f6c1c7af23e64f2b286e6f7130a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=87c2b7c045a44f6c1c7af23e64f2b286e6f7130a Author: Heiko Carstens <hei...@de...> Date: Thu Nov 2 22:06:58 2006 -0800 [PATCH] sys_pselect7 vs compat_sys_pselect7 uaccess error handling 758333458aa719bfc26ec16eafd4ad3a9e96014d fixes the not checked copy_to_user return value of compat_sys_pselect7. I ran into this too because of an old source tree, but my fix would look quite a bit different to Andi's fix. The reason is that the compat function IMHO should behave the very same as the non-compat function if possible. Since sys_pselect7 does not return -EFAULT in this specific case, change the compat code so it behaves like sys_pselect7. Cc: David Woodhouse <dw...@in...> Cc: Andi Kleen <ak...@su...> Signed-off-by: Heiko Carstens <hei...@de...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7870db4c7fa1b03fec133c4f4e67fdaa04c5ac15 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7870db4c7fa1b03fec133c4f4e67fdaa04c5ac15 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7870db4c7fa1b03fec133c4f4e67fdaa04c5ac15 Author: NeilBrown <ne...@su...> Date: Thu Nov 2 22:06:57 2006 -0800 [PATCH] md: send online/offline uevents when an md array starts/stops This allows udev to do something intelligent when an array becomes available. Acked-by: Greg KH <gr...@kr...> Signed-off-by: Neil Brown <ne...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit df66b8552be5fdab5c4b4d53ee08b99388b9bd02 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=df66b8552be5fdab5c4b4d53ee08b99388b9bd02 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=df66b8552be5fdab5c4b4d53ee08b99388b9bd02 Author: Andrew Morton <ak...@os...> Date: Thu Nov 2 22:06:56 2006 -0800 [PATCH] tidy "md: check bio address after mapping through partitions" Neil's xterms are too wide. Cc: Neil Brown <ne...@cs...> Cc: Jens Axboe <jen...@or...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7bd473fcc217adec000f213e8864bf9a161d57e1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7bd473fcc217adec000f213e8864bf9a161d57e1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7bd473fcc217adec000f213e8864bf9a161d57e1 Author: Michael Halcrow <mha...@us...> Date: Thu Nov 2 22:06:56 2006 -0800 [PATCH] eCryptfs: Fix pointer deref I missed a pointer dereference in this kmalloc result check. Signed-off-by: Michael Halcrow <mha...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 18ee91fa9815fa3bb4e51cdcb8229bd0a0f11a70 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=18ee91fa9815fa3bb4e51cdcb8229bd0a0f11a70 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=18ee91fa9815fa3bb4e51cdcb8229bd0a0f11a70 Author: David Brownell <da...@pa...> Date: Thu Nov 2 12:29:12 2006 -0800 USB: use MII hooks only if CONFIG_MII is enabled Fix mcs7830 patch The recent mcs7830 update to make the MII support sharable goofed various pre-existing configurations in two ways: - it made the usbnet infrastructure reference MII symbols even when they're not needed in the kernel being built - it didn't enable MII along with the mcs7830 minidriver This patch fixes these two problems. However, there does seem to be a Kconfig reverse dependency bug in that MII gets wrongly enabled in some cases (like USBNET=y and USBNET_MII=n); I think I've noticed that same problem in other situations too. So the result can mean kernels being bloated by stuff that's needlessly enabled ... better than wrongly being disabled, but contributing to bloat. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 9b823b43ff308c914530ec7fde5e2d79cb37b51a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9b823b43ff308c914530ec7fde5e2d79cb37b51a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9b823b43ff308c914530ec7fde5e2d79cb37b51a Author: Jan Mate <ma...@fi...> Date: Fri Oct 20 14:51:44 2006 -0700 USB Storage: unusual_devs.h entry for Sony Ericsson P990i USB Storage: this patch adds support for Sony Ericsson P990i Signed-off-by: Jan Mate <ma...@fi...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit d518b2b48a9c11fc381b179709f5321bce1f3b39 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d518b2b48a9c11fc381b179709f5321bce1f3b39 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d518b2b48a9c11fc381b179709f5321bce1f3b39 Author: Dominic Cerquetti <bin...@ya...> Date: Fri Oct 20 14:51:45 2006 -0700 USB: xpad: additional USB id's added Adding additional USB vendor/product ID's for XBOX pads provided by the XBOX Linux team. Signed-off-by: Dominic Cerquetti <bin...@ya...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 11bd44abbd204f580ea91e75c84e012988971012 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=11bd44abbd204f580ea91e75c84e012988971012 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=11bd44abbd204f580ea91e75c84e012988971012 Author: David Brownell <da...@pa...> Date: Wed Nov 1 14:26:26 2006 -0800 USB: fix compiler issues with newer gcc versions Remove complaint from newer GCCs; they don't like forward function declarations except in top-level contexts. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 23b0d968c2c82c2574ca97148ce092eff4ab84a6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=23b0d968c2c82c2574ca97148ce092eff4ab84a6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=23b0d968c2c82c2574ca97148ce092eff4ab84a6 Author: Naranjo Manuel Francisco <nar...@gm...> Date: Fri Oct 27 16:08:54 2006 -0300 USB: HID: add blacklist AIRcable USB, little beautification This patch add AIRcable USBto USB-HID blacklist, makes some little changes things in the Kconfig to make AIRcable USB look as all the rest of drivers. And it removes the readme part that was on Documentation/usb/usb-serial.txt because it is not needed anymore. Signed-off-by: Naranjo Manuel Francisco <nar...@gm... Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 5a69ebe1e90d9e8d43131f08d344751cf42254c5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5a69ebe1e90d9e8d43131f08d344751cf42254c5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5a69ebe1e90d9e8d43131f08d344751cf42254c5 Author: Oliver Neukum <ol...@ne...> Date: Sat Oct 28 18:07:25 2006 +0200 USB: usblp: fix system suspend for some systems this has been confirmed to fix suspend problems with usblp. Signed-off-by: Oliver Neukum <ol...@ne...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 6c8df79f8c0f8d861ea25e6e104a29398d8398f4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6c8df79f8c0f8d861ea25e6e104a29398d8398f4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6c8df79f8c0f8d861ea25e6e104a29398d8398f4 Author: Oliver Neukum <ol...@ne...> Date: Sat Oct 28 11:36:59 2006 +0200 USB: failure in usblp's error path if urb submission fails due to a transient error here eg. ENOMEM , the driver is dead. This fixes it. Regards Oliver Signed-off-by: Oliver Neukum <ol...@ne...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit d8fa59a8f6f7c9a1bc294154fd6805c6b247683d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d8fa59a8f6f7c9a1bc294154fd6805c6b247683d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d8fa59a8f6f7c9a1bc294154fd6805c6b247683d Author: Daniel Ritz <dan...@sw...> Date: Fri Oct 27 22:46:03 2006 +0200 usbtouchscreen: use endpoint address from endpoint descriptor use the endpoint address from the endpoint descriptor instead of the hardcoding it to 0x81. at least some ITM based screen use a different address and don't work without this. Signed-off-by: Daniel Ritz <dan...@gm...> Cc: Ralf Lehmann <ra...@le...> Cc: J.P. Delport <jpd...@cs...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit baafe37c6a58d4ddb8c2c62cd0f20340b4c66b35 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=baafe37c6a58d4ddb8c2c62cd0f20340b4c66b35 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=baafe37c6a58d4ddb8c2c62cd0f20340b4c66b35 Author: Jan Luebbe <jl...@la...> Date: Fri Oct 27 18:59:24 2006 +0200 USB: sierra: Fix id for Sierra Wireless MC8755 in new table The new version of sierra.c has introduced tables for the 1 port and 3 port variants. The device id i added in my last patch needs to be added to the 3 port table. Signed-off-by: Jan Luebbe <jl...@la...> Cc: Kevin Lloyd <li...@si...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 78001e3d75c5d3ae1e8dc9875892b9461e4c8d4b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=78001e3d75c5d3ae1e8dc9875892b9461e4c8d4b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=78001e3d75c5d3ae1e8dc9875892b9461e4c8d4b Author: Bjorn Schneider <sch...@li...> Date: Sat Oct 28 12:42:04 2006 +0200 USB: new VID/PID-combos for cp2101 3 new VID/PID combinations (registered with Silicon Laboratories Inc.) added for devices made by Lipowsky Industrie Elektronik GmbH all using the CP2102 usb-to-serial converter (Baby-JTAG, Baby-LIN, HARP-1). Signed-off-by: Bjorn Schneider <sch...@li...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 68717950e11eab8ff754b2721d23e9cb3a47b56f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=68717950e11eab8ff754b2721d23e9cb3a47b56f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=68717950e11eab8ff754b2721d23e9cb3a47b56f Author: Grant Grundler <gru...@pa...> Date: Thu Oct 19 15:09:51 2006 -0700 hid-core: big-endian fix fix Adam Kropelin had posted 32-bit fix in June 2005 about two weeks after I originally had posted my fixes for big endian support. Adam has a UPS device which reports LINEV using 32-bits. Added comments to describe the limitations of the code. extract() is the same version I posted earlier and tested in user space. Made similar changes to implement() routine. I've written (and will shortly post) a test for implement(). Code tested on C3600 (parisc) with USB keyboard/mouse attached. I've dropped test_implement.c and a few other user space test programs on http://iou.parisc-linux.org/~grundler/tests/ -rw-r--r-- 1 grundler grundler 1750 Oct 18 09:13 test_extract.c -rw-r--r-- 1 grundler grundler 561 Jan 25 2006 test_ffs.c -rw-r--r-- 1 grundler users 7175 Apr 8 2005 test_fls.c -rw-r--r-- 1 grundler grundler 206 Sep 1 15:52 test_gettimeofday.c -rw-r--r-- 1 grundler grundler 1886 Oct 19 09:20 test_implement.c -rw-r--r-- 1 grundler users 2707 Jun 4 2005 test_unaligned.c I would appreciate if someone else would look at the output of test_implement.c to make it does The Right Thing. Signed-off-by: Grant Grundler <gru...@pa...> Cc: Matthew Wilcox <ma...@wi...> Cc: Dmitry Torokhov <dt...@ma...> Acked-By: Adam Kropelin <akr...@ro...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit bc724b98c5e782c2d6781428ed87768daa34921d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bc724b98c5e782c2d6781428ed87768daa34921d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bc724b98c5e782c2d6781428ed87768daa34921d Author: Phil Dibowitz <ph...@ip...> Date: Thu Oct 19 00:11:17 2006 -0700 USB: usb-storage: Unusual_dev update The protocol in this entry is needed for some versions of the device but not others. This adds the NEED_OVERRIDE flag to prevent it complaining to users who don't need it. Signed-off-by: Phil Dibowitz <ph...@ip...> commit 90ac3c8124453fb355c10d3e1a27af5c0ab21099 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=90ac3c8124453fb355c10d3e1a27af5c0ab21099 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=90ac3c8124453fb355c10d3e1a27af5c0ab21099 Author: Greg Kroah-Hartman <gr...@su...> Date: Tue Apr 9 12:14:34 2002 -0700 USB: add another sierra wireless device id As reported by Peter Kucmeroski and Jason Ganovsky. Cc: Peter Kucmeroski <PKu...@no...> Cc: Jason Ganovsky <JGa...@no...> Cc: Kevin Lloyd <kl...@si...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit bb44c308ee37c14ab63251e27d6d8b4dc73a10a4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bb44c308ee37c14ab63251e27d6d8b4dc73a10a4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bb44c308ee37c14ab63251e27d6d8b4dc73a10a4 Author: Adrian Bunk <bu...@st...> Date: Fri Oct 27 16:12:30 2006 -0700 PCI: Let PCI_MULTITHREAD_PROBE depend on BROKEN PCI_MULTITHREAD_PROBE is an interesting feature, but in its current state it seems to be more of a trap for users who accidentally enable it. This patch lets PCI_MULTITHREAD_PROBE depend on BROKEN for 2.6.19. The intention is to get this patch reversed in -mm as soon as it's in Linus' tree, and reverse it for 2.6.20 or 2.6.21 after the fallout of in-kernel problems PCI_MULTITHREAD_PROBE causes got fixed. (akpm: I get enough bug reports already) Signed-off-by: Adrian Bunk <bu...@st...> Cc: Alan Cox <al...@lx...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 6851ecc6e2fa4a01449a0fec9f4abd9aec43afde gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6851ecc6e2fa4a01449a0fec9f4abd9aec43afde gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6851ecc6e2fa4a01449a0fec9f4abd9aec43afde Author: Greg Kroah-Hartman <gr...@su...> Date: Thu Nov 2 23:02:24 2006 -0800 PCI: Revert "PCI: i386/x86_84: disable PCI resource decode on device disable" This reverts commit 53e4d30dd666d7f83598957ee4a415eefb47c9a6. It was found that it caused unneeded problems (see http://bugzilla.kernel.org/show_bug.cgi?id=7082 for details of one such issue. Signed-off-by: Greg Kroah-Hartman <gr...@su...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-03 07:57:34
|
drivers/ata/ahci.c | 8 ++++ drivers/ata/pata_amd.c | 2 + drivers/infiniband/core/addr.c | 28 ++++++++++++++- drivers/infiniband/core/cma.c | 31 +++++++++++----- drivers/infiniband/core/uverbs_cmd.c | 2 - drivers/infiniband/hw/amso1100/c2_alloc.c | 13 +++--- drivers/infiniband/hw/amso1100/c2_cq.c | 18 +++------ drivers/infiniband/hw/amso1100/c2_rnic.c | 56 ++++++++++++------------------ drivers/infiniband/hw/ehca/ehca_tools.h | 1 drivers/infiniband/hw/mthca/mthca_cmd.c | 14 +++---- drivers/infiniband/ulp/iser/iscsi_iser.c | 4 +- fs/cifs/CHANGES | 5 ++ fs/cifs/connect.c | 7 +++ fs/cifs/inode.c | 14 ++++--- fs/cifs/readdir.c | 9 ++++ include/linux/pci_ids.h | 1 include/rdma/ib_addr.h | 20 ++++++++++ include/rdma/ib_user_verbs.h | 2 - 18 files changed, 154 insertions(+), 81 deletions(-) New commits: commit 2de6c39f389f25442389c3ab0f2d9b50e3f4a77d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2de6c39f389f25442389c3ab0f2d9b50e3f4a77d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2de6c39f389f25442389c3ab0f2d9b50e3f4a77d Merge: 0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed 4fa2eeeac5e13a8579ee45bc172eed690d28fbb7 Author: Linus Torvalds <tor...@g5...> Date: Thu Nov 2 17:23:13 2006 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: pci_ids.h: Add NVIDIA PCI ID commit 0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed Merge: 895663cd92574367054e0eb604a7428852f359b8 8e87d4dc159148f04f515bc072df22a2c089e7f2 Author: Linus Torvalds <tor...@g5...> Date: Thu Nov 2 17:22:24 2006 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] report rename failure when target file is locked by Windows [CIFS] Allow null user connections [CIFS] Fix readdir breakage when blocksize set too small commit 4fa2eeeac5e13a8579ee45bc172eed690d28fbb7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4fa2eeeac5e13a8579ee45bc172eed690d28fbb7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4fa2eeeac5e13a8579ee45bc172eed690d28fbb7 Author: Peer Chen <pc...@nv...> Date: Thu Nov 2 18:55:48 2006 -0500 pci_ids.h: Add NVIDIA PCI ID Signed-off-by: Jeff Garzik <je...@ga...> commit 895663cd92574367054e0eb604a7428852f359b8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=895663cd92574367054e0eb604a7428852f359b8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=895663cd92574367054e0eb604a7428852f359b8 Author: Peer Chen <pc...@nv...> Date: Thu Nov 2 17:59:46 2006 -0500 [libata] Add support for AHCI controllers of MCP67. Signed-off-by: Peer Chen <pc...@nv...> Signed-off-by: Jeff Garzik <je...@ga...> commit 05e2867a7bcc76de37e103a97ed48ba6872db797 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=05e2867a7bcc76de37e103a97ed48ba6872db797 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=05e2867a7bcc76de37e103a97ed48ba6872db797 Author: Peer Chen <pc...@nv...> Date: Thu Nov 2 17:58:21 2006 -0500 [libata] Add support for PATA controllers of MCP67 to pata_amd.c. Signed-off-by: Peer Chen <pc...@nv...> Signed-off-by: Jeff Garzik <je...@ga...> commit 40eb006685387b2861bd7196be0ab7144c5d5b71 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=40eb006685387b2861bd7196be0ab7144c5d5b71 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=40eb006685387b2861bd7196be0ab7144c5d5b71 Merge: e957b00a8caece90cbc2afd0a4cb4c4d61b9efa8 7a118df3ea23820b9922a1b51cd2f24e464f4c17 Author: Linus Torvalds <tor...@g5...> Date: Thu Nov 2 14:36:05 2006 -0800 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: RDMA/addr: Use client registration to fix module unload race IB/mthca: Fix MAD extended header format for MAD_IFC firmware command IB/uverbs: Return sq_draining value in query_qp response IB/amso1100: Fix incorrect pr_debug() IB/amso1100: Use dma_alloc_coherent() instead of kmalloc/dma_map_single IB/ehca: Fix eHCA driver compilation for uniprocessor RDMA/cma: rdma_bind_addr() leaks a cma_dev reference count IB/iser: Start connection after enabling iSER commit 7a118df3ea23820b9922a1b51cd2f24e464f4c17 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7a118df3ea23820b9922a1b51cd2f24e464f4c17 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7a118df3ea23820b9922a1b51cd2f24e464f4c17 Author: Sean Hefty <sea...@in...> Date: Tue Oct 31 11:12:59 2006 -0800 RDMA/addr: Use client registration to fix module unload race Require registration with ib_addr module to prevent caller from unloading while a callback is in progress. Signed-off-by: Sean Hefty <sea...@in...> Signed-off-by: Roland Dreier <ro...@ci...> commit 8e87d4dc159148f04f515bc072df22a2c089e7f2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8e87d4dc159148f04f515bc072df22a2c089e7f2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8e87d4dc159148f04f515bc072df22a2c089e7f2 Author: Steve French <sf...@us...> Date: Thu Nov 2 03:45:24 2006 +0000 [CIFS] report rename failure when target file is locked by Windows Fixes Samba bugzilla bug # 4182 Rename by handle failures (retry after rename by path) were not being returned back. Signed-off-by: Steve French <sf...@us...> commit 68586b67ab1a2fd618f79e29a06f10ae886f4b46 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=68586b67ab1a2fd618f79e29a06f10ae886f4b46 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=68586b67ab1a2fd618f79e29a06f10ae886f4b46 Author: Michael S. Tsirkin <ms...@me...> Date: Mon Oct 30 16:31:52 2006 +0200 IB/mthca: Fix MAD extended header format for MAD_IFC firmware command Several fields in an incoming MAD extended info header were passed into the MAD_IFC firmware command at incorrect offsets (mostly off by 4 bytes). As the result, the HCA will fail to generate traps in which this info is needed (e.g. traps which include the GRH of the incoming packet), in violation of the IB spec. Signed-off-by: Michael S. Tsirkin <ms...@me...> Signed-off-by: Roland Dreier <ro...@ci...> commit 0b26c88f29ad8bcf91a2ea8f25a36f2028ebabea gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0b26c88f29ad8bcf91a2ea8f25a36f2028ebabea gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0b26c88f29ad8bcf91a2ea8f25a36f2028ebabea Author: Jack Morgenstein <ja...@de...> Date: Wed Oct 25 12:54:20 2006 +0200 IB/uverbs: Return sq_draining value in query_qp response Return the sq_draining value back to user space for query_qp instead of the en_sqd_async notify value, which is valid only for modify_qp. For query_qp, the draining status should returned. Signed-off-by: Jack Morgenstein <ja...@me...> Signed-off-by: Roland Dreier <ro...@ci...> commit d7b748d63c908a0a85099ce546594192ae0926f6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d7b748d63c908a0a85099ce546594192ae0926f6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d7b748d63c908a0a85099ce546594192ae0926f6 Author: Steve Wise <sw...@op...> Date: Mon Oct 30 20:52:53 2006 -0800 IB/amso1100: Fix incorrect pr_debug() pr_debug() was printing the wrong stuff. Signed-off-by: Steve Wise <sw...@op...> Signed-off-by: Roland Dreier <ro...@ci...> commit 8de94ce19dd3c6fc6e9d9658da11cf3d76841ee5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8de94ce19dd3c6fc6e9d9658da11cf3d76841ee5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8de94ce19dd3c6fc6e9d9658da11cf3d76841ee5 Author: Steve Wise <sw...@op...> Date: Fri Oct 27 17:28:35 2006 -0500 IB/amso1100: Use dma_alloc_coherent() instead of kmalloc/dma_map_single The Ammasso driver needs to use dma_alloc_coherent() for allocating memory that will be used by the HW for dma. Signed-off-by: Steve Wise <sw...@op...> Signed-off-by: Roland Dreier <ro...@ci...> commit 04d03bc576f244bfa9692452aab83fa357ac0d57 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=04d03bc576f244bfa9692452aab83fa357ac0d57 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=04d03bc576f244bfa9692452aab83fa357ac0d57 Author: Paul Mackerras <pa...@sa...> Date: Wed Oct 25 15:28:08 2006 +1000 IB/ehca: Fix eHCA driver compilation for uniprocessor The eHCA driver does not compile for a uniprocessor configuration (CONFIG_SMP=n), due to H_SUCCESS and other symbols being undefined. This fixes it. Signed-off-by: Paul Mackerras <pa...@sa...> Acked-by: Hoang-Nam Nguyen <HN...@de...> Signed-off-by: Roland Dreier <ro...@ci...> commit 255d0c14b3757e8bd85add874e4dca4c3621b39e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=255d0c14b3757e8bd85add874e4dca4c3621b39e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=255d0c14b3757e8bd85add874e4dca4c3621b39e Author: Krishna Kumar <krk...@in...> Date: Tue Oct 24 13:22:28 2006 -0700 RDMA/cma: rdma_bind_addr() leaks a cma_dev reference count rdma_bind_addr() leaks a cma_dev reference count in failure case. Signed-off-by: Krishna Kumar <krk...@in...> Signed-off-by: Sean Hefty <sea...@in...> commit 2e7a7426282bfa2d7dff6eddc5485af8c79a68f3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2e7a7426282bfa2d7dff6eddc5485af8c79a68f3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2e7a7426282bfa2d7dff6eddc5485af8c79a68f3 Author: Erez Zilber <er...@vo...> Date: Sun Oct 22 10:28:38 2006 +0200 IB/iser: Start connection after enabling iSER When a connection is started (a new connection or a recovered one), iSER should prepare its resources for full-featured mode and only then notify the iSCSI layer that it is ready to start queueing commands. Signed-off-by: Erez Zilber <er...@vo...> Signed-off-by: Roland Dreier <ro...@ci...> commit 4b952a9b0877dbe8f0f69b2747abe79e3bbd2865 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4b952a9b0877dbe8f0f69b2747abe79e3bbd2865 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4b952a9b0877dbe8f0f69b2747abe79e3bbd2865 Author: Steve French <sf...@us...> Date: Mon Oct 30 21:46:13 2006 +0000 [CIFS] Allow null user connections Some servers are configured to only allow null user mounts for guest access. Allow nul user (anonymous) mounts e.g. mount -t cifs //server/share /mnt -o username= Signed-off-by: Steve French <sf...@us...> commit 7ca85ba752e521f1b5ead1f3b91c562cc3910c7b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7ca85ba752e521f1b5ead1f3b91c562cc3910c7b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7ca85ba752e521f1b5ead1f3b91c562cc3910c7b Author: Steve French <sf...@us...> Date: Mon Oct 30 21:42:57 2006 +0000 [CIFS] Fix readdir breakage when blocksize set too small Do not treat filldir running out of space as an error that needs to be returned. Fixes Redhat bugzilla bug # 211070 Signed-off-by: Steve French <sf...@us...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-02 20:19:52
|
arch/mips/Kconfig | 9 +++------ arch/mips/Makefile | 4 +++- arch/mips/kernel/setup.c | 6 +++++- arch/mips/momentum/ocelot_g/gt-irq.c | 8 ++++---- fs/jfs/file.c | 2 ++ include/asm-mips/system.h | 2 +- include/asm-sparc64/futex.h | 18 ++++++++---------- net/bridge/netfilter/ebtables.c | 2 +- net/ipv4/sysctl_net_ipv4.c | 7 ------- net/ipv4/tcp_cong.c | 8 ++++++++ net/ipv6/xfrm6_tunnel.c | 4 ++-- net/tipc/port.c | 5 +++-- 12 files changed, 40 insertions(+), 35 deletions(-) New commits: commit e957b00a8caece90cbc2afd0a4cb4c4d61b9efa8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e957b00a8caece90cbc2afd0a4cb4c4d61b9efa8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e957b00a8caece90cbc2afd0a4cb4c4d61b9efa8 Merge: 096e5bdaf166791e128ed3b9190542412559333b 236d333c3c05c179e31f461285c09271256a1381 Author: Linus Torvalds <tor...@g5...> Date: Thu Nov 2 10:14:37 2006 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Do not use -msym32 option for modules. [MIPS] Don't use R10000 llsc workaround version for all llsc-full processors. [MIPS] Ocelot G: Fix : "CURRENTLY_UNUSED" is not defined warning. [MIPS] Fix warning about init_initrd() call if !CONFIG_BLK_DEV_INITRD. [MIPS] IP27: Allow SMP ;-) Another changeset messed up by patch. [MIPS] Fix merge screwup by patch(1) Revert "[MIPS] Make SPARSEMEM selectable on QEMU." commit 236d333c3c05c179e31f461285c09271256a1381 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=236d333c3c05c179e31f461285c09271256a1381 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=236d333c3c05c179e31f461285c09271256a1381 Author: Atsushi Nemoto <an...@mb...> Date: Tue Oct 10 22:13:55 2006 +0900 [MIPS] Do not use -msym32 option for modules. On 64-bit kernel, modules are loaded into XKSEG for now. While XKSEG address is not a sign-extended 32-bit address, we can not use -msym32 option. Signed-off-by: Atsushi Nemoto <an...@mb...> Signed-off-by: Ralf Baechle <ra...@li...> commit 904880e717c5466041485ca6d6e8c6c1ef06d0fd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=904880e717c5466041485ca6d6e8c6c1ef06d0fd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=904880e717c5466041485ca6d6e8c6c1ef06d0fd Author: Ralf Baechle <ra...@li...> Date: Fri Oct 13 11:32:50 2006 +0100 [MIPS] Don't use R10000 llsc workaround version for all llsc-full processors. Found and original patch by bi...@la.... Signed-off-by: Ralf Baechle <ra...@li...> commit 8b922a851731037b2f1e1669e9b1a0baff3ab5dc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8b922a851731037b2f1e1669e9b1a0baff3ab5dc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8b922a851731037b2f1e1669e9b1a0baff3ab5dc Author: Ralf Baechle <ra...@li...> Date: Mon Oct 30 12:48:04 2006 +0000 [MIPS] Ocelot G: Fix : "CURRENTLY_UNUSED" is not defined warning. CC arch/mips/momentum/ocelot_g/gt-irq.o arch/mips/momentum/ocelot_g/gt-irq.c:30:5: warning: "CURRENTLY_UNUSED" is not defined arch/mips/momentum/ocelot_g/gt-irq.c:199:5: warning: "CURRENTLY_UNUSED" is not defined Signed-off-by: Ralf Baechle <ra...@li...> commit 9ba126cfbf505f4d5b39ed294cedd241321c7a91 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9ba126cfbf505f4d5b39ed294cedd241321c7a91 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9ba126cfbf505f4d5b39ed294cedd241321c7a91 Author: Ralf Baechle <ra...@li...> Date: Fri Oct 13 11:22:52 2006 +0100 [MIPS] Fix warning about init_initrd() call if !CONFIG_BLK_DEV_INITRD. Signed-off-by: Ralf Baechle <ra...@li...> commit 1a5c5de1b64ec510a6ab6994702c295db00b9acc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1a5c5de1b64ec510a6ab6994702c295db00b9acc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1a5c5de1b64ec510a6ab6994702c295db00b9acc Author: Ralf Baechle <ra...@li...> Date: Thu Nov 2 17:23:33 2006 +0000 [MIPS] IP27: Allow SMP ;-) Another changeset messed up by patch. When lmo commit 4ef893e0515e8bf336dfbd200884f244869fbb43 was merged to kernel.org as e73ea273ef87a04ff59fc368fa33333dca275dde patch happily applied the IP27 segment to IP22. f63f36c18b11e166d0f362ac04dbcd7e6ea23f9e did fix the effects partially - and with a wrong log message. Now fixed for real (tm). Signed-off-by: Ralf Baechle <ra...@li...> commit 8a88ca8f7fd15d06e53a848c6b3558ed9973327c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8a88ca8f7fd15d06e53a848c6b3558ed9973327c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8a88ca8f7fd15d06e53a848c6b3558ed9973327c Author: Ralf Baechle <ra...@li...> Date: Thu Nov 2 17:23:33 2006 +0000 [MIPS] Fix merge screwup by patch(1) Patch happily applied an Ocelot G patch to Ocelot C when merging linux-mips.org changeset 91ee9a801e65d2981dfe327d2519c7fc6ab02e6b into kernel.org as 6ceb6d3ab2d402cea326320a4143db90a66fd216. Signed-off-by: Ralf Baechle <ra...@li...> commit 8427829711b35e0e62668618cec577f65c102935 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8427829711b35e0e62668618cec577f65c102935 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8427829711b35e0e62668618cec577f65c102935 Author: Ralf Baechle <ra...@li...> Date: Thu Nov 2 02:00:02 2006 +0000 Revert "[MIPS] Make SPARSEMEM selectable on QEMU." This reverts commit 31473747bd441719f9f6a07385684dce547533e0. Another amazing example of patch(1) messing up - lmo changeset 66e8560d11d02bcadc261498471831a6375ad046 was merged twice to kernel.org and ended up doing this rubbish job. Signed-off-by: Ralf Baechle <ra...@li...> commit 096e5bdaf166791e128ed3b9190542412559333b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=096e5bdaf166791e128ed3b9190542412559333b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=096e5bdaf166791e128ed3b9190542412559333b Merge: eb193e405155c5680ca1560b040b1551566660f9 89f68225876db7df638de2884b561facb1870239 Author: Linus Torvalds <tor...@g5...> Date: Thu Nov 2 08:51:26 2006 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: Add splice support commit eb193e405155c5680ca1560b040b1551566660f9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=eb193e405155c5680ca1560b040b1551566660f9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=eb193e405155c5680ca1560b040b1551566660f9 Merge: 0ca2b776ab1f4ba99d7f592baa4ff8525e53b050 6f5b7ef6b5816dc497094048d7d8a270004602d6 Author: Linus Torvalds <tor...@g5...> Date: Thu Nov 2 08:50:46 2006 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NETFILTER]: silence a warning in ebtables [IPV6]: File the fingerprints off ah6->spi/esp6->spi [TCP]: Set default congestion control when no sysctl. [TIPC] net/tipc/port.c: fix NULL dereference commit 0ca2b776ab1f4ba99d7f592baa4ff8525e53b050 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0ca2b776ab1f4ba99d7f592baa4ff8525e53b050 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0ca2b776ab1f4ba99d7f592baa4ff8525e53b050 Merge: aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7 c7fed9d75074f7c243ec8ff2c55d04de2839a6f6 Author: Linus Torvalds <tor...@g5...> Date: Thu Nov 2 08:50:02 2006 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix futex_atomic_cmpxchg_inatomic implementation. commit 6f5b7ef6b5816dc497094048d7d8a270004602d6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6f5b7ef6b5816dc497094048d7d8a270004602d6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6f5b7ef6b5816dc497094048d7d8a270004602d6 Author: Meelis Roos <mr...@li...> Date: Wed Nov 1 18:07:27 2006 -0800 [NETFILTER]: silence a warning in ebtables net/bridge/netfilter/ebtables.c: In function 'ebt_dev_check': net/bridge/netfilter/ebtables.c:89: warning: initialization discards qualifiers from pointer target type So make the char* a const char * and the warning is gone. Signed-off-by: Meelis Roos <mr...@li...> Signed-off-by: David S. Miller <da...@da...> commit c7fed9d75074f7c243ec8ff2c55d04de2839a6f6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c7fed9d75074f7c243ec8ff2c55d04de2839a6f6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c7fed9d75074f7c243ec8ff2c55d04de2839a6f6 Author: David S. Miller <da...@da...> Date: Wed Nov 1 16:30:39 2006 -0800 [SPARC64]: Fix futex_atomic_cmpxchg_inatomic implementation. I copied the logic from ll/sc arch implementations, but that was wrong and makes no sense at all. Just do a straight compare-exchange instruction, just like x86. Based upon bug reports from Dennis Gilmore and Fabio Massimo. Signed-off-by: David S. Miller <da...@da...> commit 5b1225454f7891970cb5ba87c8ef24edb1fa6c3a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5b1225454f7891970cb5ba87c8ef24edb1fa6c3a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5b1225454f7891970cb5ba87c8ef24edb1fa6c3a Author: Al Viro <vi...@ze...> Date: Wed Nov 1 15:28:58 2006 -0800 [IPV6]: File the fingerprints off ah6->spi/esp6->spi In theory these are opaque 32bit values. However, we end up allocating them sequentially in host-endian and stick unchanged on the wire. Signed-off-by: Al Viro <vi...@ze...> Signed-off-by: David S. Miller <da...@da...> commit b1736a71404b3961f061c795a81210aa7f945fc0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b1736a71404b3961f061c795a81210aa7f945fc0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b1736a71404b3961f061c795a81210aa7f945fc0 Author: Stephen Hemminger <she...@os...> Date: Tue Oct 31 17:31:33 2006 -0800 [TCP]: Set default congestion control when no sysctl. The setting of the default congestion control was buried in the sysctl code so it would not be done properly if SYSCTL was not enabled. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: David S. Miller <da...@da...> commit d55b4c631e89a008e80b003e5aa4291d9ec800ac gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d55b4c631e89a008e80b003e5aa4291d9ec800ac gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d55b4c631e89a008e80b003e5aa4291d9ec800ac Author: Adrian Bunk <bu...@st...> Date: Tue Oct 31 16:59:35 2006 -0800 [TIPC] net/tipc/port.c: fix NULL dereference The correct order is: NULL check before dereference Spotted by the Coverity checker. Signed-off-by: Adrian Bunk <bu...@st...> Signed-off-by: David S. Miller <da...@da...> commit 89f68225876db7df638de2884b561facb1870239 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=89f68225876db7df638de2884b561facb1870239 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=89f68225876db7df638de2884b561facb1870239 Author: Daniel Drake <dd...@br...> Date: Mon Oct 30 11:47:02 2006 -0600 jfs: Add splice support This allows the splice() and tee() syscalls to be used with JFS. Signed-off-by: Daniel Drake <dd...@br...> Signed-off-by: Dave Kleikamp <sh...@au...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-02 07:07:18
|
arch/mips/kernel/asm-offsets.c | 2 +- arch/mips/kernel/entry.S | 3 +++ arch/mips/kernel/head.S | 3 ++- arch/mips/kernel/r4k_switch.S | 5 +++++ arch/mips/kernel/smtc-asm.S | 7 ++++++- arch/mips/kernel/smtc.c | 1 + arch/mips/kernel/vmlinux.lds.S | 10 ++++++++++ arch/mips/lib-64/dump_tlb.c | 6 +++--- arch/mips/mips-boards/generic/memory.c | 2 +- arch/mips/mips-boards/generic/pci.c | 2 +- arch/mips/mm/pg-r4k.c | 30 ++++++++++++++++++++++++++++-- arch/mips/mm/tlbex.c | 13 ++++++++++--- arch/powerpc/kernel/head_64.S | 27 +++++++++++++++------------ drivers/ata/ahci.c | 3 +-- drivers/ata/ata_piix.c | 1 - drivers/ata/sata_nv.c | 12 ++++++++---- include/asm-mips/asm.h | 2 ++ include/asm-mips/pgalloc.h | 2 +- include/asm-mips/pgtable-64.h | 2 +- 19 files changed, 99 insertions(+), 34 deletions(-) New commits: commit aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7 Merge: 3ccfc65c5004e5fe5cfbffe43b8acc686680b53e 732f74a46711c0724885703fb689c79139c84a3c Author: Linus Torvalds <tor...@g5...> Date: Wed Nov 1 19:16:31 2006 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: Revert "[PATCH] Add 0x7110 piix to ata_piix.c" [libata] sata_nv: Add PCI IDs [PATCH] ahci: fix status register check in ahci_softreset commit 732f74a46711c0724885703fb689c79139c84a3c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=732f74a46711c0724885703fb689c79139c84a3c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=732f74a46711c0724885703fb689c79139c84a3c Author: Jeff Garzik <je...@ga...> Date: Wed Nov 1 22:09:21 2006 -0500 Revert "[PATCH] Add 0x7110 piix to ata_piix.c" This reverts commit f833229c96c0bf53c05995e4bd58709d9e9edd67: According to reviewers and the lspci data provided in commit message itself, PCI ID 0x7110 should not have been added to ata_piix. Signed-off-by: Jeff Garzik <je...@ga...> commit 3ccfc65c5004e5fe5cfbffe43b8acc686680b53e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3ccfc65c5004e5fe5cfbffe43b8acc686680b53e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3ccfc65c5004e5fe5cfbffe43b8acc686680b53e Author: Paul Mackerras <pa...@sa...> Date: Thu Nov 2 09:44:37 2006 +1100 [PATCH] powerpc: Eliminate "exceeds stub group size" linker warning It turns out that the linker warnings on 64-bit powerpc about "section blah exceeds stub group size" were being triggered by conditional branches in head_64.S branching to global symbols, whether in head_64.S or in other files. This eliminates the warnings by making some global symbols in head_64.S no longer global, and by rearranging some branches. Signed-off-by: Paul Mackerras <pa...@sa...> [ Yee-haa. Maybe I'll notice newly introduced real warnings now - Linus ] Signed-off-by: Linus Torvalds <tor...@os...> commit dd472546edefe0d48613c466b110533514e20455 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=dd472546edefe0d48613c466b110533514e20455 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=dd472546edefe0d48613c466b110533514e20455 Merge: f9dadfa71bc594df09044da61d1c72701121d802 67cac1eba7eee92e2b25c1e8e4737968dc7c8522 Author: Linus Torvalds <tor...@g5...> Date: Wed Nov 1 12:00:22 2006 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix warning in mips-boards generic PCI [MIPS] SMTC: Synchronize cp0 counters on bootup. [MIPS] SMTC: Fix crash if # of TC's > # of VPE's after pt_regs irq cleanup. [MIPS] 16K & 64K page size fixes commit 67cac1eba7eee92e2b25c1e8e4737968dc7c8522 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=67cac1eba7eee92e2b25c1e8e4737968dc7c8522 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=67cac1eba7eee92e2b25c1e8e4737968dc7c8522 Author: Yoichi Yuasa <yoi...@tr...> Date: Wed Nov 1 18:55:22 2006 +0900 [MIPS] Fix warning in mips-boards generic PCI arch/mips/mips-boards/generic/pci.c: In function `mips_pcibios_init': arch/mips/mips-boards/generic/pci.c:227: warning: comparison of distinct pointer types lacks a cast arch/mips/mips-boards/generic/pci.c:228: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Yoichi Yuasa <yoi...@tr...> Signed-off-by: Ralf Baechle <ra...@li...> commit 64c590b7a62ae1272fe4afd7b915de314591f35e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=64c590b7a62ae1272fe4afd7b915de314591f35e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=64c590b7a62ae1272fe4afd7b915de314591f35e Author: Ralf Baechle <ra...@li...> Date: Wed Nov 1 00:22:00 2006 +0000 [MIPS] SMTC: Synchronize cp0 counters on bootup. Signed-off-by: Ralf Baechle <ra...@li...> commit cb56837ea5f15fa5279fd490f292134c3a92e5de gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cb56837ea5f15fa5279fd490f292134c3a92e5de gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cb56837ea5f15fa5279fd490f292134c3a92e5de Author: Ralf Baechle <ra...@li...> Date: Tue Oct 31 22:49:04 2006 +0000 [MIPS] SMTC: Fix crash if # of TC's > # of VPE's after pt_regs irq cleanup. Signed-off-by: Ralf Baechle <ra...@li...> commit 242954b5aa8e5ec84f46a84637daf08ee4247c6e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=242954b5aa8e5ec84f46a84637daf08ee4247c6e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=242954b5aa8e5ec84f46a84637daf08ee4247c6e Author: Ralf Baechle <ra...@li...> Date: Tue Oct 24 02:29:01 2006 +0100 [MIPS] 16K & 64K page size fixes Derived from Peter Watkins <tre...@gm...>'s work. Signed-off-by: Ralf Baechle <ra...@li...> commit 8fc2d9cae99e47e236cb7b77015b9faf69a097cc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8fc2d9cae99e47e236cb7b77015b9faf69a097cc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8fc2d9cae99e47e236cb7b77015b9faf69a097cc Author: Peer Chen <pc...@nv...> Date: Wed Nov 1 05:23:11 2006 -0500 [libata] sata_nv: Add PCI IDs Signed-off-by: Jeff Garzik <je...@ga...> commit 1244a19cde42c268aa159d264fc2df072a3ff82f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1244a19cde42c268aa159d264fc2df072a3ff82f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1244a19cde42c268aa159d264fc2df072a3ff82f Author: Tejun Heo <ht...@gm...> Date: Wed Nov 1 17:19:18 2006 +0900 [PATCH] ahci: fix status register check in ahci_softreset ahci_softreset() used to use ahci_tf_read() which reads D2H_REG area to check for the Status register. However, this area is zeroed on initialization and not set by initial signature FIS. Replace it with ahci_check_status(). This bug prevented CLO code from being activated whenever BSY and/or DRQ is set prior to softreset. This fix makes AHCI_FLAG_RESET_NEEDS_CLO flag redundant. Signed-off-by: Tejun Heo <ht...@gm...> Signed-off-by: Jeff Garzik <je...@ga...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-01 20:05:35
|
arch/i386/kernel/io_apic.c | 66 ++++++++++++++++++++++++++++++++++++++++++--- include/asm-i386/io_apic.h | 29 ------------------- 2 files changed, 64 insertions(+), 31 deletions(-) New commits: commit f9dadfa71bc594df09044da61d1c72701121d802 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f9dadfa71bc594df09044da61d1c72701121d802 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f9dadfa71bc594df09044da61d1c72701121d802 Author: Linus Torvalds <tor...@ma...> Date: Wed Nov 1 10:05:35 2006 -0800 i386: write IO APIC irq routing entries in correct order Since the "mask" bit is in the low word, when we write a new entry, we need to write the high word first, before we potentially unmask it. The exception is when we actually want to mask the interrupt, in which case we want to write the low word first to make sure that the high word doesn't change while the interrupt routing is still active. Signed-off-by: Linus Torvalds <tor...@os...> commit 130fe05dbc0114609cfef9815c0c5580b42decfa gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=130fe05dbc0114609cfef9815c0c5580b42decfa gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=130fe05dbc0114609cfef9815c0c5580b42decfa Author: Linus Torvalds <tor...@ma...> Date: Wed Nov 1 09:11:00 2006 -0800 i386: clean up io-apic accesses This is preparation for fixing the ordering of the accesses that got broken by the commit cf4c6a2f27f5db810b69dcb1da7f194489e8ff88 when factoring out the "common" io apic routing entry accesses. Move the accessor function (that were only used by io_apic.c) out of a header file, and use proper memory-mapped accesses rather than making up our own "volatile" pointers. Signed-off-by: Linus Torvalds <tor...@os...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-01 15:20:30
|
arch/ia64/kernel/mca_drv.c | 95 ++++++++---- arch/ia64/kernel/sal.c | 11 - arch/ia64/kernel/setup.c | 2 arch/ia64/kernel/smp.c | 12 - arch/powerpc/kernel/Makefile | 1 arch/powerpc/kernel/btext.c | 2 arch/powerpc/kernel/iommu.c | 77 +++++----- arch/powerpc/kernel/perfmon_fsl_booke.c | 221 ----------------------------- arch/powerpc/kernel/pmc.c | 2 arch/powerpc/kernel/traps.c | 18 +- arch/powerpc/kernel/vio.c | 4 arch/powerpc/lib/sstep.c | 5 arch/powerpc/mm/hugetlbpage.c | 3 arch/powerpc/oprofile/Makefile | 2 arch/powerpc/oprofile/common.c | 10 + arch/powerpc/oprofile/op_model_7450.c | 2 arch/powerpc/oprofile/op_model_fsl_booke.c | 170 +++++++++++++++++----- arch/powerpc/oprofile/op_model_power4.c | 2 arch/powerpc/oprofile/op_model_rs64.c | 2 arch/powerpc/platforms/iseries/iommu.c | 11 - arch/powerpc/platforms/pseries/iommu.c | 35 +--- arch/powerpc/sysdev/dart.h | 1 arch/powerpc/sysdev/dart_iommu.c | 8 - arch/powerpc/sysdev/qe_lib/qe.c | 3 arch/ppc/kernel/traps.c | 18 +- drivers/ata/ata_piix.c | 38 ---- drivers/ata/libata-core.c | 1 drivers/ata/libata.h | 1 drivers/ata/sata_sis.c | 21 +- drivers/net/Kconfig | 6 drivers/net/arm/ep93xx_eth.c | 40 +---- drivers/net/ehea/ehea_main.c | 11 - drivers/net/irda/stir4200.c | 3 drivers/net/myri10ge/myri10ge.c | 1 drivers/net/s2io.c | 11 + drivers/net/skge.c | 3 drivers/net/sky2.c | 9 - drivers/net/tokenring/proteon.c | 9 - drivers/net/tokenring/skisa.c | 9 - drivers/net/wan/n2.c | 6 drivers/video/offb.c | 36 +++- include/asm-ia64/sal.h | 1 include/asm-ia64/uaccess.h | 2 include/asm-powerpc/current.h | 12 + include/asm-powerpc/io.h | 7 include/asm-powerpc/iommu.h | 22 ++ include/asm-powerpc/oprofile_impl.h | 87 +++++++++++ include/asm-powerpc/pmc.h | 13 - include/asm-powerpc/system.h | 6 include/asm-powerpc/tce.h | 3 include/linux/libata.h | 1 net/sched/sch_netem.c | 2 52 files changed, 538 insertions(+), 540 deletions(-) New commits: commit 4b1c46a383aafc137bc91a0f9698bfc11e062d1b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4b1c46a383aafc137bc91a0f9698bfc11e062d1b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4b1c46a383aafc137bc91a0f9698bfc11e062d1b Merge: 30574b61611ccd29677989097f8c8a5d9a73d873 4393c4f6788cee65095dd838cfeca6edefbfeb52 Author: Linus Torvalds <tor...@g5...> Date: Wed Nov 1 06:38:20 2006 -0800 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Make alignment exception always check exception table [POWERPC] Disallow kprobes on emulate_step and branch_taken [POWERPC] Make mmiowb's io_sync preempt safe [POWERPC] Make high hugepage areas preempt safe [POWERPC] Make current preempt-safe [POWERPC] qe_lib: qe_issue_cmd writes wrong value to CECDR [POWERPC] Use 4kB iommu pages even on 64kB-page systems [POWERPC] Fix oprofile support for e500 in arch/powerpc [POWERPC] Fix rmb() for e500-based machines it [POWERPC] Fix various offb issues commit 30574b61611ccd29677989097f8c8a5d9a73d873 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=30574b61611ccd29677989097f8c8a5d9a73d873 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=30574b61611ccd29677989097f8c8a5d9a73d873 Merge: 0ca43235b34c92278fa903297acef37198ec3e26 c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 Author: Linus Torvalds <tor...@g5...> Date: Tue Oct 31 21:17:23 2006 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] ata_piix: allow 01b MAP for both ICH6M and ICH7M [PATCH] libata: unexport ata_dev_revalidate() [PATCH] Add 0x7110 piix to ata_piix.c [PATCH] sata_sis: fix flags handling for the secondary port commit 4393c4f6788cee65095dd838cfeca6edefbfeb52 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4393c4f6788cee65095dd838cfeca6edefbfeb52 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4393c4f6788cee65095dd838cfeca6edefbfeb52 Author: Benjamin Herrenschmidt <be...@ke...> Date: Wed Nov 1 15:11:39 2006 +1100 [POWERPC] Make alignment exception always check exception table The alignment exception used to only check the exception table for -EFAULT, not for other errors. That opens an oops window if we can coerce the kernel into getting an alignment exception for other reasons in what would normally be a user-protected accessor, which can be done via some of the futex ops. This fixes it by always checking the exception tables. Signed-off-by: Benjamin Herrenschmidt <be...@ke...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 0d69a052d4d7c4085706b9ac0d1bd28ff90c9fca gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0d69a052d4d7c4085706b9ac0d1bd28ff90c9fca gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0d69a052d4d7c4085706b9ac0d1bd28ff90c9fca Author: Gui,Jian <gu...@cn...> Date: Wed Nov 1 10:50:15 2006 +0800 [POWERPC] Disallow kprobes on emulate_step and branch_taken On powerpc, probing on emulate_step function will crash 2.6.18.1 when it is triggered. When kprobe is triggered, emulate_step() is on its kernel path and will cause recursive kprobe fault. And branch_taken() is called in emulate_step(). This disallows kprobes on both of them. Signed-off-by: Paul Mackerras <pa...@sa...> commit 292f86f005e3867277b2126c2399eea3e773a4fc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=292f86f005e3867277b2126c2399eea3e773a4fc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=292f86f005e3867277b2126c2399eea3e773a4fc Author: Hugh Dickins <hu...@ve...> Date: Tue Oct 31 18:41:51 2006 +0000 [POWERPC] Make mmiowb's io_sync preempt safe If mmiowb() is always used prior to releasing spinlock as Doc suggests, then it's safe against preemption; but I'm not convinced that's always the case. If preemption occurs between sync and get_paca()->io_sync = 0, I believe there's no problem. But in the unlikely event that gcc does the store relative to another register than r13 (as it did with current), then there's a small danger of setting another cpu's io_sync to 0, after it had just set it to 1. Rewrite ppc64 mmiowb to prevent that. The remaining io_sync assignments in io.h all get_paca()->io_sync = 1, which is harmless even if preempted to the wrong cpu (the context switch itself syncs); and those in spinlock.h are while preemption is disabled. Signed-off-by: Hugh Dickins <hu...@ve...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 96268889ee369b36203b7a06e8aabb197270216e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=96268889ee369b36203b7a06e8aabb197270216e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=96268889ee369b36203b7a06e8aabb197270216e Author: Hugh Dickins <hu...@ve...> Date: Tue Oct 31 18:40:39 2006 +0000 [POWERPC] Make high hugepage areas preempt safe Checking source for other get_paca()->field preemption dangers found that open_high_hpage_areas does a structure copy into its paca while preemption is enabled: unsafe however gcc accomplishes it. Just remove that copy: it's done safely afterwards by on_each_cpu, as in open_low_hpage_areas. Signed-off-by: Hugh Dickins <hu...@ve...> Acked-by: David Gibson <dw...@au...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 5fe8e8b88e68e517637e3f8287f1fee89e2d9252 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5fe8e8b88e68e517637e3f8287f1fee89e2d9252 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5fe8e8b88e68e517637e3f8287f1fee89e2d9252 Author: Hugh Dickins <hu...@ve...> Date: Tue Oct 31 18:39:31 2006 +0000 [POWERPC] Make current preempt-safe Repeated -j20 kernel builds on a G5 Quad running an SMP PREEMPT kernel would often collapse within a day, some exec failing with "Bad address". In each case examined, load_elf_binary was doing a kernel_read, but generic_file_aio_read's access_ok saw current->thread.fs.seg as USER_DS instead of KERNEL_DS. objdump of filemap.o shows gcc 4.1.0 emitting "mr r5,r13 ... ld r9,416(r5)" here for get_paca()->__current, instead of the expected and much more usual "ld r9,416(r13)"; I've seen other gcc4s do the same, but perhaps not gcc3s. So, if the task is preempted and rescheduled on a different cpu in between the mr and the ld, r5 will be looking at a different paca_struct from the one it's now on, pick up the wrong __current, and perhaps the wrong seg. Presumably much worse could happen elsewhere, though that split is rare. Other architectures appear to be safe (x86_64's read_pda is more limiting than get_paca), but ppc64 needs to force "current" into one instruction. Signed-off-by: Hugh Dickins <hu...@ve...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 302439d2167e0f1e01a6480ac40c06063f4e16a1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=302439d2167e0f1e01a6480ac40c06063f4e16a1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=302439d2167e0f1e01a6480ac40c06063f4e16a1 Author: Timur Tabi <ti...@fr...> Date: Tue Oct 31 17:53:42 2006 +0800 [POWERPC] qe_lib: qe_issue_cmd writes wrong value to CECDR Changed qe_issue_cmd() to write cmd_input to the CECDR unmodified. It was treating cmd_input as a virtual address and tried to convert it to a physical address. Signed-off-by: Timur Tabi <ti...@fr...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 5d2efba64b231a1733c4048d1708d77e07f26426 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5d2efba64b231a1733c4048d1708d77e07f26426 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5d2efba64b231a1733c4048d1708d77e07f26426 Author: Linas Vepstas <li...@au...> Date: Mon Oct 30 16:15:59 2006 +1100 [POWERPC] Use 4kB iommu pages even on 64kB-page systems The 10Gigabit ethernet device drivers appear to be able to chew up all 256MB of TCE mappings on pSeries systems, as evidenced by numerous error messages: iommu_alloc failed, tbl c0000000010d5c48 vaddr c0000000d875eff0 npages 1 Some experimentation indicates that this is essentially because one 1500 byte ethernet MTU gets mapped as a 64K DMA region when the large 64K pages are enabled. Thus, it doesn't take much to exhaust all of the available DMA mappings for a high-speed card. This patch changes the iommu allocator to work with its own unique, distinct page size. Although the patch is long, its actually quite simple: it just #defines a distinct IOMMU_PAGE_SIZE and then uses this in all the places that matter. As a side effect, it also dramatically improves network performance on platforms with H-calls on iommu translation inserts/removes (since we no longer call it 16 times for a 1500 bytes packet when the iommu HW is still 4k). In the future, we might want to make the IOMMU_PAGE_SIZE a variable in the iommu_table instance, thus allowing support for different HW page sizes in the iommu itself. Signed-off-by: Linas Vepstas <li...@au...> Signed-off-by: Benjamin Herrenschmidt <be...@ke...> Acked-by: Olof Johansson <ol...@li...> Acked-by: Stephen Rothwell <sf...@ca...> Signed-off-by: Paul Mackerras <pa...@sa...> commit dd6c89f686bdb2a5de72fab636fc839e5a0add6d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=dd6c89f686bdb2a5de72fab636fc839e5a0add6d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=dd6c89f686bdb2a5de72fab636fc839e5a0add6d Author: Andy Fleming <afl...@fr...> Date: Fri Oct 27 15:06:32 2006 -0500 [POWERPC] Fix oprofile support for e500 in arch/powerpc Fixed a compile error in building the 85xx support with oprofile, and in the process cleaned up some issues with the fsl_booke performance monitor code. * Reorganized FSL Book-E performance monitoring code so that the 7450 wouldn't be built if the e500 was, and cleaned it up so it was more self-contained. * Added a cpu_setup function for FSL Book-E. The original cpu_setup function prototype had no arguments, assuming that the reg_setup function would copy the required information into variables which represented the registers. This was silly for e500, since it has 1 register per counter (rather than 3 for all counters), so the code has been restructured to have cpu_setup take the current counter config array as an argument, with op_powerpc_setup() invoking op_powerpc_cpu_setup() through on_each_cpu(), and op_powerpc_cpu_setup() invoking the model-specific cpu_setup function with an argument. The argument is ignored on all other platforms at present. * Fixed a confusing line where a trinary operator only had two arguments Signed-off-by: Andrew Fleming <afl...@fr...> Signed-off-by: Paul Mackerras <pa...@sa...> commit e0da0daee14862e0a5c49f2059641a8deb27eca2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e0da0daee14862e0a5c49f2059641a8deb27eca2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e0da0daee14862e0a5c49f2059641a8deb27eca2 Author: Andy Fleming <afl...@fr...> Date: Fri Oct 27 14:31:07 2006 -0500 [POWERPC] Fix rmb() for e500-based machines it The e500 core generates an illegal instruction exception when it tries to execute the lwsync instruction, which we currently use for rmb(). This fixes it by using the LWSYNC macro, which turns into a plain sync on 32-bit machines. Signed-off-by: Andrew Fleming <afl...@fr...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 441cbd8dace80545db2ac43175ac1c097d96f75c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=441cbd8dace80545db2ac43175ac1c097d96f75c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=441cbd8dace80545db2ac43175ac1c097d96f75c Author: Benjamin Herrenschmidt <be...@ke...> Date: Thu Oct 26 15:38:10 2006 +1000 [POWERPC] Fix various offb issues This patch fixes a few issues in offb: - A test was inverted causing the palette hack to never work (no device node was passed down to the init function) - Some cards seem to have their assigned-addresses property in a random order, thus we need to try using of_get_pci_address() first, which will fail if it's not a PCI device, and fallback to of_get_address() in that case. of_get_pci_address() properly parsees assigned-addresses to test the BAR number and thus will get it right whatever the order is. - Some cards (like GXT4500) provide a linebytes of 0xffffffff in the device-tree which does no good. This patch handles that by using the screen width when that happens. (Also fixes btext.c while at it). - Add detection of the GXT4500 in addition to the GXT2000 for the palette hacks (we use the same hack, palette is linear in register space at offset 0x6000). Signed-off-by: Benjamin Herrenschmidt <be...@ke...> Signed-off-by: Paul Mackerras <pa...@sa...> commit c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 Author: Tejun Heo <ht...@gm...> Date: Mon Oct 9 13:23:58 2006 +0900 [PATCH] ata_piix: allow 01b MAP for both ICH6M and ICH7M ICH7M was separated from ICH6M to allow undocumented MAP value 01b which was spotted on an ASUS notebook. However, there is also notebooks with MAP value 01b on ICH6M. This patch re-merges ICH6M and ICH7M entries and allows MAP value 01b for both. This problem has been reported and initial patch provided by Jonathan Dieter. Signed-off-by: Tejun Heo <ht...@gm...> Cc: Jonathan Dieter <jd...@gm...> Cc: Tom Deblauwe <tom...@te...> Signed-off-by: Jeff Garzik <je...@ga...> commit 6e42acc4115bc376b8523acbcba2b2b7cc27d016 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6e42acc4115bc376b8523acbcba2b2b7cc27d016 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6e42acc4115bc376b8523acbcba2b2b7cc27d016 Author: Tejun Heo <ht...@gm...> Date: Fri Oct 27 19:08:42 2006 -0700 [PATCH] libata: unexport ata_dev_revalidate() ata_dev_revalidate() isn't used outside of libata core. Unexport it. Signed-off-by: Tejun Heo <ht...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit f833229c96c0bf53c05995e4bd58709d9e9edd67 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f833229c96c0bf53c05995e4bd58709d9e9edd67 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f833229c96c0bf53c05995e4bd58709d9e9edd67 Author: Jens Axboe <jen...@or...> Date: Tue Oct 31 09:31:37 2006 +0100 [PATCH] Add 0x7110 piix to ata_piix.c Hi Jeff, I tested the PATA support on my old VAIO notebook, and it failed to find my piix device: 00:07.1 Class 0101: 8086:7111 (rev 01) (prog-if 80 [Master]) Control: I/O+ Mem- BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- Latency: 64 Region 4: I/O ports at fc90 [size=16] This patch adds the pci id to ata_piix.c and things then work as expected. Signed-off-by: Jens Axboe <jen...@or...> Signed-off-by: Jeff Garzik <je...@ga...> commit cf0e812f0e90ee496af072b136e8bd02770387e6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cf0e812f0e90ee496af072b136e8bd02770387e6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cf0e812f0e90ee496af072b136e8bd02770387e6 Author: Tejun Heo <ht...@gm...> Date: Fri Oct 27 19:08:47 2006 -0700 [PATCH] sata_sis: fix flags handling for the secondary port sis_init_one() modifies probe_ent->port_flags after allocating and initializing it using ata_pci_init_native_mode(). This makes port_flags for the secondary port (probe_ent->pinfo2->flags) go out of sync resulting in misdetection of device due to incorrectly initialized SCR access flag. This patch make probe_ent alloc/init happen after the final port flags value is determined. This is fragile but probe_ent and all the related mess are scheduled to go away soon for exactly this reason. We just need to hold everything together till then. This has been spotted and diagnosed and tested by Patrick McHardy. Signed-off-by: Tejun Heo <ht...@gm...> Cc: Patric McHardy <ka...@tr...> Cc: Jeff Garzik <je...@ga...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit 0ca43235b34c92278fa903297acef37198ec3e26 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0ca43235b34c92278fa903297acef37198ec3e26 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0ca43235b34c92278fa903297acef37198ec3e26 Author: Stephen Hemminger <she...@os...> Date: Wed Oct 18 13:39:28 2006 -0700 [PATCH] sky2: netpoll on dual port cards The sky2 driver uses a single NAPI poll routine for both ports on dual ported cards (because there is a single IRQ and status ring). Netpoll makes assumptions about the relationship between network device and NAPI that aren't correct on the second port, this will cause the port to never clear work. Most systems, just have single port, so not a big issue. The easy fix is just make the second port, not netpoll capable. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit 798b6b19d7a4b6e1ea5340ec8b3b92811e05b81b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=798b6b19d7a4b6e1ea5340ec8b3b92811e05b81b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=798b6b19d7a4b6e1ea5340ec8b3b92811e05b81b Author: Stephen Hemminger <she...@os...> Date: Sun Oct 22 20:16:57 2006 -0700 [PATCH] skge, sky2, et all. gplv2 only I don't want my code to downgraded to GPLv3 because of cut-n-pasted the comments. These files which I hold copyright on were started before it was clear what GPLv3 was going to be. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit 2ceaac755423cb93c1bb2f59ebd1a06f027ac095 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2ceaac755423cb93c1bb2f59ebd1a06f027ac095 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2ceaac755423cb93c1bb2f59ebd1a06f027ac095 Author: David Rientjes <rie...@cs...> Date: Mon Oct 30 14:19:25 2006 -0800 [PATCH] net s2io: return on NULL dev_alloc_skb() Checks for NULL dev_alloc_skb() and returns on true to avoid subsequent dereference. Cc: Jeff Garzik <jg...@po...> Cc: Christoph Hellwig <hc...@in...> Signed-off-by: David Rientjes <rie...@cs...> Signed-off-by: Jeff Garzik <je...@ga...> commit 1e1675ccf758cbb4303ab052d58405cda6c745a7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1e1675ccf758cbb4303ab052d58405cda6c745a7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1e1675ccf758cbb4303ab052d58405cda6c745a7 Author: Jan-Bernd Themann <oss...@de...> Date: Wed Oct 25 13:11:42 2006 +0200 [PATCH] ehea: kzalloc GFP_ATOMIC fix This patch fixes kzalloc parameters (GFP_ATOMIC instead of GFP_KERNEL) Signed-off-by: Jan-Bernd Themann <th...@de...> Signed-off-by: Jeff Garzik <je...@ga...> commit 1e7bed081968c42469bd02842b4190a115008221 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1e7bed081968c42469bd02842b4190a115008221 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1e7bed081968c42469bd02842b4190a115008221 Author: Brice Goglin <br...@my...> Date: Thu Oct 26 22:51:33 2006 +0200 [PATCH] myri10ge: ServerWorks HT2000 PCI id is already defined in pci_ids.h No need to keep defining PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE in the driver code since it is now defined in pci_ids.h. Signed-off-by: Brice Goglin <br...@my...> Signed-off-by: Jeff Garzik <je...@ga...> commit f479b322a0949d540b45aea645793058b0c50be5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f479b322a0949d540b45aea645793058b0c50be5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f479b322a0949d540b45aea645793058b0c50be5 Author: Stephen Hemminger <she...@os...> Date: Fri Oct 27 10:22:10 2006 -0700 [PATCH] sky2: not experimental The sky2 driver is no longer in experimental state. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit 09669585b5d0cfdebe28250d442693b3baac66a2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=09669585b5d0cfdebe28250d442693b3baac66a2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=09669585b5d0cfdebe28250d442693b3baac66a2 Author: Akinobu Mita <aki...@gm...> Date: Sun Oct 29 03:47:12 2006 +0900 [PATCH] n2: fix confusing error code modprobe n2 with no parameters or no such devices will get confusing error message. # modprobe n2 ... Kernel does not have module support This patch replaces return code from -ENOSYS to -EINVAL. Cc: Jeff Garzik <jg...@po...> Cc: Krzysztof Halasa <kh...@pm...> Signed-off-by: Akinobu Mita <aki...@gm...> drivers/net/wan/n2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Signed-off-by: Jeff Garzik <je...@ga...> commit 9d4df9e0fadfc84cd826e0f7e946691b4d7baee5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9d4df9e0fadfc84cd826e0f7e946691b4d7baee5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9d4df9e0fadfc84cd826e0f7e946691b4d7baee5 Author: Akinobu Mita <aki...@gm...> Date: Sun Oct 29 03:52:14 2006 +0900 [PATCH] tokenring: fix module_init error handling - Call platform_driver_unregister() before return when no cards found. (fixes data corruption when no cards found) - Check platform_device_register_simple() return value Cc: Jeff Garzik <jg...@po...> Cc: Mike Phillips <mi...@li...> Signed-off-by: Akinobu Mita <aki...@gm...> drivers/net/tokenring/proteon.c | 9 +++++++-- drivers/net/tokenring/skisa.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) Signed-off-by: Jeff Garzik <je...@ga...> commit 06f0015ace46ce9d313ec02d6b13c47c8e795a6c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=06f0015ace46ce9d313ec02d6b13c47c8e795a6c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=06f0015ace46ce9d313ec02d6b13c47c8e795a6c Author: Lennert Buytenhek <bu...@wa...> Date: Mon Oct 30 19:54:08 2006 +0100 [PATCH] ep93xx_eth: don't report RX errors Flooding the console with error messages for every RX FIFO overrun, checksum error and framing error isn't very sensible. Each of these errors can occur during normal operation, so stop printk'ing error messages for RX errors at all. Signed-off-by: Lennert Buytenhek <bu...@wa...> Signed-off-by: Jeff Garzik <je...@ga...> commit 79c356f44b26da9fe357ed1a11e7faec4fd94e13 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=79c356f44b26da9fe357ed1a11e7faec4fd94e13 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=79c356f44b26da9fe357ed1a11e7faec4fd94e13 Author: Lennert Buytenhek <bu...@wa...> Date: Mon Oct 30 19:52:54 2006 +0100 [PATCH] ep93xx_eth: fix unlikely(x) > y test Fix unlikely(x) > y test in ep93xx_eth. Signed-off-by: Lennert Buytenhek <bu...@wa...> Signed-off-by: Jeff Garzik <je...@ga...> commit 2d38caba5fd148976f54930782e8209fa45879a0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2d38caba5fd148976f54930782e8209fa45879a0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2d38caba5fd148976f54930782e8209fa45879a0 Author: Lennert Buytenhek <bu...@wa...> Date: Mon Oct 30 19:52:31 2006 +0100 [PATCH] ep93xx_eth: fix RX/TXstatus ring full handling Ray Lehtiniemi reported that an incoming UDP packet flood can lock up the ep93xx ethernet driver. Herbert Valerio Riedel noted that due to the way ep93xx_eth manages the RX/TXstatus rings, it cannot distinguish a full ring from an empty one, and correctly suggested that this was likely to be causing this lockup to occur. Instead of looking at the hardware's RX/TXstatus ring write pointers to determine when to stop reading from those rings, we should just check every individual RX/TXstatus descriptor's valid bit instead, since there is no other way to distinguish an empty ring from a full ring, and if there is a descriptor waiting, we take the hit of reading the descriptor from memory anyway. Signed-off-by: Lennert Buytenhek <bu...@wa...> Signed-off-by: Jeff Garzik <je...@ga...> commit d5b9b787b5e1618dfe82a2c2a6972374e85b02db gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d5b9b787b5e1618dfe82a2c2a6972374e85b02db gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d5b9b787b5e1618dfe82a2c2a6972374e85b02db Merge: 16b7b2ac0148e839da86af8747b6fa4aad43a9b7 024e4f2c5175a482c234cf67ed22368d770bf78f Author: Linus Torvalds <tor...@g5...> Date: Tue Oct 31 17:03:50 2006 -0800 Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Correct definition of handle_IPI [IA64] move SAL_CACHE_FLUSH check later in boot [IA64] MCA recovery: Montecito support [IA64] cpu-hotplug: Fixing confliction between CPU hot-add and IPI [IA64] don't double >> PAGE_SHIFT pointer for /dev/kmem access commit 024e4f2c5175a482c234cf67ed22368d770bf78f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=024e4f2c5175a482c234cf67ed22368d770bf78f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=024e4f2c5175a482c234cf67ed22368d770bf78f Author: Keith Owens <ka...@sg...> Date: Wed Oct 18 15:36:49 2006 +1000 [IA64] Correct definition of handle_IPI The declaration of handle_IPI in arch/ia64/kernel/smp.c was changed but not the definition of this function. Remove struct pt_regs from handle_IPI(). Signed-off-by: Keith Owens <ka...@sg...> Signed-off-by: Tony Luck <ton...@in...> commit fa1d19e5d9a94120f31e5783ab44758f46892d94 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fa1d19e5d9a94120f31e5783ab44758f46892d94 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fa1d19e5d9a94120f31e5783ab44758f46892d94 Author: Troy Heber <tro...@hp...> Date: Wed Oct 25 14:46:15 2006 -0600 [IA64] move SAL_CACHE_FLUSH check later in boot The check to see if the firmware drops interrupts during a SAL_CACHE_FLUSH is done to early in the boot. SAL_CACHE_FLUSH expects to be able to make PAL calls in virtual mode, on some cell based machines a fault occurs causing a MCA. This patch moves the check after mmu_context_init so the TLB and VHPT are properly setup. Signed-off-by Troy Heber <tro...@hp...> Signed-off-by: Tony Luck <ton...@in...> commit 264b0f99308436deaee38bab99e586612d012fc1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=264b0f99308436deaee38bab99e586612d012fc1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=264b0f99308436deaee38bab99e586612d012fc1 Author: Russ Anderson <rj...@sg...> Date: Wed Oct 25 17:59:47 2006 -0500 [IA64] MCA recovery: Montecito support The information in MCA records is filled in slightly differently on Montecito than on Madison/McKinley. Usually, the cache check and bus check target identifiers have the same address. On Montecito the cache check and bus check target identifiers can be different if a corrected error (ie SBE or unconsumed poison data) was encountered and then an uncorrected error (ie DBE) was consumed. In that case, the cache check target identifier is the physical address of the DBE (that caused the MCA to surface) while the bus check target identifier is the physical address of the SBE. This patch correctly finds the target identifier that triggered the MCA. If there are multiple valid cache target identifiers in the same error record then use the one with the lowest cache level. Signed-off-by: Russ Anderson (rj...@sg...) Signed-off-by: Tony Luck <ton...@in...> commit 5ee7737379b1d7f0c977c0f1661fbaf01a8d4721 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5ee7737379b1d7f0c977c0f1661fbaf01a8d4721 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5ee7737379b1d7f0c977c0f1661fbaf01a8d4721 Author: Kenji Kaneshige <kan...@jp...> Date: Fri Oct 27 19:49:53 2006 +0900 [IA64] cpu-hotplug: Fixing confliction between CPU hot-add and IPI Signed-off-by: Kenji Kaneshige <kan...@jp...> Acked-by: Satoru Takeuchi <tak...@jp...> Acked-by: KAMEZAWA Hiroyuki <kam...@jp...> Signed-off-by: Tony Luck <ton...@in...> commit f2454a1a4b2aca38d3b7887619f43291d773c1ee gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f2454a1a4b2aca38d3b7887619f43291d773c1ee gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f2454a1a4b2aca38d3b7887619f43291d773c1ee Author: Jes Sorensen <je...@sg...> Date: Wed Oct 25 05:49:53 2006 -0400 [IA64] don't double >> PAGE_SHIFT pointer for /dev/kmem access Don't PAGE_SHIFT pointer before handing it to virt_to_page() in xlate_dev_kmem_ptr() as it results in a double shift. Spotted by Bob Montgomery. Signed-off-by: Jes Sorensen <je...@sg...> Signed-off-by: Tony Luck <ton...@in...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-10-31 22:35:28
|
Documentation/mips/time.README | 39 --- Makefile | 2 arch/mips/Kconfig | 3 arch/mips/au1000/common/prom.c | 2 arch/mips/au1000/common/setup.c | 2 arch/mips/au1000/common/time.c | 106 -------- arch/mips/dec/time.c | 9 arch/mips/emma2rh/common/irq_emma2rh.c | 2 arch/mips/emma2rh/markeins/irq_markeins.c | 4 arch/mips/emma2rh/markeins/platform.c | 88 ++++--- arch/mips/jmr3927/rbhma3100/irq.c | 3 arch/mips/jmr3927/rbhma3100/setup.c | 40 --- arch/mips/kernel/scall32-o32.S | 2 arch/mips/kernel/scall64-64.S | 2 arch/mips/kernel/scall64-n32.S | 2 arch/mips/kernel/scall64-o32.S | 2 arch/mips/kernel/smp-mt.c | 154 +++++++------ arch/mips/kernel/time.c | 319 ++++----------------------- arch/mips/kernel/traps.c | 2 arch/mips/mips-boards/generic/time.c | 7 arch/mips/mm/c-sb1.c | 18 + arch/mips/momentum/ocelot_g/ocelot_pld.h | 6 arch/mips/momentum/ocelot_g/setup.c | 5 arch/mips/oprofile/op_model_mipsxx.c | 12 - arch/mips/philips/pnx8550/common/time.c | 4 arch/mips/pmc-sierra/yosemite/i2c-yosemite.c | 2 arch/mips/pmc-sierra/yosemite/smp.c | 6 arch/mips/sgi-ip27/ip27-timer.c | 16 - arch/mips/sibyte/bcm1480/time.c | 33 +- arch/mips/sibyte/sb1250/time.c | 28 -- arch/mips/tx4927/common/smsc_fdc37m81x.c | 172 ++++++++++++++ arch/mips/tx4927/common/tx4927_setup.c | 2 arch/mips/tx4938/toshiba_rbtx4938/spi_txx9.c | 8 arch/sh/boards/renesas/hs7751rvoip/setup.c | 12 - arch/sh/boards/renesas/sh7710voipgw/setup.c | 105 +++----- arch/sh/boards/se/7300/irq.c | 20 + arch/sh/boards/se/73180/irq.c | 47 ++- arch/sh/boards/se/7343/irq.c | 90 ++++--- arch/sh/boards/se/770x/irq.c | 80 +++--- arch/sh/boards/se/7751/irq.c | 85 +++---- arch/sh/boards/sh03/setup.c | 13 - arch/sh/boards/snapgear/setup.c | 12 - arch/sh/boards/titan/setup.c | 12 - arch/sh/configs/r7780rp_defconfig | 174 ++++++++------ arch/sh/configs/titan_defconfig | 101 ++++++-- arch/sh/drivers/dma/dma-sh.c | 42 ++- arch/sh/kernel/cpu/irq/ipr.c | 106 ++++---- arch/sh/kernel/cpu/irq/pint.c | 8 arch/sh/kernel/syscalls.S | 3 arch/sparc64/kernel/prom.c | 21 + arch/sparc64/kernel/traps.c | 8 arch/um/drivers/ubd_kern.c | 319 ++++++++++++++------------- arch/um/include/mconsole_kern.h | 1 arch/um/kernel/dyn.lds.S | 1 arch/um/kernel/tt/tracer.c | 1 arch/um/kernel/uml.lds.S | 1 block/cfq-iosched.c | 6 block/ll_rw_blk.c | 24 +- drivers/ieee1394/eth1394.c | 20 + drivers/net/au1000_eth.c | 2 drivers/net/wan/Kconfig | 2 drivers/scsi/qla4xxx/Kconfig | 2 drivers/video/backlight/hp680_bl.c | 2 fs/block_dev.c | 56 +++- fs/ecryptfs/crypto.c | 206 +++++++++-------- fs/ecryptfs/dentry.c | 8 fs/ecryptfs/ecryptfs_kernel.h | 22 + fs/ecryptfs/file.c | 44 +++ fs/ecryptfs/inode.c | 95 ++------ fs/ecryptfs/keystore.c | 114 ++++++--- fs/ecryptfs/main.c | 15 - fs/ecryptfs/super.c | 18 - include/asm-mips/div64.h | 21 - include/asm-mips/mipsmtregs.h | 2 include/asm-mips/sibyte/sb1250.h | 2 include/asm-mips/time.h | 10 include/asm-mips/unistd.h | 19 + include/asm-sh/irq.h | 10 include/asm-sh/unistd.h | 5 include/asm-um/common.lds.S | 8 kernel/taskstats.c | 17 - net/appletalk/ddp.c | 2 net/core/skbuff.c | 9 net/dccp/ccids/ccid2.c | 18 - net/ipv4/cipso_ipv4.c | 7 net/ipv4/ip_options.c | 2 net/ipv4/netfilter/arp_tables.c | 25 +- net/ipv4/netfilter/ip_tables.c | 67 ++--- net/ipv4/raw.c | 17 - net/ipv6/ip6_flowlabel.c | 24 -- net/ipv6/netfilter/Kconfig | 2 net/ipv6/netfilter/ip6_tables.c | 24 +- net/ipv6/raw.c | 17 - net/netfilter/nf_conntrack_core.c | 3 net/netlink/af_netlink.c | 5 net/sctp/associola.c | 15 - net/sctp/endpointola.c | 7 net/sctp/input.c | 9 net/sctp/protocol.c | 2 net/sctp/socket.c | 9 net/xfrm/xfrm_user.c | 4 security/selinux/hooks.c | 8 security/selinux/include/selinux_netlabel.h | 10 security/selinux/ss/services.c | 37 +++ 104 files changed, 1790 insertions(+), 1627 deletions(-) New commits: commit 16b7b2ac0148e839da86af8747b6fa4aad43a9b7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=16b7b2ac0148e839da86af8747b6fa4aad43a9b7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=16b7b2ac0148e839da86af8747b6fa4aad43a9b7 Author: Atsushi Nemoto <an...@mb...> Date: Tue Oct 24 00:21:27 2006 +0900 [MIPS] Fixup migration to GENERIC_TIME Since we already moved to GENERIC_TIME, we should implement alternatives of old do_gettimeoffset routines to get sub-jiffies resolution from gettimeofday(). This patch includes: * MIPS clocksource support (based on works by Manish Lachwani). * remove unused gettimeoffset routines and related codes. * remove unised 64bit do_div64_32(). * simplify mips_hpt_init. (no argument needed, __init tag) * simplify c0_hpt_timer_init. (no need to write to c0_count) * remove some hpt_init routines. * mips_hpt_mask variable to specify bitmask of hpt value. * convert jmr3927_do_gettimeoffset to jmr3927_hpt_read. * convert ip27_do_gettimeoffset to ip27_hpt_read. * convert bcm1480_do_gettimeoffset to bcm1480_hpt_read. * simplify sb1250 hpt functions. (no need to subtract and shift) Signed-off-by: Atsushi Nemoto <an...@mb...> Signed-off-by: Ralf Baechle <ra...@li...> commit 70e46f48cb5933119712ee27945309a4bfc98282 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=70e46f48cb5933119712ee27945309a4bfc98282 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=70e46f48cb5933119712ee27945309a4bfc98282 Author: Ralf Baechle <ra...@li...> Date: Tue Oct 31 18:33:09 2006 +0000 [MIPS] VSMP: Synchronize cp0 counters on bootup. Signed-off-by: Ralf Baechle <ra...@li...> commit e79f55a8c7aaae5a33e8c2b29682ec8e603b5434 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e79f55a8c7aaae5a33e8c2b29682ec8e603b5434 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e79f55a8c7aaae5a33e8c2b29682ec8e603b5434 Author: Ralf Baechle <ra...@li...> Date: Tue Oct 31 19:53:15 2006 +0000 [MIPS] Flags must be unsigned long. Signed-off-by: Ralf Baechle <ra...@li...> commit 781b0f8d4f9c90137ea32771346ab49f0e5319b3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=781b0f8d4f9c90137ea32771346ab49f0e5319b3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=781b0f8d4f9c90137ea32771346ab49f0e5319b3 Author: Ralf Baechle <ra...@li...> Date: Tue Oct 31 18:25:10 2006 +0000 [MIPS] VSMP: Fix initialization ordering bug. Signed-off-by: Ralf Baechle <ra...@li...> commit 3ab0f40f333007eb31dc1e08f578ec224c7d71c2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3ab0f40f333007eb31dc1e08f578ec224c7d71c2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3ab0f40f333007eb31dc1e08f578ec224c7d71c2 Author: Yoichi Yuasa <yoi...@tr...> Date: Tue Oct 31 13:44:38 2006 +0900 [MIPS] Fix warning of printk format in mips_srs_init() arch/mips/kernel/traps.c:1115: warning: int format, long unsigned int arg (arg 2) Signed-off-by: Yoichi Yuasa <yoi...@tr...> Signed-off-by: Ralf Baechle <ra...@li...> commit 38384c8bd82474bf74ea68e4e44aaa14504deb07 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=38384c8bd82474bf74ea68e4e44aaa14504deb07 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=38384c8bd82474bf74ea68e4e44aaa14504deb07 Author: Yoichi Yuasa <yoi...@tr...> Date: Tue Oct 31 13:38:44 2006 +0900 [MIPS] Yosemite: fix uninitialized variable in titan_i2c_xfer() Signed-off-by: Yoichi Yuasa <yoi...@tr...> Signed-off-by: Ralf Baechle <ra...@li...> commit c21e6d65f70d64b359a37545592f39e28074864e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c21e6d65f70d64b359a37545592f39e28074864e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c21e6d65f70d64b359a37545592f39e28074864e Author: Ralf Baechle <ra...@li...> Date: Tue Oct 31 13:41:59 2006 +0000 [MIPS] Sort out missuse of __init for prom_getcmdline() Signed-off-by: Ralf Baechle <ra...@li...> commit e8f05de54055e90e6d58e45866f84ecdb0b48acd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e8f05de54055e90e6d58e45866f84ecdb0b48acd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e8f05de54055e90e6d58e45866f84ecdb0b48acd Author: Manish Lachwani <mla...@mv...> Date: Sat Jan 22 09:23:38 2005 -0800 [MIPS] Add missing file for support of backplane on TX4927 based board Signed-off-by: Manish Lachwani <mla...@mv...> Signed-off-by: Ralf Baechle <ra...@li...> commit 0887fa5158fe7da4a46ae526d313ae636440deae gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0887fa5158fe7da4a46ae526d313ae636440deae gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0887fa5158fe7da4a46ae526d313ae636440deae Author: Ralf Baechle <ra...@li...> Date: Tue Oct 31 11:52:03 2006 +0000 [MIPS] TX4927: Remove indent error message that somehow ended in the code. Signed-off-by: Ralf Baechle <ra...@li...> commit 80fc115d461031dc66bb7f31b8c84868e370fea6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=80fc115d461031dc66bb7f31b8c84868e370fea6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=80fc115d461031dc66bb7f31b8c84868e370fea6 Author: Randy Dunlap <ran...@or...> Date: Mon Oct 30 20:41:11 2006 -0800 [PATCH] SCSI: ISCSI build failure SCSI_QLA_ISCSI needs to depend on NET to prevent build (link) failures that are caused by selecting SCSI_ISCSI_ATTRS. Signed-off-by: Randy Dunlap <ran...@or...> Signed-off-by: Linus Torvalds <tor...@os...> commit 5fccbf61be2a7f32d2002b04afca4c5009612a58 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5fccbf61be2a7f32d2002b04afca4c5009612a58 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5fccbf61be2a7f32d2002b04afca4c5009612a58 Author: Jens Axboe <jen...@or...> Date: Tue Oct 31 14:21:55 2006 +0100 [PATCH] CFQ: request <-> request merging rr_list fixup In very rare circumstances would we be pruning a merged request and at the same time delete the implicated cfqq from the rr_list, and not readd it when the merged request got added. This could cause io stalls until that process issued io again. Fix it up by putting the rr_list add handling into cfq_add_rq_rb(), identical to how pruning is handled in cfq_del_rq_rb(). This fixes a hang reproducible with fsx-linux. Signed-off-by: Jens Axboe <jen...@or...> Signed-off-by: Linus Torvalds <tor...@os...> commit eafa6cb18ec7e5424ce54017b5ce6d11dff58b79 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=eafa6cb18ec7e5424ce54017b5ce6d11dff58b79 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=eafa6cb18ec7e5424ce54017b5ce6d11dff58b79 Merge: 612b322ade7954a1d984fa410a70d4ae50f75c0d 4731f2dfd5049b7a2b3b5a7131525f6151855f0d Author: Linus Torvalds <tor...@g5...> Date: Tue Oct 31 08:10:03 2006 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Titan defconfig update. sh: Fix IPR-IRQ's for IRQ-chip change breakage. sh: Update r7780rp_defconfig. video: Fix include in hp680_bl. sh: Wire up new syscalls. commit 612b322ade7954a1d984fa410a70d4ae50f75c0d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=612b322ade7954a1d984fa410a70d4ae50f75c0d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=612b322ade7954a1d984fa410a70d4ae50f75c0d Merge: d2c59a22dd7c0a59dfff60a8e9910f76f308b9f2 1b7c2dbc07bf0663a41e3dc838992930019f08fd Author: Linus Torvalds <tor...@g5...> Date: Tue Oct 31 08:08:31 2006 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPV6]: fix flowlabel seqfile handling [IPV6]: return EINVAL for invalid address with flowlabel lease request [SCTP]: Remove temporary associations from backlog and hash. [SCTP]: Correctly set IP id for SCTP traffic [NetLabel]: protect the CIPSOv4 socket option from setsockopt() [NETFILTER]: ip_tables: compat code module refcounting fix [NETFILTER]: nf_conntrack: add missing unlock in get_next_corpse() [NETFILTER]: ip_tables: compat error way cleanup [NETFILTER]: Missed and reordered checks in {arp,ip,ip6}_tables [NETFILTER]: remove masq/NAT from ip6tables Kconfig help [IPV6]: fix lockup via /proc/net/ip6_flowlabel [NET]: fix uaccess handling [SCTP]: Always linearise packet on input [ETH1394]: Fix unaligned accesses. [DCCP]: fix printk format warnings [NET]: Fix segmentation of linear packets [XFRM] xfrm_user: Fix unaligned accesses. [APPLETALK]: Fix potential OOPS in atalk_sendmsg(). [NET] sealevel: uses arp_broken_ops commit d2c59a22dd7c0a59dfff60a8e9910f76f308b9f2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d2c59a22dd7c0a59dfff60a8e9910f76f308b9f2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d2c59a22dd7c0a59dfff60a8e9910f76f308b9f2 Merge: 5ddfe9691c91a244e8d1be597b6428fcefd58103 5af47db796cb7e06e9bafb0d75ad98693b55f8b6 Author: Linus Torvalds <tor...@g5...> Date: Tue Oct 31 08:08:06 2006 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Add some missing print_symbol() calls. [SPARC64]: Fix Tomatillo/Schizo IRQ handling. commit 5ddfe9691c91a244e8d1be597b6428fcefd58103 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5ddfe9691c91a244e8d1be597b6428fcefd58103 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5ddfe9691c91a244e8d1be597b6428fcefd58103 Author: NeilBrown <ne...@su...> Date: Mon Oct 30 22:07:21 2006 -0800 [PATCH] md: check bio address after mapping through partitions. Partitions are not limited to live within a device. So we should range check after partition mapping. Note that 'maxsector' was being used for two different things. I have split off the second usage into 'old_sector' so that maxsector can be still be used for it's primary usage later in the function. Cc: Jens Axboe <jen...@or...> Signed-off-by: Neil Brown <ne...@su...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 45ec4ababe999cb95f9c0cad03b2689cb0b77a2b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=45ec4ababe999cb95f9c0cad03b2689cb0b77a2b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=45ec4ababe999cb95f9c0cad03b2689cb0b77a2b Author: Michael Halcrow <mha...@us...> Date: Mon Oct 30 22:07:20 2006 -0800 [PATCH] eCryptfs: Fix handling of lower d_count Fix the use of dget/dput calls to balance out on the lower filesystem. Signed-off-by: Michael Halcrow <mha...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 316bb95e8ed0ddcd767e8aa54264b6c6190f150c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=316bb95e8ed0ddcd767e8aa54264b6c6190f150c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=316bb95e8ed0ddcd767e8aa54264b6c6190f150c Author: Michael Halcrow <mha...@us...> Date: Mon Oct 30 22:07:20 2006 -0800 [PATCH] eCryptfs: Remove ecryptfs_umount_begin There is no point to calling the lower umount_begin when the eCryptfs umount_begin is called. Signed-off-by: Michael Halcrow <mha...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7ff1d74f5670329ac4b5959a675f8698ba95be20 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7ff1d74f5670329ac4b5959a675f8698ba95be20 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7ff1d74f5670329ac4b5959a675f8698ba95be20 Author: Michael Halcrow <mha...@us...> Date: Mon Oct 30 22:07:19 2006 -0800 [PATCH] eCryptfs: Consolidate lower dentry_open's Opens on lower dentry objects happen in several places in eCryptfs, and they all involve the same steps (dget, mntget, dentry_open). This patch consolidates the lower open events into a single function call. Signed-off-by: Michael Halcrow <mha...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 8bba066f4e3854755a303cee37ea37bd080a46b3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8bba066f4e3854755a303cee37ea37bd080a46b3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8bba066f4e3854755a303cee37ea37bd080a46b3 Author: Michael Halcrow <mha...@us...> Date: Mon Oct 30 22:07:18 2006 -0800 [PATCH] eCryptfs: Cipher code to new crypto API Update cipher block encryption code to the new crypto API. Signed-off-by: Michael Halcrow <mha...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 565d9724b8ce49b530287de34aa17f45f21624d5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=565d9724b8ce49b530287de34aa17f45f21624d5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=565d9724b8ce49b530287de34aa17f45f21624d5 Author: Michael Halcrow <mha...@us...> Date: Mon Oct 30 22:07:17 2006 -0800 [PATCH] eCryptfs: Hash code to new crypto API Update eCryptfs hash code to the new kernel crypto API. Signed-off-by: Michael Halcrow <mha...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit e5d9cbde6ce0001e49994df5fcdcbeff8be8037b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e5d9cbde6ce0001e49994df5fcdcbeff8be8037b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e5d9cbde6ce0001e49994df5fcdcbeff8be8037b Author: Michael Halcrow <mha...@us...> Date: Mon Oct 30 22:07:16 2006 -0800 [PATCH] eCryptfs: Clean up crypto initialization Clean up the crypto initialization code; let the crypto API take care of the key size checks. Signed-off-by: Michael Halcrow <mha...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 4a279ff1ea1cf325775ada983035123fcdc8e986 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4a279ff1ea1cf325775ada983035123fcdc8e986 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4a279ff1ea1cf325775ada983035123fcdc8e986 Author: Oleg Nesterov <ol...@tv...> Date: Mon Oct 30 22:07:15 2006 -0800 [PATCH] taskstats: fix sub-threads accounting If there are no listeners, taskstats_exit_send() just returns because taskstats_exit_alloc() didn't allocate *tidstats. This is wrong, each sub-thread should do fill_tgid_exit() on exit, otherwise its ->delays is not recorded in ->signal->stats and lost. Q: We don't send TASKSTATS_TYPE_AGGR_TGID when single-threaded process exits. Is it good? How can the listener figure out that it was actually a process exit, not sub-thread? Signed-off-by: Oleg Nesterov <ol...@tv...> Cc: Balbir Singh <ba...@in...> Acked-by: Shailabh Nagar <na...@wa...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 525fdb6cc929b515ad7e0be40fd023cff8660ed8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=525fdb6cc929b515ad7e0be40fd023cff8660ed8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=525fdb6cc929b515ad7e0be40fd023cff8660ed8 Author: Jeff Dike <jd...@ad...> Date: Mon Oct 30 22:07:14 2006 -0800 [PATCH] uml: add INITCALLS This is the UML piece of the INITCALLS tidying. Signed-off-by: Jeff Dike <jd...@ad...> Cc: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d1480c56feb2a894fd47fb399999a5b320c3e103 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d1480c56feb2a894fd47fb399999a5b320c3e103 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d1480c56feb2a894fd47fb399999a5b320c3e103 Author: Jeff Dike <jd...@ad...> Date: Mon Oct 30 22:07:13 2006 -0800 [PATCH] uml: add _text definition to linker scripts kallsyms now refers to addresses as '_text + 0xADDRESS', rather than just '0xADDRESS', so we need to define _text. Signed-off-by: Jeff Dike <jd...@ad...> Cc: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d8d7c28ec0b50ac57ddc909ae6eca1519473f300 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d8d7c28ec0b50ac57ddc909ae6eca1519473f300 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d8d7c28ec0b50ac57ddc909ae6eca1519473f300 Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Mon Oct 30 22:07:12 2006 -0800 [PATCH] uml ubd driver: various little changes Fix a small memory leak in ubd_config, and clearify the confusion which lead to it. Then, some little changes not affecting operations - * move init functions together, * add a comment about a potential problem in case of some evolution in the block layer, * mark all initcalls as static __init functions * mark an used once little function as inline * document that mconsole methods are all called in process context (was triggered when checking ubd mconsole methods). Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 0bf16bffeef65622603af22151156807323d7dc7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0bf16bffeef65622603af22151156807323d7dc7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0bf16bffeef65622603af22151156807323d7dc7 Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Mon Oct 30 22:07:11 2006 -0800 [PATCH] uml ubd driver: do not store error codes as ->fd To simplify error handling, make sure fd is saved into ubd_dev->fd only when we are sure it is an fd and not an error code. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 84e945e399ce9710a34035ea81eaf5719aa709af gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=84e945e399ce9710a34035ea81eaf5719aa709af gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=84e945e399ce9710a34035ea81eaf5719aa709af Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Mon Oct 30 22:07:10 2006 -0800 [PATCH] uml ubd driver: use bitfields where possible Use bitfields for boolean fields in ubd data structure. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit e7f6552f237498c805af9f01aba168b731e0a4ce gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e7f6552f237498c805af9f01aba168b731e0a4ce gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e7f6552f237498c805af9f01aba168b731e0a4ce Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Mon Oct 30 22:07:09 2006 -0800 [PATCH] uml ubd driver: reformat ubd_config Pure whitespace and style fixes split out from subsequent patch. Some changes (err -> ret) don't make sense now, only later, but I split them out anyway since they cluttered the patch. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 2fe30a34a141c2188ff2cdd670d031088d9c5d20 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2fe30a34a141c2188ff2cdd670d031088d9c5d20 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2fe30a34a141c2188ff2cdd670d031088d9c5d20 Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Mon Oct 30 22:07:09 2006 -0800 [PATCH] uml ubd driver: convert do_ubd to a boolean variable do_ubd is actually just a boolean variable - the way it is used currently is a leftover from the old 2.4 block layer, but it is still used; its use is suspicious, but removing it would be too intrusive for now and needs more thinking. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 33f775eea185e8df7701c4afc2c8fcee85c83282 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=33f775eea185e8df7701c4afc2c8fcee85c83282 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=33f775eea185e8df7701c4afc2c8fcee85c83282 Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Mon Oct 30 22:07:08 2006 -0800 [PATCH] uml ubd driver: ubd_io_lock usage fixup Add some comments about requirements for ubd_io_lock and expand its use. When an irq signals that the "controller" (i.e. another thread on the host, which does the actual requests and is the only one blocked on I/O on the host) has done some work, we call again the request function ourselves (do_ubd_request). We now do that with ubd_io_lock held - that's useful to protect against concurrent calls to elv_next_request and so on. XXX: Maybe we shouldn't call at all the request function. Input needed on this. Are we supposed to plug and unplug the queue? That code "indirectly" does that by setting a flag, called do_ubd, which makes the request function return (it's a residual of 2.4 block layer interface). Meanwhile, however, merge this patch, which improves things. Cc: Jens Axboe <ax...@su...> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d7fb2c3865ca0f95d92e2864c3dc9220789d83f5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d7fb2c3865ca0f95d92e2864c3dc9220789d83f5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d7fb2c3865ca0f95d92e2864c3dc9220789d83f5 Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Mon Oct 30 22:07:07 2006 -0800 [PATCH] uml ubd driver: change ubd_lock to be a mutex This lock protects ubd setup and teardown, so is only used in process context; beyond that, during such setup memory allocations must be performed and some generic functions which can sleep must be called (such as add_disk()). So the only correct solution is to make it a mutex instead of a spin_lock. No other change is done - this lock must be acquired in different places but it's done afterwards. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 5f75a4f887a35b99878fc07ed749a90375194b63 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5f75a4f887a35b99878fc07ed749a90375194b63 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5f75a4f887a35b99878fc07ed749a90375194b63 Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Mon Oct 30 22:07:06 2006 -0800 [PATCH] uml ubd driver: give better names to some functions. To rethink locking, I needed to understand well what each function does. While doing this I renamed some: * ubd_close -> ubd_close_dev (since it pairs with ubd_open_dev) * ubd_new_disk -> ubd_disk_register (it handles registration with the block layer - one hopes this makes clearer the difference with ubd_add()) Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7d314e346d6081e8013a96206e601a48528d8f60 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7d314e346d6081e8013a96206e601a48528d8f60 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7d314e346d6081e8013a96206e601a48528d8f60 Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Mon Oct 30 22:07:05 2006 -0800 [PATCH] uml ubd driver: var renames Rename the ubd_dev array to ubd_devs and then call any "struct ubd" ubd_dev instead of dev, which doesn't make clear what we're treating (and no, it's not hungarian notation - not any more than calling all vm_area_struct vma or all inodes inode). Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 2a9d32f682b2b4928dcd4680bc99e98a3d096816 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2a9d32f682b2b4928dcd4680bc99e98a3d096816 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2a9d32f682b2b4928dcd4680bc99e98a3d096816 Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Mon Oct 30 22:07:04 2006 -0800 [PATCH] uml ubd driver: document some struct fields Add documentation about some fields in struct ubd, whose meaning is non-obvious due to struct names (should change names altogether, I agree). Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 97d88ac83540f9ba9536326c30db4815c5b9169b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=97d88ac83540f9ba9536326c30db4815c5b9169b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=97d88ac83540f9ba9536326c30db4815c5b9169b Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Mon Oct 30 22:07:03 2006 -0800 [PATCH] uml ubd driver: allow using up to 16 UBD devices With 256 minors and 16 minors used per each UBD device, we can allow the use of up to 16 UBD devices per UML. Also chnage parse_unit and leave to the caller (which already do it) the check for excess numbers, since this is just supposed to do raw parsing. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 36a561d6a95c4b89ae4845bf91456b4f784b6eec gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=36a561d6a95c4b89ae4845bf91456b4f784b6eec gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=36a561d6a95c4b89ae4845bf91456b4f784b6eec Author: Andrew Morton <ak...@os...> Date: Mon Oct 30 22:07:03 2006 -0800 [PATCH] find_bd_holder() fix fs/block_dev.c: In function 'find_bd_holder': fs/block_dev.c:666: warning: return makes integer from pointer without a cast fs/block_dev.c:669: warning: return makes integer from pointer without a cast fs/block_dev.c: In function 'add_bd_holder': fs/block_dev.c:685: warning: unused variable 'tmp' fs/block_dev.c: In function 'bd_claim_by_kobject': fs/block_dev.c:773: warning: assignment makes pointer from integer without a cast Acked-by: Jun'ichi Nomura <j-n...@ce...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 1b7c2dbc07bf0663a41e3dc838992930019f08fd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1b7c2dbc07bf0663a41e3dc838992930019f08fd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1b7c2dbc07bf0663a41e3dc838992930019f08fd Author: James Morris <jm...@na...> Date: Tue Oct 31 00:43:44 2006 -0800 [IPV6]: fix flowlabel seqfile handling There's a bug in the seqfile show operation for flowlabel objects, where each hash chain is traversed cumulatively for each element. The following function is called for each element of each chain: static void ip6fl_fl_seq_show(struct seq_file *seq, struct ip6_flowlabel *fl) { while(fl) { seq_printf... fl = fl->next; } } Thus, objects can appear mutliple times when reading /proc/net/ip6_flowlabel, as the above is called for each element in the chain. The solution is to remove the while() loop from the above, and traverse each chain exactly once, per the patch below. This also removes the ip6fl_fl_seq_show() function, which does nothing else. Signed-off-by: James Morris <jm...@na...> Signed-off-by: David S. Miller <da...@da...> commit 4731f2dfd5049b7a2b3b5a7131525f6151855f0d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4731f2dfd5049b7a2b3b5a7131525f6151855f0d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4731f2dfd5049b7a2b3b5a7131525f6151855f0d Author: Jamie Lenehan <le...@tw...> Date: Tue Oct 31 12:36:35 2006 +0900 sh: Titan defconfig update. Small defconfig update for titan for 2.6.19-rc3, adding SH-RTC. Signed-off-by: Jamie Lenehan <le...@tw...> Signed-off-by: Paul Mundt <le...@li...> commit bd71ab88deab3358241f22ed6c035c427aacc4e7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bd71ab88deab3358241f22ed6c035c427aacc4e7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bd71ab88deab3358241f22ed6c035c427aacc4e7 Author: Jamie Lenehan <le...@tw...> Date: Tue Oct 31 12:35:02 2006 +0900 sh: Fix IPR-IRQ's for IRQ-chip change breakage. The conversion from IPR-IRQ to IRQ-chip resulted in the ipr data being allocated in a local variable in make_ipr_irq - breaking anything using IPR interrupts. This changes all of the callers of make_ipr_irq to allocate a static structure containing the IPR data which is then passed to make_ipr_irq. This removes the need for make_ipr_irq to allocate any additional space for the IPR information. Signed-off-by: Jamie Lenehan <le...@tw...> Signed-off-by: Paul Mundt <le...@li...> commit 1f6c526c409ed7ecdd02469c46ab4b4a50ebec45 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1f6c526c409ed7ecdd02469c46ab4b4a50ebec45 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1f6c526c409ed7ecdd02469c46ab4b4a50ebec45 Author: Paul Mundt <le...@li...> Date: Tue Oct 31 12:33:30 2006 +0900 sh: Update r7780rp_defconfig. Small defconfig updates for R7780RP, enabling SH-RTC. Signed-off-by: Paul Mundt <le...@li...> commit 1aea7e00f6b83d32d359aeb8d670f1f7aaa88d55 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1aea7e00f6b83d32d359aeb8d670f1f7aaa88d55 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1aea7e00f6b83d32d359aeb8d670f1f7aaa88d55 Author: Kristoffer Ericson <kri...@ho...> Date: Tue Oct 31 11:47:27 2006 +0900 video: Fix include in hp680_bl. The hp6xx.h header moved location, causing the build to fail, fix it up. Signed-off-by: Kristoffer Ericson <kri...@ho...> Signed-off-by: Paul Mundt <le...@li...> commit 6887d83d6a537b5002edff7efa1a7c600af0ce26 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6887d83d6a537b5002edff7efa1a7c600af0ce26 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6887d83d6a537b5002edff7efa1a7c600af0ce26 Author: Paul Mundt <le...@li...> Date: Tue Oct 31 11:44:25 2006 +0900 sh: Wire up new syscalls. This wires up sys_move_pages, sys_getcpu, and sys_epoll_pwait. Signed-off-by: Paul Mundt <le...@li...> commit ae99a78af33f00565a05dbbc6ca9b247fed002c5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ae99a78af33f00565a05dbbc6ca9b247fed002c5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ae99a78af33f00565a05dbbc6ca9b247fed002c5 Author: Linus Torvalds <tor...@g5...> Date: Mon Oct 30 19:37:36 2006 -0800 Linux 2.6.19-rc4 Not halloween. Not scary. Just a regular -rc release. commit 5af47db796cb7e06e9bafb0d75ad98693b55f8b6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5af47db796cb7e06e9bafb0d75ad98693b55f8b6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5af47db796cb7e06e9bafb0d75ad98693b55f8b6 Author: David S. Miller <da...@su...> Date: Mon Oct 30 01:10:20 2006 -0800 [SPARC64]: Add some missing print_symbol() calls. Signed-off-by: David S. Miller <da...@da...> commit 9001f2850ff92b52d7654379e7b7feb72f78f161 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9001f2850ff92b52d7654379e7b7feb72f78f161 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9001f2850ff92b52d7654379e7b7feb72f78f161 Author: David S. Miller <da...@su...> Date: Sun Oct 29 16:32:31 2006 -0800 [SPARC64]: Fix Tomatillo/Schizo IRQ handling. The code in schizo_irq_trans_init() should set irq_data->sync_reg to the location of the SYNC register if this is Tomatillo, and set it to zero otherwise. But that is not what it is doing. As a result, non-Tomatillo systems were trying to access a non-existent register resulting in bus errors at the first PCI interrupt. Thanks to Roland Stigge for the bug report. Signed-off-by: David S. Miller <da...@da...> commit 528ba4ef855bd184b7d68e3fa596b420fb4fa86a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=528ba4ef855bd184b7d68e3fa596b420fb4fa86a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=528ba4ef855bd184b7d68e3fa596b420fb4fa86a Merge: df6c0cd9a872ebf2298f5d66d8c789f62dbe35fc 21e9ac7b2dd96dfca997313bae6d9a8f642635c7 Author: Linus Torvalds <tor...@g5...> Date: Mon Oct 30 19:31:20 2006 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] MIPS doesn't need compat_sys_getdents. [MIPS] JMR3927: Fixup another victim of the irq pt_regs cleanup. [MIPS] EMMA 2 / Markeins: struct resource takes physical addresses. [MIPS] EMMA 2 / Markeins: Convert to name struct resource initialization. [MIPS] EMMA 2 / Markeins: Formitting fixes split from actual address fixes. [MIPS] EMMA 2 / Markeins: Fix build wreckage due to genirq wreckage. [MIPS] Ocelot G: Fix build error and numerous warnings. [MIPS] Fix return value of TXX9 SPI interrupt handler [MIPS] Au1000: Fix warning about unused variable. [MIPS] Wire up getcpu(2) and epoll_wait(2) syscalls. [MIPS] Make SB1 cache flushes not to use on_each_cpu [MIPS] Fix warning about unused definition in c-sb1.c [MIPS] SMTC: Make 8 the default number of processors. [MIPS] Oprofile: Fix MIPSxx counter number detection. [MIPS] Au1xx0 code sets incorrect mips_hpt_frequency [MIPS] Oprofile: fix on non-VSMP / non-SMTC SMP configurations. commit df6c0cd9a872ebf2298f5d66d8c789f62dbe35fc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=df6c0cd9a872ebf2298f5d66d8c789f62dbe35fc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=df6c0cd9a872ebf2298f5d66d8c789f62dbe35fc Author: Jun'ichi Nomura <j-n...@ce...> Date: Mon Oct 30 16:23:56 2006 -0500 [PATCH] clean up add_bd_holder() add_bd_holder() is called from bd_claim_by_kobject to put a given struct bd_holder in the list if there is no matching entry. There are 3 possible results of add_bd_holder(): 1. there is no matching entry and add the given one to the list 2. there is matching entry, so just increment reference count of the existing one 3. something failed during its course 1 and 2 are successful cases. But for case 2, someone has to free the unused struct bd_holder. The current code frees it inside of add_bd_holder and returns same value 0 for both cases 1 and 2. However, it's natural and less error-prone if caller frees it since it's allocated by the caller. Signed-off-by: Jun'ichi Nomura <j-n...@ce...> Signed-off-by: Linus Torvalds <tor...@os...> commit bcb55165d3d1ae3ec95807d118fd6d5956cd127b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bcb55165d3d1ae3ec95807d118fd6d5956cd127b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bcb55165d3d1ae3ec95807d118fd6d5956cd127b Author: Jun'ichi Nomura <j-n...@ce...> Date: Mon Oct 30 16:23:45 2006 -0500 [PATCH] fix bd_claim_by_kobject error handling This fixes bd_claim_by_kobject to release bdev correctly in case that bd_claim succeeds but following add_bd_holder fails. Signed-off-by: Jun'ichi Nomura <j-n...@ce...> Signed-off-by: Linus Torvalds <tor...@os...> commit c6817e4c32d8c4118405d2dec30ac1c264349085 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c6817e4c32d8c4118405d2dec30ac1c264349085 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c6817e4c32d8c4118405d2dec30ac1c264349085 Author: James Morris <jm...@na...> Date: Mon Oct 30 18:56:06 2006 -0800 [IPV6]: return EINVAL for invalid address with flowlabel lease request Currently, when an application requests a lease for a flowlabel via the IPV6_FLOWLABEL_MGR socket option, no error is returned if an invalid type of destination address is supplied as part of the request, leading to a silent failure. This patch ensures that EINVAL is returned to the application in this case. Signed-off-by: James Morris <jm...@na...> Signed-off-by: David S. Miller <da...@da...> commit de76e695a5ce19c121ba7e246b45f258be678a75 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=de76e695a5ce19c121ba7e246b45f258be678a75 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=de76e695a5ce19c121ba7e246b45f258be678a75 Author: Vlad Yasevich <vla...@hp...> Date: Mon Oct 30 18:55:11 2006 -0800 [SCTP]: Remove temporary associations from backlog and hash. Every time SCTP creates a temporary association, the stack hashes it, puts it on a list of endpoint associations and increments the backlog. However, the lifetime of a temporary association is the processing time of a current packet and it's destroyed after that. In fact, we don't really want anyone else finding this association. There is no reason to do this extra work. Signed-off-by: Vlad Yasevich <vla...@hp...> Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 4f4443088b763ca4ac7521e9b4a881b52c294dec gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4f4443088b763ca4ac7521e9b4a881b52c294dec gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4f4443088b763ca4ac7521e9b4a881b52c294dec Author: Vlad Yasevich <vla...@hp...> Date: Mon Oct 30 18:54:32 2006 -0800 [SCTP]: Correctly set IP id for SCTP traffic Make SCTP 1-1 style and peeled-off associations behave like TCP when setting IP id. In both cases, we set the inet_sk(sk)->daddr and initialize inet_sk(sk)->id to a random value. Signed-off-by: Vlad Yasevich <vla...@hp...> Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit f8687afefcc821fc47c75775eec87731fe3de360 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f8687afefcc821fc47c75775eec87731fe3de360 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f8687afefcc821fc47c75775eec87731fe3de360 Author: Paul Moore <pau...@hp...> Date: Mon Oct 30 15:22:15 2006 -0800 [NetLabel]: protect the CIPSOv4 socket option from setsockopt() This patch makes two changes to protect applications from either removing or tampering with the CIPSOv4 IP option on a socket. The first is the requirement that applications have the CAP_NET_RAW capability to set an IPOPT_CIPSO option on a socket; this prevents untrusted applications from setting their own CIPSOv4 security attributes on the packets they send. The second change is to SELinux and it prevents applications from setting any IPv4 options when there is an IPOPT_CIPSO option already present on the socket; this prevents applications from removing CIPSOv4 security attributes from the packets they send. Signed-off-by: Paul Moore <pau...@hp...> Signed-off-by: James Morris <jm...@na...> Signed-off-by: David S. Miller <da...@da...> commit 920b868ae1dfdac77c5e8c97e7067b23680f043e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=920b868ae1dfdac77c5e8c97e7067b23680f043e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=920b868ae1dfdac77c5e8c97e7067b23680f043e Author: Dmitry Mishin <di...@op...> Date: Mon Oct 30 15:14:27 2006 -0800 [NETFILTER]: ip_tables: compat code module refcounting fix This patch fixes bug in iptables modules refcounting on compat error way. As we are getting modules in check_compat_entry_size_and_hooks(), in case of later error, we should put them all in translate_compat_table(), not in the compat_copy_entry_from_user() or compat_copy_match_from_user(), as it is now. Signed-off-by: Dmitry Mishin <di...@op...> Acked-by: Vasily Averin <vv...@op...> Acked-by: Kirill Korotaev <de...@op...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit c073e3fa8b7f9841aa6451885f135656d455f511 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c073e3fa8b7f9841aa6451885f135656d455f511 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c073e3fa8b7f9841aa6451885f135656d455f511 Author: Martin Josefsson <ga...@wl...> Date: Mon Oct 30 15:13:58 2006 -0800 [NETFILTER]: nf_conntrack: add missing unlock in get_next_corpse() Add missing unlock in get_next_corpse() in nf_conntrack. It was missed during the removal of listhelp.h . Also remove an unneeded use of nf_ct_tuplehash_to_ctrack() in the same function. Should be applied before 2.6.19 is released. Signed-off-by: Martin Josefsson <ga...@wl...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit ef4512e76679b4f4997f60f93f8a576a0d20c26b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ef4512e76679b4f4997f60f93f8a576a0d20c26b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ef4512e76679b4f4997f60f93f8a576a0d20c26b Author: Vasily Averin <vv...@op...> Date: Mon Oct 30 15:13:28 2006 -0800 [NETFILTER]: ip_tables: compat error way cleanup This patch adds forgotten compat_flush_offset() call to error way of translate_compat_table(). May lead to table corruption on the next compat_do_replace(). Signed-off-by: Vasily Averin <vv...@op...> Acked-by: Dmitry Mishin <di...@op...> Acked-by: Kirill Korotaev <de...@op...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 590bdf7fd2292b47c428111cb1360e312eff207e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=590bdf7fd2292b47c428111cb1360e312eff207e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=590bdf7fd2292b47c428111cb1360e312eff207e Author: Dmitry Mishin <di...@op...> Date: Mon Oct 30 15:12:55 2006 -0800 [NETFILTER]: Missed and reordered checks in {arp,ip,ip6}_tables There is a number of issues in parsing user-provided table in translate_table(). Malicious user with CAP_NET_ADMIN may crash system by passing special-crafted table to the *_tables. The first issue is that mark_source_chains() function is called before entry content checks. In case of standard target, mark_source_chains() function uses t->verdict field in order to determine new position. But the check, that this field leads no further, than the table end, is in check_entry(), which is called later, than mark_source_chains(). The second issue, that there is no check that target_offset points inside entry. If so, *_ITERATE_MATCH macro will follow further, than the entry ends. As a result, we'll have oops or memory disclosure. And the third issue, that there is no check that the target is completely inside entry. Results are the same, as in previous issue. Signed-off-by: Dmitry Mishin <di...@op...> Acked-by: Kirill Korotaev <de...@op...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 844dc7c88046ecd2e52596730d7cc400d6c3ad67 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=844dc7c88046ecd2e52596730d7cc400d6c3ad67 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=844dc7c88046ecd2e52596730d7cc400d6c3ad67 Author: Patrick McHardy <ka...@tr...> Date: Mon Oct 30 15:12:16 2006 -0800 [NETFILTER]: remove masq/NAT from ip6tables Kconfig help Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit bcd620757d3a4ae78ef0ca41adb5d9e400ed92b6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bcd620757d3a4ae78ef0ca41adb5d9e400ed92b6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bcd620757d3a4ae78ef0ca41adb5d9e400ed92b6 Author: James Morris <jm...@na...> Date: Mon Oct 30 15:08:42 2006 -0800 [IPV6]: fix lockup via /proc/net/ip6_flowlabel There's a bug in the seqfile handling for /proc/net/ip6_flowlabel, where, after finding a flowlabel, the code will loop forever not finding any further flowlabels, first traversing the rest of the hash bucket then just looping. This patch fixes the problem by breaking after the hash bucket has been traversed. Note that this bug can cause lockups and oopses, and is trivially invoked by an unpriveleged user. Signed-off-by: James Morris <jm...@na...> Signed-off-by: David S. Miller <da...@da...> commit a27b58fed90cc5654e2daf1d292cc5bc61be4dd7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a27b58fed90cc5654e2daf1d292cc5bc61be4dd7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a27b58fed90cc5654e2daf1d292cc5bc61be4dd7 Author: Heiko Carstens <hei...@de...> Date: Mon Oct 30 15:06:12 2006 -0800 [NET]: fix uaccess handling Signed-off-by: Heiko Carstens <hei...@de...> Signed-off-by: David S. Miller <da...@da...> commit 28cd7752734563d5b0967b96a6bade7a1dc89c7f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=28cd7752734563d5b0967b96a6bade7a1dc89c7f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=28cd7752734563d5b0967b96a6bade7a1dc89c7f Author: Herbert Xu <he...@go...> Date: Sun Oct 29 23:46:42 2006 -0800 [SCTP]: Always linearise packet on input I was looking at a RHEL5 bug report involving Xen and SCTP (https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=212550). It turns out that SCTP wasn't written to handle skb fragments at all. The absence of any calls to skb_may_pull is testament to that. It just so happens that Xen creates fragmented packets more often than other scenarios (header & data split when going from domU to dom0). That's what caused this bug to show up. Until someone has the time sits down and audits the entire net/sctp directory, here is a conservative and safe solution that simply linearises all packets on input. Signed-off-by: Herbert Xu <he...@go...> Signed-off-by: David S. Miller <da...@da...> commit c20e3945c761502b9d5d73ef0ff5f1a84b3a717e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c20e3945c761502b9d5d73ef0ff5f1a84b3a717e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c20e3945c761502b9d5d73ef0ff5f1a84b3a717e Author: David S. Miller <da...@da...> Date: Sun Oct 29 16:14:55 2006 -0800 [ETH1394]: Fix unaligned accesses. Several u64 objects are derefernced in situations where the pointer is not guarenteed to be aligned correctly. Use get_unaligned() as needed. Thanks to Will Simoneau for lots of testing and debugging help. Signed-off-by: David S. Miller <da...@da...> Acked-by: Stefan Richter <st...@s5...> commit 234af4840135342ab295b4e1219fd35c27fdd439 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=234af4840135342ab295b4e1219fd35c27fdd439 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=234af4840135342ab295b4e1219fd35c27fdd439 Author: Randy Dunlap <ran...@or...> Date: Sun Oct 29 16:03:30 2006 -0800 [DCCP]: fix printk forma... [truncated message content] |
|
From: Jan-Benedict G. <jb...@he...> - 2006-10-30 21:17:24
|
Documentation/DocBook/Makefile | 2 Documentation/DocBook/filesystems.tmpl | 101 +++ Documentation/DocBook/kernel-api.tmpl | 60 - arch/arm/Makefile | 6 arch/arm/configs/realview-smp_defconfig | 994 ++++++++++++++++++++++++++++++++ arch/arm/kernel/smp.c | 20 arch/arm/kernel/time.c | 3 arch/arm/mach-iop32x/n2100.c | 2 arch/arm/mach-sa1100/cpu-sa1110.c | 2 arch/arm/vfp/vfpdouble.c | 2 arch/arm/vfp/vfpmodule.c | 1 arch/cris/arch-v32/drivers/cryptocop.c | 1 arch/i386/kernel/apm.c | 2 arch/m68k/kernel/vmlinux-std.lds | 8 arch/m68k/kernel/vmlinux-sun3.lds | 8 arch/um/Makefile | 21 arch/um/Makefile-i386 | 4 arch/um/Makefile-x86_64 | 4 arch/um/os-Linux/sys-i386/tls.c | 3 arch/um/os-Linux/tls.c | 1 arch/um/sys-i386/unmap.c | 11 arch/um/sys-x86_64/unmap.c | 11 arch/x86_64/ia32/ia32_signal.c | 5 block/cfq-iosched.c | 10 drivers/bluetooth/bluecard_cs.c | 2 drivers/char/watchdog/sc1200wdt.c | 9 drivers/i2c/busses/i2c-pxa.c | 8 drivers/ide/pci/generic.c | 2 drivers/ieee1394/ohci1394.c | 19 drivers/isdn/gigaset/common.c | 2 drivers/md/dm-crypt.c | 11 drivers/message/i2o/exec-osm.c | 2 drivers/net/r8169.c | 38 - drivers/net/wireless/hostap/hostap_cs.c | 7 drivers/pcmcia/at91_cf.c | 28 drivers/pcmcia/au1000_generic.c | 25 drivers/pcmcia/ds.c | 29 drivers/pcmcia/i82092.c | 9 drivers/pcmcia/m8xx_pcmcia.c | 12 drivers/pcmcia/omap_cf.c | 3 drivers/pcmcia/pcmcia_ioctl.c | 11 drivers/pcmcia/pcmcia_resource.c | 2 drivers/pcmcia/pd6729.c | 4 drivers/pcmcia/pxa2xx_base.c | 41 - drivers/pcmcia/pxa2xx_base.h | 2 drivers/pcmcia/pxa2xx_lubbock.c | 2 drivers/pcmcia/soc_common.c | 1 drivers/pcmcia/yenta_socket.c | 22 drivers/scsi/dpt/dpti_i2o.h | 2 drivers/scsi/imm.c | 2 drivers/scsi/lpfc/lpfc_hbadisc.c | 2 drivers/scsi/lpfc/lpfc_sli.c | 4 drivers/scsi/ppa.c | 2 drivers/serial/ioc4_serial.c | 4 drivers/usb/net/usbnet.c | 2 include/asm-arm/uaccess.h | 20 include/linux/mtd/nand.h | 2 include/linux/wait.h | 9 kernel/module.c | 2 kernel/taskstats.c | 6 kernel/tsacct.c | 10 lib/Kconfig.debug | 2 mm/vmalloc.c | 2 net/sunrpc/svcauth.c | 4 net/sunrpc/svcsock.c | 31 65 files changed, 1392 insertions(+), 287 deletions(-) New commits: commit a7aacdf9ea45bf6139cfd750e558a3dcbc6f16c3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a7aacdf9ea45bf6139cfd750e558a3dcbc6f16c3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a7aacdf9ea45bf6139cfd750e558a3dcbc6f16c3 Author: Albert Cahalan <aca...@gm...> Date: Sun Oct 29 22:26:17 2006 -0500 [PATCH] fix i386 regparm=3 RT signal handlers on x86_64 The recent change to make x86_64 support i386 binaries compiled with -mregparm=3 only covered signal handlers without SA_SIGINFO. (the 3-arg "real-time" ones) This is useful for klibc at least. Signed-off-by: Albert Cahalan <aca...@gm...> Signed-off-by: Linus Torvalds <tor...@os...> commit 202dd450246cd658e298a86dddca5592fcb898cd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=202dd450246cd658e298a86dddca5592fcb898cd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=202dd450246cd658e298a86dddca5592fcb898cd Author: Andrew Morton <ak...@os...> Date: Sun Oct 29 22:57:57 2006 -0800 [PATCH] fix "sunrpc: fix refcounting problems in rpc servers" - printk should remain dprintk - fix coding-style. Cc: Neil Brown <ne...@su...> Cc: Trond Myklebust <tro...@fy...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3f4b23e9833f0816b57d07401eac5e184b627fd7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3f4b23e9833f0816b57d07401eac5e184b627fd7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3f4b23e9833f0816b57d07401eac5e184b627fd7 Author: Kristian Mueller <Kri...@Kr...> Date: Sun Oct 29 22:46:46 2006 -0800 [PATCH] APM: URL of APM 1.2 specs has changed APM BIOS Interface Secification can now be found at http://www.microsoft.com/whdc/archive/amp_12.mspx Signed-off-by: Kristian Mueller <Kri...@Kr...> Acked-by: Stephen Rothwell <sf...@ca...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d6740df98e12a8e49ef3a699dcc1e2913f22c51b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d6740df98e12a8e49ef3a699dcc1e2913f22c51b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d6740df98e12a8e49ef3a699dcc1e2913f22c51b Author: Neil Brown <ne...@su...> Date: Sun Oct 29 22:46:45 2006 -0800 [PATCH] sunrpc: fix refcounting problems in rpc servers A recent patch fixed a problem which would occur when the refcount on an auth_domain reached zero. This problem has not been reported in practice despite existing in two major kernel releases because the refcount can never reach zero. This patch fixes the problems that stop the refcount reaching zero. 1/ We were adding to the refcount when inserting in the hash table, but only removing from the hashtable when the refcount reached zero. Obviously it never would. So don't count the implied reference of being in the hash table. 2/ There are two paths on which a socket can be destroyed. One called svcauth_unix_info_release(). The other didn't. So when the other was taken, we can lose a reference to an ip_map which in-turn holds a reference to an auth_domain So unify the exit paths into svc_sock_put. This highlights the fact that svc_delete_socket has slightly odd semantics - it does not drop a reference but probably should. Fixing this need a bit more thought and testing. Signed-off-by: Neil Brown <ne...@su...> Cc: Trond Myklebust <tro...@fy...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 2b52c9590d5ad2fb67b720ec12018dd2cf061480 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2b52c9590d5ad2fb67b720ec12018dd2cf061480 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2b52c9590d5ad2fb67b720ec12018dd2cf061480 Author: Sergey Vlasov <vs...@al...> Date: Sun Oct 29 22:46:44 2006 -0800 [PATCH] drivers/ide/pci/generic.c: add missing newline to the all-generic-ide message Signed-off-by: Sergey Vlasov <vs...@al...> Acked-by: Alan Cox <al...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit f0ec1aaf54caddd21c259aea8b2ecfbde4ee4fb9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f0ec1aaf54caddd21c259aea8b2ecfbde4ee4fb9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f0ec1aaf54caddd21c259aea8b2ecfbde4ee4fb9 Author: Oleg Nesterov <ol...@tv...> Date: Sun Oct 29 22:46:43 2006 -0800 [PATCH] xacct_add_tsk: fix pure theoretical ->mm use-after-free Paranoid fix. The task can free its ->mm after the 'if (p->mm)' check. Signed-off-by: Oleg Nesterov <ol...@tv...> Cc: Shailabh Nagar <na...@wa...> Cc: Balbir Singh <ba...@in...> Cc: Jay Lan <jl...@sg...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d45e44d4be60ef508579001792f33753b5cb6d36 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d45e44d4be60ef508579001792f33753b5cb6d36 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d45e44d4be60ef508579001792f33753b5cb6d36 Author: ak...@os... <ak...@os...> Date: Sun Oct 29 22:46:42 2006 -0800 [PATCH] uml: fix compilation options for USER_OBJS From: Jeff Dike <jd...@ad...>, Paolo Giarrusso <bla...@ya...> Make sure that when compiling USER_OBJS the correct compilation options are passed; since they are compiled with USER_CFLAGS which is derived from CFLAGS, make sure it is a recursively evaluated variable, so that changes to CFLAGS done afterwards the inclusion of arch/$(ARCH)/Makefile are reflected in USER_CFLAGS. For instance, without this patch userspace objects are never compiled with debug info active. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit b428b51ed9a4ff8445ea50769961f948480c1d36 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b428b51ed9a4ff8445ea50769961f948480c1d36 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b428b51ed9a4ff8445ea50769961f948480c1d36 Author: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Date: Sun Oct 29 22:46:41 2006 -0800 [PATCH] Fix "Remove the use of _syscallX macros in UML" Fix commit 5f4c6bc1f369f20807a8e753c2308d1629478c61: it spits out warnings about missing syscall prototype (it is in <unistd.h>) and it does not recognize that two uses of _syscallX are to be resolved against kernel headers in the source tree, not against _syscallX; they in fact do not compile and would not work anyway. If _syscallX macros will be removed from the kernel tree altogether, the only reasonable solution for that piece of code is switching to open-coded inline assembly (it's remapping the whole executable from memory, except the page containing this code). Signed-off-by: Paolo 'Blaisorblade' Giarrusso <bla...@ya...> Cc: Jeff Dike <jd...@ad...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit bbb5bbb037812ba36d638014a93134148a568684 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bbb5bbb037812ba36d638014a93134148a568684 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bbb5bbb037812ba36d638014a93134148a568684 Author: Randy Dunlap <ran...@or...> Date: Sun Oct 29 22:46:40 2006 -0800 [PATCH] docbook: make a filesystems book Make a filesystems DocBook book/file by moving all filesystems info from kernel-api.tmpl. Will also merge journal-api.tmpl into it soon (with permission from Roger Gammans). Localizes filesystem info and reduces size of the huge (produced) kernel-api output files. Signed-off-by: Randy Dunlap <ran...@or...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 351edd240d0ba8620789ca9e24f5a38b62157f23 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=351edd240d0ba8620789ca9e24f5a38b62157f23 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=351edd240d0ba8620789ca9e24f5a38b62157f23 Author: Randy Dunlap <ran...@or...> Date: Sun Oct 29 22:46:40 2006 -0800 [PATCH] MTD: fix last kernel-doc warning Fix the last current kernel-doc warning: Warning(/var/linsrc/linux-2619-rc3g5//include/linux/mtd/nand.h:416): No description found for parameter 'write_page' Signed-off-by: Randy Dunlap <ran...@or...> Cc: David Woodhouse <dw...@in...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit f8da1f746588ba997734274b4aadc5ae501fbd88 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f8da1f746588ba997734274b4aadc5ae501fbd88 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f8da1f746588ba997734274b4aadc5ae501fbd88 Author: Alexey Dobriyan <ado...@gm...> Date: Sun Oct 29 22:46:39 2006 -0800 [PATCH] cryptocop: double spin_lock_irqsave() Signed-off-by: Alexey Dobriyan <ado...@gm...> Cc: Mikael Starvik <st...@ax...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 7259f0d05d595b73ef312a082e628627c6414969 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7259f0d05d595b73ef312a082e628627c6414969 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7259f0d05d595b73ef312a082e628627c6414969 Author: Peter Zijlstra <a.p...@ch...> Date: Sun Oct 29 22:46:36 2006 -0800 [PATCH] lockdep: annotate DECLARE_WAIT_QUEUE_HEAD kernel: INFO: trying to register non-static key. kernel: the code is fine but needs lockdep annotation. kernel: turning off the locking correctness validator. kernel: [<c04051ed>] show_trace_log_lvl+0x58/0x16a kernel: [<c04057fa>] show_trace+0xd/0x10 kernel: [<c0405913>] dump_stack+0x19/0x1b kernel: [<c043b1e2>] __lock_acquire+0xf0/0x90d kernel: [<c043bf70>] lock_acquire+0x4b/0x6b kernel: [<c061472f>] _spin_lock_irqsave+0x22/0x32 kernel: [<c04363d3>] prepare_to_wait+0x17/0x4b kernel: [<f89a24b6>] lpfc_do_work+0xdd/0xcc2 [lpfc] kernel: [<c04361b9>] kthread+0xc3/0xf2 kernel: [<c0402005>] kernel_thread_helper+0x5/0xb Another case of non-static lockdep keys; duplicate the paradigm set by DECLARE_COMPLETION_ONSTACK and introduce DECLARE_WAIT_QUEUE_HEAD_ONSTACK. Signed-off-by: Peter Zijlstra <a.p...@ch...> Cc: Greg KH <gr...@su...> Cc: Markus Lidel <mar...@sh...> Acked-by: Ingo Molnar <mi...@el...> Cc: Arjan van de Ven <ar...@in...> Cc: James Bottomley <Jam...@st...> Cc: Marcel Holtmann <ma...@ho...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 70812522b847bdb8fabee963191734f5fa3143f3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=70812522b847bdb8fabee963191734f5fa3143f3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=70812522b847bdb8fabee963191734f5fa3143f3 Author: Akinobu Mita <aki...@gm...> Date: Sun Oct 29 22:46:35 2006 -0800 [PATCH] isdn/gigaset: avoid cs->dev null pointer dereference When gigaset_initbcs() is called, cs->dev is not initialized yet. If dev_alloc_skb() failed in this function, NULL poinster dereference will happen at dev_warn(). Cc: Kai Germaschewski <kai...@gm...> Cc: Hansjoerg Lipp <hj...@we...> Cc: Tilman Schmidt <ti...@im...> Acked-by: Karsten Keil <kk...@su...> Signed-off-by: Akinobu Mita <aki...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 0e2d57fc6e7dabdbfdd4f26c861e7e6c75d5bdcf gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0e2d57fc6e7dabdbfdd4f26c861e7e6c75d5bdcf gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0e2d57fc6e7dabdbfdd4f26c861e7e6c75d5bdcf Author: Randy Dunlap <ran...@or...> Date: Sun Oct 29 22:46:34 2006 -0800 [PATCH] ndiswrapper: don't set the module->taints flags For ndiswrapper, don't set the module->taints flags, just set the kernel global tainted flag. This should allow ndiswrapper to continue to use GPL symbols. Signed-off-by: Randy Dunlap <ran...@or...> Cc: Florin Malita <fm...@gm...> Cc: Alan Cox <al...@lx...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a5a89bae0449634fdb7aa7cdb1c5ba154e4a789b Author: Andrew Morton <ak...@os...> Date: Sun Oct 29 22:46:33 2006 -0800 [PATCH] ioc4_serial: irq flags fix Use the correct type for the CPU flags. Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 37af6560f7978c60791b5f3df17ce8b3e97f2d6e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=37af6560f7978c60791b5f3df17ce8b3e97f2d6e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=37af6560f7978c60791b5f3df17ce8b3e97f2d6e Author: Christophe Saout <chr...@sa...> Date: Mon Oct 30 20:39:08 2006 +0100 [PATCH] Fix dmsetup table output change Fix dm-crypt after the block cipher API changes to correctly return the backwards compatible cipher-chainmode[-ivmode] format for "dmsetup table". Signed-off-by: Christophe Saout <chr...@sa...> Cc: Alasdair G Kergon <ag...@re...> Cc: Herbert Xu <he...@go...> Signed-off-by: Linus Torvalds <tor...@os...> diff linux-2.6.19-rc3.orig/drivers/md/dm-crypt.c linux-2.6.19-rc3/drivers/md/dm-crypt.c commit c1b707d253fe918b92882cff1dbd926b47e14fd2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c1b707d253fe918b92882cff1dbd926b47e14fd2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c1b707d253fe918b92882cff1dbd926b47e14fd2 Author: Jens Axboe <jen...@or...> Date: Mon Oct 30 19:54:23 2006 +0100 [PATCH] CFQ: bad locking in changed_ioprio() When the ioprio code recently got juggled a bit, a bug was introduced. changed_ioprio() is no longer called with interrupts disabled, so using plain spin_lock() on the queue_lock is a bug. Signed-off-by: Jens Axboe <jen...@or...> Signed-off-by: Linus Torvalds <tor...@os...> commit 0261d6886eb5822867a5310dc1e4479b940a1942 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0261d6886eb5822867a5310dc1e4479b940a1942 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0261d6886eb5822867a5310dc1e4479b940a1942 Author: Jens Axboe <jen...@or...> Date: Mon Oct 30 19:07:48 2006 +0100 [PATCH] CFQ: use irq safe locking in cfq_cic_link() If cfq_set_request() is called for a new process AND a non-fs io request (so that __GFP_WAIT may not be set), cfq_cic_link() may use spin_lock_irq() and spin_unlock_irq() with interrupts already disabled. Fix is to always use irq safe locking in cfq_cic_link() Acked-By: Arjan van de Ven <ar...@li...> Acked-by: Ingo Molnar <mi...@el...> Signed-off-by: Jens Axboe <jen...@or...> Signed-off-by: Linus Torvalds <tor...@os...> commit 209ad53bc19667a128d9c51beba873a5c62bff6e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=209ad53bc19667a128d9c51beba873a5c62bff6e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=209ad53bc19667a128d9c51beba873a5c62bff6e Author: Linus Torvalds <tor...@g5...> Date: Sun Oct 29 17:31:49 2006 -0800 Revert "r8169: mac address change support" This reverts commit a2b98a697fa4e7564f78905b83db122824916cf9. As per Guennadi Liakhovetski, the mac address change support code breaks some normal uses (_without_ any address changes), and until it's all sorted out, we're better off without it. Says Francois: "Go revert it. Despite what I claimed, I can not find a third-party confirmation by email that it works elsewhere. It would probably be enough to remove the call to __rtl8169_set_mac_addr() in rtl8169_hw_start() though." See also http://bugzilla.kernel.org/show_bug.cgi?id=6032 Cc: Guennadi Liakhovetski <g.l...@gm...> Acked-by: Francois Romieu <ro...@fr...> Signed-off-by: Linus Torvalds <tor...@os...> commit 9ca0e5474d11ca044e0aacfa6e78bf17957118d2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9ca0e5474d11ca044e0aacfa6e78bf17957118d2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9ca0e5474d11ca044e0aacfa6e78bf17957118d2 Merge: c0f79c4cb11acca545f9802ee0e14ad3b5cc123d 9f0f9313cec8c76c89bc8a68653f928fa12fab96 Author: Linus Torvalds <tor...@g5...> Date: Sun Oct 29 17:25:48 2006 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3914/1: [Jornada7xx] - Typo Fix in cpu-sa1110.c (b != B) [ARM] 3913/1: n2100: fix IRQ routing for second ethernet port [ARM] Add KBUILD_IMAGE target support [ARM] Fix suspend oops caused by PXA2xx PCMCIA driver [ARM] Fix i2c-pxa slave mode support [ARM] 3900/1: Fix VFP Division by Zero exception handling. [ARM] 3899/1: Fix the normalization of the denormal double precision number. [ARM] 3909/1: Disable UWIND_INFO for ARM (again) [ARM] Add __must_check to uaccess functions [ARM] Add realview SMP default configuration [ARM] Fix SMP irqflags support commit c0f79c4cb11acca545f9802ee0e14ad3b5cc123d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c0f79c4cb11acca545f9802ee0e14ad3b5cc123d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c0f79c4cb11acca545f9802ee0e14ad3b5cc123d Merge: 7a20655bc5316ccec0f036cde46e609ba5571f5e f901b8c46fa9748b9d6836e9b158cf7be89447f1 Author: Linus Torvalds <tor...@g5...> Date: Sun Oct 29 17:21:42 2006 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6: [PATCH] PCMCIA: fix __must_check warnings [PATCH] PCMCIA: handle sysfs, PCI errors [PATCH] Export soc_common_drv_pcmcia_remove to allow modular PCMCIA. [PATCH] ioremap balanced with iounmap for drivers/pcmcia [PATCH] pcmcia: au1000_generic fix [PATCH] i82092: wire up errors from pci_register_driver() [PATCH] CONFIG_PM=n slim: drivers/pcmcia/* [PATCH] pcmcia/ds: driver layer error checking [PATCH] pcmcia: update alloc_io_space for conflict checking for multifunction PC card [PATCH] pcmcia: add more IDs to hostap_cs.c [PATCH] pcmcia: at91_cf update commit 7a20655bc5316ccec0f036cde46e609ba5571f5e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7a20655bc5316ccec0f036cde46e609ba5571f5e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7a20655bc5316ccec0f036cde46e609ba5571f5e Merge: e6c9f716ba91c1e065b75949f643383d1888bed5 150ed8ed63b96d7f93ef7e6081797aa0df2b1abd Author: Linus Torvalds <tor...@g5...> Date: Sun Oct 29 13:53:05 2006 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] sc1200wdt.c pnp unregister fix. commit 9f0f9313cec8c76c89bc8a68653f928fa12fab96 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9f0f9313cec8c76c89bc8a68653f928fa12fab96 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9f0f9313cec8c76c89bc8a68653f928fa12fab96 Author: Kristoffer Ericson <Kristoffer_e1@com.rmk.(none)> Date: Sun Oct 29 22:38:08 2006 +0100 [ARM] 3914/1: [Jornada7xx] - Typo Fix in cpu-sa1110.c (b != B) "K4S281632b-1H" should read "K4S281632B-1H" (As it does everywhere else). No more coffe! Signed-off-by: Kristoffer Ericson <Kri...@ho...> Signed-off-by: Russell King <rmk...@ar...> commit e6c9f716ba91c1e065b75949f643383d1888bed5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e6c9f716ba91c1e065b75949f643383d1888bed5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e6c9f716ba91c1e065b75949f643383d1888bed5 Merge: 5fdb51a10f3ab4320c3170b79d66ce34a6e65a67 346f5c7ee7fa4ebee0e4c96415a7e59716bfa1d0 Author: Linus Torvalds <tor...@g5...> Date: Sun Oct 29 13:34:15 2006 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: ohci1394: revert fail on error in suspend commit 150ed8ed63b96d7f93ef7e6081797aa0df2b1abd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=150ed8ed63b96d7f93ef7e6081797aa0df2b1abd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=150ed8ed63b96d7f93ef7e6081797aa0df2b1abd Author: Akinobu Mita <aki...@gm...> Date: Sun Oct 29 03:43:19 2006 +0900 [WATCHDOG] sc1200wdt.c pnp unregister fix. If no devices found or invalid parameter is specified, scl200wdt_pnp_driver is left unregistered. It breaks global list of pnp drivers. Signed-off-by: Akinobu Mita <aki...@gm...> Signed-off-by: Wim Van Sebroeck <wi...@ig...> Signed-off-by: Andrew Morton <ak...@os...> commit 5fdb51a10f3ab4320c3170b79d66ce34a6e65a67 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5fdb51a10f3ab4320c3170b79d66ce34a6e65a67 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5fdb51a10f3ab4320c3170b79d66ce34a6e65a67 Author: Geert Uytterhoeven <ge...@li...> Date: Sun Oct 29 11:21:51 2006 +0100 [PATCH] m68k: consolidate initcall sections Commit 61ce1efe6e40233663d27ab8ac9ba9710eebcaad missed the m68k initcall sections. Signed-off-by: Geert Uytterhoeven <ge...@li...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3d8334def5cf831d2ed438aae021696a2faa4ddd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3d8334def5cf831d2ed438aae021696a2faa4ddd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3d8334def5cf831d2ed438aae021696a2faa4ddd Author: Oleg Nesterov <ol...@tv...> Date: Sun Oct 29 18:57:16 2006 +0300 [PATCH] taskstats: fix sk_buff size calculation prepare_reply() adds GENL_HDRLEN to the payload (genlmsg_total_size()), but then it does genlmsg_put()->nlmsg_put(). This means we forget to reserve a room for 'struct nlmsghdr'. Signed-off-by: Oleg Nesterov <ol...@tv...> Cc: Thomas Graf <tg...@su...> Cc: Andrew Morton <ak...@os...> Cc: Shailabh Nagar <na...@wa...> Cc: Balbir Singh <ba...@in...> Cc: Jay Lan <jl...@sg...> Signed-off-by: Linus Torvalds <tor...@os...> commit d46a3d0d07ba539aea5b0e1ad30e568f0cb03576 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d46a3d0d07ba539aea5b0e1ad30e568f0cb03576 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d46a3d0d07ba539aea5b0e1ad30e568f0cb03576 Author: Oleg Nesterov <ol...@tv...> Date: Sun Oct 29 16:45:58 2006 +0300 [PATCH] taskstats: fix sk_buff leak 'return genlmsg_cancel()' in taskstats_user_cmd/taskstats_exit_send potentially leaks a skb. Unless we pass 'rep_skb' to the netlink layer we own sk_buff. This means we should always do kfree_skb() on failure. [ Thomas acked and pointed out missing return value in original version ] Signed-off-by: Oleg Nesterov <ol...@tv...> Acked-by: Thomas Graf <tg...@su...> Cc: Andrew Morton <ak...@os...> Cc: Shailabh Nagar <na...@wa...> Cc: Balbir Singh <ba...@in...> Cc: Jay Lan <jl...@sg...> Signed-off-by: Linus Torvalds <tor...@os...> commit 346f5c7ee7fa4ebee0e4c96415a7e59716bfa1d0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=346f5c7ee7fa4ebee0e4c96415a7e59716bfa1d0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=346f5c7ee7fa4ebee0e4c96415a7e59716bfa1d0 Author: Stefan Richter <st...@s5...> Date: Sun Oct 29 19:52:49 2006 +0100 ieee1394: ohci1394: revert fail on error in suspend Some errors during preparation for suspended state can be skipped with a warning instead of a failure of the whole suspend transition, notably an error in pci_set_power_state. Signed-off-by: Stefan Richter <st...@s5...> commit 811c9a4b618ffc7de097490f8dc61b43b8464b9c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=811c9a4b618ffc7de097490f8dc61b43b8464b9c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=811c9a4b618ffc7de097490f8dc61b43b8464b9c Author: Lennert Buytenhek <buytenh@org.rmk.(none)> Date: Sun Oct 29 14:15:10 2006 +0100 [ARM] 3913/1: n2100: fix IRQ routing for second ethernet port The second ethernet port on the Thecus n2100 was incorrectly assigned to XINT1 instead of the correct XINT3 (PCI INTB instead of INTD), which caused that port to be non-functional. Signed-off-by: Lennert Buytenhek <bu...@wa...> Signed-off-by: Russell King <rmk...@ar...> commit 5211e6e6c671f0d4b1e1a1023384d20227d8ee65 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5211e6e6c671f0d4b1e1a1023384d20227d8ee65 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5211e6e6c671f0d4b1e1a1023384d20227d8ee65 Author: Giridhar Pemmasani <pg...@ya...> Date: Sun Oct 29 04:46:55 2006 -0800 [PATCH] Fix GFP_HIGHMEM slab panic As reported by Martin J. Bligh <mb...@go...>, we let through some non-slab bits to slab allocation through __get_vm_area_node when doing a vmalloc. I haven't been able to reproduce this, although I understand why it happens: vmalloc allocates memory with GFP_KERNEL | __GFP_HIGHMEM and commit 52fd24ca1db3a741f144bbc229beefe044202cac resulted in the same flags are passed down to cache_alloc_refill, causing the BUG. The following patch fixes it. Note that when calling kmalloc_node, I am masking off __GFP_HIGHMEM with GFP_LEVEL_MASK, whereas __vmalloc_area_node does the same with ~(__GFP_HIGHMEM | __GFP_ZERO). IMHO, using GFP_LEVEL_MASK is preferable, but either should fix this problem. Signed-off-by: Giridhar Pemmasani (pg...@ya...) Cc: Martin J. Bligh <mb...@go...> Cc: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 51342d7126342e1f1a40cd96a5798a3cfd6136eb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=51342d7126342e1f1a40cd96a5798a3cfd6136eb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=51342d7126342e1f1a40cd96a5798a3cfd6136eb Author: Russell King <rm...@dy...> Date: Sun Oct 29 12:51:05 2006 +0000 [ARM] Add KBUILD_IMAGE target support Add support for KBUILD_IMAGE on ARM. This takes the usual target specifiers (zImage/Image/etc) in the same way that powerpc does (iow, without the arch/arm/boot prefix). Signed-off-by: Russell King <rmk...@ar...> commit 9468613b2bb0a386af563953b613efc6c77bd8c1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9468613b2bb0a386af563953b613efc6c77bd8c1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9468613b2bb0a386af563953b613efc6c77bd8c1 Author: Russell King <rm...@dy...> Date: Sat Oct 28 22:42:56 2006 +0100 [ARM] Fix suspend oops caused by PXA2xx PCMCIA driver The PXA2xx PCMCIA driver was registering a device_driver with the platform_bus_type. Unfortunately, this causes data outside the device_driver structure to be dereferenced as if it were a platform_driver structure, causing an oops. Convert the PXA2xx core driver to use the proper platform_driver structure. Signed-off-by: Russell King <rmk...@ar...> commit 84b5abe69ff600a559e1a1fa29f1edad707d4e2f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=84b5abe69ff600a559e1a1fa29f1edad707d4e2f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=84b5abe69ff600a559e1a1fa29f1edad707d4e2f Author: Russell King <rm...@dy...> Date: Sat Oct 28 22:30:17 2006 +0100 [ARM] Fix i2c-pxa slave mode support i2c-pxa times out when trying to enable slave mode due to an incorrect test. Also, check that i2c->slave is non-NULL before dereferencing it. Signed-off-by: Russell King <rmk...@ar...> commit e0f205d9c656da9dad6340f75e33a96014b7d23f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e0f205d9c656da9dad6340f75e33a96014b7d23f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e0f205d9c656da9dad6340f75e33a96014b7d23f Author: Takashi Ohmasa <ohmasa.takashi@com.rmk.(none)> Date: Mon Oct 23 11:19:40 2006 +0100 [ARM] 3900/1: Fix VFP Division by Zero exception handling. The SIGFPE signal should be generated if Division by Zero exception is detected. Signed-off-by: Takashi Ohmasa <ohm...@jp...> Signed-off-by: Russell King <rmk...@ar...> commit e816d71a50a714b532e3965364f3f53c23a53d42 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e816d71a50a714b532e3965364f3f53c23a53d42 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e816d71a50a714b532e3965364f3f53c23a53d42 Author: Takashi Ohmasa <ohmasa.takashi@com.rmk.(none)> Date: Mon Oct 23 08:30:35 2006 +0100 [ARM] 3899/1: Fix the normalization of the denormal double precision number. The significand should be shifted until the value of bit [62] is 1 to normalize the denormal double number. Signed-off-by: Takashi Ohmasa <ohm...@jp...> Signed-off-by: Russell King <rmk...@ar...> commit 75e31aaaf43b53517fd2b36cedc08bd4e4af14d5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=75e31aaaf43b53517fd2b36cedc08bd4e4af14d5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=75e31aaaf43b53517fd2b36cedc08bd4e4af14d5 Author: Kevin Hilman <khilman@com.rmk.(none)> Date: Wed Oct 25 23:07:50 2006 +0100 [ARM] 3909/1: Disable UWIND_INFO for ARM (again) According to Daniel Jacobowitz, UNWIND_INFO is not useful on ARM, and in fact doesn't even compile. This patch disables the option for ARM. Signed-off-by: Kevin Hilman <kh...@mv...> Signed-off-by: Russell King <rmk...@ar...> commit 9957329800b8b554b1af669bcc6878282338c34e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9957329800b8b554b1af669bcc6878282338c34e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9957329800b8b554b1af669bcc6878282338c34e Author: Russell King <rm...@dy...> Date: Thu Oct 26 10:27:42 2006 +0100 [ARM] Add __must_check to uaccess functions Signed-off-by: Russell King <rmk...@ar...> commit a233bf9ee819c726c581af48010e0c0f1cdde245 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a233bf9ee819c726c581af48010e0c0f1cdde245 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a233bf9ee819c726c581af48010e0c0f1cdde245 Author: Russell King <rm...@dy...> Date: Wed Oct 25 14:25:52 2006 +0100 [ARM] Add realview SMP default configuration Signed-off-by: Russell King <rmk...@ar...> commit c97d4869a23c439d2bc23cb26c1147c099f9ff78 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c97d4869a23c439d2bc23cb26c1147c099f9ff78 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c97d4869a23c439d2bc23cb26c1147c099f9ff78 Author: Russell King <rm...@dy...> Date: Wed Oct 25 13:59:16 2006 +0100 [ARM] Fix SMP irqflags support The IRQ changes a while back broke the build for SMP machines. Fix up the SMP code to use set_irq_regs/get_irq_regs as appropriate. Also, fix a warning in arch/arm/kernel/time.c where 'regs' becomes unused for SMP builds. Signed-off-by: Russell King <rmk...@ar...> commit f901b8c46fa9748b9d6836e9b158cf7be89447f1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f901b8c46fa9748b9d6836e9b158cf7be89447f1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f901b8c46fa9748b9d6836e9b158cf7be89447f1 Author: Dominik Brodowski <li...@do...> Date: Wed Oct 25 19:56:55 2006 -0400 [PATCH] PCMCIA: fix __must_check warnings Fix the remaining __must_check warnings in the PCMCIA core. Signed-off-by: Dominik Brodowski <li...@do...> commit 4deb7c1ed2b622b565c5330b475adc5a6cea30da gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4deb7c1ed2b622b565c5330b475adc5a6cea30da gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4deb7c1ed2b622b565c5330b475adc5a6cea30da Author: Jeff Garzik <je...@ga...> Date: Fri Oct 20 14:44:23 2006 -0700 [PATCH] PCMCIA: handle sysfs, PCI errors Handle sysfs and PCI errors correctly. Signed-off-by: Jeff Garzik <je...@ga...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit 26aaa3c202fb3bec8d6c6619122442d476f55658 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=26aaa3c202fb3bec8d6c6619122442d476f55658 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=26aaa3c202fb3bec8d6c6619122442d476f55658 Author: Jonathan McDowell <no...@ea...> Date: Fri Oct 20 14:44:19 2006 -0700 [PATCH] Export soc_common_drv_pcmcia_remove to allow modular PCMCIA. Allow a modular sa1100_cs. Signed-off-by: Jonathan McDowell <no...@ea...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit 3efa9970bd0ac731302224ab9243693e91bc4bea gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3efa9970bd0ac731302224ab9243693e91bc4bea gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3efa9970bd0ac731302224ab9243693e91bc4bea Author: Amol Lad <am...@ve...> Date: Fri Oct 20 14:44:18 2006 -0700 [PATCH] ioremap balanced with iounmap for drivers/pcmcia ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Signed-off-by: Amol Lad <am...@ve...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit a230a6785dd5af84b8b043a64d8df8adc81f3724 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a230a6785dd5af84b8b043a64d8df8adc81f3724 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a230a6785dd5af84b8b043a64d8df8adc81f3724 Author: Om Narasimhan <om....@gm...> Date: Fri Oct 20 14:44:15 2006 -0700 [PATCH] pcmcia: au1000_generic fix The previous code did something like, if (error) goto out_err; .... do { struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i); del_timer_sync(&skt->poll_timer); pcmcia_unregister_socket(&skt->socket); out_err: flush_scheduled_work(); ops->hw_shutdown(skt); i--; } while (i > 0) ..... - On the error path, skt would not contain a valid value for the first iteration (skt is masked by uninitialized automatic skt) - Does not do hw_shutdown() for 0th element of PCMCIA_SOCKET Signed-off-by: Om Narasimhan <om....@gm...> Cc: "Yoichi Yuasa" <yoi...@tr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit f465ce176fb2f1778a04fc3fcb2b8aa564901419 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f465ce176fb2f1778a04fc3fcb2b8aa564901419 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f465ce176fb2f1778a04fc3fcb2b8aa564901419 Author: Alexey Dobriyan <ado...@gm...> Date: Fri Oct 20 14:44:13 2006 -0700 [PATCH] i82092: wire up errors from pci_register_driver() debugging goo removed to not leave assymetry in it after possible "leave" removal. Signed-off-by: Alexey Dobriyan <ado...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit f237de58b13bf65ba2f7fab896daacb92ae7ddef gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f237de58b13bf65ba2f7fab896daacb92ae7ddef gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f237de58b13bf65ba2f7fab896daacb92ae7ddef Author: Alexey Dobriyan <ado...@gm...> Date: Fri Oct 20 14:44:13 2006 -0700 [PATCH] CONFIG_PM=n slim: drivers/pcmcia/* Remove some code which is unneeded if CONFIG_PM=n. Signed-off-by: Alexey Dobriyan <ado...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit ace7d4772cf056d9b13b51bd496a8be968774592 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ace7d4772cf056d9b13b51bd496a8be968774592 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ace7d4772cf056d9b13b51bd496a8be968774592 Author: Randy Dunlap <rd...@xe...> Date: Fri Oct 20 14:44:12 2006 -0700 [PATCH] pcmcia/ds: driver layer error checking Check driver layer return values in pcmcia/ds.c Signed-off-by: Randy Dunlap <rd...@xe...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit 4708b5faf7c53bb4128d34267bdfe4b8c74b488a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4708b5faf7c53bb4128d34267bdfe4b8c74b488a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4708b5faf7c53bb4128d34267bdfe4b8c74b488a Author: Kaustav Majumdar <kau...@wi...> Date: Fri Oct 20 14:44:09 2006 -0700 [PATCH] pcmcia: update alloc_io_space for conflict checking for multifunction PC card Some PCMCIA cards do not mention specific IO addresses in the CIS. In that case, inside the alloc_io_space function, conflicts are detected (the function returns 1) for the second function of a multifunction card unless the length of IO address range required is greater than 0x100. The following patch will remove this conflict checking for a PCMCIA function which had not mentioned any specific IO address to be mapped from. The patch is tested for Linux kernel 2.6.15.4 and works fine in the above case and is as suggested by Dave Hinds. Signed-off-by: Kaustav Majumdar <kau...@wi...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Dominik Brodowski <li...@do...> commit 01918d16c837485ceba92d48fb734cf520e61144 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=01918d16c837485ceba92d48fb734cf520e61144 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=01918d16c837485ceba92d48fb734cf520e61144 Author: Dominik Brodowski <li...@do...> Date: Sun Jul 2 21:21:51 2006 +0200 [PATCH] pcmcia: add more IDs to hostap_cs.c As a replacement for the broad manufactor/card ID match we commented out because of conflicts with pcnet_cs, add two product ID matches. Signed-off-by: Dominik Brodowski <li...@do...> commit 1fbece150a230d0ab447cfb2fc4df10fb89f0d8c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1fbece150a230d0ab447cfb2fc4df10fb89f0d8c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1fbece150a230d0ab447cfb2fc4df10fb89f0d8c Author: David Brownell <da...@pa...> Date: Sat Jul 1 13:39:55 2006 -0700 [PATCH] pcmcia: at91_cf update More correct AT91 CF wakeup logic ... only enable/disable the IRQ wakeup capability, not the IRQ itself. That way the we know that the IRQ will be disabled correctly, in suspend/resume logic instead of ARM IRQ code. Most of the pin multiplexing setup has moved to the devices.c setup code. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Andrew Victor <an...@sa...> Signed-off-by: Dominik Brodowski <li...@do...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-10-29 14:07:30
|
CREDITS | 9 Documentation/devices.txt | 5 Documentation/memory-barriers.txt | 4 Documentation/networking/operstates.txt | 161 ++ Documentation/scsi/ChangeLog.megaraid | 25 Documentation/spi/pxa2xx | 234 ++++ Documentation/spi/spi-summary | 34 MAINTAINERS | 18 Makefile | 2 arch/arm/configs/collie_defconfig | 430 ++++--- arch/arm/configs/versatile_defconfig | 390 ++++--- arch/arm/kernel/asm-offsets.c | 2 arch/arm/kernel/dma-isa.c | 23 arch/arm/kernel/process.c | 37 arch/arm/lib/backtrace.S | 4 arch/arm/lib/div64.S | 4 arch/arm/mach-realview/realview_eb.c | 5 arch/arm/mm/ioremap.c | 4 arch/arm/tools/mach-types | 89 + arch/i386/Kconfig | 6 arch/i386/kernel/acpi/boot.c | 8 arch/i386/kernel/setup.c | 2 arch/i386/oprofile/nmi_int.c | 7 arch/powerpc/kernel/prom_init.c | 2 arch/powerpc/platforms/pseries/setup.c | 2 arch/s390/kernel/compat_wrapper.S | 8 arch/s390/kernel/syscalls.S | 1 arch/s390/kernel/time.c | 7 arch/sparc/kernel/ioport.c | 5 arch/sparc/kernel/module.c | 1 arch/sparc/kernel/sparc_ksyms.c | 13 arch/sparc64/defconfig | 19 arch/sparc64/kernel/module.c | 5 arch/x86_64/kernel/pci-nommu.c | 7 arch/x86_64/kernel/traps.c | 21 arch/x86_64/mm/srat.c | 15 block/elevator.c | 8 block/genhd.c | 2 block/ll_rw_blk.c | 17 drivers/block/ub.c | 18 drivers/char/Kconfig | 2 drivers/char/pcmcia/cm4000_cs.c | 10 drivers/char/pcmcia/cm4040_cs.c | 11 drivers/char/rio/host.h | 9 drivers/char/rio/rioboot.c | 1 drivers/char/rio/rioctrl.c | 43 drivers/char/rio/rioioctl.h | 56 - drivers/char/tpm/Kconfig | 2 drivers/char/tpm/tpm.h | 2 drivers/char/tpm/tpm_tis.c | 2 drivers/i2c/busses/scx200_acb.c | 16 drivers/ide/legacy/ide-cs.c | 1 drivers/infiniband/core/cm.c | 12 drivers/infiniband/core/mad.c | 47 drivers/infiniband/core/mad_priv.h | 5 drivers/infiniband/core/mad_rmpp.c | 20 drivers/infiniband/core/sysfs.c | 2 drivers/infiniband/core/ucm.c | 12 drivers/infiniband/hw/ipath/ipath_driver.c | 7 drivers/infiniband/hw/mthca/mthca_cq.c | 41 drivers/infiniband/hw/mthca/mthca_dev.h | 2 drivers/infiniband/hw/mthca/mthca_mr.c | 15 drivers/infiniband/hw/mthca/mthca_provider.h | 22 drivers/infiniband/hw/mthca/mthca_qp.c | 31 drivers/infiniband/hw/mthca/mthca_srq.c | 23 drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 4 drivers/infiniband/ulp/srp/ib_srp.c | 195 ++- drivers/infiniband/ulp/srp/ib_srp.h | 4 drivers/isdn/capi/capi.c | 1 drivers/isdn/gigaset/usb-gigaset.c | 4 drivers/leds/Kconfig | 7 drivers/leds/led-class.c | 9 drivers/leds/ledtrig-timer.c | 17 drivers/message/fusion/mptbase.c | 63 - drivers/message/fusion/mptbase.h | 10 drivers/message/fusion/mptfc.c | 134 +- drivers/message/fusion/mptsas.c | 99 + drivers/message/fusion/mptscsih.c | 50 drivers/message/fusion/mptspi.c | 68 + drivers/net/b44.c | 28 drivers/net/dl2k.c | 13 drivers/net/irda/Makefile | 2 drivers/net/irda/sir-dev.h | 13 drivers/net/irda/sir_dev.c | 315 +++++ drivers/net/irda/sir_kthread.c | 508 --------- drivers/net/irda/smsc-ircc2.c | 14 drivers/net/phy/mdio_bus.c | 4 drivers/net/sis900.c | 1 drivers/net/sky2.c | 5 drivers/net/tg3.c | 11 drivers/pci/quirks.c | 16 drivers/pcmcia/pcmcia_ioctl.c | 23 drivers/s390/net/lcs.c | 2 drivers/sbus/char/openprom.c | 15 drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 1 drivers/scsi/aic7xxx/aic7xxx_pci.c | 12 drivers/scsi/ibmvscsi/ibmvscsi.c | 30 drivers/scsi/lpfc/lpfc_crtn.h | 1 drivers/scsi/lpfc/lpfc_disc.h | 1 drivers/scsi/lpfc/lpfc_els.c | 95 - drivers/scsi/lpfc/lpfc_hbadisc.c | 18 drivers/scsi/lpfc/lpfc_hw.h | 3 drivers/scsi/lpfc/lpfc_init.c | 22 drivers/scsi/lpfc/lpfc_mbox.c | 33 drivers/scsi/lpfc/lpfc_nportdisc.c | 134 +- drivers/scsi/lpfc/lpfc_scsi.c | 68 - drivers/scsi/lpfc/lpfc_version.h | 2 drivers/scsi/megaraid.c | 1 drivers/scsi/megaraid/megaraid_mbox.c | 59 - drivers/scsi/megaraid/megaraid_mbox.h | 7 drivers/scsi/megaraid/megaraid_mm.c | 6 drivers/scsi/qla2xxx/qla_os.c | 19 drivers/scsi/scsi_devinfo.c | 2 drivers/scsi/scsi_lib.c | 27 drivers/scsi/sim710.c | 2 drivers/serial/8250.c | 74 + drivers/serial/8250_au1x00.c | 5 drivers/serial/serial_core.c | 123 +- drivers/spi/Kconfig | 8 drivers/spi/Makefile | 1 drivers/spi/pxa2xx_spi.c | 1467 +++++++++++++++++++++++++++ drivers/spi/spi.c | 7 drivers/spi/spi_bitbang.c | 104 + drivers/usb/atm/speedtch.c | 2 drivers/usb/atm/usbatm.c | 8 drivers/usb/core/hcd.c | 13 drivers/usb/core/hub.c | 23 drivers/usb/host/ohci-hcd.c | 2 drivers/usb/input/hid-core.c | 4 drivers/usb/misc/emi26.c | 4 drivers/usb/misc/emi62.c | 4 drivers/usb/net/pegasus.c | 20 drivers/usb/serial/Kconfig | 10 drivers/usb/serial/Makefile | 1 drivers/usb/serial/airprime.c | 1 drivers/usb/serial/ark3116.c | 465 ++++++++ drivers/usb/serial/ftdi_sio.c | 2 drivers/usb/serial/ftdi_sio.h | 9 drivers/usb/serial/generic.c | 1 drivers/usb/serial/omninet.c | 12 drivers/usb/serial/usb-serial.c | 19 drivers/video/backlight/backlight.c | 18 drivers/video/backlight/lcd.c | 32 fs/9p/fcall.c | 21 fs/9p/mux.c | 222 ++-- fs/9p/mux.h | 4 fs/9p/vfs_file.c | 13 fs/9p/vfs_inode.c | 19 fs/autofs4/autofs_i.h | 5 fs/autofs4/root.c | 10 fs/autofs4/waitq.c | 77 - fs/compat.c | 2 fs/jffs2/nodelist.c | 6 fs/namespace.c | 7 fs/open.c | 1 fs/partitions/check.c | 3 fs/smbfs/dir.c | 5 fs/smbfs/request.c | 4 include/asm-arm/arch-pxa/pxa2xx_spi.h | 68 + include/asm-arm/procinfo.h | 2 include/asm-s390/unistd.h | 8 include/linux/dma-mapping.h | 1 include/linux/kernel.h | 1 include/linux/netdevice.h | 3 include/linux/rcupdate.h | 1 include/linux/serial_core.h | 1 include/linux/slab.h | 1 include/linux/spi/spi.h | 45 include/linux/spi/spi_bitbang.h | 8 include/linux/swap.h | 2 include/net/neighbour.h | 1 include/scsi/srp.h | 23 init/do_mounts.c | 5 init/initramfs.c | 8 kernel/extable.c | 2 kernel/module.c | 12 kernel/ptrace.c | 20 kernel/rcupdate.c | 19 lib/Kconfig.debug | 2 mm/page_alloc.c | 11 mm/slab.c | 19 mm/sparse.c | 2 net/atm/clip.c | 2 net/bridge/br_if.c | 21 net/core/dev.c | 99 - net/core/link_watch.c | 10 net/core/neighbour.c | 21 net/ipv4/ip_options.c | 2 net/ipv6/inet6_connection_sock.c | 2 net/irda/irias_object.c | 3 net/sched/sch_hfsc.c | 6 security/selinux/ss/services.c | 4 192 files changed, 5395 insertions(+), 2104 deletions(-) New commits: commit f6b0f2547cc72c43fc64dea7e17ba1b2569a199b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f6b0f2547cc72c43fc64dea7e17ba1b2569a199b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f6b0f2547cc72c43fc64dea7e17ba1b2569a199b Merge: b533878dccd05c2cba36ec5fc73f81e490e6c669 babdd5b2a4f95715d5965115f3ed0889dcd100a8 Author: Jan-Benedict Glaw <jb...@d2...> Date: Wed May 17 17:02:40 2006 +0200 Merge branch 'vax4linus' commit babdd5b2a4f95715d5965115f3ed0889dcd100a8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=babdd5b2a4f95715d5965115f3ed0889dcd100a8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=babdd5b2a4f95715d5965115f3ed0889dcd100a8 Merge: 8befe1a49fdf2f33672bcb85d8682afac40b1659 0c056c50a6218e0e577817c16ba8851af593d742 Author: Jan-Benedict Glaw <jb...@d2...> Date: Wed May 17 17:00:41 2006 +0200 Merge branch 'master' commit 0c056c50a6218e0e577817c16ba8851af593d742 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0c056c50a6218e0e577817c16ba8851af593d742 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0c056c50a6218e0e577817c16ba8851af593d742 Merge: 4fbca5320eb102d2e15bdeffe79e125c11cf925e 1e316d7566b63767aa18902235c719e9e95465d0 Author: Linus Torvalds <tor...@g5...> Date: Tue May 16 15:18:26 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6: [PATCH] SPI: spi_bitbang: clocking fixes [PATCH] spi: Update to PXA2xx SPI Driver [PATCH] SPI: busnum == 0 needs to work [PATCH] SPI: devices can require LSB-first encodings [PATCH] SPI: Renamed bitbang_transfer_setup to spi_bitbang_setup_transfer and export it [PATCH] SPI: Add David as the SPI subsystem maintainer [PATCH] SPI: spi bounce buffer has a minimum length [PATCH] SPI: spi whitespace fixes [PATCH] SPI: add PXA2xx SSP SPI Driver [PATCH] SPI: per-transfer overrides for wordsize and clocking commit 4fbca5320eb102d2e15bdeffe79e125c11cf925e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4fbca5320eb102d2e15bdeffe79e125c11cf925e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4fbca5320eb102d2e15bdeffe79e125c11cf925e Merge: 509b70b677ca35a0e800807c6470181df5008d70 3170a5e80be7db29ab5ccb6b4145cf28b4a156de Author: Linus Torvalds <tor...@g5...> Date: Tue May 16 15:16:14 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] arch/arm/kernel/dma-isa.c: named initializers [ARM] 3527/1: MPCore Boot Lockup Fix [ARM] arch/arm/kernel/process.c: Fix warning [ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM [ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h commit 509b70b677ca35a0e800807c6470181df5008d70 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=509b70b677ca35a0e800807c6470181df5008d70 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=509b70b677ca35a0e800807c6470181df5008d70 Merge: 716f8954fb3029ca2df52a986b60af8d06f093ee 1281e36027a9119356bd93b5e7853c72c35dd462 Author: Linus Torvalds <tor...@g5...> Date: Tue May 16 15:15:59 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial * master.kernel.org:/home/rmk/linux-2.6-serial: [ARM] 3523/1: Serial core pm_state commit 1e316d7566b63767aa18902235c719e9e95465d0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1e316d7566b63767aa18902235c719e9e95465d0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1e316d7566b63767aa18902235c719e9e95465d0 Author: David Brownell <da...@pa...> Date: Thu Apr 6 22:25:56 2006 -0700 [PATCH] SPI: spi_bitbang: clocking fixes This fixes two problems triggered by the MMC stack updating clocks: - SPI masters driver should accept a max clock speed of zero; that's one convention for marking idle devices. (Presumably that helps controllers that don't autogate clocks to "off" when not in use.) - There are more than 1000 nanoseconds per millisecond; setting the clock down to 125 KHz now works properly. Showing once again that Zero (http://en.wikipedia.org/wiki/Zero) is still an inexhaustible number of bugs. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 9708c121c38fe864eb6f5a119f7525729686e095 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9708c121c38fe864eb6f5a119f7525729686e095 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9708c121c38fe864eb6f5a119f7525729686e095 Author: Stephen Street <st...@st...> Date: Tue Mar 28 14:05:23 2006 -0800 [PATCH] spi: Update to PXA2xx SPI Driver Fix two outstanding issues with the pxa2xx_spi driver: 1) Bad cast in the function u32_writer. Thanks to Henrik Bechmann 2) Adds support for per transfer changes to speed and bits per word Signed-off-by: Stephen Street <st...@st...> Cc: David Brownell <dbr...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit a020ed7521a9737bcf3e34eb880867c60c3c68d0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a020ed7521a9737bcf3e34eb880867c60c3c68d0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a020ed7521a9737bcf3e34eb880867c60c3c68d0 Author: David Brownell <da...@pa...> Date: Mon Apr 3 15:49:04 2006 -0700 [PATCH] SPI: busnum == 0 needs to work We need to be able to have a "SPI bus 0" matching chip numbering; but that number was wrongly used to flag dynamic allocation of a bus number. This patch resolves that issue; now negative numbers trigger dynamic alloc. It also updates the how-to-write-a-controller-driver overview to mention this stuff. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit ccf77cc4af5b048e20cfd9327fcc286cb69c34cc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ccf77cc4af5b048e20cfd9327fcc286cb69c34cc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ccf77cc4af5b048e20cfd9327fcc286cb69c34cc Author: David Brownell <da...@pa...> Date: Mon Apr 3 15:46:22 2006 -0700 [PATCH] SPI: devices can require LSB-first encodings Add spi_device hook for LSB-first word encoding, and update all the (in-tree) controller drivers to reject such devices. Eventually, some controller drivers will be updated to support lsb-first encodings on the wire; no current drivers need this. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b Author: Kumar Gala <ga...@ke...> Date: Sun Apr 2 16:06:35 2006 -0500 [PATCH] SPI: Renamed bitbang_transfer_setup to spi_bitbang_setup_transfer and export it Renamed bitbang_transfer_setup to follow convention of other exported symbols from spi-bitbang. Exported spi_bitbang_setup_transfer to allow users of spi-bitbang to use the function in their own setup_transfer. Signed-off-by: Kumar Gala <ga...@ke...> Cc: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 025c398710ac24456f0288fc7e64f426c5c5508f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=025c398710ac24456f0288fc7e64f426c5c5508f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=025c398710ac24456f0288fc7e64f426c5c5508f Author: Kumar Gala <ga...@ke...> Date: Sun Apr 2 16:05:54 2006 -0500 [PATCH] SPI: Add David as the SPI subsystem maintainer Add David as the SPI subsystem maintainer Signed-off-by: Kumar Gala <ga...@ke...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit a9948b6194b46e489aa3b4d111d6dfd786c39c4b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a9948b6194b46e489aa3b4d111d6dfd786c39c4b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a9948b6194b46e489aa3b4d111d6dfd786c39c4b Author: David Brownell <da...@pa...> Date: Sun Apr 2 10:37:40 2006 -0800 [PATCH] SPI: spi bounce buffer has a minimum length Make sure that spi_write_then_read() can always handle at least 32 bytes of transfer (total, both directions), minimizing one portability issue. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 747d844ee9a183ff3067bb1181f2a25c50649538 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=747d844ee9a183ff3067bb1181f2a25c50649538 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=747d844ee9a183ff3067bb1181f2a25c50649538 Author: David Brownell <da...@pa...> Date: Sun Apr 2 10:33:37 2006 -0800 [PATCH] SPI: spi whitespace fixes This removes superfluous whitespace in the <linux/spi/spi.h> header. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 Author: Stephen Street <st...@st...> Date: Tue Mar 7 23:53:24 2006 -0800 [PATCH] SPI: add PXA2xx SSP SPI Driver This driver turns a PXA2xx synchronous serial port (SSP) into a SPI master controller (see Documentation/spi/spi_summary). The driver has the following features: - Support for any PXA2xx SSP - SSP PIO and SSP DMA data transfers. - External and Internal (SSPFRM) chip selects. - Per slave device (chip) configuration. - Full suspend, freeze, resume support. Signed-off-by: Stephen Street <st...@st...> Signed-off-by: Andrew Morton <ak...@os...> Cc: David Brownell <da...@pa...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa Author: Imre Deak <imr...@no...> Date: Fri Feb 17 10:02:18 2006 -0800 [PATCH] SPI: per-transfer overrides for wordsize and clocking Some protocols (like one for some bitmap displays) require different clock speed or word size settings for each transfer in an SPI message. This adds those parameters to struct spi_transfer. They are to be used when they are nonzero; otherwise the defaults from spi_device are to be used. The patch also adds a setup_transfer callback to spi_bitbang, uses it for messages that use those overrides, and implements it so that the pure bitbanging code can help resolve any questions about how it should work. Signed-off-by: Imre Deak <imr...@no...> Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 3170a5e80be7db29ab5ccb6b4145cf28b4a156de gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3170a5e80be7db29ab5ccb6b4145cf28b4a156de gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3170a5e80be7db29ab5ccb6b4145cf28b4a156de Author: Adrian Bunk <bu...@st...> Date: Tue May 16 22:09:46 2006 +0100 [ARM] arch/arm/kernel/dma-isa.c: named initializers This patch converts struct dma_resources to named initializers. Besides fixing a compile error in -mm, it didn't sound like a bad idea. Signed-off-by: Adrian Bunk <bu...@st...> Acked-by: Alexander Schulz <al...@sh...> Signed-off-by: Russell King <rmk...@ar...> commit bb1a2aa617e67e2d60f22052b13422c7caeaf798 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bb1a2aa617e67e2d60f22052b13422c7caeaf798 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bb1a2aa617e67e2d60f22052b13422c7caeaf798 Author: Harry Fearnhamm <Har...@ar...> Date: Tue May 16 16:50:21 2006 +0100 [ARM] 3527/1: MPCore Boot Lockup Fix Patch from Harry Fearnhamm This patch fixes the occasional lockup seen in early boot stage on RealView MPCore system. Signed-off-by: Harry Fearnhamm <Har...@ar...> Signed-off-by: Russell King <rmk...@ar...> commit 716f8954fb3029ca2df52a986b60af8d06f093ee gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=716f8954fb3029ca2df52a986b60af8d06f093ee gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=716f8954fb3029ca2df52a986b60af8d06f093ee Merge: a4523a8b38089478f93bc053c31f678c63f5ee1b cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 Author: Linus Torvalds <tor...@g5...> Date: Tue May 16 08:46:10 2006 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] Fix pSeries identification in prom_init.c [PATCH] powerpc: fix kernel version display on pseries boxes commit a4523a8b38089478f93bc053c31f678c63f5ee1b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a4523a8b38089478f93bc053c31f678c63f5ee1b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a4523a8b38089478f93bc053c31f678c63f5ee1b Author: Roland Dreier <rd...@ci...> Date: Mon May 15 11:41:00 2006 -0700 [PATCH] slab: Fix kmem_cache_destroy() on NUMA With CONFIG_NUMA set, kmem_cache_destroy() may fail and say "Can't free all objects." The problem is caused by sequences such as the following (suppose we are on a NUMA machine with two nodes, 0 and 1): * Allocate an object from cache on node 0. * Free the object on node 1. The object is put into node 1's alien array_cache for node 0. * Call kmem_cache_destroy(), which ultimately ends up in __cache_shrink(). * __cache_shrink() does drain_cpu_caches(), which loops through all nodes. For each node it drains the shared array_cache and then handles the alien array_cache for the other node. However this means that node 0's shared array_cache will be drained, and then node 1 will move the contents of its alien[0] array_cache into that same shared array_cache. node 0's shared array_cache is never looked at again, so the objects left there will appear to be in use when __cache_shrink() calls __node_shrink() for node 0. So __node_shrink() will return 1 and kmem_cache_destroy() will fail. This patch fixes this by having drain_cpu_caches() do drain_alien_cache() on every node before it does drain_array() on the nodes' shared array_caches. The problem was originally reported by Or Gerlitz <oge...@vo...>. Signed-off-by: Roland Dreier <ro...@ci...> Acked-by: Christoph Lameter <cla...@sg...> Acked-by: Pekka Enberg <pe...@cs...> Signed-off-by: Linus Torvalds <tor...@os...> commit 40e59a61669a3cab9e0bd24644e29155d6b00970 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=40e59a61669a3cab9e0bd24644e29155d6b00970 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=40e59a61669a3cab9e0bd24644e29155d6b00970 Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:47 2006 +0200 [PATCH] x86_64: Don't schedule on exception stack on preemptive kernels Extends an earlier patch from John Blackwood to more exception handlers that also run on the exception stacks. Expand the use of preempt_conditional_{sti,cli} to all cases where interrupts are to be re-enabled during exception handling while running on an IST stack. Based on original patch from Jan Beulich. Cc: John Blackwood <joh...@cc...> Cc: jbe...@no... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit fad7906d16e8c4926aeb5b0f1756eb9f55b2837d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fad7906d16e8c4926aeb5b0f1756eb9f55b2837d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fad7906d16e8c4926aeb5b0f1756eb9f55b2837d Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:44 2006 +0200 [PATCH] x86_64: Fix memory hotadd heuristics This fixes some boot failures on Dell and Unisys systems with memory hotadd added. - Set hotadd_percent to 0 by default. This means anybody using hotadd memory needs to specify the value on the command line. That's because there are lots of Intel boxes which have a bogus hotplug area in their SRAT and they would waste a lot of memory before. - Fix calculation of how much memory to use when the hotplug area exceeds hotadd_percent - Fix fallback when the - Fix fallback if memory hotadd is not compiled in. Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit 5491d0f3e206beb95eeb506510d62a1dab462df1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5491d0f3e206beb95eeb506510d62a1dab462df1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5491d0f3e206beb95eeb506510d62a1dab462df1 Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:41 2006 +0200 [PATCH] i386/x86_64: Force pci=noacpi on HP XW9300 This is needed to see all devices. The system has multiple PCI segments and we don't handle that properly yet in PCI and ACPI. Short term before this is fixed blacklist it to pci=noacpi. Acked-by: len...@in... Cc: gr...@su... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit f0fdabf8bf187c9aafeb139a828c530ef45cf022 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f0fdabf8bf187c9aafeb139a828c530ef45cf022 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f0fdabf8bf187c9aafeb139a828c530ef45cf022 Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:38 2006 +0200 [PATCH] x86_64: Don't warn for overflow in nommu case when dma_mask is < 32bit This triggers for b44's 1GB DMA workaround which tries to map first and then bounces. The 32bit heuristic is reasonable because the IOMMU doesn't attempt to handle < 32bit masks anyways. Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit 639b421b911bbde1e3fb5ed037a4f8c85a5bffcb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=639b421b911bbde1e3fb5ed037a4f8c85a5bffcb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=639b421b911bbde1e3fb5ed037a4f8c85a5bffcb Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:35 2006 +0200 [PATCH] x86_64: Check for bad dma address in b44 1GB DMA workaround Needed for interaction with the nommu code in x86-64 which will return bad_dma_address if the address exceeds dma_mask. Cc: ne...@vg... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 Author: Benjamin Herrenschmidt <be...@ke...> Date: Mon May 15 15:46:03 2006 +1000 [PATCH] Fix pSeries identification in prom_init.c The OF trampoline code prom_init.c still needs to identify IBM pSeries (PAPR) machines in order to run some platform specific code on them like instanciating the TCE tables. The code doing that detection was changed recently in 2.6.17 early stages but was done slightly incorrectly. It should be testing for an exact match of "chrp" and it currently tests for anything that begins with "chrp". That means it will incorrectly match with platforms using Maple-like device-trees and have open firmware. This fixes it by using strcmp instead of strncmp to match what the actual platform detection code does. Signed-off-by: Benjamin Herrenschmidt <be...@ke...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 3de620e8394406fd01f450b8c6e3e74464e81a78 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3de620e8394406fd01f450b8c6e3e74464e81a78 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3de620e8394406fd01f450b8c6e3e74464e81a78 Author: Anton Blanchard <an...@sa...> Date: Wed May 10 13:05:54 2006 +1000 [PATCH] powerpc: fix kernel version display on pseries boxes We are displaying the wrong thing on the operator panel (2x40 character LCD). This got broken in commit cebb21b5, when UTS_RELEASE got changed to system_utsname.version. Signed-off-by: Anton Blanchard <an...@sa...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 9d494ccb9ca297f80dc61a0d6357e88c86f44e92 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9d494ccb9ca297f80dc61a0d6357e88c86f44e92 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9d494ccb9ca297f80dc61a0d6357e88c86f44e92 Author: Russell King <rm...@dy...> Date: Tue May 16 11:33:15 2006 +0100 [ARM] arch/arm/kernel/process.c: Fix warning arch/arm/kernel/process.c:314: warning: assignment makes integer from pointer without a cast Signed-off-by: Russell King <rmk...@ar...> commit 478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee Author: Catalin Marinas <cat...@ar...> Date: Tue May 16 11:30:26 2006 +0100 [ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM Patch from Catalin Marinas This patch modifies the __ioremap_pfn and __iounmap functions in arch/arm/mm/ioremap.c to use vunmap instead of vfree. Signed-off-by: Catalin Marinas <cat...@ar...> Signed-off-by: Russell King <rmk...@ar...> commit 1d6760a3ac6b5691e4914a3333b48fee5c2e275d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1d6760a3ac6b5691e4914a3333b48fee5c2e275d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1d6760a3ac6b5691e4914a3333b48fee5c2e275d Author: Nicolas Pitre <ni...@ca...> Date: Tue May 16 11:29:46 2006 +0100 [ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes Patch from Nicolas Pitre Assembly code that calls C code must ensure the C code sees a 64-bit aligned stack pointer. Signed-off-by: Nicolas Pitre <ni...@ca...> Signed-off-by: Russell King <rmk...@ar...> commit 2ceec0c8c6e2780d58dece91b4b787729405d9e7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2ceec0c8c6e2780d58dece91b4b787729405d9e7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2ceec0c8c6e2780d58dece91b4b787729405d9e7 Author: Uwe Zeisberger <Uwe...@di...> Date: Wed May 10 18:11:05 2006 +0100 [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h Patch from Uwe Zeisberger The symbol is only used in arch/arm/kernel/head-common.S. This in turn is included from arch/arm/kernel/head.S and arch/arm/kernel/head-nommu.S which include asm-offsets.h . Signed-off-by: Uwe Zeisberger <Uwe...@di...> Signed-off-by: Russell King <rmk...@ar...> commit 1281e36027a9119356bd93b5e7853c72c35dd462 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1281e36027a9119356bd93b5e7853c72c35dd462 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1281e36027a9119356bd93b5e7853c72c35dd462 Author: Andrew Victor <an...@sa...> Date: Tue May 16 11:28:49 2006 +0100 [ARM] 3523/1: Serial core pm_state Patch from Andrew Victor The serial_core already manages the power state of the UARTs, and therefore it shouldn't suspend a UART which was previously suspended. This patch modifies serial_core only call the UART-specific power-management function if the PM state is actually changing. Signed-off-by: Andrew Victor <an...@sa...> Signed-off-by: Russell King <rmk...@ar...> commit c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 Author: Andrew Morton <ak...@os...> Date: Mon May 15 09:44:43 2006 -0700 [PATCH] dl2k needs dma-mapping.h On alpha: drivers/net/dl2k.c: In function `rio_free_tx': drivers/net/dl2k.c:768: error: `DMA_48BIT_MASK' undeclared (first use in this function) drivers/net/dl2k.c:768: error: (Each undeclared identifier is reported only once drivers/net/dl2k.c:768: error: for each function it appears in.) drivers/net/dl2k.c: In function `receive_packet': drivers/net/dl2k.c:896: error: `DMA_48BIT_MASK' undeclared (first use in this function) drivers/net/dl2k.c: In function `rio_close': drivers/net/dl2k.c:1803: error: `DMA_48BIT_MASK' undeclared (first use in this function) Cc: Jeff Garzik <je...@ga...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 194a61b8e09ac526c33777a688ee2a1504d7fbc3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=194a61b8e09ac526c33777a688ee2a1504d7fbc3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=194a61b8e09ac526c33777a688ee2a1504d7fbc3 Author: Andrew Morton <ak...@os...> Date: Mon May 15 09:44:42 2006 -0700 [PATCH] jffs2 warning fixes fs/jffs2/nodelist.c: In function `check_node_data': fs/jffs2/nodelist.c:441: warning: unsigned int format, different type arg (arg 4) fs/jffs2/nodelist.c:464: warning: int format, different type arg (arg 5) Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d3779e7989cfdba854b843fe605f8df9e991cd18 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d3779e7989cfdba854b843fe605f8df9e991cd18 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d3779e7989cfdba854b843fe605f8df9e991cd18 Author: Peter Osterlund <pe...@te...> Date: Mon May 15 09:44:40 2006 -0700 [PATCH] devices.txt: remove pktcdvd entry Changing the driver to use dynamic device numbers was one of the many changes that were made in order to have the driver accepted into the mainline kernel. Therefore I would say that the entry in devices.txt is obsolete. This patch removes it. Signed-off-by: Peter Osterlund <pe...@te...> Cc: Torben Mathiasen <de...@la...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 264a341231e8af2c2e35ac15d26de76f1198525b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=264a341231e8af2c2e35ac15d26de76f1198525b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=264a341231e8af2c2e35ac15d26de76f1198525b Author: Thomas Kleffel <tk...@ma...> Date: Mon May 15 09:44:37 2006 -0700 [PATCH] ide_cs: Add IBM microdrive to known IDs Add the IBM microdrive to the known PCMCIA IDs for ide_cs. Signed-off-by: Thomas Kleffel <tk...@ma...> Cc: Bartlomiej Zolnierkiewicz <B.Z...@el...> Cc: Alan Cox <al...@lx...> Cc: Dominik Brodowski <li...@do...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 79afecfaabbe42e2a8a7e28880517f1721f2f3a7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=79afecfaabbe42e2a8a7e28880517f1721f2f3a7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=79afecfaabbe42e2a8a7e28880517f1721f2f3a7 Author: Aneesh Kumar <ane...@gm...> Date: Mon May 15 09:44:36 2006 -0700 [PATCH] Fix typos in Documentation/memory-barriers.txt Fix some typos in Documentation/memory-barriers.txt Signed-off-by: Aneesh Kumar K.V <ane...@gm...> Cc: David Howells <dho...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit bfe2e9349f318883c036607c64b6205d573a28ff gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bfe2e9349f318883c036607c64b6205d573a28ff gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bfe2e9349f318883c036607c64b6205d573a28ff Author: Alexey Dobriyan <ado...@gm...> Date: Mon May 15 09:44:35 2006 -0700 [PATCH] gigaset: endian fix Signed-off-by: Alexey Dobriyan <ado...@gm...> Cc: Hansjoerg Lipp <hj...@we...> Cc: Tilman Schmidt <ti...@im...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit b2d596d8e08099b47e0a75aa4b7f82aae780e851 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b2d596d8e08099b47e0a75aa4b7f82aae780e851 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b2d596d8e08099b47e0a75aa4b7f82aae780e851 Author: Pavel Machek <pa...@uc...> Date: Mon May 15 09:44:34 2006 -0700 [PATCH] fix hotplug kconfig help HOTPLUG_CPU entry says "Say Y..." then "Say N.". Slightly ugly, so I fixed it up, and added remark about suspend on SMP as a bonus. Signed-off-by: Pavel Machek <pa...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit ce007ea59729d627f62bb5fa8c1a81e25653a0ad gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ce007ea59729d627f62bb5fa8c1a81e25653a0ad gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ce007ea59729d627f62bb5fa8c1a81e25653a0ad Author: Carl-Daniel Hailfinger <c-d...@gm...> Date: Mon May 15 09:44:33 2006 -0700 [PATCH] smbus unhiding kills thermal management Do not enable the SMBus device on Asus boards if suspend is used. We do not reenable the device on resume, leading to all sorts of undesirable effects, the worst being a total fan failure after resume on Samsung P35 laptop. Signed-off-by: Carl-Daniel Hailfinger <c-d...@gm...> Signed-off-by: Pavel Machek <pa...@su...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit eee391a66d774e644bf3cbb35403562e09d88bb2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=eee391a66d774e644bf3cbb35403562e09d88bb2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=eee391a66d774e644bf3cbb35403562e09d88bb2 Author: Andrew Morton <ak...@os...> Date: Mon May 15 09:44:30 2006 -0700 [PATCH] revert "vfs: propagate mnt_flags into do_loopback/vfsmount" Revert commit f6422f17d3a480f21917a3895e2a46b968f56a08, due to Val...@vt... wrote: > > There seems to have been a bug introduced in this changeset: > > Am running 2.6.17-rc3-mm1. When this changeset is applied, 'mount --bind' > misbehaves: > > > # mkdir /foo > > # mount -t tmpfs -o rw,nosuid,nodev,noexec,noatime,nodiratime none /foo > > # mkdir /foo/bar > > # mount --bind /foo/bar /foo > > # tail -2 /proc/mounts > > none /foo tmpfs rw,nosuid,nodev,noexec,noatime,nodiratime 0 0 > > none /foo tmpfs rw 0 0 > > Reverting this changeset causes both mounts to have the same options. > > (Thanks to Stephen Smalley for tracking down the changeset...) > Cc: Herbert Poetzl <he...@13...> Cc: Christoph Hellwig <hc...@in...> Cc: <Val...@vt...> Cc: Stephen Smalley <sd...@ty...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit be6e028b6422878df2e799a74609a03a553c7dad gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=be6e028b6422878df2e799a74609a03a553c7dad gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=be6e028b6422878df2e799a74609a03a553c7dad Author: Andy Whitcroft <ap...@sh...> Date: Mon May 15 09:44:29 2006 -0700 [PATCH] root mount failure: emit filesystems attempted When we fail to mount from a valid root device list out the filesystems we have tried to mount it with. This gives the user vital diagnostics as to what is missing from their kernel. For example in the fragment below the kernel does not have CRAMFS compiled into the kernel and yet appears to recognise it at the RAMDISK detect stage. Later the mount fails as we don't have the filesystem. RAMDISK: cramfs filesystem found at block 0 RAMDISK: Loading 1604KiB [1 disk] into ram disk... done. XFS: bad magic number XFS: SB validate failed No filesystem could mount root, tried: reiserfs ext3 ext2 msdos vfat iso9660 jfs xfs Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(8,1) Signed-off-by: Andy Whitcroft <ap...@sh...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3835a9bd07778d87dea37fbf190f70883515e8fc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3835a9bd07778d87dea37fbf190f70883515e8fc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3835a9bd07778d87dea37fbf190f70883515e8fc Author: Alexey Dobriyan <ado...@gm...> Date: Mon May 15 09:44:27 2006 -0700 [PATCH] fs/compat.c: fix 'if (a |= b )' typo Mentioned by Mark Armbrust somewhere on Usenet. Signed-off-by: Alexey Dobriyan <ado...@gm...> Cc: David Woodhouse <dw...@in...> Cc: Ulrich Drepper <dr...@re...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit bb53a76116a8af13ee2581c85c02fe40e0c1a599 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bb53a76116a8af13ee2581c85c02fe40e0c1a599 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bb53a76116a8af13ee2581c85c02fe40e0c1a599 Author: Daniel Walker <dw...@mv...> Date: Mon May 15 09:44:27 2006 -0700 [PATCH] tpm_register_hardware gcc 4.1 warning fix drivers/char/tpm/tpm.c: In function 'tpm_register_hardware': drivers/char/tpm/tpm.c:1157: warning: assignment from incompatible pointer type Signed-off-by: Daniel Walker <dw...@mv...> Acked-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 655fdeab809a5612b0eab6aee873b00d26404ca7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=655fdeab809a5612b0eab6aee873b00d26404ca7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=655fdeab809a5612b0eab6aee873b00d26404ca7 Author: Alan Cox <al...@lx...> Date: Mon May 15 09:44:26 2006 -0700 [PATCH] Final rio polish Signed-off-by: Alan Cox <al...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 Author: Kylene Jo Hall <kj...@us...> Date: Mon May 15 09:44:25 2006 -0700 [PATCH] tpm: fix constant Fix the constant used for the base address when it cannot be determined from ACPI. It was off by one order of magnitude. Signed-off-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 64471ebe534dc6cedd72849b2324b52cb5249eb9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=64471ebe534dc6cedd72849b2324b52cb5249eb9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=64471ebe534dc6cedd72849b2324b52cb5249eb9 Author: Benjamin LaHaise <bc...@kv...> Date: Mon May 15 09:44:24 2006 -0700 [PATCH] Add Core Solo and Core Duo support to oprofile Add support to oprofile for the Intel Core Solo and Core Duo processors. See also the patch to add support to oprofile-0.9.1-8.1.1 at http://www.kvack.org/~bcrl/patches/oprofile/oprofile-core-0.9.1.diff . Signed-off-by: Benjamin LaHaise <ben...@in...> Cc: Philippe Elie <ph...@wa...> Cc: John Levon <le...@mo...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit e6333fd4ddf7a583480017f535b9ea53c116ab81 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e6333fd4ddf7a583480017f535b9ea53c116ab81 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e6333fd4ddf7a583480017f535b9ea53c116ab81 Author: Hua Zhong <hz...@gm...> Date: Mon May 15 09:44:22 2006 -0700 [PATCH] fix can_share_swap_page() when !CONFIG_SWAP can_share_swap_page() is used to check if the page has the last reference. This avoids allocating a new page for COW if it's the last page. However, if CONFIG_SWAP is not set, can_share_swap_page() is defined as 0, thus always causes a copy for the last COW page. The below simple patch fixes it. Signed-off-by: Hua Zhong <hz...@gm...> Cc: David Howells <dho...@re...> Cc: Hugh Dickins <hu...@ve...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 41e5a6ac80c600e1f8bda0a4871f0b797e097d78 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=41e5a6ac80c600e1f8bda0a4871f0b797e097d78 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=41e5a6ac80c600e1f8bda0a4871f0b797e097d78 Author: Latchesar Ionkov <lu...@io...> Date: Mon May 15 09:44:21 2006 -0700 [PATCH] v9fs: signal handling fixes Multiple races can happen when v9fs is interrupted by a signal and Tflush message is sent to the server. After v9fs sends Tflush it doesn't wait until it receives Rflush, and possibly the response of the original message. This behavior may confuse v9fs what fids are allocated by the file server. This patch fixes the races and the fid allocation. Signed-off-by: Latchesar Ionkov <lu...@io...> Cc: Eric Van Hensbergen <er...@he...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 343f1fe6f2e3fb4912db241e639b0721c2e14f2e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=343f1fe6f2e3fb4912db241e639b0721c2e14f2e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=343f1fe6f2e3fb4912db241e639b0721c2e14f2e Author: Latchesar Ionkov <lu...@io...> Date: Mon May 15 09:44:18 2006 -0700 [PATCH] v9fs: Twalk memory leak v9fs leaks memory if the file server responds with Rerror to a Twalk message. The patch fixes the leak. Signed-off-by: Latchesar Ionkov <lu...@io...> Cc: Eric Van Hensbergen <er...@he...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3dc7b82ea7649356bf027fba50c16ca50cec31e2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3dc7b82ea7649356bf027fba50c16ca50cec31e2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3dc7b82ea7649356bf027fba50c16ca50cec31e2 Author: Richard Purdie <rp...@rp...> Date: Mon May 15 09:44:17 2006 -0700 [PATCH] LED: Fix sysfs store function error handling Fix the error handling of some LED _store functions. This corrects them to return -EINVAL if the value is not numeric with an optional byte of trailing whitespace. Signed-off-by: Richard Purdie <rp...@rp...> Cc: Greg KH <gr...@kr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 263de9b582b0f9b6ad5a0651b7df884fe80d6c3c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=263de9b582b0f9b6ad5a0651b7df884fe80d6c3c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=263de9b582b0f9b6ad5a0651b7df884fe80d6c3c Author: Richard Purdie <rp...@rp...> Date: Mon May 15 09:44:16 2006 -0700 [PATCH] LED: Add maintainer entry for the LED subsystem Add a MAINTAINERS entry for the LED subsystem. Signed-off-by: Richard Purdie <rp...@rp...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 68673afd443c5eeb4cebfb9026e3675f43d79f2b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=68673afd443c5eeb4cebfb9026e3675f43d79f2b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=68673afd443c5eeb4cebfb9026e3675f43d79f2b Author: Richard Purdie <rp...@rp...> Date: Mon May 15 09:44:15 2006 -0700 [PATCH] Backlight/LCD Class: Fix sysfs _store error handling The backlight and LCD class _store functions currently accept values like "34 some random strings" without error. This corrects them to return -EINVAL if the value is not numeric with an optional byte of trailing whitespace. Signed-off-by: Richard Purdie <rp...@rp...> Cc: Greg KH <gr...@kr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit a8d2e7d95229db9999682113bfac40b49978f212 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a8d2e7d95229db9999682113bfac40b49978f212 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a8d2e7d95229db9999682113bfac40b49978f212 Author: Richard Purdie <rp...@rp...> Date: Mon May 15 09:44:14 2006 -0700 [PATCH] LED: Improve Kconfig information Improve the NEW_LEDS Kconfig information to say what it does as well as what it doesn't. Signed-off-by: Richard Purdie <rp...@rp...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 39d24e64263cd3211705d3b61ea4171c65030921 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=39d24e64263cd3211705d3b61ea4171c65030921 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=39d24e64263cd3211705d3b61ea4171c65030921 Author: Mike Kravetz <kr...@us...> Date: Mon May 15 09:44:13 2006 -0700 [PATCH] add slab_is_available() routine for boot code slab_is_available() indicates slab based allocators are available for use. SPARSEMEM code needs to know this as it can be called at various times during the boot process. Signed-off-by: Mike Kravetz <kr...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 48564e628bd7662d7a0b3ac81c41cd0e4cc36dae gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=48564e628bd7662d7a0b3ac81c41cd0e4cc36dae gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=48564e628bd7662d7a0b3ac81c41cd0e4cc36dae Author: Jan Niehusmann <ja...@go...> Date: Mon May 15 09:44:12 2006 -0700 [PATCH] smbfs: Fix slab corruption in samba error path Yesterday, I got the following error with 2.6.16.13 during a file copy from a smb filesystem over a wireless link. I guess there was some error on the wireless link, which in turn caused an error condition for the smb filesystem. In the log, smb_file_read reports error=4294966784 (0xfffffe00), which also shows up in the slab dumps, and also is -ERESTARTSYS. Error code 27499 corresponds to 0x6b6b, so the rq_errno field seems to be the only one being set after freeing the slab. In smb_add_request (which is the only place in smbfs where I found ERESTARTSYS), I found the following: if (!timeleft || signal_pending(current)) { /* * On timeout or on interrupt we want to try and remove the * request from the recvq/xmitq. */ smb_lock_server(server); if (!(req->rq_flags & SMB_REQ_RECEIVED)) { list_del_init(&req->rq_queue); smb_rput(req); } smb_unlock_server(server); } [...] if (signal_pending(current)) req->rq_errno = -ERESTARTSYS; I guess that some codepath like smbiod_flush() caused the request to be removed from the queue, and smb_rput(req) be called, without SMB_REQ_RECEIVED being set. This violates an asumption made by the quoted code. Then, the above code calls smb_rput(req) again, the req gets freed, and req->rq_errno = -ERESTARTSYS writes into the already freed slab. As list_del_init doesn't cause an error if called multiple times, that does cause the observed behaviour (freed slab with rq_errno=-ERESTARTSYS). I... [truncated message content] |
|
From: Jan-Benedict G. <jb...@he...> - 2006-10-29 14:07:28
|
CREDITS | 9 Documentation/devices.txt | 5 Documentation/memory-barriers.txt | 4 Documentation/networking/operstates.txt | 161 ++ Documentation/scsi/ChangeLog.megaraid | 25 Documentation/spi/pxa2xx | 234 ++++ Documentation/spi/spi-summary | 34 MAINTAINERS | 18 Makefile | 2 arch/arm/configs/collie_defconfig | 430 ++++--- arch/arm/configs/versatile_defconfig | 390 ++++--- arch/arm/kernel/asm-offsets.c | 2 arch/arm/kernel/dma-isa.c | 23 arch/arm/kernel/process.c | 37 arch/arm/lib/backtrace.S | 4 arch/arm/lib/div64.S | 4 arch/arm/mach-realview/realview_eb.c | 5 arch/arm/mm/ioremap.c | 4 arch/arm/tools/mach-types | 89 + arch/i386/Kconfig | 6 arch/i386/kernel/acpi/boot.c | 8 arch/i386/kernel/setup.c | 2 arch/i386/oprofile/nmi_int.c | 7 arch/powerpc/kernel/prom_init.c | 2 arch/powerpc/platforms/pseries/setup.c | 2 arch/s390/kernel/compat_wrapper.S | 8 arch/s390/kernel/syscalls.S | 1 arch/s390/kernel/time.c | 7 arch/sparc/kernel/ioport.c | 5 arch/sparc/kernel/module.c | 1 arch/sparc/kernel/sparc_ksyms.c | 13 arch/sparc64/defconfig | 19 arch/sparc64/kernel/module.c | 5 arch/x86_64/kernel/pci-nommu.c | 7 arch/x86_64/kernel/traps.c | 21 arch/x86_64/mm/srat.c | 15 block/elevator.c | 8 block/genhd.c | 2 block/ll_rw_blk.c | 17 drivers/block/ub.c | 18 drivers/char/Kconfig | 2 drivers/char/pcmcia/cm4000_cs.c | 10 drivers/char/pcmcia/cm4040_cs.c | 11 drivers/char/rio/host.h | 9 drivers/char/rio/rioboot.c | 1 drivers/char/rio/rioctrl.c | 43 drivers/char/rio/rioioctl.h | 56 - drivers/char/tpm/Kconfig | 2 drivers/char/tpm/tpm.h | 2 drivers/char/tpm/tpm_tis.c | 2 drivers/i2c/busses/scx200_acb.c | 16 drivers/ide/legacy/ide-cs.c | 1 drivers/infiniband/core/cm.c | 12 drivers/infiniband/core/mad.c | 47 drivers/infiniband/core/mad_priv.h | 5 drivers/infiniband/core/mad_rmpp.c | 20 drivers/infiniband/core/sysfs.c | 2 drivers/infiniband/core/ucm.c | 12 drivers/infiniband/hw/ipath/ipath_driver.c | 7 drivers/infiniband/hw/mthca/mthca_cq.c | 41 drivers/infiniband/hw/mthca/mthca_dev.h | 2 drivers/infiniband/hw/mthca/mthca_mr.c | 15 drivers/infiniband/hw/mthca/mthca_provider.h | 22 drivers/infiniband/hw/mthca/mthca_qp.c | 31 drivers/infiniband/hw/mthca/mthca_srq.c | 23 drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 4 drivers/infiniband/ulp/srp/ib_srp.c | 195 ++- drivers/infiniband/ulp/srp/ib_srp.h | 4 drivers/isdn/capi/capi.c | 1 drivers/isdn/gigaset/usb-gigaset.c | 4 drivers/leds/Kconfig | 7 drivers/leds/led-class.c | 9 drivers/leds/ledtrig-timer.c | 17 drivers/message/fusion/mptbase.c | 63 - drivers/message/fusion/mptbase.h | 10 drivers/message/fusion/mptfc.c | 134 +- drivers/message/fusion/mptsas.c | 99 + drivers/message/fusion/mptscsih.c | 50 drivers/message/fusion/mptspi.c | 68 + drivers/net/b44.c | 28 drivers/net/dl2k.c | 13 drivers/net/irda/Makefile | 2 drivers/net/irda/sir-dev.h | 13 drivers/net/irda/sir_dev.c | 315 +++++ drivers/net/irda/sir_kthread.c | 508 --------- drivers/net/irda/smsc-ircc2.c | 14 drivers/net/phy/mdio_bus.c | 4 drivers/net/sis900.c | 1 drivers/net/sky2.c | 5 drivers/net/tg3.c | 11 drivers/pci/quirks.c | 16 drivers/pcmcia/pcmcia_ioctl.c | 23 drivers/s390/net/lcs.c | 2 drivers/sbus/char/openprom.c | 15 drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 1 drivers/scsi/aic7xxx/aic7xxx_pci.c | 12 drivers/scsi/ibmvscsi/ibmvscsi.c | 30 drivers/scsi/lpfc/lpfc_crtn.h | 1 drivers/scsi/lpfc/lpfc_disc.h | 1 drivers/scsi/lpfc/lpfc_els.c | 95 - drivers/scsi/lpfc/lpfc_hbadisc.c | 18 drivers/scsi/lpfc/lpfc_hw.h | 3 drivers/scsi/lpfc/lpfc_init.c | 22 drivers/scsi/lpfc/lpfc_mbox.c | 33 drivers/scsi/lpfc/lpfc_nportdisc.c | 134 +- drivers/scsi/lpfc/lpfc_scsi.c | 68 - drivers/scsi/lpfc/lpfc_version.h | 2 drivers/scsi/megaraid.c | 1 drivers/scsi/megaraid/megaraid_mbox.c | 59 - drivers/scsi/megaraid/megaraid_mbox.h | 7 drivers/scsi/megaraid/megaraid_mm.c | 6 drivers/scsi/qla2xxx/qla_os.c | 19 drivers/scsi/scsi_devinfo.c | 2 drivers/scsi/scsi_lib.c | 27 drivers/scsi/sim710.c | 2 drivers/serial/8250.c | 74 + drivers/serial/8250_au1x00.c | 5 drivers/serial/serial_core.c | 123 +- drivers/spi/Kconfig | 8 drivers/spi/Makefile | 1 drivers/spi/pxa2xx_spi.c | 1467 +++++++++++++++++++++++++++ drivers/spi/spi.c | 7 drivers/spi/spi_bitbang.c | 104 + drivers/usb/atm/speedtch.c | 2 drivers/usb/atm/usbatm.c | 8 drivers/usb/core/hcd.c | 13 drivers/usb/core/hub.c | 23 drivers/usb/host/ohci-hcd.c | 2 drivers/usb/input/hid-core.c | 4 drivers/usb/misc/emi26.c | 4 drivers/usb/misc/emi62.c | 4 drivers/usb/net/pegasus.c | 20 drivers/usb/serial/Kconfig | 10 drivers/usb/serial/Makefile | 1 drivers/usb/serial/airprime.c | 1 drivers/usb/serial/ark3116.c | 465 ++++++++ drivers/usb/serial/ftdi_sio.c | 2 drivers/usb/serial/ftdi_sio.h | 9 drivers/usb/serial/generic.c | 1 drivers/usb/serial/omninet.c | 12 drivers/usb/serial/usb-serial.c | 19 drivers/video/backlight/backlight.c | 18 drivers/video/backlight/lcd.c | 32 fs/9p/fcall.c | 21 fs/9p/mux.c | 222 ++-- fs/9p/mux.h | 4 fs/9p/vfs_file.c | 13 fs/9p/vfs_inode.c | 19 fs/autofs4/autofs_i.h | 5 fs/autofs4/root.c | 10 fs/autofs4/waitq.c | 77 - fs/compat.c | 2 fs/jffs2/nodelist.c | 6 fs/namespace.c | 7 fs/open.c | 1 fs/partitions/check.c | 3 fs/smbfs/dir.c | 5 fs/smbfs/request.c | 4 include/asm-arm/arch-pxa/pxa2xx_spi.h | 68 + include/asm-arm/procinfo.h | 2 include/asm-s390/unistd.h | 8 include/linux/dma-mapping.h | 1 include/linux/kernel.h | 1 include/linux/netdevice.h | 3 include/linux/rcupdate.h | 1 include/linux/serial_core.h | 1 include/linux/slab.h | 1 include/linux/spi/spi.h | 45 include/linux/spi/spi_bitbang.h | 8 include/linux/swap.h | 2 include/net/neighbour.h | 1 include/scsi/srp.h | 23 init/do_mounts.c | 5 init/initramfs.c | 8 kernel/extable.c | 2 kernel/module.c | 12 kernel/ptrace.c | 20 kernel/rcupdate.c | 19 lib/Kconfig.debug | 2 mm/page_alloc.c | 11 mm/slab.c | 19 mm/sparse.c | 2 net/atm/clip.c | 2 net/bridge/br_if.c | 21 net/core/dev.c | 99 - net/core/link_watch.c | 10 net/core/neighbour.c | 21 net/ipv4/ip_options.c | 2 net/ipv6/inet6_connection_sock.c | 2 net/irda/irias_object.c | 3 net/sched/sch_hfsc.c | 6 security/selinux/ss/services.c | 4 192 files changed, 5395 insertions(+), 2104 deletions(-) New commits: commit babdd5b2a4f95715d5965115f3ed0889dcd100a8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=babdd5b2a4f95715d5965115f3ed0889dcd100a8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=babdd5b2a4f95715d5965115f3ed0889dcd100a8 Merge: 8befe1a49fdf2f33672bcb85d8682afac40b1659 0c056c50a6218e0e577817c16ba8851af593d742 Author: Jan-Benedict Glaw <jb...@d2...> Date: Wed May 17 17:00:41 2006 +0200 Merge branch 'master' commit 0c056c50a6218e0e577817c16ba8851af593d742 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0c056c50a6218e0e577817c16ba8851af593d742 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0c056c50a6218e0e577817c16ba8851af593d742 Merge: 4fbca5320eb102d2e15bdeffe79e125c11cf925e 1e316d7566b63767aa18902235c719e9e95465d0 Author: Linus Torvalds <tor...@g5...> Date: Tue May 16 15:18:26 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6: [PATCH] SPI: spi_bitbang: clocking fixes [PATCH] spi: Update to PXA2xx SPI Driver [PATCH] SPI: busnum == 0 needs to work [PATCH] SPI: devices can require LSB-first encodings [PATCH] SPI: Renamed bitbang_transfer_setup to spi_bitbang_setup_transfer and export it [PATCH] SPI: Add David as the SPI subsystem maintainer [PATCH] SPI: spi bounce buffer has a minimum length [PATCH] SPI: spi whitespace fixes [PATCH] SPI: add PXA2xx SSP SPI Driver [PATCH] SPI: per-transfer overrides for wordsize and clocking commit 4fbca5320eb102d2e15bdeffe79e125c11cf925e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4fbca5320eb102d2e15bdeffe79e125c11cf925e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4fbca5320eb102d2e15bdeffe79e125c11cf925e Merge: 509b70b677ca35a0e800807c6470181df5008d70 3170a5e80be7db29ab5ccb6b4145cf28b4a156de Author: Linus Torvalds <tor...@g5...> Date: Tue May 16 15:16:14 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] arch/arm/kernel/dma-isa.c: named initializers [ARM] 3527/1: MPCore Boot Lockup Fix [ARM] arch/arm/kernel/process.c: Fix warning [ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM [ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h commit 509b70b677ca35a0e800807c6470181df5008d70 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=509b70b677ca35a0e800807c6470181df5008d70 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=509b70b677ca35a0e800807c6470181df5008d70 Merge: 716f8954fb3029ca2df52a986b60af8d06f093ee 1281e36027a9119356bd93b5e7853c72c35dd462 Author: Linus Torvalds <tor...@g5...> Date: Tue May 16 15:15:59 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial * master.kernel.org:/home/rmk/linux-2.6-serial: [ARM] 3523/1: Serial core pm_state commit 1e316d7566b63767aa18902235c719e9e95465d0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1e316d7566b63767aa18902235c719e9e95465d0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1e316d7566b63767aa18902235c719e9e95465d0 Author: David Brownell <da...@pa...> Date: Thu Apr 6 22:25:56 2006 -0700 [PATCH] SPI: spi_bitbang: clocking fixes This fixes two problems triggered by the MMC stack updating clocks: - SPI masters driver should accept a max clock speed of zero; that's one convention for marking idle devices. (Presumably that helps controllers that don't autogate clocks to "off" when not in use.) - There are more than 1000 nanoseconds per millisecond; setting the clock down to 125 KHz now works properly. Showing once again that Zero (http://en.wikipedia.org/wiki/Zero) is still an inexhaustible number of bugs. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 9708c121c38fe864eb6f5a119f7525729686e095 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9708c121c38fe864eb6f5a119f7525729686e095 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9708c121c38fe864eb6f5a119f7525729686e095 Author: Stephen Street <st...@st...> Date: Tue Mar 28 14:05:23 2006 -0800 [PATCH] spi: Update to PXA2xx SPI Driver Fix two outstanding issues with the pxa2xx_spi driver: 1) Bad cast in the function u32_writer. Thanks to Henrik Bechmann 2) Adds support for per transfer changes to speed and bits per word Signed-off-by: Stephen Street <st...@st...> Cc: David Brownell <dbr...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit a020ed7521a9737bcf3e34eb880867c60c3c68d0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a020ed7521a9737bcf3e34eb880867c60c3c68d0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a020ed7521a9737bcf3e34eb880867c60c3c68d0 Author: David Brownell <da...@pa...> Date: Mon Apr 3 15:49:04 2006 -0700 [PATCH] SPI: busnum == 0 needs to work We need to be able to have a "SPI bus 0" matching chip numbering; but that number was wrongly used to flag dynamic allocation of a bus number. This patch resolves that issue; now negative numbers trigger dynamic alloc. It also updates the how-to-write-a-controller-driver overview to mention this stuff. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit ccf77cc4af5b048e20cfd9327fcc286cb69c34cc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ccf77cc4af5b048e20cfd9327fcc286cb69c34cc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ccf77cc4af5b048e20cfd9327fcc286cb69c34cc Author: David Brownell <da...@pa...> Date: Mon Apr 3 15:46:22 2006 -0700 [PATCH] SPI: devices can require LSB-first encodings Add spi_device hook for LSB-first word encoding, and update all the (in-tree) controller drivers to reject such devices. Eventually, some controller drivers will be updated to support lsb-first encodings on the wire; no current drivers need this. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b Author: Kumar Gala <ga...@ke...> Date: Sun Apr 2 16:06:35 2006 -0500 [PATCH] SPI: Renamed bitbang_transfer_setup to spi_bitbang_setup_transfer and export it Renamed bitbang_transfer_setup to follow convention of other exported symbols from spi-bitbang. Exported spi_bitbang_setup_transfer to allow users of spi-bitbang to use the function in their own setup_transfer. Signed-off-by: Kumar Gala <ga...@ke...> Cc: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 025c398710ac24456f0288fc7e64f426c5c5508f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=025c398710ac24456f0288fc7e64f426c5c5508f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=025c398710ac24456f0288fc7e64f426c5c5508f Author: Kumar Gala <ga...@ke...> Date: Sun Apr 2 16:05:54 2006 -0500 [PATCH] SPI: Add David as the SPI subsystem maintainer Add David as the SPI subsystem maintainer Signed-off-by: Kumar Gala <ga...@ke...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit a9948b6194b46e489aa3b4d111d6dfd786c39c4b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a9948b6194b46e489aa3b4d111d6dfd786c39c4b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a9948b6194b46e489aa3b4d111d6dfd786c39c4b Author: David Brownell <da...@pa...> Date: Sun Apr 2 10:37:40 2006 -0800 [PATCH] SPI: spi bounce buffer has a minimum length Make sure that spi_write_then_read() can always handle at least 32 bytes of transfer (total, both directions), minimizing one portability issue. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 747d844ee9a183ff3067bb1181f2a25c50649538 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=747d844ee9a183ff3067bb1181f2a25c50649538 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=747d844ee9a183ff3067bb1181f2a25c50649538 Author: David Brownell <da...@pa...> Date: Sun Apr 2 10:33:37 2006 -0800 [PATCH] SPI: spi whitespace fixes This removes superfluous whitespace in the <linux/spi/spi.h> header. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 Author: Stephen Street <st...@st...> Date: Tue Mar 7 23:53:24 2006 -0800 [PATCH] SPI: add PXA2xx SSP SPI Driver This driver turns a PXA2xx synchronous serial port (SSP) into a SPI master controller (see Documentation/spi/spi_summary). The driver has the following features: - Support for any PXA2xx SSP - SSP PIO and SSP DMA data transfers. - External and Internal (SSPFRM) chip selects. - Per slave device (chip) configuration. - Full suspend, freeze, resume support. Signed-off-by: Stephen Street <st...@st...> Signed-off-by: Andrew Morton <ak...@os...> Cc: David Brownell <da...@pa...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa Author: Imre Deak <imr...@no...> Date: Fri Feb 17 10:02:18 2006 -0800 [PATCH] SPI: per-transfer overrides for wordsize and clocking Some protocols (like one for some bitmap displays) require different clock speed or word size settings for each transfer in an SPI message. This adds those parameters to struct spi_transfer. They are to be used when they are nonzero; otherwise the defaults from spi_device are to be used. The patch also adds a setup_transfer callback to spi_bitbang, uses it for messages that use those overrides, and implements it so that the pure bitbanging code can help resolve any questions about how it should work. Signed-off-by: Imre Deak <imr...@no...> Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 3170a5e80be7db29ab5ccb6b4145cf28b4a156de gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3170a5e80be7db29ab5ccb6b4145cf28b4a156de gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3170a5e80be7db29ab5ccb6b4145cf28b4a156de Author: Adrian Bunk <bu...@st...> Date: Tue May 16 22:09:46 2006 +0100 [ARM] arch/arm/kernel/dma-isa.c: named initializers This patch converts struct dma_resources to named initializers. Besides fixing a compile error in -mm, it didn't sound like a bad idea. Signed-off-by: Adrian Bunk <bu...@st...> Acked-by: Alexander Schulz <al...@sh...> Signed-off-by: Russell King <rmk...@ar...> commit bb1a2aa617e67e2d60f22052b13422c7caeaf798 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bb1a2aa617e67e2d60f22052b13422c7caeaf798 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bb1a2aa617e67e2d60f22052b13422c7caeaf798 Author: Harry Fearnhamm <Har...@ar...> Date: Tue May 16 16:50:21 2006 +0100 [ARM] 3527/1: MPCore Boot Lockup Fix Patch from Harry Fearnhamm This patch fixes the occasional lockup seen in early boot stage on RealView MPCore system. Signed-off-by: Harry Fearnhamm <Har...@ar...> Signed-off-by: Russell King <rmk...@ar...> commit 716f8954fb3029ca2df52a986b60af8d06f093ee gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=716f8954fb3029ca2df52a986b60af8d06f093ee gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=716f8954fb3029ca2df52a986b60af8d06f093ee Merge: a4523a8b38089478f93bc053c31f678c63f5ee1b cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 Author: Linus Torvalds <tor...@g5...> Date: Tue May 16 08:46:10 2006 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] Fix pSeries identification in prom_init.c [PATCH] powerpc: fix kernel version display on pseries boxes commit a4523a8b38089478f93bc053c31f678c63f5ee1b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a4523a8b38089478f93bc053c31f678c63f5ee1b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a4523a8b38089478f93bc053c31f678c63f5ee1b Author: Roland Dreier <rd...@ci...> Date: Mon May 15 11:41:00 2006 -0700 [PATCH] slab: Fix kmem_cache_destroy() on NUMA With CONFIG_NUMA set, kmem_cache_destroy() may fail and say "Can't free all objects." The problem is caused by sequences such as the following (suppose we are on a NUMA machine with two nodes, 0 and 1): * Allocate an object from cache on node 0. * Free the object on node 1. The object is put into node 1's alien array_cache for node 0. * Call kmem_cache_destroy(), which ultimately ends up in __cache_shrink(). * __cache_shrink() does drain_cpu_caches(), which loops through all nodes. For each node it drains the shared array_cache and then handles the alien array_cache for the other node. However this means that node 0's shared array_cache will be drained, and then node 1 will move the contents of its alien[0] array_cache into that same shared array_cache. node 0's shared array_cache is never looked at again, so the objects left there will appear to be in use when __cache_shrink() calls __node_shrink() for node 0. So __node_shrink() will return 1 and kmem_cache_destroy() will fail. This patch fixes this by having drain_cpu_caches() do drain_alien_cache() on every node before it does drain_array() on the nodes' shared array_caches. The problem was originally reported by Or Gerlitz <oge...@vo...>. Signed-off-by: Roland Dreier <ro...@ci...> Acked-by: Christoph Lameter <cla...@sg...> Acked-by: Pekka Enberg <pe...@cs...> Signed-off-by: Linus Torvalds <tor...@os...> commit 40e59a61669a3cab9e0bd24644e29155d6b00970 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=40e59a61669a3cab9e0bd24644e29155d6b00970 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=40e59a61669a3cab9e0bd24644e29155d6b00970 Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:47 2006 +0200 [PATCH] x86_64: Don't schedule on exception stack on preemptive kernels Extends an earlier patch from John Blackwood to more exception handlers that also run on the exception stacks. Expand the use of preempt_conditional_{sti,cli} to all cases where interrupts are to be re-enabled during exception handling while running on an IST stack. Based on original patch from Jan Beulich. Cc: John Blackwood <joh...@cc...> Cc: jbe...@no... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit fad7906d16e8c4926aeb5b0f1756eb9f55b2837d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fad7906d16e8c4926aeb5b0f1756eb9f55b2837d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fad7906d16e8c4926aeb5b0f1756eb9f55b2837d Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:44 2006 +0200 [PATCH] x86_64: Fix memory hotadd heuristics This fixes some boot failures on Dell and Unisys systems with memory hotadd added. - Set hotadd_percent to 0 by default. This means anybody using hotadd memory needs to specify the value on the command line. That's because there are lots of Intel boxes which have a bogus hotplug area in their SRAT and they would waste a lot of memory before. - Fix calculation of how much memory to use when the hotplug area exceeds hotadd_percent - Fix fallback when the - Fix fallback if memory hotadd is not compiled in. Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit 5491d0f3e206beb95eeb506510d62a1dab462df1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5491d0f3e206beb95eeb506510d62a1dab462df1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5491d0f3e206beb95eeb506510d62a1dab462df1 Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:41 2006 +0200 [PATCH] i386/x86_64: Force pci=noacpi on HP XW9300 This is needed to see all devices. The system has multiple PCI segments and we don't handle that properly yet in PCI and ACPI. Short term before this is fixed blacklist it to pci=noacpi. Acked-by: len...@in... Cc: gr...@su... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit f0fdabf8bf187c9aafeb139a828c530ef45cf022 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f0fdabf8bf187c9aafeb139a828c530ef45cf022 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f0fdabf8bf187c9aafeb139a828c530ef45cf022 Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:38 2006 +0200 [PATCH] x86_64: Don't warn for overflow in nommu case when dma_mask is < 32bit This triggers for b44's 1GB DMA workaround which tries to map first and then bounces. The 32bit heuristic is reasonable because the IOMMU doesn't attempt to handle < 32bit masks anyways. Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit 639b421b911bbde1e3fb5ed037a4f8c85a5bffcb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=639b421b911bbde1e3fb5ed037a4f8c85a5bffcb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=639b421b911bbde1e3fb5ed037a4f8c85a5bffcb Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:35 2006 +0200 [PATCH] x86_64: Check for bad dma address in b44 1GB DMA workaround Needed for interaction with the nommu code in x86-64 which will return bad_dma_address if the address exceeds dma_mask. Cc: ne...@vg... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 Author: Benjamin Herrenschmidt <be...@ke...> Date: Mon May 15 15:46:03 2006 +1000 [PATCH] Fix pSeries identification in prom_init.c The OF trampoline code prom_init.c still needs to identify IBM pSeries (PAPR) machines in order to run some platform specific code on them like instanciating the TCE tables. The code doing that detection was changed recently in 2.6.17 early stages but was done slightly incorrectly. It should be testing for an exact match of "chrp" and it currently tests for anything that begins with "chrp". That means it will incorrectly match with platforms using Maple-like device-trees and have open firmware. This fixes it by using strcmp instead of strncmp to match what the actual platform detection code does. Signed-off-by: Benjamin Herrenschmidt <be...@ke...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 3de620e8394406fd01f450b8c6e3e74464e81a78 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3de620e8394406fd01f450b8c6e3e74464e81a78 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3de620e8394406fd01f450b8c6e3e74464e81a78 Author: Anton Blanchard <an...@sa...> Date: Wed May 10 13:05:54 2006 +1000 [PATCH] powerpc: fix kernel version display on pseries boxes We are displaying the wrong thing on the operator panel (2x40 character LCD). This got broken in commit cebb21b5, when UTS_RELEASE got changed to system_utsname.version. Signed-off-by: Anton Blanchard <an...@sa...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 9d494ccb9ca297f80dc61a0d6357e88c86f44e92 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9d494ccb9ca297f80dc61a0d6357e88c86f44e92 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9d494ccb9ca297f80dc61a0d6357e88c86f44e92 Author: Russell King <rm...@dy...> Date: Tue May 16 11:33:15 2006 +0100 [ARM] arch/arm/kernel/process.c: Fix warning arch/arm/kernel/process.c:314: warning: assignment makes integer from pointer without a cast Signed-off-by: Russell King <rmk...@ar...> commit 478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee Author: Catalin Marinas <cat...@ar...> Date: Tue May 16 11:30:26 2006 +0100 [ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM Patch from Catalin Marinas This patch modifies the __ioremap_pfn and __iounmap functions in arch/arm/mm/ioremap.c to use vunmap instead of vfree. Signed-off-by: Catalin Marinas <cat...@ar...> Signed-off-by: Russell King <rmk...@ar...> commit 1d6760a3ac6b5691e4914a3333b48fee5c2e275d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1d6760a3ac6b5691e4914a3333b48fee5c2e275d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1d6760a3ac6b5691e4914a3333b48fee5c2e275d Author: Nicolas Pitre <ni...@ca...> Date: Tue May 16 11:29:46 2006 +0100 [ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes Patch from Nicolas Pitre Assembly code that calls C code must ensure the C code sees a 64-bit aligned stack pointer. Signed-off-by: Nicolas Pitre <ni...@ca...> Signed-off-by: Russell King <rmk...@ar...> commit 2ceec0c8c6e2780d58dece91b4b787729405d9e7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2ceec0c8c6e2780d58dece91b4b787729405d9e7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2ceec0c8c6e2780d58dece91b4b787729405d9e7 Author: Uwe Zeisberger <Uwe...@di...> Date: Wed May 10 18:11:05 2006 +0100 [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h Patch from Uwe Zeisberger The symbol is only used in arch/arm/kernel/head-common.S. This in turn is included from arch/arm/kernel/head.S and arch/arm/kernel/head-nommu.S which include asm-offsets.h . Signed-off-by: Uwe Zeisberger <Uwe...@di...> Signed-off-by: Russell King <rmk...@ar...> commit 1281e36027a9119356bd93b5e7853c72c35dd462 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1281e36027a9119356bd93b5e7853c72c35dd462 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1281e36027a9119356bd93b5e7853c72c35dd462 Author: Andrew Victor <an...@sa...> Date: Tue May 16 11:28:49 2006 +0100 [ARM] 3523/1: Serial core pm_state Patch from Andrew Victor The serial_core already manages the power state of the UARTs, and therefore it shouldn't suspend a UART which was previously suspended. This patch modifies serial_core only call the UART-specific power-management function if the PM state is actually changing. Signed-off-by: Andrew Victor <an...@sa...> Signed-off-by: Russell King <rmk...@ar...> commit c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 Author: Andrew Morton <ak...@os...> Date: Mon May 15 09:44:43 2006 -0700 [PATCH] dl2k needs dma-mapping.h On alpha: drivers/net/dl2k.c: In function `rio_free_tx': drivers/net/dl2k.c:768: error: `DMA_48BIT_MASK' undeclared (first use in this function) drivers/net/dl2k.c:768: error: (Each undeclared identifier is reported only once drivers/net/dl2k.c:768: error: for each function it appears in.) drivers/net/dl2k.c: In function `receive_packet': drivers/net/dl2k.c:896: error: `DMA_48BIT_MASK' undeclared (first use in this function) drivers/net/dl2k.c: In function `rio_close': drivers/net/dl2k.c:1803: error: `DMA_48BIT_MASK' undeclared (first use in this function) Cc: Jeff Garzik <je...@ga...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 194a61b8e09ac526c33777a688ee2a1504d7fbc3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=194a61b8e09ac526c33777a688ee2a1504d7fbc3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=194a61b8e09ac526c33777a688ee2a1504d7fbc3 Author: Andrew Morton <ak...@os...> Date: Mon May 15 09:44:42 2006 -0700 [PATCH] jffs2 warning fixes fs/jffs2/nodelist.c: In function `check_node_data': fs/jffs2/nodelist.c:441: warning: unsigned int format, different type arg (arg 4) fs/jffs2/nodelist.c:464: warning: int format, different type arg (arg 5) Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d3779e7989cfdba854b843fe605f8df9e991cd18 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d3779e7989cfdba854b843fe605f8df9e991cd18 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d3779e7989cfdba854b843fe605f8df9e991cd18 Author: Peter Osterlund <pe...@te...> Date: Mon May 15 09:44:40 2006 -0700 [PATCH] devices.txt: remove pktcdvd entry Changing the driver to use dynamic device numbers was one of the many changes that were made in order to have the driver accepted into the mainline kernel. Therefore I would say that the entry in devices.txt is obsolete. This patch removes it. Signed-off-by: Peter Osterlund <pe...@te...> Cc: Torben Mathiasen <de...@la...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 264a341231e8af2c2e35ac15d26de76f1198525b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=264a341231e8af2c2e35ac15d26de76f1198525b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=264a341231e8af2c2e35ac15d26de76f1198525b Author: Thomas Kleffel <tk...@ma...> Date: Mon May 15 09:44:37 2006 -0700 [PATCH] ide_cs: Add IBM microdrive to known IDs Add the IBM microdrive to the known PCMCIA IDs for ide_cs. Signed-off-by: Thomas Kleffel <tk...@ma...> Cc: Bartlomiej Zolnierkiewicz <B.Z...@el...> Cc: Alan Cox <al...@lx...> Cc: Dominik Brodowski <li...@do...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 79afecfaabbe42e2a8a7e28880517f1721f2f3a7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=79afecfaabbe42e2a8a7e28880517f1721f2f3a7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=79afecfaabbe42e2a8a7e28880517f1721f2f3a7 Author: Aneesh Kumar <ane...@gm...> Date: Mon May 15 09:44:36 2006 -0700 [PATCH] Fix typos in Documentation/memory-barriers.txt Fix some typos in Documentation/memory-barriers.txt Signed-off-by: Aneesh Kumar K.V <ane...@gm...> Cc: David Howells <dho...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit bfe2e9349f318883c036607c64b6205d573a28ff gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bfe2e9349f318883c036607c64b6205d573a28ff gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bfe2e9349f318883c036607c64b6205d573a28ff Author: Alexey Dobriyan <ado...@gm...> Date: Mon May 15 09:44:35 2006 -0700 [PATCH] gigaset: endian fix Signed-off-by: Alexey Dobriyan <ado...@gm...> Cc: Hansjoerg Lipp <hj...@we...> Cc: Tilman Schmidt <ti...@im...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit b2d596d8e08099b47e0a75aa4b7f82aae780e851 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b2d596d8e08099b47e0a75aa4b7f82aae780e851 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b2d596d8e08099b47e0a75aa4b7f82aae780e851 Author: Pavel Machek <pa...@uc...> Date: Mon May 15 09:44:34 2006 -0700 [PATCH] fix hotplug kconfig help HOTPLUG_CPU entry says "Say Y..." then "Say N.". Slightly ugly, so I fixed it up, and added remark about suspend on SMP as a bonus. Signed-off-by: Pavel Machek <pa...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit ce007ea59729d627f62bb5fa8c1a81e25653a0ad gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ce007ea59729d627f62bb5fa8c1a81e25653a0ad gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ce007ea59729d627f62bb5fa8c1a81e25653a0ad Author: Carl-Daniel Hailfinger <c-d...@gm...> Date: Mon May 15 09:44:33 2006 -0700 [PATCH] smbus unhiding kills thermal management Do not enable the SMBus device on Asus boards if suspend is used. We do not reenable the device on resume, leading to all sorts of undesirable effects, the worst being a total fan failure after resume on Samsung P35 laptop. Signed-off-by: Carl-Daniel Hailfinger <c-d...@gm...> Signed-off-by: Pavel Machek <pa...@su...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit eee391a66d774e644bf3cbb35403562e09d88bb2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=eee391a66d774e644bf3cbb35403562e09d88bb2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=eee391a66d774e644bf3cbb35403562e09d88bb2 Author: Andrew Morton <ak...@os...> Date: Mon May 15 09:44:30 2006 -0700 [PATCH] revert "vfs: propagate mnt_flags into do_loopback/vfsmount" Revert commit f6422f17d3a480f21917a3895e2a46b968f56a08, due to Val...@vt... wrote: > > There seems to have been a bug introduced in this changeset: > > Am running 2.6.17-rc3-mm1. When this changeset is applied, 'mount --bind' > misbehaves: > > > # mkdir /foo > > # mount -t tmpfs -o rw,nosuid,nodev,noexec,noatime,nodiratime none /foo > > # mkdir /foo/bar > > # mount --bind /foo/bar /foo > > # tail -2 /proc/mounts > > none /foo tmpfs rw,nosuid,nodev,noexec,noatime,nodiratime 0 0 > > none /foo tmpfs rw 0 0 > > Reverting this changeset causes both mounts to have the same options. > > (Thanks to Stephen Smalley for tracking down the changeset...) > Cc: Herbert Poetzl <he...@13...> Cc: Christoph Hellwig <hc...@in...> Cc: <Val...@vt...> Cc: Stephen Smalley <sd...@ty...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit be6e028b6422878df2e799a74609a03a553c7dad gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=be6e028b6422878df2e799a74609a03a553c7dad gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=be6e028b6422878df2e799a74609a03a553c7dad Author: Andy Whitcroft <ap...@sh...> Date: Mon May 15 09:44:29 2006 -0700 [PATCH] root mount failure: emit filesystems attempted When we fail to mount from a valid root device list out the filesystems we have tried to mount it with. This gives the user vital diagnostics as to what is missing from their kernel. For example in the fragment below the kernel does not have CRAMFS compiled into the kernel and yet appears to recognise it at the RAMDISK detect stage. Later the mount fails as we don't have the filesystem. RAMDISK: cramfs filesystem found at block 0 RAMDISK: Loading 1604KiB [1 disk] into ram disk... done. XFS: bad magic number XFS: SB validate failed No filesystem could mount root, tried: reiserfs ext3 ext2 msdos vfat iso9660 jfs xfs Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(8,1) Signed-off-by: Andy Whitcroft <ap...@sh...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3835a9bd07778d87dea37fbf190f70883515e8fc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3835a9bd07778d87dea37fbf190f70883515e8fc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3835a9bd07778d87dea37fbf190f70883515e8fc Author: Alexey Dobriyan <ado...@gm...> Date: Mon May 15 09:44:27 2006 -0700 [PATCH] fs/compat.c: fix 'if (a |= b )' typo Mentioned by Mark Armbrust somewhere on Usenet. Signed-off-by: Alexey Dobriyan <ado...@gm...> Cc: David Woodhouse <dw...@in...> Cc: Ulrich Drepper <dr...@re...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit bb53a76116a8af13ee2581c85c02fe40e0c1a599 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bb53a76116a8af13ee2581c85c02fe40e0c1a599 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bb53a76116a8af13ee2581c85c02fe40e0c1a599 Author: Daniel Walker <dw...@mv...> Date: Mon May 15 09:44:27 2006 -0700 [PATCH] tpm_register_hardware gcc 4.1 warning fix drivers/char/tpm/tpm.c: In function 'tpm_register_hardware': drivers/char/tpm/tpm.c:1157: warning: assignment from incompatible pointer type Signed-off-by: Daniel Walker <dw...@mv...> Acked-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 655fdeab809a5612b0eab6aee873b00d26404ca7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=655fdeab809a5612b0eab6aee873b00d26404ca7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=655fdeab809a5612b0eab6aee873b00d26404ca7 Author: Alan Cox <al...@lx...> Date: Mon May 15 09:44:26 2006 -0700 [PATCH] Final rio polish Signed-off-by: Alan Cox <al...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 Author: Kylene Jo Hall <kj...@us...> Date: Mon May 15 09:44:25 2006 -0700 [PATCH] tpm: fix constant Fix the constant used for the base address when it cannot be determined from ACPI. It was off by one order of magnitude. Signed-off-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 64471ebe534dc6cedd72849b2324b52cb5249eb9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=64471ebe534dc6cedd72849b2324b52cb5249eb9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=64471ebe534dc6cedd72849b2324b52cb5249eb9 Author: Benjamin LaHaise <bc...@kv...> Date: Mon May 15 09:44:24 2006 -0700 [PATCH] Add Core Solo and Core Duo support to oprofile Add support to oprofile for the Intel Core Solo and Core Duo processors. See also the patch to add support to oprofile-0.9.1-8.1.1 at http://www.kvack.org/~bcrl/patches/oprofile/oprofile-core-0.9.1.diff . Signed-off-by: Benjamin LaHaise <ben...@in...> Cc: Philippe Elie <ph...@wa...> Cc: John Levon <le...@mo...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit e6333fd4ddf7a583480017f535b9ea53c116ab81 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e6333fd4ddf7a583480017f535b9ea53c116ab81 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e6333fd4ddf7a583480017f535b9ea53c116ab81 Author: Hua Zhong <hz...@gm...> Date: Mon May 15 09:44:22 2006 -0700 [PATCH] fix can_share_swap_page() when !CONFIG_SWAP can_share_swap_page() is used to check if the page has the last reference. This avoids allocating a new page for COW if it's the last page. However, if CONFIG_SWAP is not set, can_share_swap_page() is defined as 0, thus always causes a copy for the last COW page. The below simple patch fixes it. Signed-off-by: Hua Zhong <hz...@gm...> Cc: David Howells <dho...@re...> Cc: Hugh Dickins <hu...@ve...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 41e5a6ac80c600e1f8bda0a4871f0b797e097d78 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=41e5a6ac80c600e1f8bda0a4871f0b797e097d78 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=41e5a6ac80c600e1f8bda0a4871f0b797e097d78 Author: Latchesar Ionkov <lu...@io...> Date: Mon May 15 09:44:21 2006 -0700 [PATCH] v9fs: signal handling fixes Multiple races can happen when v9fs is interrupted by a signal and Tflush message is sent to the server. After v9fs sends Tflush it doesn't wait until it receives Rflush, and possibly the response of the original message. This behavior may confuse v9fs what fids are allocated by the file server. This patch fixes the races and the fid allocation. Signed-off-by: Latchesar Ionkov <lu...@io...> Cc: Eric Van Hensbergen <er...@he...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 343f1fe6f2e3fb4912db241e639b0721c2e14f2e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=343f1fe6f2e3fb4912db241e639b0721c2e14f2e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=343f1fe6f2e3fb4912db241e639b0721c2e14f2e Author: Latchesar Ionkov <lu...@io...> Date: Mon May 15 09:44:18 2006 -0700 [PATCH] v9fs: Twalk memory leak v9fs leaks memory if the file server responds with Rerror to a Twalk message. The patch fixes the leak. Signed-off-by: Latchesar Ionkov <lu...@io...> Cc: Eric Van Hensbergen <er...@he...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3dc7b82ea7649356bf027fba50c16ca50cec31e2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3dc7b82ea7649356bf027fba50c16ca50cec31e2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3dc7b82ea7649356bf027fba50c16ca50cec31e2 Author: Richard Purdie <rp...@rp...> Date: Mon May 15 09:44:17 2006 -0700 [PATCH] LED: Fix sysfs store function error handling Fix the error handling of some LED _store functions. This corrects them to return -EINVAL if the value is not numeric with an optional byte of trailing whitespace. Signed-off-by: Richard Purdie <rp...@rp...> Cc: Greg KH <gr...@kr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 263de9b582b0f9b6ad5a0651b7df884fe80d6c3c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=263de9b582b0f9b6ad5a0651b7df884fe80d6c3c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=263de9b582b0f9b6ad5a0651b7df884fe80d6c3c Author: Richard Purdie <rp...@rp...> Date: Mon May 15 09:44:16 2006 -0700 [PATCH] LED: Add maintainer entry for the LED subsystem Add a MAINTAINERS entry for the LED subsystem. Signed-off-by: Richard Purdie <rp...@rp...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 68673afd443c5eeb4cebfb9026e3675f43d79f2b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=68673afd443c5eeb4cebfb9026e3675f43d79f2b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=68673afd443c5eeb4cebfb9026e3675f43d79f2b Author: Richard Purdie <rp...@rp...> Date: Mon May 15 09:44:15 2006 -0700 [PATCH] Backlight/LCD Class: Fix sysfs _store error handling The backlight and LCD class _store functions currently accept values like "34 some random strings" without error. This corrects them to return -EINVAL if the value is not numeric with an optional byte of trailing whitespace. Signed-off-by: Richard Purdie <rp...@rp...> Cc: Greg KH <gr...@kr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit a8d2e7d95229db9999682113bfac40b49978f212 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a8d2e7d95229db9999682113bfac40b49978f212 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a8d2e7d95229db9999682113bfac40b49978f212 Author: Richard Purdie <rp...@rp...> Date: Mon May 15 09:44:14 2006 -0700 [PATCH] LED: Improve Kconfig information Improve the NEW_LEDS Kconfig information to say what it does as well as what it doesn't. Signed-off-by: Richard Purdie <rp...@rp...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 39d24e64263cd3211705d3b61ea4171c65030921 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=39d24e64263cd3211705d3b61ea4171c65030921 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=39d24e64263cd3211705d3b61ea4171c65030921 Author: Mike Kravetz <kr...@us...> Date: Mon May 15 09:44:13 2006 -0700 [PATCH] add slab_is_available() routine for boot code slab_is_available() indicates slab based allocators are available for use. SPARSEMEM code needs to know this as it can be called at various times during the boot process. Signed-off-by: Mike Kravetz <kr...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 48564e628bd7662d7a0b3ac81c41cd0e4cc36dae gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=48564e628bd7662d7a0b3ac81c41cd0e4cc36dae gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=48564e628bd7662d7a0b3ac81c41cd0e4cc36dae Author: Jan Niehusmann <ja...@go...> Date: Mon May 15 09:44:12 2006 -0700 [PATCH] smbfs: Fix slab corruption in samba error path Yesterday, I got the following error with 2.6.16.13 during a file copy from a smb filesystem over a wireless link. I guess there was some error on the wireless link, which in turn caused an error condition for the smb filesystem. In the log, smb_file_read reports error=4294966784 (0xfffffe00), which also shows up in the slab dumps, and also is -ERESTARTSYS. Error code 27499 corresponds to 0x6b6b, so the rq_errno field seems to be the only one being set after freeing the slab. In smb_add_request (which is the only place in smbfs where I found ERESTARTSYS), I found the following: if (!timeleft || signal_pending(current)) { /* * On timeout or on interrupt we want to try and remove the * request from the recvq/xmitq. */ smb_lock_server(server); if (!(req->rq_flags & SMB_REQ_RECEIVED)) { list_del_init(&req->rq_queue); smb_rput(req); } smb_unlock_server(server); } [...] if (signal_pending(current)) req->rq_errno = -ERESTARTSYS; I guess that some codepath like smbiod_flush() caused the request to be removed from the queue, and smb_rput(req) be called, without SMB_REQ_RECEIVED being set. This violates an asumption made by the quoted code. Then, the above code calls smb_rput(req) again, the req gets freed, and req->rq_errno = -ERESTARTSYS writes into the already freed slab. As list_del_init doesn't cause an error if called multiple times, that does cause the observed behaviour (freed slab with rq_errno=-ERESTARTSYS). If this observation is correct, the following patch should fix it. I wonder why the smb code uses list_del_init everywhere - using list_del instead would catch such situations by poisoning the next and prev pointers. May 4 23:29:21 knautsch kernel: [17180085.456000] ipw2200: Firmware error detected. Restarting. May 4 23:29:21 knautsch kernel: [17180085.456000] ipw2200: Sysfs 'error' log captured. May 4 23:33:02 knautsch kernel: [17180306.316000] ipw2200: Firmware error detected. Restarting. Ma... [truncated message content] |
|
From: Jan-Benedict G. <jb...@he...> - 2006-10-29 14:07:27
|
CREDITS | 9 Documentation/devices.txt | 5 Documentation/memory-barriers.txt | 4 Documentation/networking/operstates.txt | 161 ++ Documentation/scsi/ChangeLog.megaraid | 25 Documentation/spi/pxa2xx | 234 ++++ Documentation/spi/spi-summary | 34 MAINTAINERS | 18 Makefile | 2 arch/arm/configs/collie_defconfig | 430 ++++--- arch/arm/configs/versatile_defconfig | 390 ++++--- arch/arm/kernel/asm-offsets.c | 2 arch/arm/kernel/dma-isa.c | 23 arch/arm/kernel/process.c | 37 arch/arm/lib/backtrace.S | 4 arch/arm/lib/div64.S | 4 arch/arm/mach-realview/realview_eb.c | 5 arch/arm/mm/ioremap.c | 4 arch/arm/tools/mach-types | 89 + arch/i386/Kconfig | 6 arch/i386/kernel/acpi/boot.c | 8 arch/i386/kernel/setup.c | 2 arch/i386/oprofile/nmi_int.c | 7 arch/powerpc/kernel/prom_init.c | 2 arch/powerpc/platforms/pseries/setup.c | 2 arch/s390/kernel/compat_wrapper.S | 8 arch/s390/kernel/syscalls.S | 1 arch/s390/kernel/time.c | 7 arch/sparc/kernel/ioport.c | 5 arch/sparc/kernel/module.c | 1 arch/sparc/kernel/sparc_ksyms.c | 13 arch/sparc64/defconfig | 19 arch/sparc64/kernel/module.c | 5 arch/x86_64/kernel/pci-nommu.c | 7 arch/x86_64/kernel/traps.c | 21 arch/x86_64/mm/srat.c | 15 block/elevator.c | 8 block/genhd.c | 2 block/ll_rw_blk.c | 17 drivers/block/ub.c | 18 drivers/char/Kconfig | 2 drivers/char/pcmcia/cm4000_cs.c | 10 drivers/char/pcmcia/cm4040_cs.c | 11 drivers/char/rio/host.h | 9 drivers/char/rio/rioboot.c | 1 drivers/char/rio/rioctrl.c | 43 drivers/char/rio/rioioctl.h | 56 - drivers/char/tpm/Kconfig | 2 drivers/char/tpm/tpm.h | 2 drivers/char/tpm/tpm_tis.c | 2 drivers/i2c/busses/scx200_acb.c | 16 drivers/ide/legacy/ide-cs.c | 1 drivers/infiniband/core/cm.c | 12 drivers/infiniband/core/mad.c | 47 drivers/infiniband/core/mad_priv.h | 5 drivers/infiniband/core/mad_rmpp.c | 20 drivers/infiniband/core/sysfs.c | 2 drivers/infiniband/core/ucm.c | 12 drivers/infiniband/hw/ipath/ipath_driver.c | 7 drivers/infiniband/hw/mthca/mthca_cq.c | 41 drivers/infiniband/hw/mthca/mthca_dev.h | 2 drivers/infiniband/hw/mthca/mthca_mr.c | 15 drivers/infiniband/hw/mthca/mthca_provider.h | 22 drivers/infiniband/hw/mthca/mthca_qp.c | 31 drivers/infiniband/hw/mthca/mthca_srq.c | 23 drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 4 drivers/infiniband/ulp/srp/ib_srp.c | 195 ++- drivers/infiniband/ulp/srp/ib_srp.h | 4 drivers/isdn/capi/capi.c | 1 drivers/isdn/gigaset/usb-gigaset.c | 4 drivers/leds/Kconfig | 7 drivers/leds/led-class.c | 9 drivers/leds/ledtrig-timer.c | 17 drivers/message/fusion/mptbase.c | 63 - drivers/message/fusion/mptbase.h | 10 drivers/message/fusion/mptfc.c | 134 +- drivers/message/fusion/mptsas.c | 99 + drivers/message/fusion/mptscsih.c | 50 drivers/message/fusion/mptspi.c | 68 + drivers/net/b44.c | 28 drivers/net/dl2k.c | 13 drivers/net/irda/Makefile | 2 drivers/net/irda/sir-dev.h | 13 drivers/net/irda/sir_dev.c | 315 +++++ drivers/net/irda/sir_kthread.c | 508 --------- drivers/net/irda/smsc-ircc2.c | 14 drivers/net/phy/mdio_bus.c | 4 drivers/net/sis900.c | 1 drivers/net/sky2.c | 5 drivers/net/tg3.c | 11 drivers/pci/quirks.c | 16 drivers/pcmcia/pcmcia_ioctl.c | 23 drivers/s390/net/lcs.c | 2 drivers/sbus/char/openprom.c | 15 drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 1 drivers/scsi/aic7xxx/aic7xxx_pci.c | 12 drivers/scsi/ibmvscsi/ibmvscsi.c | 30 drivers/scsi/lpfc/lpfc_crtn.h | 1 drivers/scsi/lpfc/lpfc_disc.h | 1 drivers/scsi/lpfc/lpfc_els.c | 95 - drivers/scsi/lpfc/lpfc_hbadisc.c | 18 drivers/scsi/lpfc/lpfc_hw.h | 3 drivers/scsi/lpfc/lpfc_init.c | 22 drivers/scsi/lpfc/lpfc_mbox.c | 33 drivers/scsi/lpfc/lpfc_nportdisc.c | 134 +- drivers/scsi/lpfc/lpfc_scsi.c | 68 - drivers/scsi/lpfc/lpfc_version.h | 2 drivers/scsi/megaraid.c | 1 drivers/scsi/megaraid/megaraid_mbox.c | 59 - drivers/scsi/megaraid/megaraid_mbox.h | 7 drivers/scsi/megaraid/megaraid_mm.c | 6 drivers/scsi/qla2xxx/qla_os.c | 19 drivers/scsi/scsi_devinfo.c | 2 drivers/scsi/scsi_lib.c | 27 drivers/scsi/sim710.c | 2 drivers/serial/8250.c | 74 + drivers/serial/8250_au1x00.c | 5 drivers/serial/serial_core.c | 123 +- drivers/spi/Kconfig | 8 drivers/spi/Makefile | 1 drivers/spi/pxa2xx_spi.c | 1467 +++++++++++++++++++++++++++ drivers/spi/spi.c | 7 drivers/spi/spi_bitbang.c | 104 + drivers/usb/atm/speedtch.c | 2 drivers/usb/atm/usbatm.c | 8 drivers/usb/core/hcd.c | 13 drivers/usb/core/hub.c | 23 drivers/usb/host/ohci-hcd.c | 2 drivers/usb/input/hid-core.c | 4 drivers/usb/misc/emi26.c | 4 drivers/usb/misc/emi62.c | 4 drivers/usb/net/pegasus.c | 20 drivers/usb/serial/Kconfig | 10 drivers/usb/serial/Makefile | 1 drivers/usb/serial/airprime.c | 1 drivers/usb/serial/ark3116.c | 465 ++++++++ drivers/usb/serial/ftdi_sio.c | 2 drivers/usb/serial/ftdi_sio.h | 9 drivers/usb/serial/generic.c | 1 drivers/usb/serial/omninet.c | 12 drivers/usb/serial/usb-serial.c | 19 drivers/video/backlight/backlight.c | 18 drivers/video/backlight/lcd.c | 32 fs/9p/fcall.c | 21 fs/9p/mux.c | 222 ++-- fs/9p/mux.h | 4 fs/9p/vfs_file.c | 13 fs/9p/vfs_inode.c | 19 fs/autofs4/autofs_i.h | 5 fs/autofs4/root.c | 10 fs/autofs4/waitq.c | 77 - fs/compat.c | 2 fs/jffs2/nodelist.c | 6 fs/namespace.c | 7 fs/open.c | 1 fs/partitions/check.c | 3 fs/smbfs/dir.c | 5 fs/smbfs/request.c | 4 include/asm-arm/arch-pxa/pxa2xx_spi.h | 68 + include/asm-arm/procinfo.h | 2 include/asm-s390/unistd.h | 8 include/linux/dma-mapping.h | 1 include/linux/kernel.h | 1 include/linux/netdevice.h | 3 include/linux/rcupdate.h | 1 include/linux/serial_core.h | 1 include/linux/slab.h | 1 include/linux/spi/spi.h | 45 include/linux/spi/spi_bitbang.h | 8 include/linux/swap.h | 2 include/net/neighbour.h | 1 include/scsi/srp.h | 23 init/do_mounts.c | 5 init/initramfs.c | 8 kernel/extable.c | 2 kernel/module.c | 12 kernel/ptrace.c | 20 kernel/rcupdate.c | 19 lib/Kconfig.debug | 2 mm/page_alloc.c | 11 mm/slab.c | 19 mm/sparse.c | 2 net/atm/clip.c | 2 net/bridge/br_if.c | 21 net/core/dev.c | 99 - net/core/link_watch.c | 10 net/core/neighbour.c | 21 net/ipv4/ip_options.c | 2 net/ipv6/inet6_connection_sock.c | 2 net/irda/irias_object.c | 3 net/sched/sch_hfsc.c | 6 security/selinux/ss/services.c | 4 192 files changed, 5395 insertions(+), 2104 deletions(-) New commits: commit 23ecb962c9e87c2b87ea18d62c1a5a1b9d53465f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=23ecb962c9e87c2b87ea18d62c1a5a1b9d53465f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=23ecb962c9e87c2b87ea18d62c1a5a1b9d53465f Merge: 0d2b439d7e28b35da10bf2d3ab65e5157fa1fef2 babdd5b2a4f95715d5965115f3ed0889dcd100a8 Author: Jan-Benedict Glaw <jb...@d2...> Date: Wed May 17 17:01:43 2006 +0200 Merge branch 'vax4linus' commit babdd5b2a4f95715d5965115f3ed0889dcd100a8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=babdd5b2a4f95715d5965115f3ed0889dcd100a8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=babdd5b2a4f95715d5965115f3ed0889dcd100a8 Merge: 8befe1a49fdf2f33672bcb85d8682afac40b1659 0c056c50a6218e0e577817c16ba8851af593d742 Author: Jan-Benedict Glaw <jb...@d2...> Date: Wed May 17 17:00:41 2006 +0200 Merge branch 'master' commit 0c056c50a6218e0e577817c16ba8851af593d742 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0c056c50a6218e0e577817c16ba8851af593d742 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0c056c50a6218e0e577817c16ba8851af593d742 Merge: 4fbca5320eb102d2e15bdeffe79e125c11cf925e 1e316d7566b63767aa18902235c719e9e95465d0 Author: Linus Torvalds <tor...@g5...> Date: Tue May 16 15:18:26 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6: [PATCH] SPI: spi_bitbang: clocking fixes [PATCH] spi: Update to PXA2xx SPI Driver [PATCH] SPI: busnum == 0 needs to work [PATCH] SPI: devices can require LSB-first encodings [PATCH] SPI: Renamed bitbang_transfer_setup to spi_bitbang_setup_transfer and export it [PATCH] SPI: Add David as the SPI subsystem maintainer [PATCH] SPI: spi bounce buffer has a minimum length [PATCH] SPI: spi whitespace fixes [PATCH] SPI: add PXA2xx SSP SPI Driver [PATCH] SPI: per-transfer overrides for wordsize and clocking commit 4fbca5320eb102d2e15bdeffe79e125c11cf925e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4fbca5320eb102d2e15bdeffe79e125c11cf925e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4fbca5320eb102d2e15bdeffe79e125c11cf925e Merge: 509b70b677ca35a0e800807c6470181df5008d70 3170a5e80be7db29ab5ccb6b4145cf28b4a156de Author: Linus Torvalds <tor...@g5...> Date: Tue May 16 15:16:14 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] arch/arm/kernel/dma-isa.c: named initializers [ARM] 3527/1: MPCore Boot Lockup Fix [ARM] arch/arm/kernel/process.c: Fix warning [ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM [ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h commit 509b70b677ca35a0e800807c6470181df5008d70 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=509b70b677ca35a0e800807c6470181df5008d70 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=509b70b677ca35a0e800807c6470181df5008d70 Merge: 716f8954fb3029ca2df52a986b60af8d06f093ee 1281e36027a9119356bd93b5e7853c72c35dd462 Author: Linus Torvalds <tor...@g5...> Date: Tue May 16 15:15:59 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial * master.kernel.org:/home/rmk/linux-2.6-serial: [ARM] 3523/1: Serial core pm_state commit 1e316d7566b63767aa18902235c719e9e95465d0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1e316d7566b63767aa18902235c719e9e95465d0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1e316d7566b63767aa18902235c719e9e95465d0 Author: David Brownell <da...@pa...> Date: Thu Apr 6 22:25:56 2006 -0700 [PATCH] SPI: spi_bitbang: clocking fixes This fixes two problems triggered by the MMC stack updating clocks: - SPI masters driver should accept a max clock speed of zero; that's one convention for marking idle devices. (Presumably that helps controllers that don't autogate clocks to "off" when not in use.) - There are more than 1000 nanoseconds per millisecond; setting the clock down to 125 KHz now works properly. Showing once again that Zero (http://en.wikipedia.org/wiki/Zero) is still an inexhaustible number of bugs. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 9708c121c38fe864eb6f5a119f7525729686e095 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9708c121c38fe864eb6f5a119f7525729686e095 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9708c121c38fe864eb6f5a119f7525729686e095 Author: Stephen Street <st...@st...> Date: Tue Mar 28 14:05:23 2006 -0800 [PATCH] spi: Update to PXA2xx SPI Driver Fix two outstanding issues with the pxa2xx_spi driver: 1) Bad cast in the function u32_writer. Thanks to Henrik Bechmann 2) Adds support for per transfer changes to speed and bits per word Signed-off-by: Stephen Street <st...@st...> Cc: David Brownell <dbr...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit a020ed7521a9737bcf3e34eb880867c60c3c68d0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a020ed7521a9737bcf3e34eb880867c60c3c68d0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a020ed7521a9737bcf3e34eb880867c60c3c68d0 Author: David Brownell <da...@pa...> Date: Mon Apr 3 15:49:04 2006 -0700 [PATCH] SPI: busnum == 0 needs to work We need to be able to have a "SPI bus 0" matching chip numbering; but that number was wrongly used to flag dynamic allocation of a bus number. This patch resolves that issue; now negative numbers trigger dynamic alloc. It also updates the how-to-write-a-controller-driver overview to mention this stuff. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit ccf77cc4af5b048e20cfd9327fcc286cb69c34cc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ccf77cc4af5b048e20cfd9327fcc286cb69c34cc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ccf77cc4af5b048e20cfd9327fcc286cb69c34cc Author: David Brownell <da...@pa...> Date: Mon Apr 3 15:46:22 2006 -0700 [PATCH] SPI: devices can require LSB-first encodings Add spi_device hook for LSB-first word encoding, and update all the (in-tree) controller drivers to reject such devices. Eventually, some controller drivers will be updated to support lsb-first encodings on the wire; no current drivers need this. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ff9f4771b5f017ee0f57629488b6cd7a6ef3d19b Author: Kumar Gala <ga...@ke...> Date: Sun Apr 2 16:06:35 2006 -0500 [PATCH] SPI: Renamed bitbang_transfer_setup to spi_bitbang_setup_transfer and export it Renamed bitbang_transfer_setup to follow convention of other exported symbols from spi-bitbang. Exported spi_bitbang_setup_transfer to allow users of spi-bitbang to use the function in their own setup_transfer. Signed-off-by: Kumar Gala <ga...@ke...> Cc: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 025c398710ac24456f0288fc7e64f426c5c5508f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=025c398710ac24456f0288fc7e64f426c5c5508f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=025c398710ac24456f0288fc7e64f426c5c5508f Author: Kumar Gala <ga...@ke...> Date: Sun Apr 2 16:05:54 2006 -0500 [PATCH] SPI: Add David as the SPI subsystem maintainer Add David as the SPI subsystem maintainer Signed-off-by: Kumar Gala <ga...@ke...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit a9948b6194b46e489aa3b4d111d6dfd786c39c4b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a9948b6194b46e489aa3b4d111d6dfd786c39c4b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a9948b6194b46e489aa3b4d111d6dfd786c39c4b Author: David Brownell <da...@pa...> Date: Sun Apr 2 10:37:40 2006 -0800 [PATCH] SPI: spi bounce buffer has a minimum length Make sure that spi_write_then_read() can always handle at least 32 bytes of transfer (total, both directions), minimizing one portability issue. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 747d844ee9a183ff3067bb1181f2a25c50649538 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=747d844ee9a183ff3067bb1181f2a25c50649538 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=747d844ee9a183ff3067bb1181f2a25c50649538 Author: David Brownell <da...@pa...> Date: Sun Apr 2 10:33:37 2006 -0800 [PATCH] SPI: spi whitespace fixes This removes superfluous whitespace in the <linux/spi/spi.h> header. Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e0c9905e87ac1bc56c9ea8f5b2934aeee53dce26 Author: Stephen Street <st...@st...> Date: Tue Mar 7 23:53:24 2006 -0800 [PATCH] SPI: add PXA2xx SSP SPI Driver This driver turns a PXA2xx synchronous serial port (SSP) into a SPI master controller (see Documentation/spi/spi_summary). The driver has the following features: - Support for any PXA2xx SSP - SSP PIO and SSP DMA data transfers. - External and Internal (SSPFRM) chip selects. - Per slave device (chip) configuration. - Full suspend, freeze, resume support. Signed-off-by: Stephen Street <st...@st...> Signed-off-by: Andrew Morton <ak...@os...> Cc: David Brownell <da...@pa...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4cff33f94fefcce1b3c01a9d1da6bb85fe3cbdfa Author: Imre Deak <imr...@no...> Date: Fri Feb 17 10:02:18 2006 -0800 [PATCH] SPI: per-transfer overrides for wordsize and clocking Some protocols (like one for some bitmap displays) require different clock speed or word size settings for each transfer in an SPI message. This adds those parameters to struct spi_transfer. They are to be used when they are nonzero; otherwise the defaults from spi_device are to be used. The patch also adds a setup_transfer callback to spi_bitbang, uses it for messages that use those overrides, and implements it so that the pure bitbanging code can help resolve any questions about how it should work. Signed-off-by: Imre Deak <imr...@no...> Signed-off-by: David Brownell <dbr...@us...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> commit 3170a5e80be7db29ab5ccb6b4145cf28b4a156de gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3170a5e80be7db29ab5ccb6b4145cf28b4a156de gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3170a5e80be7db29ab5ccb6b4145cf28b4a156de Author: Adrian Bunk <bu...@st...> Date: Tue May 16 22:09:46 2006 +0100 [ARM] arch/arm/kernel/dma-isa.c: named initializers This patch converts struct dma_resources to named initializers. Besides fixing a compile error in -mm, it didn't sound like a bad idea. Signed-off-by: Adrian Bunk <bu...@st...> Acked-by: Alexander Schulz <al...@sh...> Signed-off-by: Russell King <rmk...@ar...> commit bb1a2aa617e67e2d60f22052b13422c7caeaf798 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bb1a2aa617e67e2d60f22052b13422c7caeaf798 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bb1a2aa617e67e2d60f22052b13422c7caeaf798 Author: Harry Fearnhamm <Har...@ar...> Date: Tue May 16 16:50:21 2006 +0100 [ARM] 3527/1: MPCore Boot Lockup Fix Patch from Harry Fearnhamm This patch fixes the occasional lockup seen in early boot stage on RealView MPCore system. Signed-off-by: Harry Fearnhamm <Har...@ar...> Signed-off-by: Russell King <rmk...@ar...> commit 716f8954fb3029ca2df52a986b60af8d06f093ee gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=716f8954fb3029ca2df52a986b60af8d06f093ee gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=716f8954fb3029ca2df52a986b60af8d06f093ee Merge: a4523a8b38089478f93bc053c31f678c63f5ee1b cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 Author: Linus Torvalds <tor...@g5...> Date: Tue May 16 08:46:10 2006 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] Fix pSeries identification in prom_init.c [PATCH] powerpc: fix kernel version display on pseries boxes commit a4523a8b38089478f93bc053c31f678c63f5ee1b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a4523a8b38089478f93bc053c31f678c63f5ee1b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a4523a8b38089478f93bc053c31f678c63f5ee1b Author: Roland Dreier <rd...@ci...> Date: Mon May 15 11:41:00 2006 -0700 [PATCH] slab: Fix kmem_cache_destroy() on NUMA With CONFIG_NUMA set, kmem_cache_destroy() may fail and say "Can't free all objects." The problem is caused by sequences such as the following (suppose we are on a NUMA machine with two nodes, 0 and 1): * Allocate an object from cache on node 0. * Free the object on node 1. The object is put into node 1's alien array_cache for node 0. * Call kmem_cache_destroy(), which ultimately ends up in __cache_shrink(). * __cache_shrink() does drain_cpu_caches(), which loops through all nodes. For each node it drains the shared array_cache and then handles the alien array_cache for the other node. However this means that node 0's shared array_cache will be drained, and then node 1 will move the contents of its alien[0] array_cache into that same shared array_cache. node 0's shared array_cache is never looked at again, so the objects left there will appear to be in use when __cache_shrink() calls __node_shrink() for node 0. So __node_shrink() will return 1 and kmem_cache_destroy() will fail. This patch fixes this by having drain_cpu_caches() do drain_alien_cache() on every node before it does drain_array() on the nodes' shared array_caches. The problem was originally reported by Or Gerlitz <oge...@vo...>. Signed-off-by: Roland Dreier <ro...@ci...> Acked-by: Christoph Lameter <cla...@sg...> Acked-by: Pekka Enberg <pe...@cs...> Signed-off-by: Linus Torvalds <tor...@os...> commit 40e59a61669a3cab9e0bd24644e29155d6b00970 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=40e59a61669a3cab9e0bd24644e29155d6b00970 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=40e59a61669a3cab9e0bd24644e29155d6b00970 Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:47 2006 +0200 [PATCH] x86_64: Don't schedule on exception stack on preemptive kernels Extends an earlier patch from John Blackwood to more exception handlers that also run on the exception stacks. Expand the use of preempt_conditional_{sti,cli} to all cases where interrupts are to be re-enabled during exception handling while running on an IST stack. Based on original patch from Jan Beulich. Cc: John Blackwood <joh...@cc...> Cc: jbe...@no... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit fad7906d16e8c4926aeb5b0f1756eb9f55b2837d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fad7906d16e8c4926aeb5b0f1756eb9f55b2837d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fad7906d16e8c4926aeb5b0f1756eb9f55b2837d Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:44 2006 +0200 [PATCH] x86_64: Fix memory hotadd heuristics This fixes some boot failures on Dell and Unisys systems with memory hotadd added. - Set hotadd_percent to 0 by default. This means anybody using hotadd memory needs to specify the value on the command line. That's because there are lots of Intel boxes which have a bogus hotplug area in their SRAT and they would waste a lot of memory before. - Fix calculation of how much memory to use when the hotplug area exceeds hotadd_percent - Fix fallback when the - Fix fallback if memory hotadd is not compiled in. Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit 5491d0f3e206beb95eeb506510d62a1dab462df1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5491d0f3e206beb95eeb506510d62a1dab462df1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5491d0f3e206beb95eeb506510d62a1dab462df1 Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:41 2006 +0200 [PATCH] i386/x86_64: Force pci=noacpi on HP XW9300 This is needed to see all devices. The system has multiple PCI segments and we don't handle that properly yet in PCI and ACPI. Short term before this is fixed blacklist it to pci=noacpi. Acked-by: len...@in... Cc: gr...@su... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit f0fdabf8bf187c9aafeb139a828c530ef45cf022 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f0fdabf8bf187c9aafeb139a828c530ef45cf022 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f0fdabf8bf187c9aafeb139a828c530ef45cf022 Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:38 2006 +0200 [PATCH] x86_64: Don't warn for overflow in nommu case when dma_mask is < 32bit This triggers for b44's 1GB DMA workaround which tries to map first and then bounces. The 32bit heuristic is reasonable because the IOMMU doesn't attempt to handle < 32bit masks anyways. Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit 639b421b911bbde1e3fb5ed037a4f8c85a5bffcb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=639b421b911bbde1e3fb5ed037a4f8c85a5bffcb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=639b421b911bbde1e3fb5ed037a4f8c85a5bffcb Author: Andi Kleen <ak...@su...> Date: Mon May 15 18:19:35 2006 +0200 [PATCH] x86_64: Check for bad dma address in b44 1GB DMA workaround Needed for interaction with the nommu code in x86-64 which will return bad_dma_address if the address exceeds dma_mask. Cc: ne...@vg... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cb6b2eb9bcf2f61e84dc0b55ef7e3d4923842313 Author: Benjamin Herrenschmidt <be...@ke...> Date: Mon May 15 15:46:03 2006 +1000 [PATCH] Fix pSeries identification in prom_init.c The OF trampoline code prom_init.c still needs to identify IBM pSeries (PAPR) machines in order to run some platform specific code on them like instanciating the TCE tables. The code doing that detection was changed recently in 2.6.17 early stages but was done slightly incorrectly. It should be testing for an exact match of "chrp" and it currently tests for anything that begins with "chrp". That means it will incorrectly match with platforms using Maple-like device-trees and have open firmware. This fixes it by using strcmp instead of strncmp to match what the actual platform detection code does. Signed-off-by: Benjamin Herrenschmidt <be...@ke...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 3de620e8394406fd01f450b8c6e3e74464e81a78 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3de620e8394406fd01f450b8c6e3e74464e81a78 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3de620e8394406fd01f450b8c6e3e74464e81a78 Author: Anton Blanchard <an...@sa...> Date: Wed May 10 13:05:54 2006 +1000 [PATCH] powerpc: fix kernel version display on pseries boxes We are displaying the wrong thing on the operator panel (2x40 character LCD). This got broken in commit cebb21b5, when UTS_RELEASE got changed to system_utsname.version. Signed-off-by: Anton Blanchard <an...@sa...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 9d494ccb9ca297f80dc61a0d6357e88c86f44e92 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9d494ccb9ca297f80dc61a0d6357e88c86f44e92 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9d494ccb9ca297f80dc61a0d6357e88c86f44e92 Author: Russell King <rm...@dy...> Date: Tue May 16 11:33:15 2006 +0100 [ARM] arch/arm/kernel/process.c: Fix warning arch/arm/kernel/process.c:314: warning: assignment makes integer from pointer without a cast Signed-off-by: Russell King <rmk...@ar...> commit 478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee Author: Catalin Marinas <cat...@ar...> Date: Tue May 16 11:30:26 2006 +0100 [ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM Patch from Catalin Marinas This patch modifies the __ioremap_pfn and __iounmap functions in arch/arm/mm/ioremap.c to use vunmap instead of vfree. Signed-off-by: Catalin Marinas <cat...@ar...> Signed-off-by: Russell King <rmk...@ar...> commit 1d6760a3ac6b5691e4914a3333b48fee5c2e275d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1d6760a3ac6b5691e4914a3333b48fee5c2e275d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1d6760a3ac6b5691e4914a3333b48fee5c2e275d Author: Nicolas Pitre <ni...@ca...> Date: Tue May 16 11:29:46 2006 +0100 [ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes Patch from Nicolas Pitre Assembly code that calls C code must ensure the C code sees a 64-bit aligned stack pointer. Signed-off-by: Nicolas Pitre <ni...@ca...> Signed-off-by: Russell King <rmk...@ar...> commit 2ceec0c8c6e2780d58dece91b4b787729405d9e7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2ceec0c8c6e2780d58dece91b4b787729405d9e7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2ceec0c8c6e2780d58dece91b4b787729405d9e7 Author: Uwe Zeisberger <Uwe...@di...> Date: Wed May 10 18:11:05 2006 +0100 [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h Patch from Uwe Zeisberger The symbol is only used in arch/arm/kernel/head-common.S. This in turn is included from arch/arm/kernel/head.S and arch/arm/kernel/head-nommu.S which include asm-offsets.h . Signed-off-by: Uwe Zeisberger <Uwe...@di...> Signed-off-by: Russell King <rmk...@ar...> commit 1281e36027a9119356bd93b5e7853c72c35dd462 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1281e36027a9119356bd93b5e7853c72c35dd462 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1281e36027a9119356bd93b5e7853c72c35dd462 Author: Andrew Victor <an...@sa...> Date: Tue May 16 11:28:49 2006 +0100 [ARM] 3523/1: Serial core pm_state Patch from Andrew Victor The serial_core already manages the power state of the UARTs, and therefore it shouldn't suspend a UART which was previously suspended. This patch modifies serial_core only call the UART-specific power-management function if the PM state is actually changing. Signed-off-by: Andrew Victor <an...@sa...> Signed-off-by: Russell King <rmk...@ar...> commit c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 Author: Andrew Morton <ak...@os...> Date: Mon May 15 09:44:43 2006 -0700 [PATCH] dl2k needs dma-mapping.h On alpha: drivers/net/dl2k.c: In function `rio_free_tx': drivers/net/dl2k.c:768: error: `DMA_48BIT_MASK' undeclared (first use in this function) drivers/net/dl2k.c:768: error: (Each undeclared identifier is reported only once drivers/net/dl2k.c:768: error: for each function it appears in.) drivers/net/dl2k.c: In function `receive_packet': drivers/net/dl2k.c:896: error: `DMA_48BIT_MASK' undeclared (first use in this function) drivers/net/dl2k.c: In function `rio_close': drivers/net/dl2k.c:1803: error: `DMA_48BIT_MASK' undeclared (first use in this function) Cc: Jeff Garzik <je...@ga...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 194a61b8e09ac526c33777a688ee2a1504d7fbc3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=194a61b8e09ac526c33777a688ee2a1504d7fbc3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=194a61b8e09ac526c33777a688ee2a1504d7fbc3 Author: Andrew Morton <ak...@os...> Date: Mon May 15 09:44:42 2006 -0700 [PATCH] jffs2 warning fixes fs/jffs2/nodelist.c: In function `check_node_data': fs/jffs2/nodelist.c:441: warning: unsigned int format, different type arg (arg 4) fs/jffs2/nodelist.c:464: warning: int format, different type arg (arg 5) Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit d3779e7989cfdba854b843fe605f8df9e991cd18 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d3779e7989cfdba854b843fe605f8df9e991cd18 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d3779e7989cfdba854b843fe605f8df9e991cd18 Author: Peter Osterlund <pe...@te...> Date: Mon May 15 09:44:40 2006 -0700 [PATCH] devices.txt: remove pktcdvd entry Changing the driver to use dynamic device numbers was one of the many changes that were made in order to have the driver accepted into the mainline kernel. Therefore I would say that the entry in devices.txt is obsolete. This patch removes it. Signed-off-by: Peter Osterlund <pe...@te...> Cc: Torben Mathiasen <de...@la...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 264a341231e8af2c2e35ac15d26de76f1198525b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=264a341231e8af2c2e35ac15d26de76f1198525b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=264a341231e8af2c2e35ac15d26de76f1198525b Author: Thomas Kleffel <tk...@ma...> Date: Mon May 15 09:44:37 2006 -0700 [PATCH] ide_cs: Add IBM microdrive to known IDs Add the IBM microdrive to the known PCMCIA IDs for ide_cs. Signed-off-by: Thomas Kleffel <tk...@ma...> Cc: Bartlomiej Zolnierkiewicz <B.Z...@el...> Cc: Alan Cox <al...@lx...> Cc: Dominik Brodowski <li...@do...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 79afecfaabbe42e2a8a7e28880517f1721f2f3a7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=79afecfaabbe42e2a8a7e28880517f1721f2f3a7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=79afecfaabbe42e2a8a7e28880517f1721f2f3a7 Author: Aneesh Kumar <ane...@gm...> Date: Mon May 15 09:44:36 2006 -0700 [PATCH] Fix typos in Documentation/memory-barriers.txt Fix some typos in Documentation/memory-barriers.txt Signed-off-by: Aneesh Kumar K.V <ane...@gm...> Cc: David Howells <dho...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit bfe2e9349f318883c036607c64b6205d573a28ff gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bfe2e9349f318883c036607c64b6205d573a28ff gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bfe2e9349f318883c036607c64b6205d573a28ff Author: Alexey Dobriyan <ado...@gm...> Date: Mon May 15 09:44:35 2006 -0700 [PATCH] gigaset: endian fix Signed-off-by: Alexey Dobriyan <ado...@gm...> Cc: Hansjoerg Lipp <hj...@we...> Cc: Tilman Schmidt <ti...@im...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit b2d596d8e08099b47e0a75aa4b7f82aae780e851 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b2d596d8e08099b47e0a75aa4b7f82aae780e851 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b2d596d8e08099b47e0a75aa4b7f82aae780e851 Author: Pavel Machek <pa...@uc...> Date: Mon May 15 09:44:34 2006 -0700 [PATCH] fix hotplug kconfig help HOTPLUG_CPU entry says "Say Y..." then "Say N.". Slightly ugly, so I fixed it up, and added remark about suspend on SMP as a bonus. Signed-off-by: Pavel Machek <pa...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit ce007ea59729d627f62bb5fa8c1a81e25653a0ad gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ce007ea59729d627f62bb5fa8c1a81e25653a0ad gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ce007ea59729d627f62bb5fa8c1a81e25653a0ad Author: Carl-Daniel Hailfinger <c-d...@gm...> Date: Mon May 15 09:44:33 2006 -0700 [PATCH] smbus unhiding kills thermal management Do not enable the SMBus device on Asus boards if suspend is used. We do not reenable the device on resume, leading to all sorts of undesirable effects, the worst being a total fan failure after resume on Samsung P35 laptop. Signed-off-by: Carl-Daniel Hailfinger <c-d...@gm...> Signed-off-by: Pavel Machek <pa...@su...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit eee391a66d774e644bf3cbb35403562e09d88bb2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=eee391a66d774e644bf3cbb35403562e09d88bb2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=eee391a66d774e644bf3cbb35403562e09d88bb2 Author: Andrew Morton <ak...@os...> Date: Mon May 15 09:44:30 2006 -0700 [PATCH] revert "vfs: propagate mnt_flags into do_loopback/vfsmount" Revert commit f6422f17d3a480f21917a3895e2a46b968f56a08, due to Val...@vt... wrote: > > There seems to have been a bug introduced in this changeset: > > Am running 2.6.17-rc3-mm1. When this changeset is applied, 'mount --bind' > misbehaves: > > > # mkdir /foo > > # mount -t tmpfs -o rw,nosuid,nodev,noexec,noatime,nodiratime none /foo > > # mkdir /foo/bar > > # mount --bind /foo/bar /foo > > # tail -2 /proc/mounts > > none /foo tmpfs rw,nosuid,nodev,noexec,noatime,nodiratime 0 0 > > none /foo tmpfs rw 0 0 > > Reverting this changeset causes both mounts to have the same options. > > (Thanks to Stephen Smalley for tracking down the changeset...) > Cc: Herbert Poetzl <he...@13...> Cc: Christoph Hellwig <hc...@in...> Cc: <Val...@vt...> Cc: Stephen Smalley <sd...@ty...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit be6e028b6422878df2e799a74609a03a553c7dad gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=be6e028b6422878df2e799a74609a03a553c7dad gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=be6e028b6422878df2e799a74609a03a553c7dad Author: Andy Whitcroft <ap...@sh...> Date: Mon May 15 09:44:29 2006 -0700 [PATCH] root mount failure: emit filesystems attempted When we fail to mount from a valid root device list out the filesystems we have tried to mount it with. This gives the user vital diagnostics as to what is missing from their kernel. For example in the fragment below the kernel does not have CRAMFS compiled into the kernel and yet appears to recognise it at the RAMDISK detect stage. Later the mount fails as we don't have the filesystem. RAMDISK: cramfs filesystem found at block 0 RAMDISK: Loading 1604KiB [1 disk] into ram disk... done. XFS: bad magic number XFS: SB validate failed No filesystem could mount root, tried: reiserfs ext3 ext2 msdos vfat iso9660 jfs xfs Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(8,1) Signed-off-by: Andy Whitcroft <ap...@sh...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3835a9bd07778d87dea37fbf190f70883515e8fc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3835a9bd07778d87dea37fbf190f70883515e8fc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3835a9bd07778d87dea37fbf190f70883515e8fc Author: Alexey Dobriyan <ado...@gm...> Date: Mon May 15 09:44:27 2006 -0700 [PATCH] fs/compat.c: fix 'if (a |= b )' typo Mentioned by Mark Armbrust somewhere on Usenet. Signed-off-by: Alexey Dobriyan <ado...@gm...> Cc: David Woodhouse <dw...@in...> Cc: Ulrich Drepper <dr...@re...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit bb53a76116a8af13ee2581c85c02fe40e0c1a599 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bb53a76116a8af13ee2581c85c02fe40e0c1a599 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bb53a76116a8af13ee2581c85c02fe40e0c1a599 Author: Daniel Walker <dw...@mv...> Date: Mon May 15 09:44:27 2006 -0700 [PATCH] tpm_register_hardware gcc 4.1 warning fix drivers/char/tpm/tpm.c: In function 'tpm_register_hardware': drivers/char/tpm/tpm.c:1157: warning: assignment from incompatible pointer type Signed-off-by: Daniel Walker <dw...@mv...> Acked-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 655fdeab809a5612b0eab6aee873b00d26404ca7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=655fdeab809a5612b0eab6aee873b00d26404ca7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=655fdeab809a5612b0eab6aee873b00d26404ca7 Author: Alan Cox <al...@lx...> Date: Mon May 15 09:44:26 2006 -0700 [PATCH] Final rio polish Signed-off-by: Alan Cox <al...@re...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2a7362f52a17e8dbeab57c00c3c45fcfeb0dff54 Author: Kylene Jo Hall <kj...@us...> Date: Mon May 15 09:44:25 2006 -0700 [PATCH] tpm: fix constant Fix the constant used for the base address when it cannot be determined from ACPI. It was off by one order of magnitude. Signed-off-by: Kylene Hall <kj...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 64471ebe534dc6cedd72849b2324b52cb5249eb9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=64471ebe534dc6cedd72849b2324b52cb5249eb9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=64471ebe534dc6cedd72849b2324b52cb5249eb9 Author: Benjamin LaHaise <bc...@kv...> Date: Mon May 15 09:44:24 2006 -0700 [PATCH] Add Core Solo and Core Duo support to oprofile Add support to oprofile for the Intel Core Solo and Core Duo processors. See also the patch to add support to oprofile-0.9.1-8.1.1 at http://www.kvack.org/~bcrl/patches/oprofile/oprofile-core-0.9.1.diff . Signed-off-by: Benjamin LaHaise <ben...@in...> Cc: Philippe Elie <ph...@wa...> Cc: John Levon <le...@mo...> Cc: <st...@ke...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit e6333fd4ddf7a583480017f535b9ea53c116ab81 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e6333fd4ddf7a583480017f535b9ea53c116ab81 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e6333fd4ddf7a583480017f535b9ea53c116ab81 Author: Hua Zhong <hz...@gm...> Date: Mon May 15 09:44:22 2006 -0700 [PATCH] fix can_share_swap_page() when !CONFIG_SWAP can_share_swap_page() is used to check if the page has the last reference. This avoids allocating a new page for COW if it's the last page. However, if CONFIG_SWAP is not set, can_share_swap_page() is defined as 0, thus always causes a copy for the last COW page. The below simple patch fixes it. Signed-off-by: Hua Zhong <hz...@gm...> Cc: David Howells <dho...@re...> Cc: Hugh Dickins <hu...@ve...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 41e5a6ac80c600e1f8bda0a4871f0b797e097d78 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=41e5a6ac80c600e1f8bda0a4871f0b797e097d78 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=41e5a6ac80c600e1f8bda0a4871f0b797e097d78 Author: Latchesar Ionkov <lu...@io...> Date: Mon May 15 09:44:21 2006 -0700 [PATCH] v9fs: signal handling fixes Multiple races can happen when v9fs is interrupted by a signal and Tflush message is sent to the server. After v9fs sends Tflush it doesn't wait until it receives Rflush, and possibly the response of the original message. This behavior may confuse v9fs what fids are allocated by the file server. This patch fixes the races and the fid allocation. Signed-off-by: Latchesar Ionkov <lu...@io...> Cc: Eric Van Hensbergen <er...@he...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 343f1fe6f2e3fb4912db241e639b0721c2e14f2e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=343f1fe6f2e3fb4912db241e639b0721c2e14f2e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=343f1fe6f2e3fb4912db241e639b0721c2e14f2e Author: Latchesar Ionkov <lu...@io...> Date: Mon May 15 09:44:18 2006 -0700 [PATCH] v9fs: Twalk memory leak v9fs leaks memory if the file server responds with Rerror to a Twalk message. The patch fixes the leak. Signed-off-by: Latchesar Ionkov <lu...@io...> Cc: Eric Van Hensbergen <er...@he...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 3dc7b82ea7649356bf027fba50c16ca50cec31e2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3dc7b82ea7649356bf027fba50c16ca50cec31e2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3dc7b82ea7649356bf027fba50c16ca50cec31e2 Author: Richard Purdie <rp...@rp...> Date: Mon May 15 09:44:17 2006 -0700 [PATCH] LED: Fix sysfs store function error handling Fix the error handling of some LED _store functions. This corrects them to return -EINVAL if the value is not numeric with an optional byte of trailing whitespace. Signed-off-by: Richard Purdie <rp...@rp...> Cc: Greg KH <gr...@kr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 263de9b582b0f9b6ad5a0651b7df884fe80d6c3c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=263de9b582b0f9b6ad5a0651b7df884fe80d6c3c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=263de9b582b0f9b6ad5a0651b7df884fe80d6c3c Author: Richard Purdie <rp...@rp...> Date: Mon May 15 09:44:16 2006 -0700 [PATCH] LED: Add maintainer entry for the LED subsystem Add a MAINTAINERS entry for the LED subsystem. Signed-off-by: Richard Purdie <rp...@rp...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 68673afd443c5eeb4cebfb9026e3675f43d79f2b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=68673afd443c5eeb4cebfb9026e3675f43d79f2b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=68673afd443c5eeb4cebfb9026e3675f43d79f2b Author: Richard Purdie <rp...@rp...> Date: Mon May 15 09:44:15 2006 -0700 [PATCH] Backlight/LCD Class: Fix sysfs _store error handling The backlight and LCD class _store functions currently accept values like "34 some random strings" without error. This corrects them to return -EINVAL if the value is not numeric with an optional byte of trailing whitespace. Signed-off-by: Richard Purdie <rp...@rp...> Cc: Greg KH <gr...@kr...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit a8d2e7d95229db9999682113bfac40b49978f212 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a8d2e7d95229db9999682113bfac40b49978f212 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a8d2e7d95229db9999682113bfac40b49978f212 Author: Richard Purdie <rp...@rp...> Date: Mon May 15 09:44:14 2006 -0700 [PATCH] LED: Improve Kconfig information Improve the NEW_LEDS Kconfig information to say what it does as well as what it doesn't. Signed-off-by: Richard Purdie <rp...@rp...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 39d24e64263cd3211705d3b61ea4171c65030921 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=39d24e64263cd3211705d3b61ea4171c65030921 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=39d24e64263cd3211705d3b61ea4171c65030921 Author: Mike Kravetz <kr...@us...> Date: Mon May 15 09:44:13 2006 -0700 [PATCH] add slab_is_available() routine for boot code slab_is_available() indicates slab based allocators are available for use. SPARSEMEM code needs to know this as it can be called at various times during the boot process. Signed-off-by: Mike Kravetz <kr...@us...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit 48564e628bd7662d7a0b3ac81c41cd0e4cc36dae gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=48564e628bd7662d7a0b3ac81c41cd0e4cc36dae gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=48564e628bd7662d7a0b3ac81c41cd0e4cc36dae Author: Jan Niehusmann <ja...@go...> Date: Mon May 15 09:44:12 2006 -0700 [PATCH] smbfs: Fix slab corruption in samba error path Yesterday, I got the following error with 2.6.16.13 during a file copy from a smb filesystem over a wireless link. I guess there was some error on the wireless link, which in turn caused an error condition for the smb filesystem. In the log, smb_file_read reports error=4294966784 (0xfffffe00), which also shows up in the slab dumps, and also is -ERESTARTSYS. Error code 27499 corresponds to 0x6b6b, so the rq_errno field seems to be the only one being set after freeing the slab. In smb_add_request (which is the only place in smbfs where I found ERESTARTSYS), I found the following: if (!timeleft || signal_pending(current)) { /* * On timeout or on interrupt we want to try and remove the * request from the recvq/xmitq. */ smb_lock_server(server); if (!(req->rq_flags & SMB_REQ_RECEIVED)) { list_del_init(&req->rq_queue); smb_rput(req); } smb_unlock_server(server); } [...] if (signal_pending(current)) req->rq_errno = -ERESTARTSYS; I guess that some codepath like smbiod_flush() caused the request to be removed from the queue, and smb_rput(req) be called, without SMB_REQ_RECEIVED being set. This violates an asumption made by the quoted code. Then, the above code calls smb_rput(req) again, the req gets freed, and req->rq_errno = -ERESTARTSYS writes into the already freed slab. As list_del_init doesn't cause an error if called multiple times, that does cause the observed behaviour (freed slab with rq_errno=-ERESTARTSYS). I... [truncated message content] |
|
From: Jan-Benedict G. <jb...@he...> - 2006-05-10 06:42:16
|
Makefile | 20 -- arch/i386/kernel/io_apic.c | 5 arch/i386/kernel/mpparse.c | 12 + arch/ia64/lib/memcpy_mck.S | 9 arch/ppc/kernel/head_8xx.S | 4 arch/x86_64/kernel/e820.c | 6 arch/x86_64/kernel/io_apic.c | 5 arch/x86_64/kernel/mpparse.c | 12 + arch/x86_64/kernel/pci-gart.c | 8 arch/x86_64/kernel/setup.c | 30 ++- arch/x86_64/kernel/traps.c | 12 + drivers/base/class.c | 32 +++ drivers/cpufreq/cpufreq_ondemand.c | 28 ++- drivers/net/au1000_eth.c | 18 - drivers/net/irda/irda-usb.c | 2 drivers/net/ne.c | 31 ++- drivers/net/sky2.c | 217 ++++++++++++------------ drivers/net/sky2.h | 3 drivers/net/spider_net.c | 12 - drivers/net/spider_net.h | 2 drivers/net/sungem_phy.c | 45 ++++ drivers/net/sungem_phy.h | 1 drivers/net/wireless/bcm43xx/bcm43xx_main.c | 45 ++-- drivers/net/wireless/bcm43xx/bcm43xx_main.h | 6 drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2 drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 7 drivers/video/logo/Makefile | 2 fs/locks.c | 21 +- fs/xfs/xfs_alloc.c | 5 fs/xfs/xfs_rename.c | 12 + fs/xfs/xfs_vfsops.c | 27 -- fs/xfs/xfs_vnodeops.c | 2 include/asm-i386/io_apic.h | 1 include/asm-ia64/bitops.h | 1 include/asm-ppc/page.h | 1 include/asm-x86_64/e820.h | 2 include/asm-x86_64/io_apic.h | 1 include/linux/device.h | 2 include/linux/netdevice.h | 20 +- include/net/ieee80211.h | 6 include/net/ieee80211softmac.h | 3 net/core/dev.c | 2 net/core/net-sysfs.c | 49 +---- net/ieee80211/softmac/ieee80211softmac_assoc.c | 17 + net/ieee80211/softmac/ieee80211softmac_auth.c | 16 + net/ieee80211/softmac/ieee80211softmac_module.c | 4 net/ieee80211/softmac/ieee80211softmac_scan.c | 8 net/ipv4/ip_input.c | 2 scripts/gen_initramfs_list.sh | 6 scripts/mkmakefile | 5 scripts/mod/modpost.c | 6 51 files changed, 504 insertions(+), 291 deletions(-) New commits: commit 0d2b439d7e28b35da10bf2d3ab65e5157fa1fef2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0d2b439d7e28b35da10bf2d3ab65e5157fa1fef2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0d2b439d7e28b35da10bf2d3ab65e5157fa1fef2 Merge: b715f60... 8befe1a... Author: Jan-Benedict Glaw <jb...@d2...> Date: Wed May 10 08:40:17 2006 +0200 Merge branch 'vax4linus' commit 8befe1a49fdf2f33672bcb85d8682afac40b1659 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8befe1a49fdf2f33672bcb85d8682afac40b1659 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8befe1a49fdf2f33672bcb85d8682afac40b1659 Merge: b913f05... 3cd73ee... Author: Jan-Benedict Glaw <jb...@d2...> Date: Wed May 10 08:39:48 2006 +0200 Merge branch 'master' commit 3cd73eedde34c5fd88d62d8523c4260970fdc6fb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3cd73eedde34c5fd88d62d8523c4260970fdc6fb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3cd73eedde34c5fd88d62d8523c4260970fdc6fb Merge: c51e078... 23aee82... Author: Linus Torvalds <tor...@g5...> Date: Tue May 9 10:18:35 2006 -0700 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6 * 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6: [PATCH] bcm43xx: Fix access to non-existent PHY registers [PATCH] bcm43xx: Fix array overrun in bcm43xx_geo_init [PATCH] bcm43xx: check for valid MAC address in SPROM [PATCH] ieee80211: Fix A band channel count (resent) [PATCH] bcm43xx: fix iwmode crash when down [PATCH] softmac: make non-operational after being stopped [PATCH] softmac: don't reassociate if user asked for deauthentication spidernet: enable support for bcm5461 ethernet phy spidernet: introduce new setting Fix RTL8019AS init for Toshiba RBTX49xx boards au1000_eth.c: use ether_crc() from <linux/crc32.h> sky2: version 1.3 Add more support for the Yukon Ultra chip found in dual core centino laptops. sky2: synchronize irq on remove sky2: dont write status ring sky2: edge triggered workaround enhancement sky2: use mask instead of modulo operation sky2: tx ring index mask fix sky2: status irq hang fix sky2: backout NAPI reschedule commit c51e078f82096a7d35ac8ec2416272e843a0e1c4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c51e078f82096a7d35ac8ec2416272e843a0e1c4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c51e078f82096a7d35ac8ec2416272e843a0e1c4 Author: Marcelo Tosatti <ma...@kv...> Date: Fri May 5 17:09:29 2006 -0300 [PATCH] ppc32/8xx: Fix r3 trashing due to 8MB TLB page instantiation Instantiation of 8MB pages on the TLB cache for the kernel static mapping trashes r3 register on !CONFIG_8xx_CPU6 configurations. This ensures r3 gets saved and restored. Signed-off-by: Marcelo Tosatti <ma...@kv...> Signed-off-by: Paul Mackerras <pa...@sa...> commit e4de00215c3af02116db3d486bf53700dfe10619 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e4de00215c3af02116db3d486bf53700dfe10619 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e4de00215c3af02116db3d486bf53700dfe10619 Author: Paul Mackerras <pa...@sa...> Date: Tue May 9 16:00:59 2006 +1000 powerpc/32: Define an is_kernel_addr() to fix ARCH=ppc compilation My commit 6bfd93c32a5065d0e858780b3beb0b667081601c broke the ARCH=ppc compilation by using the is_kernel_addr() macro in asm/uaccess.h. This fixes it by defining a suitable is_kernel_addr() for ARCH=ppc. Signed-off-by: Paul Mackerras <pa...@sa...> commit e515f048c46e457ef61ce9c8b56bd36e825a48a0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e515f048c46e457ef61ce9c8b56bd36e825a48a0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e515f048c46e457ef61ce9c8b56bd36e825a48a0 Merge: 601e7f0... e63a369... Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 17:41:05 2006 -0700 Merge git://oss.sgi.com:8090/xfs-2.6 * git://oss.sgi.com:8090/xfs-2.6: [XFS] Fix a possible metadata buffer (AGFL) refcount leak when fixing an [XFS] Fix a project quota space accounting leak on rename. [XFS] Fix a possible forced shutdown due to mishandling write barriers commit 23aee82e75c1ced9492cbff6090b8e213d95945e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=23aee82e75c1ced9492cbff6090b8e213d95945e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=23aee82e75c1ced9492cbff6090b8e213d95945e Merge: 8ec9345... 178e0cc... Author: Stephen Hemminger <she...@os...> Date: Mon May 8 16:01:20 2006 -0700 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 8ec93459655a3618dedec6360bb28d63f0010ef6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8ec93459655a3618dedec6360bb28d63f0010ef6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8ec93459655a3618dedec6360bb28d63f0010ef6 Author: Jens Osterkamp <Jen...@de...> Date: Thu May 4 05:59:41 2006 -0400 spidernet: enable support for bcm5461 ethernet phy A newer board revision changed the type of ethernet phy. Moreover, this generalizes the way that a phy gets switched into fiber mode when autodetection is not available. Signed-off-by: Jens Osterkamp <Jen...@de...> Signed-off-by: Arnd Bergmann <arn...@de...> Signed-off-by: Stephen Hemminger <she...@os...> commit b636d17a3bee8ba988e78e4bc8262f0dc3fad8ab gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b636d17a3bee8ba988e78e4bc8262f0dc3fad8ab gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b636d17a3bee8ba988e78e4bc8262f0dc3fad8ab Author: Jens Osterkamp <jen...@de...> Date: Thu May 4 05:59:56 2006 -0400 spidernet: introduce new setting We found a new chip setting that we need in order to make the driver work more reliable. Signed-off-by: Arnd Bergmann <arn...@de...> Signed-off-by: Stephen Hemminger <she...@os...> commit aedc0e520e5ae9ba1342c25c4604d18fb236c2bc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=aedc0e520e5ae9ba1342c25c4604d18fb236c2bc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=aedc0e520e5ae9ba1342c25c4604d18fb236c2bc Author: Sergei Shtylyov <ssh...@ru...> Date: Tue May 9 00:58:28 2006 +0400 Fix RTL8019AS init for Toshiba RBTX49xx boards Ensure that 8-bit mode is selected for the on-board Realtek RTL8019AS chip on Toshiba RBHMA4x00, get rid of the duplicate #ifdef's when setting ei_status.word16. The chip's datasheet says that the PSTOP register shouldn't exceed 0x60 in 8-bit mode -- ensure this too. Signed-off-by: Sergei Shtylyov <ssh...@ru...> Signed-off-by: Stephen Hemminger <she...@os...> commit 8cd35da094bed8a41eb722c1d03eab24d57bf706 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8cd35da094bed8a41eb722c1d03eab24d57bf706 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8cd35da094bed8a41eb722c1d03eab24d57bf706 Author: Herbert Valerio Riedel <hv...@gn...> Date: Mon May 1 15:37:09 2006 +0200 au1000_eth.c: use ether_crc() from <linux/crc32.h> since the au1000 driver already selects the CRC32 routines, simply replace the internal ether_crc() implementation with the semantically equivalent one from <linux/crc32.h> Signed-off-by: Herbert Valerio Riedel <hv...@gn...> Signed-off-by: Stephen Hemminger <she...@os...> commit 6d4b0f617d577975108ccc7e3b0c7dbe50144df6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6d4b0f617d577975108ccc7e3b0c7dbe50144df6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6d4b0f617d577975108ccc7e3b0c7dbe50144df6 Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:34 2006 -0700 sky2: version 1.3 Update version number, to track changes. Signed-off-by: Stephen Hemminger <she...@os...> commit ed6d32c7a927bfccf921d15a3e25160f4528c3eb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ed6d32c7a927bfccf921d15a3e25160f4528c3eb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ed6d32c7a927bfccf921d15a3e25160f4528c3eb Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:33 2006 -0700 Add more support for the Yukon Ultra chip found in dual core centino laptops. The newest Yukon Ultra chipset's require more special tweaks. They seem to be like the Yukon XL chipsets. This code is transliterated from the latest SysKonnect driver; I don't have any Ultra hardware. Signed-off-by: Stephe Hemminger <she...@os...> Signed-off-by: Stephen Hemminger <she...@os...> commit 72cb8529208020484cecd69bbf87719b50ee6313 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=72cb8529208020484cecd69bbf87719b50ee6313 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=72cb8529208020484cecd69bbf87719b50ee6313 Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:32 2006 -0700 sky2: synchronize irq on remove Need to make sure interrupt is not racing with unregister of network device. Signed-off-by: Stephen Hemminger <she...@os...> commit e71ebd73276cc21efc74aba4118ef037cd32e50a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e71ebd73276cc21efc74aba4118ef037cd32e50a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e71ebd73276cc21efc74aba4118ef037cd32e50a Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:31 2006 -0700 sky2: dont write status ring It is more efficient not to write the status ring from the processor and just read the active portion. Signed-off-by: Stephen Hemminger <she...@os...> commit 01bd75645f94d49cb7ffd61022890166ce00ec2a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=01bd75645f94d49cb7ffd61022890166ce00ec2a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=01bd75645f94d49cb7ffd61022890166ce00ec2a Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:30 2006 -0700 sky2: edge triggered workaround enhancement Need to make the edge-triggered workaround timer faster to get marginally better peformance. The test_and_set_bit in schedule_prep() acts as a barrier already. Make it a module parameter so that laptops who are concerned about power can set it to 0; and user's stuck with broken BIOS's can turn the driver into pure polling. Signed-off-by: Stephen Hemminger <she...@os...> commit cb5d9547307f44f210f88c829bad4249eeb24bc3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cb5d9547307f44f210f88c829bad4249eeb24bc3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cb5d9547307f44f210f88c829bad4249eeb24bc3 Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:29 2006 -0700 sky2: use mask instead of modulo operation Gcc isn't smart enough to know that it can do a modulo operation with power of 2 constant by doing a mask. So add macro to do it for us. Signed-off-by: Stephen Hemminger <she...@os...> commit f55925d7eb04f936ab4c001f10e3e9c74c1297ae gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f55925d7eb04f936ab4c001f10e3e9c74c1297ae gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f55925d7eb04f936ab4c001f10e3e9c74c1297ae Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:28 2006 -0700 sky2: tx ring index mask fix Mask for transmit ring status was picking up bits from the unused sync ring. They were always zero, so far... Also, make sure to remind self not to make tx ring too big. Signed-off-by: Stephen Hemminger <she...@os...> commit 1e5f1283a2aed429f4457e2eb875b1928a6643df gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1e5f1283a2aed429f4457e2eb875b1928a6643df gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1e5f1283a2aed429f4457e2eb875b1928a6643df Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:27 2006 -0700 sky2: status irq hang fix The status interrupt flag should be cleared before processing, not afterwards to avoid race. Need to process in poll routine even if no new interrupt status. This is a normal occurrence when more than 64 frames (NAPI weight) are processed in one poll routine. Signed-off-by: Stephen Hemminger <she...@os...> commit d324031245abbb54e4e0321004430826052b6c37 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d324031245abbb54e4e0321004430826052b6c37 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d324031245abbb54e4e0321004430826052b6c37 Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:26 2006 -0700 sky2: backout NAPI reschedule This is a backout of earlier patch. The whole rescheduling hack was a bad idea. It doesn't really solve the problem and it makes the code more complicated for no good reason. Signed-off-by: Stephen Hemminger <she...@os...> commit 601e7f024edbea8018de34c83a7398623214e636 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=601e7f024edbea8018de34c83a7398623214e636 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=601e7f024edbea8018de34c83a7398623214e636 Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 13:38:42 2006 -0700 Revert "kbuild: fix modpost segfault for 64bit mipsel kernel" This reverts commit c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed, which caused problems for the x86 build. Quoth Sam: "It was discussed on mips list but apparently the fix was bogus. I will not have time to look into it so mips can carry this local fix until we get a proper fix in mainline." Signed-off-by: Linus Torvalds <tor...@os...> commit 6810b548b25114607e0814612d84125abccc0a4f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6810b548b25114607e0814612d84125abccc0a4f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6810b548b25114607e0814612d84125abccc0a4f Author: Andi Kleen <ak...@su...> Date: Mon May 8 15:17:31 2006 +0200 [PATCH] x86_64: Move ondemand timer into own work queue Taking the cpu hotplug semaphore in a normal events workqueue is unsafe because other tasks can wait for any workqueues with it hold. This results in a deadlock. Move the DBS timer into its own work queue which is not affected by other work queue flushes to avoid this. Has been acked by Venkatesh. Cc: ven...@in... Cc: cp...@li... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit ac71d12c990526b01ef6cfe50907ef8530a30331 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ac71d12c990526b01ef6cfe50907ef8530a30331 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ac71d12c990526b01ef6cfe50907ef8530a30331 Author: Andi Kleen <ak...@su...> Date: Mon May 8 15:17:28 2006 +0200 [PATCH] x86_64: Avoid EBDA area in early boot allocator Based on analysis&patch from Robert Hentosch Observed on a Dell PE6850 with 16GB The problem occurs very early on, when the kernel allocates space for the temporary memory map called bootmap. The bootmap overlaps the EBDA region. EBDA region is not historically reserved in the e820 mapping. When the bootmap is freed it marks the EBDA region as usable. If you notice in setup.c there is already code to work around the EBDA in reserve_ebda_region(), this check however occurs after the bootmap is allocated and doesn't prevent the bootmap from using this range. AK: I redid the original patch. Thanks also to Jan Beulich for spotting some mistakes. Cc: Rob...@de... Cc: jbe...@no... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit 8b1ffe9550e71224c43d8c754245bd76f4ea9bb8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8b1ffe9550e71224c43d8c754245bd76f4ea9bb8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8b1ffe9550e71224c43d8c754245bd76f4ea9bb8 Author: Corey Minyard <mi...@ac...> Date: Mon May 8 15:17:25 2006 +0200 [PATCH] x86_64: add nmi_exit to die_nmi Playing with NMI watchdog on x86_64, I discovered that it didn't do what I expected. It always panic-ed, even when it didn't happen from interrupt context. This patch solves that problem for me. Also, in this case, do_exit() will be called with interrupts disabled, I believe. Would it be wise to also call local_irq_enable() after nmi_exit()? [Yes I added it -AK] Currently, on x86_64, any NMI watchdog timeout will cause a panic because the irq count will always be set to be in an interrupt when do_exit() is called from die_nmi(). If we add nmi_exit() to the die_nmi() call (since the nmi will never exit "normally") it seems to solve this problem. The following small program can be used to trigger the NMI watchdog to reproduce this: main () { iopl(3); for (;;) asm("cli"); } Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit cdc60a4c8e71c4bcf67e83fac6c0cabd0ff19bfe gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cdc60a4c8e71c4bcf67e83fac6c0cabd0ff19bfe gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cdc60a4c8e71c4bcf67e83fac6c0cabd0ff19bfe Author: Corey Minyard <mi...@ac...> Date: Mon May 8 15:17:22 2006 +0200 [PATCH] x86_64: fix die_lock nesting I noticed this when poking around in this area. The oops_begin() function in x86_64 would only conditionally claim the die_lock if the call is nested, but oops_end() would always release the spinlock. This patch adds a nest count for the die lock so that the release of the lock is only done on the final oops_end(). Signed-off-by: Corey Minyard <mi...@ac...> Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit 5192d84e4c32cd335fd572e5ff0712041f45f7e7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5192d84e4c32cd335fd572e5ff0712041f45f7e7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5192d84e4c32cd335fd572e5ff0712041f45f7e7 Author: Andi Kleen <ak...@su...> Date: Mon May 8 15:17:19 2006 +0200 [PATCH] x86_64: Check for too many northbridges in IOMMU code The IOMMU code can only deal with 8 northbridges. Error out when more are found. Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit e0c1e9bf81badc7ba59e120d6218101903d5d103 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e0c1e9bf81badc7ba59e120d6218101903d5d103 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e0c1e9bf81badc7ba59e120d6218101903d5d103 Author: Kimball Murray <kim...@gm...> Date: Mon May 8 15:17:16 2006 +0200 [PATCH] x86_64: avoid IRQ0 ioapic pin collision The patch addresses a problem with ACPI SCI interrupt entry, which gets re-used, and the IRQ is assigned to another unrelated device. The patch corrects the code such that SCI IRQ is skipped and duplicate entry is avoided. Second issue came up with VIA chipset, the problem was caused by original patch assigning IRQs starting 16 and up. The VIA chipset uses 4-bit IRQ register for internal interrupt routing, and therefore cannot handle IRQ numbers assigned to its devices. The patch corrects this problem by allowing PCI IRQs below 16. Cc: len...@in... Signed-off by: Natalie Protasevich <Nat...@un...> Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit abfd3057187812352cd8502c29ca50cd010b3ccc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=abfd3057187812352cd8502c29ca50cd010b3ccc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=abfd3057187812352cd8502c29ca50cd010b3ccc Merge: 96b8eaa... 913ed41... Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 09:28:35 2006 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] remove asm-ia64/bitops.h self-inclusion [IA64] strcpy returns NULL pointer and not destination pointer commit 96b8eaa14a20771997b501a049e418b871bf9def gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=96b8eaa14a20771997b501a049e418b871bf9def gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=96b8eaa14a20771997b501a049e418b871bf9def Merge: bed7a56... 0eb1bd2... Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 09:11:10 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IRDA] irda-usb: use NULL instead of 0 [IPV4]: Remove likely in ip_rcv_finish() [NET]: Create netdev attribute_groups with class_device_add [CLASS DEVICE]: add attribute_group creation commit bed7a560333d40269a886c4421d4c8f964a32177 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bed7a560333d40269a886c4421d4c8f964a32177 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bed7a560333d40269a886c4421d4c8f964a32177 Merge: 75dff55... fd5f0cd... Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 09:10:44 2006 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: Do not overwrite makefile as anohter user kbuild: drivers/video/logo/ - fix ident glitch kbuild: fix gen_initramfs_list.sh kbuild modpost - relax driver data name kbuild: removing .tmp_versions considered harmful kbuild: fix modpost segfault for 64bit mipsel kernel commit 75dff55af9a989293e9f9bacf049858f4262bc08 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=75dff55af9a989293e9f9bacf049858f4262bc08 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=75dff55af9a989293e9f9bacf049858f4262bc08 Author: Trond Myklebust <Tro...@ne...> Date: Sun May 7 23:02:42 2006 -0400 [PATCH] fs/locks.c: Fix lease_init It is insane to be giving lease_init() the task of freeing the lock it is supposed to initialise, given that the lock is not guaranteed to be allocated on the stack. This causes lockups in fcntl_setlease(). Problem diagnosed by Daniel Hokka Zakrisson <da...@ho...> Also fix a slab leak in __setlease() due to an uninitialised return value. Problem diagnosed by Björn Steinbrink. Signed-off-by: Trond Myklebust <Tro...@ne...> Tested-by: Daniel Hokka Zakrisson <da...@ho...> Signed-off-by: Linus Torvalds <tor...@os...> commit e63a3690013a475746ad2cea998ebb534d825704 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e63a3690013a475746ad2cea998ebb534d825704 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e63a3690013a475746ad2cea998ebb534d825704 Author: Nathan Scott <na...@sg...> Date: Mon May 8 19:51:58 2006 +1000 [XFS] Fix a possible metadata buffer (AGFL) refcount leak when fixing an AG freelist. SGI-PV: 952681 SGI-Modid: xfs-linux-melb:xfs-kern:25902a Signed-off-by: Nathan Scott <na...@sg...> commit b1ecdda9313ec5d2f971993f44f6b657acf70cff gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b1ecdda9313ec5d2f971993f44f6b657acf70cff gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b1ecdda9313ec5d2f971993f44f6b657acf70cff Author: Nathan Scott <na...@sg...> Date: Mon May 8 19:51:42 2006 +1000 [XFS] Fix a project quota space accounting leak on rename. SGI-PV: 951636 SGI-Modid: xfs-linux-melb:xfs-kern:25811a Signed-off-by: Nathan Scott <na...@sg...> commit d08d389d5aef0509edba7ee42cd6c6a3998fee22 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d08d389d5aef0509edba7ee42cd6c6a3998fee22 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d08d389d5aef0509edba7ee42cd6c6a3998fee22 Author: Nathan Scott <na...@sg...> Date: Mon May 8 19:51:28 2006 +1000 [XFS] Fix a possible forced shutdown due to mishandling write barriers with remount,ro. SGI-PV: 951944 SGI-Modid: xfs-linux-melb:xfs-kern:25742a Signed-off-by: Nathan Scott <na...@sg...> commit fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 Author: Jan Beulich <jbe...@no...> Date: Tue May 2 12:33:20 2006 +0200 kbuild: Do not overwrite makefile as anohter user Change the conditional of the outputmakefile rule to be evaluated entirely in make, and add a conditional to not touch the generated makefile when e.g. running 'make install' as root while the build was done as non-root. Also adjust the comment describing this, and move the message printing and redirection to mkmakefile. Signed-off-by: Jan Beulich <jbe...@no...> Signed-off-by: Sam Ravnborg <sa...@ra...> commit 0eb1bd210d94e9f2c87551d794bb2755e5e24eed gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0eb1bd210d94e9f2c87551d794bb2755e5e24eed gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0eb1bd210d94e9f2c87551d794bb2755e5e24eed Author: Randy Dunlap <rd...@xe...> Date: Sat May 6 18:34:10 2006 -0700 [IRDA] irda-usb: use NULL instead of 0 Use NULL instead of 0 for a null pointer value (sparse warning): drivers/net/irda/irda-usb.c:1781:30: warning: Using plain integer as NULL pointer Also, correct timeout argument to use milliseconds instead of jiffies. Signed-off-by: Randy Dunlap <rd...@xe...> Signed-off-by: David S. Miller <da...@da...> commit 0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b Author: Hua Zhong <hz...@gm...> Date: Sat May 6 18:11:39 2006 -0700 [IPV4]: Remove likely in ip_rcv_finish() This is another result from my likely profiling tool (dw...@mv... just sent the patch of the profiling tool to linux-kernel mailing list, which is similar to what I use). On my system (not very busy, normal development machine within a VMWare workstation), I see a 6/5 miss/hit ratio for this "likely". Signed-off-by: Hua Zhong <hz...@gm...> Signed-off-by: David S. Miller <da...@da...> commit fe9925b551a95fae6ec61470c79f8b701a2fe928 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fe9925b551a95fae6ec61470c79f8b701a2fe928 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fe9925b551a95fae6ec61470c79f8b701a2fe928 Author: Stephen Hemminger <she...@os...> Date: Sat May 6 17:56:03 2006 -0700 [NET]: Create netdev attribute_groups with class_device_add Atomically create attributes when class device is added. This avoids the race between registering class_device (which generates hotplug event), and the creation of attribute groups. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> Signed-off-by: David S. Miller <da...@da...> commit 1498221d51a43d5fa1a580618591497d90f957d9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1498221d51a43d5fa1a580618591497d90f957d9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1498221d51a43d5fa1a580618591497d90f957d9 Author: Stephen Hemminger <she...@os...> Date: Sat May 6 17:55:11 2006 -0700 [CLASS DEVICE]: add attribute_group creation Extend the support of attribute groups in class_device's to allow groups to be created as part of the registration process. This allows network device's to avoid race between registration and creating groups. Note that unlike attributes that are a property of the class object, the groups are a property of the class_device object. This is done because there are different types of network devices (wireless for example). Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> Signed-off-by: David S. Miller <da...@da...> commit 178e0cc5ff249965c6cfbd78b1af6a5e614d837c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=178e0cc5ff249965c6cfbd78b1af6a5e614d837c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=178e0cc5ff249965c6cfbd78b1af6a5e614d837c Author: David Woodhouse <dw...@in...> Date: Fri May 5 18:19:37 2006 +0100 [PATCH] bcm43xx: Fix access to non-existent PHY registers Fix the conditions under which we poke at the APHY registers in bcm43xx_phy_initg() to avoid a machine check on chips where they don't exist. Signed-off-by: David Woodhouse <dw...@in...> Signed-off-by: John W. Linville <lin...@tu...> commit 869aaab1812c4212e65fb181e94b824cf49f9509 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=869aaab1812c4212e65fb181e94b824cf49f9509 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=869aaab1812c4212e65fb181e94b824cf49f9509 Author: Michael Buesch <mb...@bu...> Date: Fri May 5 17:23:51 2006 +0200 [PATCH] bcm43xx: Fix array overrun in bcm43xx_geo_init The problem here is that the bcm34xx driver and the ieee80211 stack do not agree on what channels are possible for 802.11a. The ieee80211 stack only wants channels between 34 and 165, while the bcm43xx driver accepts anything from 0 to 200. I made the bcm43xx driver comply with the ieee80211 stack expectations, by using the proper constants. Signed-off-by: Jean Delvare <jde...@su...> [mb]: Reduce stack usage by kzalloc-ing ieee80211_geo Signed-off-by: Michael Buesch <mb...@bu...> Signed-off-by: John W. Linville <lin...@tu...> commit f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d Author: Stefano Brivio <ste...@po...> Date: Fri May 5 01:26:29 2006 +0200 [PATCH] bcm43xx: check for valid MAC address in SPROM Check for valid MAC address in SPROM fields instead of relying on PHY type while setting the MAC address in the networking subsystem, as some devices have multiple PHYs. Signed-off-by: Stefano Brivio <ste...@po...> Signed-off-by: John W. Linville <lin...@tu...> commit f21709d70ad6d7ad50288f7056c3a368138b017c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f21709d70ad6d7ad50288f7056c3a368138b017c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f21709d70ad6d7ad50288f7056c3a368138b017c Author: Jean Delvare <jde...@su...> Date: Thu May 4 19:47:19 2006 +0200 [PATCH] ieee80211: Fix A band channel count (resent) The channel count for 802.11a is still not right. We better compute it from the min and max channel numbers, rather than hardcoding it. Signed-off-by: Jean Delvare <jde...@su...> Signed-off-by: John W. Linville <lin...@tu...> commit 5b4b9775a00c20ade1b1ac8aa25e0e4059d6243e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5b4b9775a00c20ade1b1ac8aa25e0e4059d6243e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5b4b9775a00c20ade1b1ac8aa25e0e4059d6243e Author: Michael Buesch <mb...@bu...> Date: Mon May 1 22:43:00 2006 +0200 [PATCH] bcm43xx: fix iwmode crash when down This fixes a crash when iwconfig ethX mode foo is done before ifconfig ethX up or after ifconfig ethX down Signed-off-by: Michael Buesch <mb...@bu...> Signed-off-by: John W. Linville <lin...@tu...> commit d57336e3f2dd7c2d1fbe4a8323029869fb6e1f00 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d57336e3f2dd7c2d1fbe4a8323029869fb6e1f00 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d57336e3f2dd7c2d1fbe4a8323029869fb6e1f00 Author: Daniel Drake <ds...@ge...> Date: Sun Apr 30 22:09:07 2006 +0100 [PATCH] softmac: make non-operational after being stopped zd1211 with softmac and wpa_supplicant revealed an issue with softmac and the use of workqueues. Some of the work functions actually reschedule themselves, so this meant that there could still be pending work after flush_scheduled_work() had been called during ieee80211softmac_stop(). This patch introduces a "running" flag which is used to ensure that rescheduling does not happen in this situation. I also used this flag to ensure that softmac's hooks into ieee80211 are non-operational once the stop operation has been started. This simply makes softmac a little more robust, because I could crash it easily by receiving frames in the short timeframe after shutting down softmac and before turning off the ZD1211 radio. (ZD1211 is now fixed as well!) Signed-off-by: Daniel Drake <ds...@ge...> Acked-by: Johannes Berg <joh...@si...> Signed-off-by: John W. Linville <lin...@tu...> commit 995c99268e0b12eb3c8939211ba5368dd92d98d9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=995c99268e0b12eb3c8939211ba5368dd92d98d9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=995c99268e0b12eb3c8939211ba5368dd92d98d9 Author: Daniel Drake <ds...@ge...> Date: Sun Apr 30 19:49:30 2006 +0100 [PATCH] softmac: don't reassociate if user asked for deauthentication When wpa_supplicant exits, it uses SIOCSIWMLME to request deauthentication. softmac then tries to reassociate without any user intervention, which isn't the desired behaviour of this signal. This change makes softmac only attempt reassociation if the remote network itself deauthenticated us. Signed-off-by: Daniel Drake <ds...@ge...> Acked-by: Johannes Berg <joh...@si...> Signed-off-by: John W. Linville <lin...@tu...> commit 913ed41eb5c948d2f8b5deffd29c2638eceef3d7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=913ed41eb5c948d2f8b5deffd29c2638eceef3d7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=913ed41eb5c948d2f8b5deffd29c2638eceef3d7 Author: Jon Mason <jd...@us...> Date: Wed May 3 17:26:58 2006 -0500 [IA64] remove asm-ia64/bitops.h self-inclusion asm-ia64/bitops.h includes itself. The #ifndef _ASM_IA64_BITOPS_H prevents this from being an issue, but it should still be removed. Signed-off-by: Jon Mason <jd...@us...> Signed-off-by: Tony Luck <ton...@in...> commit 3e6e155646706f1ef9f791a4402d145f112a3f8d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3e6e155646706f1ef9f791a4402d145f112a3f8d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3e6e155646706f1ef9f791a4402d145f112a3f8d Author: Chen, Kenneth W <ken...@in...> Date: Wed May 3 11:53:43 2006 -0700 [IA64] strcpy returns NULL pointer and not destination pointer Bob Picco noted that 6edfba1b33c701108717f4e036320fc39abe1912 dropped the -ffreestanding compiler flag from the top level Makefile, which allows the compiler to substitute memcpy() in places where strcpy() is used with a known size source string. But the ia64 memcpy() returns 0 for success, and "bytes copied" for failure. Fix to return the address of the destination string (like stdlibc version, and other architectures). There are no places where ia64 specific code makes use of the non-standard return value. Signed-off-by: Ken Chen <ken...@in...> Signed-off-by: Tony Luck <ton...@in...> commit cc873e1aa1fa916a485294117a9846e668505671 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cc873e1aa1fa916a485294117a9846e668505671 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cc873e1aa1fa916a485294117a9846e668505671 Author: Sam Ravnborg <sa...@ma...> Date: Sun Apr 30 23:59:16 2006 +0200 kbuild: drivers/video/logo/ - fix ident glitch Jan Engelhardt <je...@li...> wrote: while compiling 2.6.17-rc2 with allyesconfig, this showed up: ... LOGO drivers/video/logo/logo_superh_clut224.c CC drivers/video/logo/logo_linux_mono.o ... A tab had sneaked in. Convert it to a few spaces. Signed-off-by: Sam Ravnborg <sa...@ra...> commit 46ed981d5d203703a01137cc58c841d34e90c147 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=46ed981d5d203703a01137cc58c841d34e90c147 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=46ed981d5d203703a01137cc58c841d34e90c147 Author: Sam Ravnborg <sa...@ma...> Date: Sun Apr 30 23:56:33 2006 +0200 kbuild: fix gen_initramfs_list.sh Create correct dependencies when specifying your own file with list of files etc. to include in initramfs. Reported by: Andre Noll <ma...@sk...> Signed-off-by: Sam Ravnborg <sa...@ra...> commit 72ee59b5797e5d6fe32b5cf3473660a50a02db40 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=72ee59b5797e5d6fe32b5cf3473660a50a02db40 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=72ee59b5797e5d6fe32b5cf3473660a50a02db40 Author: Randy Dunlap <rd...@xe...> Date: Sat Apr 15 11:17:12 2006 -0700 kbuild modpost - relax driver data name Relax driver data name from *_driver to *driver. This fixes the 26 section mismatch warnings in drivers/ide/pci. Signed-off-by: Randy Dunlap <rd...@xe...> Signed-off-by: Sam Ravnborg <sa...@ra...> commit fca1dff218163ffd34d1e9e0b9b244e8c8803601 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fca1dff218163ffd34d1e9e0b9b244e8c8803601 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fca1dff218163ffd34d1e9e0b9b244e8c8803601 Author: Pavel Roskin <pr...@gn...> Date: Mon Apr 24 15:55:27 2006 -0400 kbuild: removing .tmp_versions considered harmful Remove *.mod files but not .tmp_versions for external builds When "make install" is run as root, .tmp_versions is re-created and becomes owned by root. Subsequent "make" run by user fails because .tmp_versions cannot be removed. Signed-off-by: Pavel Roskin <pr...@gn...> Signed-off-by: Sam Ravnborg <sa...@ra...> commit c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed Author: Atsushi Nemoto <an...@mb...> Date: Tue Apr 25 01:53:43 2006 +0900 kbuild: fix modpost segfault for 64bit mipsel kernel 64bit mips has different r_info layout. This patch fixes modpost segfault for 64bit little endian mips kernel. Signed-off-by: Atsushi Nemoto <an...@mb...> Signed-off-by: Sam Ravnborg <sa...@ra...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-05-10 06:42:09
|
Makefile | 20 -- arch/i386/kernel/io_apic.c | 5 arch/i386/kernel/mpparse.c | 12 + arch/ia64/lib/memcpy_mck.S | 9 arch/ppc/kernel/head_8xx.S | 4 arch/x86_64/kernel/e820.c | 6 arch/x86_64/kernel/io_apic.c | 5 arch/x86_64/kernel/mpparse.c | 12 + arch/x86_64/kernel/pci-gart.c | 8 arch/x86_64/kernel/setup.c | 30 ++- arch/x86_64/kernel/traps.c | 12 + drivers/base/class.c | 32 +++ drivers/cpufreq/cpufreq_ondemand.c | 28 ++- drivers/net/au1000_eth.c | 18 - drivers/net/irda/irda-usb.c | 2 drivers/net/ne.c | 31 ++- drivers/net/sky2.c | 217 ++++++++++++------------ drivers/net/sky2.h | 3 drivers/net/spider_net.c | 12 - drivers/net/spider_net.h | 2 drivers/net/sungem_phy.c | 45 ++++ drivers/net/sungem_phy.h | 1 drivers/net/wireless/bcm43xx/bcm43xx_main.c | 45 ++-- drivers/net/wireless/bcm43xx/bcm43xx_main.h | 6 drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2 drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 7 drivers/video/logo/Makefile | 2 fs/locks.c | 21 +- fs/xfs/xfs_alloc.c | 5 fs/xfs/xfs_rename.c | 12 + fs/xfs/xfs_vfsops.c | 27 -- fs/xfs/xfs_vnodeops.c | 2 include/asm-i386/io_apic.h | 1 include/asm-ia64/bitops.h | 1 include/asm-ppc/page.h | 1 include/asm-x86_64/e820.h | 2 include/asm-x86_64/io_apic.h | 1 include/linux/device.h | 2 include/linux/netdevice.h | 20 +- include/net/ieee80211.h | 6 include/net/ieee80211softmac.h | 3 net/core/dev.c | 2 net/core/net-sysfs.c | 49 +---- net/ieee80211/softmac/ieee80211softmac_assoc.c | 17 + net/ieee80211/softmac/ieee80211softmac_auth.c | 16 + net/ieee80211/softmac/ieee80211softmac_module.c | 4 net/ieee80211/softmac/ieee80211softmac_scan.c | 8 net/ipv4/ip_input.c | 2 scripts/gen_initramfs_list.sh | 6 scripts/mkmakefile | 5 scripts/mod/modpost.c | 6 51 files changed, 504 insertions(+), 291 deletions(-) New commits: commit b533878dccd05c2cba36ec5fc73f81e490e6c669 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b533878dccd05c2cba36ec5fc73f81e490e6c669 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b533878dccd05c2cba36ec5fc73f81e490e6c669 Merge: a1dddbe... 8befe1a... Author: Jan-Benedict Glaw <jb...@d2...> Date: Wed May 10 08:40:47 2006 +0200 Merge branch 'vax4linus' commit 8befe1a49fdf2f33672bcb85d8682afac40b1659 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8befe1a49fdf2f33672bcb85d8682afac40b1659 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8befe1a49fdf2f33672bcb85d8682afac40b1659 Merge: b913f05... 3cd73ee... Author: Jan-Benedict Glaw <jb...@d2...> Date: Wed May 10 08:39:48 2006 +0200 Merge branch 'master' commit 3cd73eedde34c5fd88d62d8523c4260970fdc6fb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3cd73eedde34c5fd88d62d8523c4260970fdc6fb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3cd73eedde34c5fd88d62d8523c4260970fdc6fb Merge: c51e078... 23aee82... Author: Linus Torvalds <tor...@g5...> Date: Tue May 9 10:18:35 2006 -0700 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6 * 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6: [PATCH] bcm43xx: Fix access to non-existent PHY registers [PATCH] bcm43xx: Fix array overrun in bcm43xx_geo_init [PATCH] bcm43xx: check for valid MAC address in SPROM [PATCH] ieee80211: Fix A band channel count (resent) [PATCH] bcm43xx: fix iwmode crash when down [PATCH] softmac: make non-operational after being stopped [PATCH] softmac: don't reassociate if user asked for deauthentication spidernet: enable support for bcm5461 ethernet phy spidernet: introduce new setting Fix RTL8019AS init for Toshiba RBTX49xx boards au1000_eth.c: use ether_crc() from <linux/crc32.h> sky2: version 1.3 Add more support for the Yukon Ultra chip found in dual core centino laptops. sky2: synchronize irq on remove sky2: dont write status ring sky2: edge triggered workaround enhancement sky2: use mask instead of modulo operation sky2: tx ring index mask fix sky2: status irq hang fix sky2: backout NAPI reschedule commit c51e078f82096a7d35ac8ec2416272e843a0e1c4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c51e078f82096a7d35ac8ec2416272e843a0e1c4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c51e078f82096a7d35ac8ec2416272e843a0e1c4 Author: Marcelo Tosatti <ma...@kv...> Date: Fri May 5 17:09:29 2006 -0300 [PATCH] ppc32/8xx: Fix r3 trashing due to 8MB TLB page instantiation Instantiation of 8MB pages on the TLB cache for the kernel static mapping trashes r3 register on !CONFIG_8xx_CPU6 configurations. This ensures r3 gets saved and restored. Signed-off-by: Marcelo Tosatti <ma...@kv...> Signed-off-by: Paul Mackerras <pa...@sa...> commit e4de00215c3af02116db3d486bf53700dfe10619 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e4de00215c3af02116db3d486bf53700dfe10619 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e4de00215c3af02116db3d486bf53700dfe10619 Author: Paul Mackerras <pa...@sa...> Date: Tue May 9 16:00:59 2006 +1000 powerpc/32: Define an is_kernel_addr() to fix ARCH=ppc compilation My commit 6bfd93c32a5065d0e858780b3beb0b667081601c broke the ARCH=ppc compilation by using the is_kernel_addr() macro in asm/uaccess.h. This fixes it by defining a suitable is_kernel_addr() for ARCH=ppc. Signed-off-by: Paul Mackerras <pa...@sa...> commit e515f048c46e457ef61ce9c8b56bd36e825a48a0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e515f048c46e457ef61ce9c8b56bd36e825a48a0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e515f048c46e457ef61ce9c8b56bd36e825a48a0 Merge: 601e7f0... e63a369... Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 17:41:05 2006 -0700 Merge git://oss.sgi.com:8090/xfs-2.6 * git://oss.sgi.com:8090/xfs-2.6: [XFS] Fix a possible metadata buffer (AGFL) refcount leak when fixing an [XFS] Fix a project quota space accounting leak on rename. [XFS] Fix a possible forced shutdown due to mishandling write barriers commit 23aee82e75c1ced9492cbff6090b8e213d95945e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=23aee82e75c1ced9492cbff6090b8e213d95945e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=23aee82e75c1ced9492cbff6090b8e213d95945e Merge: 8ec9345... 178e0cc... Author: Stephen Hemminger <she...@os...> Date: Mon May 8 16:01:20 2006 -0700 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 8ec93459655a3618dedec6360bb28d63f0010ef6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8ec93459655a3618dedec6360bb28d63f0010ef6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8ec93459655a3618dedec6360bb28d63f0010ef6 Author: Jens Osterkamp <Jen...@de...> Date: Thu May 4 05:59:41 2006 -0400 spidernet: enable support for bcm5461 ethernet phy A newer board revision changed the type of ethernet phy. Moreover, this generalizes the way that a phy gets switched into fiber mode when autodetection is not available. Signed-off-by: Jens Osterkamp <Jen...@de...> Signed-off-by: Arnd Bergmann <arn...@de...> Signed-off-by: Stephen Hemminger <she...@os...> commit b636d17a3bee8ba988e78e4bc8262f0dc3fad8ab gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b636d17a3bee8ba988e78e4bc8262f0dc3fad8ab gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b636d17a3bee8ba988e78e4bc8262f0dc3fad8ab Author: Jens Osterkamp <jen...@de...> Date: Thu May 4 05:59:56 2006 -0400 spidernet: introduce new setting We found a new chip setting that we need in order to make the driver work more reliable. Signed-off-by: Arnd Bergmann <arn...@de...> Signed-off-by: Stephen Hemminger <she...@os...> commit aedc0e520e5ae9ba1342c25c4604d18fb236c2bc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=aedc0e520e5ae9ba1342c25c4604d18fb236c2bc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=aedc0e520e5ae9ba1342c25c4604d18fb236c2bc Author: Sergei Shtylyov <ssh...@ru...> Date: Tue May 9 00:58:28 2006 +0400 Fix RTL8019AS init for Toshiba RBTX49xx boards Ensure that 8-bit mode is selected for the on-board Realtek RTL8019AS chip on Toshiba RBHMA4x00, get rid of the duplicate #ifdef's when setting ei_status.word16. The chip's datasheet says that the PSTOP register shouldn't exceed 0x60 in 8-bit mode -- ensure this too. Signed-off-by: Sergei Shtylyov <ssh...@ru...> Signed-off-by: Stephen Hemminger <she...@os...> commit 8cd35da094bed8a41eb722c1d03eab24d57bf706 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8cd35da094bed8a41eb722c1d03eab24d57bf706 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8cd35da094bed8a41eb722c1d03eab24d57bf706 Author: Herbert Valerio Riedel <hv...@gn...> Date: Mon May 1 15:37:09 2006 +0200 au1000_eth.c: use ether_crc() from <linux/crc32.h> since the au1000 driver already selects the CRC32 routines, simply replace the internal ether_crc() implementation with the semantically equivalent one from <linux/crc32.h> Signed-off-by: Herbert Valerio Riedel <hv...@gn...> Signed-off-by: Stephen Hemminger <she...@os...> commit 6d4b0f617d577975108ccc7e3b0c7dbe50144df6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6d4b0f617d577975108ccc7e3b0c7dbe50144df6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6d4b0f617d577975108ccc7e3b0c7dbe50144df6 Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:34 2006 -0700 sky2: version 1.3 Update version number, to track changes. Signed-off-by: Stephen Hemminger <she...@os...> commit ed6d32c7a927bfccf921d15a3e25160f4528c3eb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ed6d32c7a927bfccf921d15a3e25160f4528c3eb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ed6d32c7a927bfccf921d15a3e25160f4528c3eb Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:33 2006 -0700 Add more support for the Yukon Ultra chip found in dual core centino laptops. The newest Yukon Ultra chipset's require more special tweaks. They seem to be like the Yukon XL chipsets. This code is transliterated from the latest SysKonnect driver; I don't have any Ultra hardware. Signed-off-by: Stephe Hemminger <she...@os...> Signed-off-by: Stephen Hemminger <she...@os...> commit 72cb8529208020484cecd69bbf87719b50ee6313 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=72cb8529208020484cecd69bbf87719b50ee6313 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=72cb8529208020484cecd69bbf87719b50ee6313 Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:32 2006 -0700 sky2: synchronize irq on remove Need to make sure interrupt is not racing with unregister of network device. Signed-off-by: Stephen Hemminger <she...@os...> commit e71ebd73276cc21efc74aba4118ef037cd32e50a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e71ebd73276cc21efc74aba4118ef037cd32e50a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e71ebd73276cc21efc74aba4118ef037cd32e50a Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:31 2006 -0700 sky2: dont write status ring It is more efficient not to write the status ring from the processor and just read the active portion. Signed-off-by: Stephen Hemminger <she...@os...> commit 01bd75645f94d49cb7ffd61022890166ce00ec2a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=01bd75645f94d49cb7ffd61022890166ce00ec2a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=01bd75645f94d49cb7ffd61022890166ce00ec2a Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:30 2006 -0700 sky2: edge triggered workaround enhancement Need to make the edge-triggered workaround timer faster to get marginally better peformance. The test_and_set_bit in schedule_prep() acts as a barrier already. Make it a module parameter so that laptops who are concerned about power can set it to 0; and user's stuck with broken BIOS's can turn the driver into pure polling. Signed-off-by: Stephen Hemminger <she...@os...> commit cb5d9547307f44f210f88c829bad4249eeb24bc3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cb5d9547307f44f210f88c829bad4249eeb24bc3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cb5d9547307f44f210f88c829bad4249eeb24bc3 Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:29 2006 -0700 sky2: use mask instead of modulo operation Gcc isn't smart enough to know that it can do a modulo operation with power of 2 constant by doing a mask. So add macro to do it for us. Signed-off-by: Stephen Hemminger <she...@os...> commit f55925d7eb04f936ab4c001f10e3e9c74c1297ae gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f55925d7eb04f936ab4c001f10e3e9c74c1297ae gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f55925d7eb04f936ab4c001f10e3e9c74c1297ae Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:28 2006 -0700 sky2: tx ring index mask fix Mask for transmit ring status was picking up bits from the unused sync ring. They were always zero, so far... Also, make sure to remind self not to make tx ring too big. Signed-off-by: Stephen Hemminger <she...@os...> commit 1e5f1283a2aed429f4457e2eb875b1928a6643df gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1e5f1283a2aed429f4457e2eb875b1928a6643df gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1e5f1283a2aed429f4457e2eb875b1928a6643df Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:27 2006 -0700 sky2: status irq hang fix The status interrupt flag should be cleared before processing, not afterwards to avoid race. Need to process in poll routine even if no new interrupt status. This is a normal occurrence when more than 64 frames (NAPI weight) are processed in one poll routine. Signed-off-by: Stephen Hemminger <she...@os...> commit d324031245abbb54e4e0321004430826052b6c37 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d324031245abbb54e4e0321004430826052b6c37 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d324031245abbb54e4e0321004430826052b6c37 Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:26 2006 -0700 sky2: backout NAPI reschedule This is a backout of earlier patch. The whole rescheduling hack was a bad idea. It doesn't really solve the problem and it makes the code more complicated for no good reason. Signed-off-by: Stephen Hemminger <she...@os...> commit 601e7f024edbea8018de34c83a7398623214e636 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=601e7f024edbea8018de34c83a7398623214e636 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=601e7f024edbea8018de34c83a7398623214e636 Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 13:38:42 2006 -0700 Revert "kbuild: fix modpost segfault for 64bit mipsel kernel" This reverts commit c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed, which caused problems for the x86 build. Quoth Sam: "It was discussed on mips list but apparently the fix was bogus. I will not have time to look into it so mips can carry this local fix until we get a proper fix in mainline." Signed-off-by: Linus Torvalds <tor...@os...> commit 6810b548b25114607e0814612d84125abccc0a4f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6810b548b25114607e0814612d84125abccc0a4f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6810b548b25114607e0814612d84125abccc0a4f Author: Andi Kleen <ak...@su...> Date: Mon May 8 15:17:31 2006 +0200 [PATCH] x86_64: Move ondemand timer into own work queue Taking the cpu hotplug semaphore in a normal events workqueue is unsafe because other tasks can wait for any workqueues with it hold. This results in a deadlock. Move the DBS timer into its own work queue which is not affected by other work queue flushes to avoid this. Has been acked by Venkatesh. Cc: ven...@in... Cc: cp...@li... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit ac71d12c990526b01ef6cfe50907ef8530a30331 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ac71d12c990526b01ef6cfe50907ef8530a30331 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ac71d12c990526b01ef6cfe50907ef8530a30331 Author: Andi Kleen <ak...@su...> Date: Mon May 8 15:17:28 2006 +0200 [PATCH] x86_64: Avoid EBDA area in early boot allocator Based on analysis&patch from Robert Hentosch Observed on a Dell PE6850 with 16GB The problem occurs very early on, when the kernel allocates space for the temporary memory map called bootmap. The bootmap overlaps the EBDA region. EBDA region is not historically reserved in the e820 mapping. When the bootmap is freed it marks the EBDA region as usable. If you notice in setup.c there is already code to work around the EBDA in reserve_ebda_region(), this check however occurs after the bootmap is allocated and doesn't prevent the bootmap from using this range. AK: I redid the original patch. Thanks also to Jan Beulich for spotting some mistakes. Cc: Rob...@de... Cc: jbe...@no... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit 8b1ffe9550e71224c43d8c754245bd76f4ea9bb8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8b1ffe9550e71224c43d8c754245bd76f4ea9bb8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8b1ffe9550e71224c43d8c754245bd76f4ea9bb8 Author: Corey Minyard <mi...@ac...> Date: Mon May 8 15:17:25 2006 +0200 [PATCH] x86_64: add nmi_exit to die_nmi Playing with NMI watchdog on x86_64, I discovered that it didn't do what I expected. It always panic-ed, even when it didn't happen from interrupt context. This patch solves that problem for me. Also, in this case, do_exit() will be called with interrupts disabled, I believe. Would it be wise to also call local_irq_enable() after nmi_exit()? [Yes I added it -AK] Currently, on x86_64, any NMI watchdog timeout will cause a panic because the irq count will always be set to be in an interrupt when do_exit() is called from die_nmi(). If we add nmi_exit() to the die_nmi() call (since the nmi will never exit "normally") it seems to solve this problem. The following small program can be used to trigger the NMI watchdog to reproduce this: main () { iopl(3); for (;;) asm("cli"); } Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit cdc60a4c8e71c4bcf67e83fac6c0cabd0ff19bfe gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cdc60a4c8e71c4bcf67e83fac6c0cabd0ff19bfe gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cdc60a4c8e71c4bcf67e83fac6c0cabd0ff19bfe Author: Corey Minyard <mi...@ac...> Date: Mon May 8 15:17:22 2006 +0200 [PATCH] x86_64: fix die_lock nesting I noticed this when poking around in this area. The oops_begin() function in x86_64 would only conditionally claim the die_lock if the call is nested, but oops_end() would always release the spinlock. This patch adds a nest count for the die lock so that the release of the lock is only done on the final oops_end(). Signed-off-by: Corey Minyard <mi...@ac...> Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit 5192d84e4c32cd335fd572e5ff0712041f45f7e7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5192d84e4c32cd335fd572e5ff0712041f45f7e7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5192d84e4c32cd335fd572e5ff0712041f45f7e7 Author: Andi Kleen <ak...@su...> Date: Mon May 8 15:17:19 2006 +0200 [PATCH] x86_64: Check for too many northbridges in IOMMU code The IOMMU code can only deal with 8 northbridges. Error out when more are found. Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit e0c1e9bf81badc7ba59e120d6218101903d5d103 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e0c1e9bf81badc7ba59e120d6218101903d5d103 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e0c1e9bf81badc7ba59e120d6218101903d5d103 Author: Kimball Murray <kim...@gm...> Date: Mon May 8 15:17:16 2006 +0200 [PATCH] x86_64: avoid IRQ0 ioapic pin collision The patch addresses a problem with ACPI SCI interrupt entry, which gets re-used, and the IRQ is assigned to another unrelated device. The patch corrects the code such that SCI IRQ is skipped and duplicate entry is avoided. Second issue came up with VIA chipset, the problem was caused by original patch assigning IRQs starting 16 and up. The VIA chipset uses 4-bit IRQ register for internal interrupt routing, and therefore cannot handle IRQ numbers assigned to its devices. The patch corrects this problem by allowing PCI IRQs below 16. Cc: len...@in... Signed-off by: Natalie Protasevich <Nat...@un...> Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit abfd3057187812352cd8502c29ca50cd010b3ccc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=abfd3057187812352cd8502c29ca50cd010b3ccc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=abfd3057187812352cd8502c29ca50cd010b3ccc Merge: 96b8eaa... 913ed41... Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 09:28:35 2006 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] remove asm-ia64/bitops.h self-inclusion [IA64] strcpy returns NULL pointer and not destination pointer commit 96b8eaa14a20771997b501a049e418b871bf9def gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=96b8eaa14a20771997b501a049e418b871bf9def gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=96b8eaa14a20771997b501a049e418b871bf9def Merge: bed7a56... 0eb1bd2... Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 09:11:10 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IRDA] irda-usb: use NULL instead of 0 [IPV4]: Remove likely in ip_rcv_finish() [NET]: Create netdev attribute_groups with class_device_add [CLASS DEVICE]: add attribute_group creation commit bed7a560333d40269a886c4421d4c8f964a32177 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bed7a560333d40269a886c4421d4c8f964a32177 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bed7a560333d40269a886c4421d4c8f964a32177 Merge: 75dff55... fd5f0cd... Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 09:10:44 2006 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: Do not overwrite makefile as anohter user kbuild: drivers/video/logo/ - fix ident glitch kbuild: fix gen_initramfs_list.sh kbuild modpost - relax driver data name kbuild: removing .tmp_versions considered harmful kbuild: fix modpost segfault for 64bit mipsel kernel commit 75dff55af9a989293e9f9bacf049858f4262bc08 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=75dff55af9a989293e9f9bacf049858f4262bc08 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=75dff55af9a989293e9f9bacf049858f4262bc08 Author: Trond Myklebust <Tro...@ne...> Date: Sun May 7 23:02:42 2006 -0400 [PATCH] fs/locks.c: Fix lease_init It is insane to be giving lease_init() the task of freeing the lock it is supposed to initialise, given that the lock is not guaranteed to be allocated on the stack. This causes lockups in fcntl_setlease(). Problem diagnosed by Daniel Hokka Zakrisson <da...@ho...> Also fix a slab leak in __setlease() due to an uninitialised return value. Problem diagnosed by Björn Steinbrink. Signed-off-by: Trond Myklebust <Tro...@ne...> Tested-by: Daniel Hokka Zakrisson <da...@ho...> Signed-off-by: Linus Torvalds <tor...@os...> commit e63a3690013a475746ad2cea998ebb534d825704 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e63a3690013a475746ad2cea998ebb534d825704 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e63a3690013a475746ad2cea998ebb534d825704 Author: Nathan Scott <na...@sg...> Date: Mon May 8 19:51:58 2006 +1000 [XFS] Fix a possible metadata buffer (AGFL) refcount leak when fixing an AG freelist. SGI-PV: 952681 SGI-Modid: xfs-linux-melb:xfs-kern:25902a Signed-off-by: Nathan Scott <na...@sg...> commit b1ecdda9313ec5d2f971993f44f6b657acf70cff gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b1ecdda9313ec5d2f971993f44f6b657acf70cff gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b1ecdda9313ec5d2f971993f44f6b657acf70cff Author: Nathan Scott <na...@sg...> Date: Mon May 8 19:51:42 2006 +1000 [XFS] Fix a project quota space accounting leak on rename. SGI-PV: 951636 SGI-Modid: xfs-linux-melb:xfs-kern:25811a Signed-off-by: Nathan Scott <na...@sg...> commit d08d389d5aef0509edba7ee42cd6c6a3998fee22 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d08d389d5aef0509edba7ee42cd6c6a3998fee22 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d08d389d5aef0509edba7ee42cd6c6a3998fee22 Author: Nathan Scott <na...@sg...> Date: Mon May 8 19:51:28 2006 +1000 [XFS] Fix a possible forced shutdown due to mishandling write barriers with remount,ro. SGI-PV: 951944 SGI-Modid: xfs-linux-melb:xfs-kern:25742a Signed-off-by: Nathan Scott <na...@sg...> commit fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 Author: Jan Beulich <jbe...@no...> Date: Tue May 2 12:33:20 2006 +0200 kbuild: Do not overwrite makefile as anohter user Change the conditional of the outputmakefile rule to be evaluated entirely in make, and add a conditional to not touch the generated makefile when e.g. running 'make install' as root while the build was done as non-root. Also adjust the comment describing this, and move the message printing and redirection to mkmakefile. Signed-off-by: Jan Beulich <jbe...@no...> Signed-off-by: Sam Ravnborg <sa...@ra...> commit 0eb1bd210d94e9f2c87551d794bb2755e5e24eed gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0eb1bd210d94e9f2c87551d794bb2755e5e24eed gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0eb1bd210d94e9f2c87551d794bb2755e5e24eed Author: Randy Dunlap <rd...@xe...> Date: Sat May 6 18:34:10 2006 -0700 [IRDA] irda-usb: use NULL instead of 0 Use NULL instead of 0 for a null pointer value (sparse warning): drivers/net/irda/irda-usb.c:1781:30: warning: Using plain integer as NULL pointer Also, correct timeout argument to use milliseconds instead of jiffies. Signed-off-by: Randy Dunlap <rd...@xe...> Signed-off-by: David S. Miller <da...@da...> commit 0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b Author: Hua Zhong <hz...@gm...> Date: Sat May 6 18:11:39 2006 -0700 [IPV4]: Remove likely in ip_rcv_finish() This is another result from my likely profiling tool (dw...@mv... just sent the patch of the profiling tool to linux-kernel mailing list, which is similar to what I use). On my system (not very busy, normal development machine within a VMWare workstation), I see a 6/5 miss/hit ratio for this "likely". Signed-off-by: Hua Zhong <hz...@gm...> Signed-off-by: David S. Miller <da...@da...> commit fe9925b551a95fae6ec61470c79f8b701a2fe928 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fe9925b551a95fae6ec61470c79f8b701a2fe928 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fe9925b551a95fae6ec61470c79f8b701a2fe928 Author: Stephen Hemminger <she...@os...> Date: Sat May 6 17:56:03 2006 -0700 [NET]: Create netdev attribute_groups with class_device_add Atomically create attributes when class device is added. This avoids the race between registering class_device (which generates hotplug event), and the creation of attribute groups. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> Signed-off-by: David S. Miller <da...@da...> commit 1498221d51a43d5fa1a580618591497d90f957d9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1498221d51a43d5fa1a580618591497d90f957d9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1498221d51a43d5fa1a580618591497d90f957d9 Author: Stephen Hemminger <she...@os...> Date: Sat May 6 17:55:11 2006 -0700 [CLASS DEVICE]: add attribute_group creation Extend the support of attribute groups in class_device's to allow groups to be created as part of the registration process. This allows network device's to avoid race between registration and creating groups. Note that unlike attributes that are a property of the class object, the groups are a property of the class_device object. This is done because there are different types of network devices (wireless for example). Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> Signed-off-by: David S. Miller <da...@da...> commit 178e0cc5ff249965c6cfbd78b1af6a5e614d837c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=178e0cc5ff249965c6cfbd78b1af6a5e614d837c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=178e0cc5ff249965c6cfbd78b1af6a5e614d837c Author: David Woodhouse <dw...@in...> Date: Fri May 5 18:19:37 2006 +0100 [PATCH] bcm43xx: Fix access to non-existent PHY registers Fix the conditions under which we poke at the APHY registers in bcm43xx_phy_initg() to avoid a machine check on chips where they don't exist. Signed-off-by: David Woodhouse <dw...@in...> Signed-off-by: John W. Linville <lin...@tu...> commit 869aaab1812c4212e65fb181e94b824cf49f9509 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=869aaab1812c4212e65fb181e94b824cf49f9509 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=869aaab1812c4212e65fb181e94b824cf49f9509 Author: Michael Buesch <mb...@bu...> Date: Fri May 5 17:23:51 2006 +0200 [PATCH] bcm43xx: Fix array overrun in bcm43xx_geo_init The problem here is that the bcm34xx driver and the ieee80211 stack do not agree on what channels are possible for 802.11a. The ieee80211 stack only wants channels between 34 and 165, while the bcm43xx driver accepts anything from 0 to 200. I made the bcm43xx driver comply with the ieee80211 stack expectations, by using the proper constants. Signed-off-by: Jean Delvare <jde...@su...> [mb]: Reduce stack usage by kzalloc-ing ieee80211_geo Signed-off-by: Michael Buesch <mb...@bu...> Signed-off-by: John W. Linville <lin...@tu...> commit f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d Author: Stefano Brivio <ste...@po...> Date: Fri May 5 01:26:29 2006 +0200 [PATCH] bcm43xx: check for valid MAC address in SPROM Check for valid MAC address in SPROM fields instead of relying on PHY type while setting the MAC address in the networking subsystem, as some devices have multiple PHYs. Signed-off-by: Stefano Brivio <ste...@po...> Signed-off-by: John W. Linville <lin...@tu...> commit f21709d70ad6d7ad50288f7056c3a368138b017c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f21709d70ad6d7ad50288f7056c3a368138b017c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f21709d70ad6d7ad50288f7056c3a368138b017c Author: Jean Delvare <jde...@su...> Date: Thu May 4 19:47:19 2006 +0200 [PATCH] ieee80211: Fix A band channel count (resent) The channel count for 802.11a is still not right. We better compute it from the min and max channel numbers, rather than hardcoding it. Signed-off-by: Jean Delvare <jde...@su...> Signed-off-by: John W. Linville <lin...@tu...> commit 5b4b9775a00c20ade1b1ac8aa25e0e4059d6243e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5b4b9775a00c20ade1b1ac8aa25e0e4059d6243e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5b4b9775a00c20ade1b1ac8aa25e0e4059d6243e Author: Michael Buesch <mb...@bu...> Date: Mon May 1 22:43:00 2006 +0200 [PATCH] bcm43xx: fix iwmode crash when down This fixes a crash when iwconfig ethX mode foo is done before ifconfig ethX up or after ifconfig ethX down Signed-off-by: Michael Buesch <mb...@bu...> Signed-off-by: John W. Linville <lin...@tu...> commit d57336e3f2dd7c2d1fbe4a8323029869fb6e1f00 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d57336e3f2dd7c2d1fbe4a8323029869fb6e1f00 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d57336e3f2dd7c2d1fbe4a8323029869fb6e1f00 Author: Daniel Drake <ds...@ge...> Date: Sun Apr 30 22:09:07 2006 +0100 [PATCH] softmac: make non-operational after being stopped zd1211 with softmac and wpa_supplicant revealed an issue with softmac and the use of workqueues. Some of the work functions actually reschedule themselves, so this meant that there could still be pending work after flush_scheduled_work() had been called during ieee80211softmac_stop(). This patch introduces a "running" flag which is used to ensure that rescheduling does not happen in this situation. I also used this flag to ensure that softmac's hooks into ieee80211 are non-operational once the stop operation has been started. This simply makes softmac a little more robust, because I could crash it easily by receiving frames in the short timeframe after shutting down softmac and before turning off the ZD1211 radio. (ZD1211 is now fixed as well!) Signed-off-by: Daniel Drake <ds...@ge...> Acked-by: Johannes Berg <joh...@si...> Signed-off-by: John W. Linville <lin...@tu...> commit 995c99268e0b12eb3c8939211ba5368dd92d98d9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=995c99268e0b12eb3c8939211ba5368dd92d98d9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=995c99268e0b12eb3c8939211ba5368dd92d98d9 Author: Daniel Drake <ds...@ge...> Date: Sun Apr 30 19:49:30 2006 +0100 [PATCH] softmac: don't reassociate if user asked for deauthentication When wpa_supplicant exits, it uses SIOCSIWMLME to request deauthentication. softmac then tries to reassociate without any user intervention, which isn't the desired behaviour of this signal. This change makes softmac only attempt reassociation if the remote network itself deauthenticated us. Signed-off-by: Daniel Drake <ds...@ge...> Acked-by: Johannes Berg <joh...@si...> Signed-off-by: John W. Linville <lin...@tu...> commit 913ed41eb5c948d2f8b5deffd29c2638eceef3d7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=913ed41eb5c948d2f8b5deffd29c2638eceef3d7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=913ed41eb5c948d2f8b5deffd29c2638eceef3d7 Author: Jon Mason <jd...@us...> Date: Wed May 3 17:26:58 2006 -0500 [IA64] remove asm-ia64/bitops.h self-inclusion asm-ia64/bitops.h includes itself. The #ifndef _ASM_IA64_BITOPS_H prevents this from being an issue, but it should still be removed. Signed-off-by: Jon Mason <jd...@us...> Signed-off-by: Tony Luck <ton...@in...> commit 3e6e155646706f1ef9f791a4402d145f112a3f8d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3e6e155646706f1ef9f791a4402d145f112a3f8d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3e6e155646706f1ef9f791a4402d145f112a3f8d Author: Chen, Kenneth W <ken...@in...> Date: Wed May 3 11:53:43 2006 -0700 [IA64] strcpy returns NULL pointer and not destination pointer Bob Picco noted that 6edfba1b33c701108717f4e036320fc39abe1912 dropped the -ffreestanding compiler flag from the top level Makefile, which allows the compiler to substitute memcpy() in places where strcpy() is used with a known size source string. But the ia64 memcpy() returns 0 for success, and "bytes copied" for failure. Fix to return the address of the destination string (like stdlibc version, and other architectures). There are no places where ia64 specific code makes use of the non-standard return value. Signed-off-by: Ken Chen <ken...@in...> Signed-off-by: Tony Luck <ton...@in...> commit cc873e1aa1fa916a485294117a9846e668505671 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cc873e1aa1fa916a485294117a9846e668505671 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cc873e1aa1fa916a485294117a9846e668505671 Author: Sam Ravnborg <sa...@ma...> Date: Sun Apr 30 23:59:16 2006 +0200 kbuild: drivers/video/logo/ - fix ident glitch Jan Engelhardt <je...@li...> wrote: while compiling 2.6.17-rc2 with allyesconfig, this showed up: ... LOGO drivers/video/logo/logo_superh_clut224.c CC drivers/video/logo/logo_linux_mono.o ... A tab had sneaked in. Convert it to a few spaces. Signed-off-by: Sam Ravnborg <sa...@ra...> commit 46ed981d5d203703a01137cc58c841d34e90c147 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=46ed981d5d203703a01137cc58c841d34e90c147 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=46ed981d5d203703a01137cc58c841d34e90c147 Author: Sam Ravnborg <sa...@ma...> Date: Sun Apr 30 23:56:33 2006 +0200 kbuild: fix gen_initramfs_list.sh Create correct dependencies when specifying your own file with list of files etc. to include in initramfs. Reported by: Andre Noll <ma...@sk...> Signed-off-by: Sam Ravnborg <sa...@ra...> commit 72ee59b5797e5d6fe32b5cf3473660a50a02db40 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=72ee59b5797e5d6fe32b5cf3473660a50a02db40 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=72ee59b5797e5d6fe32b5cf3473660a50a02db40 Author: Randy Dunlap <rd...@xe...> Date: Sat Apr 15 11:17:12 2006 -0700 kbuild modpost - relax driver data name Relax driver data name from *_driver to *driver. This fixes the 26 section mismatch warnings in drivers/ide/pci. Signed-off-by: Randy Dunlap <rd...@xe...> Signed-off-by: Sam Ravnborg <sa...@ra...> commit fca1dff218163ffd34d1e9e0b9b244e8c8803601 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fca1dff218163ffd34d1e9e0b9b244e8c8803601 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fca1dff218163ffd34d1e9e0b9b244e8c8803601 Author: Pavel Roskin <pr...@gn...> Date: Mon Apr 24 15:55:27 2006 -0400 kbuild: removing .tmp_versions considered harmful Remove *.mod files but not .tmp_versions for external builds When "make install" is run as root, .tmp_versions is re-created and becomes owned by root. Subsequent "make" run by user fails because .tmp_versions cannot be removed. Signed-off-by: Pavel Roskin <pr...@gn...> Signed-off-by: Sam Ravnborg <sa...@ra...> commit c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed Author: Atsushi Nemoto <an...@mb...> Date: Tue Apr 25 01:53:43 2006 +0900 kbuild: fix modpost segfault for 64bit mipsel kernel 64bit mips has different r_info layout. This patch fixes modpost segfault for 64bit little endian mips kernel. Signed-off-by: Atsushi Nemoto <an...@mb...> Signed-off-by: Sam Ravnborg <sa...@ra...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-05-10 06:42:08
|
Makefile | 20 -- arch/i386/kernel/io_apic.c | 5 arch/i386/kernel/mpparse.c | 12 + arch/ia64/lib/memcpy_mck.S | 9 arch/ppc/kernel/head_8xx.S | 4 arch/x86_64/kernel/e820.c | 6 arch/x86_64/kernel/io_apic.c | 5 arch/x86_64/kernel/mpparse.c | 12 + arch/x86_64/kernel/pci-gart.c | 8 arch/x86_64/kernel/setup.c | 30 ++- arch/x86_64/kernel/traps.c | 12 + drivers/base/class.c | 32 +++ drivers/cpufreq/cpufreq_ondemand.c | 28 ++- drivers/net/au1000_eth.c | 18 - drivers/net/irda/irda-usb.c | 2 drivers/net/ne.c | 31 ++- drivers/net/sky2.c | 217 ++++++++++++------------ drivers/net/sky2.h | 3 drivers/net/spider_net.c | 12 - drivers/net/spider_net.h | 2 drivers/net/sungem_phy.c | 45 ++++ drivers/net/sungem_phy.h | 1 drivers/net/wireless/bcm43xx/bcm43xx_main.c | 45 ++-- drivers/net/wireless/bcm43xx/bcm43xx_main.h | 6 drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2 drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 7 drivers/video/logo/Makefile | 2 fs/locks.c | 21 +- fs/xfs/xfs_alloc.c | 5 fs/xfs/xfs_rename.c | 12 + fs/xfs/xfs_vfsops.c | 27 -- fs/xfs/xfs_vnodeops.c | 2 include/asm-i386/io_apic.h | 1 include/asm-ia64/bitops.h | 1 include/asm-ppc/page.h | 1 include/asm-x86_64/e820.h | 2 include/asm-x86_64/io_apic.h | 1 include/linux/device.h | 2 include/linux/netdevice.h | 20 +- include/net/ieee80211.h | 6 include/net/ieee80211softmac.h | 3 net/core/dev.c | 2 net/core/net-sysfs.c | 49 +---- net/ieee80211/softmac/ieee80211softmac_assoc.c | 17 + net/ieee80211/softmac/ieee80211softmac_auth.c | 16 + net/ieee80211/softmac/ieee80211softmac_module.c | 4 net/ieee80211/softmac/ieee80211softmac_scan.c | 8 net/ipv4/ip_input.c | 2 scripts/gen_initramfs_list.sh | 6 scripts/mkmakefile | 5 scripts/mod/modpost.c | 6 51 files changed, 504 insertions(+), 291 deletions(-) New commits: commit 8befe1a49fdf2f33672bcb85d8682afac40b1659 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8befe1a49fdf2f33672bcb85d8682afac40b1659 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8befe1a49fdf2f33672bcb85d8682afac40b1659 Merge: b913f05... 3cd73ee... Author: Jan-Benedict Glaw <jb...@d2...> Date: Wed May 10 08:39:48 2006 +0200 Merge branch 'master' commit 3cd73eedde34c5fd88d62d8523c4260970fdc6fb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3cd73eedde34c5fd88d62d8523c4260970fdc6fb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3cd73eedde34c5fd88d62d8523c4260970fdc6fb Merge: c51e078... 23aee82... Author: Linus Torvalds <tor...@g5...> Date: Tue May 9 10:18:35 2006 -0700 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6 * 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/netdev-2.6: [PATCH] bcm43xx: Fix access to non-existent PHY registers [PATCH] bcm43xx: Fix array overrun in bcm43xx_geo_init [PATCH] bcm43xx: check for valid MAC address in SPROM [PATCH] ieee80211: Fix A band channel count (resent) [PATCH] bcm43xx: fix iwmode crash when down [PATCH] softmac: make non-operational after being stopped [PATCH] softmac: don't reassociate if user asked for deauthentication spidernet: enable support for bcm5461 ethernet phy spidernet: introduce new setting Fix RTL8019AS init for Toshiba RBTX49xx boards au1000_eth.c: use ether_crc() from <linux/crc32.h> sky2: version 1.3 Add more support for the Yukon Ultra chip found in dual core centino laptops. sky2: synchronize irq on remove sky2: dont write status ring sky2: edge triggered workaround enhancement sky2: use mask instead of modulo operation sky2: tx ring index mask fix sky2: status irq hang fix sky2: backout NAPI reschedule commit c51e078f82096a7d35ac8ec2416272e843a0e1c4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c51e078f82096a7d35ac8ec2416272e843a0e1c4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c51e078f82096a7d35ac8ec2416272e843a0e1c4 Author: Marcelo Tosatti <ma...@kv...> Date: Fri May 5 17:09:29 2006 -0300 [PATCH] ppc32/8xx: Fix r3 trashing due to 8MB TLB page instantiation Instantiation of 8MB pages on the TLB cache for the kernel static mapping trashes r3 register on !CONFIG_8xx_CPU6 configurations. This ensures r3 gets saved and restored. Signed-off-by: Marcelo Tosatti <ma...@kv...> Signed-off-by: Paul Mackerras <pa...@sa...> commit e4de00215c3af02116db3d486bf53700dfe10619 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e4de00215c3af02116db3d486bf53700dfe10619 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e4de00215c3af02116db3d486bf53700dfe10619 Author: Paul Mackerras <pa...@sa...> Date: Tue May 9 16:00:59 2006 +1000 powerpc/32: Define an is_kernel_addr() to fix ARCH=ppc compilation My commit 6bfd93c32a5065d0e858780b3beb0b667081601c broke the ARCH=ppc compilation by using the is_kernel_addr() macro in asm/uaccess.h. This fixes it by defining a suitable is_kernel_addr() for ARCH=ppc. Signed-off-by: Paul Mackerras <pa...@sa...> commit e515f048c46e457ef61ce9c8b56bd36e825a48a0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e515f048c46e457ef61ce9c8b56bd36e825a48a0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e515f048c46e457ef61ce9c8b56bd36e825a48a0 Merge: 601e7f0... e63a369... Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 17:41:05 2006 -0700 Merge git://oss.sgi.com:8090/xfs-2.6 * git://oss.sgi.com:8090/xfs-2.6: [XFS] Fix a possible metadata buffer (AGFL) refcount leak when fixing an [XFS] Fix a project quota space accounting leak on rename. [XFS] Fix a possible forced shutdown due to mishandling write barriers commit 23aee82e75c1ced9492cbff6090b8e213d95945e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=23aee82e75c1ced9492cbff6090b8e213d95945e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=23aee82e75c1ced9492cbff6090b8e213d95945e Merge: 8ec9345... 178e0cc... Author: Stephen Hemminger <she...@os...> Date: Mon May 8 16:01:20 2006 -0700 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 8ec93459655a3618dedec6360bb28d63f0010ef6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8ec93459655a3618dedec6360bb28d63f0010ef6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8ec93459655a3618dedec6360bb28d63f0010ef6 Author: Jens Osterkamp <Jen...@de...> Date: Thu May 4 05:59:41 2006 -0400 spidernet: enable support for bcm5461 ethernet phy A newer board revision changed the type of ethernet phy. Moreover, this generalizes the way that a phy gets switched into fiber mode when autodetection is not available. Signed-off-by: Jens Osterkamp <Jen...@de...> Signed-off-by: Arnd Bergmann <arn...@de...> Signed-off-by: Stephen Hemminger <she...@os...> commit b636d17a3bee8ba988e78e4bc8262f0dc3fad8ab gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b636d17a3bee8ba988e78e4bc8262f0dc3fad8ab gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b636d17a3bee8ba988e78e4bc8262f0dc3fad8ab Author: Jens Osterkamp <jen...@de...> Date: Thu May 4 05:59:56 2006 -0400 spidernet: introduce new setting We found a new chip setting that we need in order to make the driver work more reliable. Signed-off-by: Arnd Bergmann <arn...@de...> Signed-off-by: Stephen Hemminger <she...@os...> commit aedc0e520e5ae9ba1342c25c4604d18fb236c2bc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=aedc0e520e5ae9ba1342c25c4604d18fb236c2bc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=aedc0e520e5ae9ba1342c25c4604d18fb236c2bc Author: Sergei Shtylyov <ssh...@ru...> Date: Tue May 9 00:58:28 2006 +0400 Fix RTL8019AS init for Toshiba RBTX49xx boards Ensure that 8-bit mode is selected for the on-board Realtek RTL8019AS chip on Toshiba RBHMA4x00, get rid of the duplicate #ifdef's when setting ei_status.word16. The chip's datasheet says that the PSTOP register shouldn't exceed 0x60 in 8-bit mode -- ensure this too. Signed-off-by: Sergei Shtylyov <ssh...@ru...> Signed-off-by: Stephen Hemminger <she...@os...> commit 8cd35da094bed8a41eb722c1d03eab24d57bf706 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8cd35da094bed8a41eb722c1d03eab24d57bf706 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8cd35da094bed8a41eb722c1d03eab24d57bf706 Author: Herbert Valerio Riedel <hv...@gn...> Date: Mon May 1 15:37:09 2006 +0200 au1000_eth.c: use ether_crc() from <linux/crc32.h> since the au1000 driver already selects the CRC32 routines, simply replace the internal ether_crc() implementation with the semantically equivalent one from <linux/crc32.h> Signed-off-by: Herbert Valerio Riedel <hv...@gn...> Signed-off-by: Stephen Hemminger <she...@os...> commit 6d4b0f617d577975108ccc7e3b0c7dbe50144df6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6d4b0f617d577975108ccc7e3b0c7dbe50144df6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6d4b0f617d577975108ccc7e3b0c7dbe50144df6 Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:34 2006 -0700 sky2: version 1.3 Update version number, to track changes. Signed-off-by: Stephen Hemminger <she...@os...> commit ed6d32c7a927bfccf921d15a3e25160f4528c3eb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ed6d32c7a927bfccf921d15a3e25160f4528c3eb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ed6d32c7a927bfccf921d15a3e25160f4528c3eb Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:33 2006 -0700 Add more support for the Yukon Ultra chip found in dual core centino laptops. The newest Yukon Ultra chipset's require more special tweaks. They seem to be like the Yukon XL chipsets. This code is transliterated from the latest SysKonnect driver; I don't have any Ultra hardware. Signed-off-by: Stephe Hemminger <she...@os...> Signed-off-by: Stephen Hemminger <she...@os...> commit 72cb8529208020484cecd69bbf87719b50ee6313 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=72cb8529208020484cecd69bbf87719b50ee6313 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=72cb8529208020484cecd69bbf87719b50ee6313 Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:32 2006 -0700 sky2: synchronize irq on remove Need to make sure interrupt is not racing with unregister of network device. Signed-off-by: Stephen Hemminger <she...@os...> commit e71ebd73276cc21efc74aba4118ef037cd32e50a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e71ebd73276cc21efc74aba4118ef037cd32e50a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e71ebd73276cc21efc74aba4118ef037cd32e50a Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:31 2006 -0700 sky2: dont write status ring It is more efficient not to write the status ring from the processor and just read the active portion. Signed-off-by: Stephen Hemminger <she...@os...> commit 01bd75645f94d49cb7ffd61022890166ce00ec2a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=01bd75645f94d49cb7ffd61022890166ce00ec2a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=01bd75645f94d49cb7ffd61022890166ce00ec2a Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:30 2006 -0700 sky2: edge triggered workaround enhancement Need to make the edge-triggered workaround timer faster to get marginally better peformance. The test_and_set_bit in schedule_prep() acts as a barrier already. Make it a module parameter so that laptops who are concerned about power can set it to 0; and user's stuck with broken BIOS's can turn the driver into pure polling. Signed-off-by: Stephen Hemminger <she...@os...> commit cb5d9547307f44f210f88c829bad4249eeb24bc3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cb5d9547307f44f210f88c829bad4249eeb24bc3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cb5d9547307f44f210f88c829bad4249eeb24bc3 Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:29 2006 -0700 sky2: use mask instead of modulo operation Gcc isn't smart enough to know that it can do a modulo operation with power of 2 constant by doing a mask. So add macro to do it for us. Signed-off-by: Stephen Hemminger <she...@os...> commit f55925d7eb04f936ab4c001f10e3e9c74c1297ae gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f55925d7eb04f936ab4c001f10e3e9c74c1297ae gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f55925d7eb04f936ab4c001f10e3e9c74c1297ae Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:28 2006 -0700 sky2: tx ring index mask fix Mask for transmit ring status was picking up bits from the unused sync ring. They were always zero, so far... Also, make sure to remind self not to make tx ring too big. Signed-off-by: Stephen Hemminger <she...@os...> commit 1e5f1283a2aed429f4457e2eb875b1928a6643df gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1e5f1283a2aed429f4457e2eb875b1928a6643df gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1e5f1283a2aed429f4457e2eb875b1928a6643df Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:27 2006 -0700 sky2: status irq hang fix The status interrupt flag should be cleared before processing, not afterwards to avoid race. Need to process in poll routine even if no new interrupt status. This is a normal occurrence when more than 64 frames (NAPI weight) are processed in one poll routine. Signed-off-by: Stephen Hemminger <she...@os...> commit d324031245abbb54e4e0321004430826052b6c37 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d324031245abbb54e4e0321004430826052b6c37 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d324031245abbb54e4e0321004430826052b6c37 Author: Stephen Hemminger <she...@os...> Date: Mon May 8 15:11:26 2006 -0700 sky2: backout NAPI reschedule This is a backout of earlier patch. The whole rescheduling hack was a bad idea. It doesn't really solve the problem and it makes the code more complicated for no good reason. Signed-off-by: Stephen Hemminger <she...@os...> commit 601e7f024edbea8018de34c83a7398623214e636 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=601e7f024edbea8018de34c83a7398623214e636 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=601e7f024edbea8018de34c83a7398623214e636 Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 13:38:42 2006 -0700 Revert "kbuild: fix modpost segfault for 64bit mipsel kernel" This reverts commit c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed, which caused problems for the x86 build. Quoth Sam: "It was discussed on mips list but apparently the fix was bogus. I will not have time to look into it so mips can carry this local fix until we get a proper fix in mainline." Signed-off-by: Linus Torvalds <tor...@os...> commit 6810b548b25114607e0814612d84125abccc0a4f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6810b548b25114607e0814612d84125abccc0a4f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6810b548b25114607e0814612d84125abccc0a4f Author: Andi Kleen <ak...@su...> Date: Mon May 8 15:17:31 2006 +0200 [PATCH] x86_64: Move ondemand timer into own work queue Taking the cpu hotplug semaphore in a normal events workqueue is unsafe because other tasks can wait for any workqueues with it hold. This results in a deadlock. Move the DBS timer into its own work queue which is not affected by other work queue flushes to avoid this. Has been acked by Venkatesh. Cc: ven...@in... Cc: cp...@li... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit ac71d12c990526b01ef6cfe50907ef8530a30331 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ac71d12c990526b01ef6cfe50907ef8530a30331 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ac71d12c990526b01ef6cfe50907ef8530a30331 Author: Andi Kleen <ak...@su...> Date: Mon May 8 15:17:28 2006 +0200 [PATCH] x86_64: Avoid EBDA area in early boot allocator Based on analysis&patch from Robert Hentosch Observed on a Dell PE6850 with 16GB The problem occurs very early on, when the kernel allocates space for the temporary memory map called bootmap. The bootmap overlaps the EBDA region. EBDA region is not historically reserved in the e820 mapping. When the bootmap is freed it marks the EBDA region as usable. If you notice in setup.c there is already code to work around the EBDA in reserve_ebda_region(), this check however occurs after the bootmap is allocated and doesn't prevent the bootmap from using this range. AK: I redid the original patch. Thanks also to Jan Beulich for spotting some mistakes. Cc: Rob...@de... Cc: jbe...@no... Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit 8b1ffe9550e71224c43d8c754245bd76f4ea9bb8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8b1ffe9550e71224c43d8c754245bd76f4ea9bb8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8b1ffe9550e71224c43d8c754245bd76f4ea9bb8 Author: Corey Minyard <mi...@ac...> Date: Mon May 8 15:17:25 2006 +0200 [PATCH] x86_64: add nmi_exit to die_nmi Playing with NMI watchdog on x86_64, I discovered that it didn't do what I expected. It always panic-ed, even when it didn't happen from interrupt context. This patch solves that problem for me. Also, in this case, do_exit() will be called with interrupts disabled, I believe. Would it be wise to also call local_irq_enable() after nmi_exit()? [Yes I added it -AK] Currently, on x86_64, any NMI watchdog timeout will cause a panic because the irq count will always be set to be in an interrupt when do_exit() is called from die_nmi(). If we add nmi_exit() to the die_nmi() call (since the nmi will never exit "normally") it seems to solve this problem. The following small program can be used to trigger the NMI watchdog to reproduce this: main () { iopl(3); for (;;) asm("cli"); } Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit cdc60a4c8e71c4bcf67e83fac6c0cabd0ff19bfe gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cdc60a4c8e71c4bcf67e83fac6c0cabd0ff19bfe gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cdc60a4c8e71c4bcf67e83fac6c0cabd0ff19bfe Author: Corey Minyard <mi...@ac...> Date: Mon May 8 15:17:22 2006 +0200 [PATCH] x86_64: fix die_lock nesting I noticed this when poking around in this area. The oops_begin() function in x86_64 would only conditionally claim the die_lock if the call is nested, but oops_end() would always release the spinlock. This patch adds a nest count for the die lock so that the release of the lock is only done on the final oops_end(). Signed-off-by: Corey Minyard <mi...@ac...> Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit 5192d84e4c32cd335fd572e5ff0712041f45f7e7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5192d84e4c32cd335fd572e5ff0712041f45f7e7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5192d84e4c32cd335fd572e5ff0712041f45f7e7 Author: Andi Kleen <ak...@su...> Date: Mon May 8 15:17:19 2006 +0200 [PATCH] x86_64: Check for too many northbridges in IOMMU code The IOMMU code can only deal with 8 northbridges. Error out when more are found. Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Linus Torvalds <tor...@os...> commit e0c1e9bf81badc7ba59e120d6218101903d5d103 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e0c1e9bf81badc7ba59e120d6218101903d5d103 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e0c1e9bf81badc7ba59e120d6218101903d5d103 Author: Kimball Murray <kim...@gm...> Date: Mon May 8 15:17:16 2006 +0200 [PATCH] x86_64: avoid IRQ0 ioapic pin collision The patch addresses a problem with ACPI SCI interrupt entry, which gets re-used, and the IRQ is assigned to another unrelated device. The patch corrects the code such that SCI IRQ is skipped and duplicate entry is avoided. Second issue came up with VIA chipset, the problem was caused by original patch assigning IRQs starting 16 and up. The VIA chipset uses 4-bit IRQ register for internal interrupt routing, and therefore cannot handle IRQ numbers assigned to its devices. The patch corrects this problem by allowing PCI IRQs below 16. Cc: len...@in... Signed-off by: Natalie Protasevich <Nat...@un...> Signed-off-by: Andi Kleen <ak...@su...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Linus Torvalds <tor...@os...> commit abfd3057187812352cd8502c29ca50cd010b3ccc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=abfd3057187812352cd8502c29ca50cd010b3ccc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=abfd3057187812352cd8502c29ca50cd010b3ccc Merge: 96b8eaa... 913ed41... Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 09:28:35 2006 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] remove asm-ia64/bitops.h self-inclusion [IA64] strcpy returns NULL pointer and not destination pointer commit 96b8eaa14a20771997b501a049e418b871bf9def gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=96b8eaa14a20771997b501a049e418b871bf9def gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=96b8eaa14a20771997b501a049e418b871bf9def Merge: bed7a56... 0eb1bd2... Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 09:11:10 2006 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IRDA] irda-usb: use NULL instead of 0 [IPV4]: Remove likely in ip_rcv_finish() [NET]: Create netdev attribute_groups with class_device_add [CLASS DEVICE]: add attribute_group creation commit bed7a560333d40269a886c4421d4c8f964a32177 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=bed7a560333d40269a886c4421d4c8f964a32177 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=bed7a560333d40269a886c4421d4c8f964a32177 Merge: 75dff55... fd5f0cd... Author: Linus Torvalds <tor...@g5...> Date: Mon May 8 09:10:44 2006 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: kbuild: Do not overwrite makefile as anohter user kbuild: drivers/video/logo/ - fix ident glitch kbuild: fix gen_initramfs_list.sh kbuild modpost - relax driver data name kbuild: removing .tmp_versions considered harmful kbuild: fix modpost segfault for 64bit mipsel kernel commit 75dff55af9a989293e9f9bacf049858f4262bc08 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=75dff55af9a989293e9f9bacf049858f4262bc08 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=75dff55af9a989293e9f9bacf049858f4262bc08 Author: Trond Myklebust <Tro...@ne...> Date: Sun May 7 23:02:42 2006 -0400 [PATCH] fs/locks.c: Fix lease_init It is insane to be giving lease_init() the task of freeing the lock it is supposed to initialise, given that the lock is not guaranteed to be allocated on the stack. This causes lockups in fcntl_setlease(). Problem diagnosed by Daniel Hokka Zakrisson <da...@ho...> Also fix a slab leak in __setlease() due to an uninitialised return value. Problem diagnosed by Björn Steinbrink. Signed-off-by: Trond Myklebust <Tro...@ne...> Tested-by: Daniel Hokka Zakrisson <da...@ho...> Signed-off-by: Linus Torvalds <tor...@os...> commit e63a3690013a475746ad2cea998ebb534d825704 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e63a3690013a475746ad2cea998ebb534d825704 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e63a3690013a475746ad2cea998ebb534d825704 Author: Nathan Scott <na...@sg...> Date: Mon May 8 19:51:58 2006 +1000 [XFS] Fix a possible metadata buffer (AGFL) refcount leak when fixing an AG freelist. SGI-PV: 952681 SGI-Modid: xfs-linux-melb:xfs-kern:25902a Signed-off-by: Nathan Scott <na...@sg...> commit b1ecdda9313ec5d2f971993f44f6b657acf70cff gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b1ecdda9313ec5d2f971993f44f6b657acf70cff gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b1ecdda9313ec5d2f971993f44f6b657acf70cff Author: Nathan Scott <na...@sg...> Date: Mon May 8 19:51:42 2006 +1000 [XFS] Fix a project quota space accounting leak on rename. SGI-PV: 951636 SGI-Modid: xfs-linux-melb:xfs-kern:25811a Signed-off-by: Nathan Scott <na...@sg...> commit d08d389d5aef0509edba7ee42cd6c6a3998fee22 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d08d389d5aef0509edba7ee42cd6c6a3998fee22 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d08d389d5aef0509edba7ee42cd6c6a3998fee22 Author: Nathan Scott <na...@sg...> Date: Mon May 8 19:51:28 2006 +1000 [XFS] Fix a possible forced shutdown due to mishandling write barriers with remount,ro. SGI-PV: 951944 SGI-Modid: xfs-linux-melb:xfs-kern:25742a Signed-off-by: Nathan Scott <na...@sg...> commit fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 Author: Jan Beulich <jbe...@no...> Date: Tue May 2 12:33:20 2006 +0200 kbuild: Do not overwrite makefile as anohter user Change the conditional of the outputmakefile rule to be evaluated entirely in make, and add a conditional to not touch the generated makefile when e.g. running 'make install' as root while the build was done as non-root. Also adjust the comment describing this, and move the message printing and redirection to mkmakefile. Signed-off-by: Jan Beulich <jbe...@no...> Signed-off-by: Sam Ravnborg <sa...@ra...> commit 0eb1bd210d94e9f2c87551d794bb2755e5e24eed gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0eb1bd210d94e9f2c87551d794bb2755e5e24eed gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0eb1bd210d94e9f2c87551d794bb2755e5e24eed Author: Randy Dunlap <rd...@xe...> Date: Sat May 6 18:34:10 2006 -0700 [IRDA] irda-usb: use NULL instead of 0 Use NULL instead of 0 for a null pointer value (sparse warning): drivers/net/irda/irda-usb.c:1781:30: warning: Using plain integer as NULL pointer Also, correct timeout argument to use milliseconds instead of jiffies. Signed-off-by: Randy Dunlap <rd...@xe...> Signed-off-by: David S. Miller <da...@da...> commit 0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b Author: Hua Zhong <hz...@gm...> Date: Sat May 6 18:11:39 2006 -0700 [IPV4]: Remove likely in ip_rcv_finish() This is another result from my likely profiling tool (dw...@mv... just sent the patch of the profiling tool to linux-kernel mailing list, which is similar to what I use). On my system (not very busy, normal development machine within a VMWare workstation), I see a 6/5 miss/hit ratio for this "likely". Signed-off-by: Hua Zhong <hz...@gm...> Signed-off-by: David S. Miller <da...@da...> commit fe9925b551a95fae6ec61470c79f8b701a2fe928 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fe9925b551a95fae6ec61470c79f8b701a2fe928 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fe9925b551a95fae6ec61470c79f8b701a2fe928 Author: Stephen Hemminger <she...@os...> Date: Sat May 6 17:56:03 2006 -0700 [NET]: Create netdev attribute_groups with class_device_add Atomically create attributes when class device is added. This avoids the race between registering class_device (which generates hotplug event), and the creation of attribute groups. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> Signed-off-by: David S. Miller <da...@da...> commit 1498221d51a43d5fa1a580618591497d90f957d9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1498221d51a43d5fa1a580618591497d90f957d9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1498221d51a43d5fa1a580618591497d90f957d9 Author: Stephen Hemminger <she...@os...> Date: Sat May 6 17:55:11 2006 -0700 [CLASS DEVICE]: add attribute_group creation Extend the support of attribute groups in class_device's to allow groups to be created as part of the registration process. This allows network device's to avoid race between registration and creating groups. Note that unlike attributes that are a property of the class object, the groups are a property of the class_device object. This is done because there are different types of network devices (wireless for example). Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Greg Kroah-Hartman <gr...@su...> Signed-off-by: David S. Miller <da...@da...> commit 178e0cc5ff249965c6cfbd78b1af6a5e614d837c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=178e0cc5ff249965c6cfbd78b1af6a5e614d837c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=178e0cc5ff249965c6cfbd78b1af6a5e614d837c Author: David Woodhouse <dw...@in...> Date: Fri May 5 18:19:37 2006 +0100 [PATCH] bcm43xx: Fix access to non-existent PHY registers Fix the conditions under which we poke at the APHY registers in bcm43xx_phy_initg() to avoid a machine check on chips where they don't exist. Signed-off-by: David Woodhouse <dw...@in...> Signed-off-by: John W. Linville <lin...@tu...> commit 869aaab1812c4212e65fb181e94b824cf49f9509 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=869aaab1812c4212e65fb181e94b824cf49f9509 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=869aaab1812c4212e65fb181e94b824cf49f9509 Author: Michael Buesch <mb...@bu...> Date: Fri May 5 17:23:51 2006 +0200 [PATCH] bcm43xx: Fix array overrun in bcm43xx_geo_init The problem here is that the bcm34xx driver and the ieee80211 stack do not agree on what channels are possible for 802.11a. The ieee80211 stack only wants channels between 34 and 165, while the bcm43xx driver accepts anything from 0 to 200. I made the bcm43xx driver comply with the ieee80211 stack expectations, by using the proper constants. Signed-off-by: Jean Delvare <jde...@su...> [mb]: Reduce stack usage by kzalloc-ing ieee80211_geo Signed-off-by: Michael Buesch <mb...@bu...> Signed-off-by: John W. Linville <lin...@tu...> commit f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f9f7b9602ecb66f55718d6d1afa3e2b1e721b22d Author: Stefano Brivio <ste...@po...> Date: Fri May 5 01:26:29 2006 +0200 [PATCH] bcm43xx: check for valid MAC address in SPROM Check for valid MAC address in SPROM fields instead of relying on PHY type while setting the MAC address in the networking subsystem, as some devices have multiple PHYs. Signed-off-by: Stefano Brivio <ste...@po...> Signed-off-by: John W. Linville <lin...@tu...> commit f21709d70ad6d7ad50288f7056c3a368138b017c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f21709d70ad6d7ad50288f7056c3a368138b017c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f21709d70ad6d7ad50288f7056c3a368138b017c Author: Jean Delvare <jde...@su...> Date: Thu May 4 19:47:19 2006 +0200 [PATCH] ieee80211: Fix A band channel count (resent) The channel count for 802.11a is still not right. We better compute it from the min and max channel numbers, rather than hardcoding it. Signed-off-by: Jean Delvare <jde...@su...> Signed-off-by: John W. Linville <lin...@tu...> commit 5b4b9775a00c20ade1b1ac8aa25e0e4059d6243e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5b4b9775a00c20ade1b1ac8aa25e0e4059d6243e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5b4b9775a00c20ade1b1ac8aa25e0e4059d6243e Author: Michael Buesch <mb...@bu...> Date: Mon May 1 22:43:00 2006 +0200 [PATCH] bcm43xx: fix iwmode crash when down This fixes a crash when iwconfig ethX mode foo is done before ifconfig ethX up or after ifconfig ethX down Signed-off-by: Michael Buesch <mb...@bu...> Signed-off-by: John W. Linville <lin...@tu...> commit d57336e3f2dd7c2d1fbe4a8323029869fb6e1f00 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d57336e3f2dd7c2d1fbe4a8323029869fb6e1f00 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d57336e3f2dd7c2d1fbe4a8323029869fb6e1f00 Author: Daniel Drake <ds...@ge...> Date: Sun Apr 30 22:09:07 2006 +0100 [PATCH] softmac: make non-operational after being stopped zd1211 with softmac and wpa_supplicant revealed an issue with softmac and the use of workqueues. Some of the work functions actually reschedule themselves, so this meant that there could still be pending work after flush_scheduled_work() had been called during ieee80211softmac_stop(). This patch introduces a "running" flag which is used to ensure that rescheduling does not happen in this situation. I also used this flag to ensure that softmac's hooks into ieee80211 are non-operational once the stop operation has been started. This simply makes softmac a little more robust, because I could crash it easily by receiving frames in the short timeframe after shutting down softmac and before turning off the ZD1211 radio. (ZD1211 is now fixed as well!) Signed-off-by: Daniel Drake <ds...@ge...> Acked-by: Johannes Berg <joh...@si...> Signed-off-by: John W. Linville <lin...@tu...> commit 995c99268e0b12eb3c8939211ba5368dd92d98d9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=995c99268e0b12eb3c8939211ba5368dd92d98d9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=995c99268e0b12eb3c8939211ba5368dd92d98d9 Author: Daniel Drake <ds...@ge...> Date: Sun Apr 30 19:49:30 2006 +0100 [PATCH] softmac: don't reassociate if user asked for deauthentication When wpa_supplicant exits, it uses SIOCSIWMLME to request deauthentication. softmac then tries to reassociate without any user intervention, which isn't the desired behaviour of this signal. This change makes softmac only attempt reassociation if the remote network itself deauthenticated us. Signed-off-by: Daniel Drake <ds...@ge...> Acked-by: Johannes Berg <joh...@si...> Signed-off-by: John W. Linville <lin...@tu...> commit 913ed41eb5c948d2f8b5deffd29c2638eceef3d7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=913ed41eb5c948d2f8b5deffd29c2638eceef3d7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=913ed41eb5c948d2f8b5deffd29c2638eceef3d7 Author: Jon Mason <jd...@us...> Date: Wed May 3 17:26:58 2006 -0500 [IA64] remove asm-ia64/bitops.h self-inclusion asm-ia64/bitops.h includes itself. The #ifndef _ASM_IA64_BITOPS_H prevents this from being an issue, but it should still be removed. Signed-off-by: Jon Mason <jd...@us...> Signed-off-by: Tony Luck <ton...@in...> commit 3e6e155646706f1ef9f791a4402d145f112a3f8d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3e6e155646706f1ef9f791a4402d145f112a3f8d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3e6e155646706f1ef9f791a4402d145f112a3f8d Author: Chen, Kenneth W <ken...@in...> Date: Wed May 3 11:53:43 2006 -0700 [IA64] strcpy returns NULL pointer and not destination pointer Bob Picco noted that 6edfba1b33c701108717f4e036320fc39abe1912 dropped the -ffreestanding compiler flag from the top level Makefile, which allows the compiler to substitute memcpy() in places where strcpy() is used with a known size source string. But the ia64 memcpy() returns 0 for success, and "bytes copied" for failure. Fix to return the address of the destination string (like stdlibc version, and other architectures). There are no places where ia64 specific code makes use of the non-standard return value. Signed-off-by: Ken Chen <ken...@in...> Signed-off-by: Tony Luck <ton...@in...> commit cc873e1aa1fa916a485294117a9846e668505671 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cc873e1aa1fa916a485294117a9846e668505671 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cc873e1aa1fa916a485294117a9846e668505671 Author: Sam Ravnborg <sa...@ma...> Date: Sun Apr 30 23:59:16 2006 +0200 kbuild: drivers/video/logo/ - fix ident glitch Jan Engelhardt <je...@li...> wrote: while compiling 2.6.17-rc2 with allyesconfig, this showed up: ... LOGO drivers/video/logo/logo_superh_clut224.c CC drivers/video/logo/logo_linux_mono.o ... A tab had sneaked in. Convert it to a few spaces. Signed-off-by: Sam Ravnborg <sa...@ra...> commit 46ed981d5d203703a01137cc58c841d34e90c147 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=46ed981d5d203703a01137cc58c841d34e90c147 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=46ed981d5d203703a01137cc58c841d34e90c147 Author: Sam Ravnborg <sa...@ma...> Date: Sun Apr 30 23:56:33 2006 +0200 kbuild: fix gen_initramfs_list.sh Create correct dependencies when specifying your own file with list of files etc. to include in initramfs. Reported by: Andre Noll <ma...@sk...> Signed-off-by: Sam Ravnborg <sa...@ra...> commit 72ee59b5797e5d6fe32b5cf3473660a50a02db40 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=72ee59b5797e5d6fe32b5cf3473660a50a02db40 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=72ee59b5797e5d6fe32b5cf3473660a50a02db40 Author: Randy Dunlap <rd...@xe...> Date: Sat Apr 15 11:17:12 2006 -0700 kbuild modpost - relax driver data name Relax driver data name from *_driver to *driver. This fixes the 26 section mismatch warnings in drivers/ide/pci. Signed-off-by: Randy Dunlap <rd...@xe...> Signed-off-by: Sam Ravnborg <sa...@ra...> commit fca1dff218163ffd34d1e9e0b9b244e8c8803601 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fca1dff218163ffd34d1e9e0b9b244e8c8803601 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fca1dff218163ffd34d1e9e0b9b244e8c8803601 Author: Pavel Roskin <pr...@gn...> Date: Mon Apr 24 15:55:27 2006 -0400 kbuild: removing .tmp_versions considered harmful Remove *.mod files but not .tmp_versions for external builds When "make install" is run as root, .tmp_versions is re-created and becomes owned by root. Subsequent "make" run by user fails because .tmp_versions cannot be removed. Signed-off-by: Pavel Roskin <pr...@gn...> Signed-off-by: Sam Ravnborg <sa...@ra...> commit c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed Author: Atsushi Nemoto <an...@mb...> Date: Tue Apr 25 01:53:43 2006 +0900 kbuild: fix modpost segfault for 64bit mipsel kernel 64bit mips has different r_info layout. This patch fixes modpost segfault for 64bit little endian mips kernel. Signed-off-by: Atsushi Nemoto <an...@mb...> Signed-off-by: Sam Ravnborg <sa...@ra...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-05-08 06:30:29
|
arch/arm/mach-aaec2000/aaed2000.c | 7 ++++- arch/arm/mach-aaec2000/core.c | 5 +-- arch/arm/mach-aaec2000/core.h | 1 arch/arm/mach-imx/mx1ads.c | 2 - arch/arm/mach-sa1100/irq.c | 16 +++++++++++ drivers/rtc/rtc-sa1100.c | 6 ++-- include/asm-arm/arch-aaec2000/debug-macro.S | 1 include/asm-arm/arch-aaec2000/entry-macro.S | 1 include/asm-arm/arch-imx/debug-macro.S | 2 - kernel/ptrace.c | 39 +++++++++++++++------------- 10 files changed, 53 insertions(+), 27 deletions(-) New commits: commit b715f60e1b0a68ae2721a060e23e6d7a5440046a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b715f60e1b0a68ae2721a060e23e6d7a5440046a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b715f60e1b0a68ae2721a060e23e6d7a5440046a Merge: 31f3f98... b913f05... Author: Jan-Benedict Glaw <jb...@d2...> Date: Mon May 8 08:29:12 2006 +0200 Merge branch 'vax4linus' commit b913f05212dd0c5a779f5a904da335a0521e548a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b913f05212dd0c5a779f5a904da335a0521e548a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b913f05212dd0c5a779f5a904da335a0521e548a Merge: 6e58f44... 9d21f09... Author: Jan-Benedict Glaw <jb...@d2...> Date: Mon May 8 08:28:59 2006 +0200 Merge branch 'master' commit 9d21f09ca03d1142f1988001f228d02581d8986c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9d21f09ca03d1142f1988001f228d02581d8986c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9d21f09ca03d1142f1988001f228d02581d8986c Merge: f5b40e3... 74fae12... Author: Linus Torvalds <tor...@g5...> Date: Sun May 7 17:32:57 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000 [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h [ARM] 3504/1: Fix clcd includes for aaec2000 [ARM] 3503/1: Fix map_desc structure for aaec2000 [ARM] 3501/1: i.MX: fix lowlevel debug macros [ARM] rtc-sa1100: fix compiler warnings and error cleanup [ARM] Allow SA1100 RTC alarm to be configured for wakeup commit 74fae122eb9f0db8b8718b9851c31c2f374fb134 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=74fae122eb9f0db8b8718b9851c31c2f374fb134 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=74fae122eb9f0db8b8718b9851c31c2f374fb134 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:24 2006 +0100 [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000 Patch from Bellido Nicolas aaed2000 map_desc.pfn conversion Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 9a708becafe99fa32211e8c53dbacefdb4b11718 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9a708becafe99fa32211e8c53dbacefdb4b11718 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9a708becafe99fa32211e8c53dbacefdb4b11718 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:23 2006 +0100 [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h Patch from Bellido Nicolas Include hardware.h in debug-macro.S, otherwise io_p2v is undefined. Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 201be92a4243e58bcc6c0878489bcc2aaaf51c80 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=201be92a4243e58bcc6c0878489bcc2aaaf51c80 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=201be92a4243e58bcc6c0878489bcc2aaaf51c80 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:22 2006 +0100 [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h Patch from Bellido Nicolas Since git commit 2b78838842346da390e8547cd37035184376d506, entry-macro.S needs to include asm/arch/irqs.h Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 8a33b224ecb576e27695ff8922c8e579dbf7070e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8a33b224ecb576e27695ff8922c8e579dbf7070e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8a33b224ecb576e27695ff8922c8e579dbf7070e Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:21 2006 +0100 [ARM] 3504/1: Fix clcd includes for aaec2000 Patch from Bellido Nicolas Since this patch: [ARM] 3366/1: Allow the 16bpp mode configuration in the CLCD control register linux/amba/bus.h needs to be included before linux/amba/clcd.h Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 16b6dd4419cdef637a907cfc26594e4ebe688975 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=16b6dd4419cdef637a907cfc26594e4ebe688975 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=16b6dd4419cdef637a907cfc26594e4ebe688975 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:21 2006 +0100 [ARM] 3503/1: Fix map_desc structure for aaec2000 Patch from Bellido Nicolas Patch: [ARM] 2982/1: Replace map_desc.physical with map_desc.pfn: aaec2000 incorrectly expanded the struct map_desc for aaec2000. Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 216251cff98838f2b79c53fc8a9e76884944be7d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=216251cff98838f2b79c53fc8a9e76884944be7d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=216251cff98838f2b79c53fc8a9e76884944be7d Author: Sascha Hauer <sa...@sa...> Date: Sun May 7 18:56:27 2006 +0100 [ARM] 3501/1: i.MX: fix lowlevel debug macros Patch from Sascha Hauer This patch fixes the addruart macro to work with both mmu enabled and disabled. Signed-off-by: Sascha Hauer <s....@pe...> Signed-off-by: Russell King <rmk...@ar...> commit f5b40e363ad6041a96e3da32281d8faa191597b9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f5b40e363ad6041a96e3da32281d8faa191597b9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f5b40e363ad6041a96e3da32281d8faa191597b9 Author: Linus Torvalds <tor...@g5...> Date: Sun May 7 10:49:33 2006 -0700 Fix ptrace_attach()/ptrace_traceme()/de_thread() race This holds the task lock (and, for ptrace_attach, the tasklist_lock) over the actual attach event, which closes a race between attacking to a thread that is either doing a PTRACE_TRACEME or getting de-threaded. Thanks to Oleg Nesterov for reminding me about this, and Chris Wright for noticing a lost return value in my first version. Signed-off-by: Linus Torvalds <tor...@os...> commit f12267011d16b1722e71aa12cd3e89eb70a9edd6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f12267011d16b1722e71aa12cd3e89eb70a9edd6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f12267011d16b1722e71aa12cd3e89eb70a9edd6 Author: Russell King <rm...@dy...> Date: Sat May 6 11:29:21 2006 +0100 [ARM] rtc-sa1100: fix compiler warnings and error cleanup Fix: drivers/rtc/rtc-sa1100.c: In function `sa1100_rtc_proc': drivers/rtc/rtc-sa1100.c:298: warning: unsigned int format, long unsigned int arg (arg 3) and arrange for sa1100_rtc_open() to pass the devid to free_irq() rather than NULL. Signed-off-by: Russell King <rmk...@ar...> commit 19ca5d27e15c10d8529984ecd98dcba2637edcd2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=19ca5d27e15c10d8529984ecd98dcba2637edcd2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=19ca5d27e15c10d8529984ecd98dcba2637edcd2 Author: Russell King <rm...@dy...> Date: Sat May 6 11:26:30 2006 +0100 [ARM] Allow SA1100 RTC alarm to be configured for wakeup The SA1100 RTC alarm can be configured to wake up the CPU from sleep mode, and the RTC driver has been using the API to configure this mode. Unfortunately, the code was which sets the required bit in the hardware was missing. Signed-off-by: Russell King <rmk...@ar...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-05-08 06:30:29
|
arch/arm/mach-aaec2000/aaed2000.c | 7 ++++- arch/arm/mach-aaec2000/core.c | 5 +-- arch/arm/mach-aaec2000/core.h | 1 arch/arm/mach-imx/mx1ads.c | 2 - arch/arm/mach-sa1100/irq.c | 16 +++++++++++ drivers/rtc/rtc-sa1100.c | 6 ++-- include/asm-arm/arch-aaec2000/debug-macro.S | 1 include/asm-arm/arch-aaec2000/entry-macro.S | 1 include/asm-arm/arch-imx/debug-macro.S | 2 - kernel/ptrace.c | 39 +++++++++++++++------------- 10 files changed, 53 insertions(+), 27 deletions(-) New commits: commit a1dddbec7227f78771a10f800c0460e1acd5b827 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a1dddbec7227f78771a10f800c0460e1acd5b827 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a1dddbec7227f78771a10f800c0460e1acd5b827 Merge: 030f476... b913f05... Author: Jan-Benedict Glaw <jb...@d2...> Date: Mon May 8 08:29:40 2006 +0200 Merge branch 'vax4linus' commit b913f05212dd0c5a779f5a904da335a0521e548a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b913f05212dd0c5a779f5a904da335a0521e548a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b913f05212dd0c5a779f5a904da335a0521e548a Merge: 6e58f44... 9d21f09... Author: Jan-Benedict Glaw <jb...@d2...> Date: Mon May 8 08:28:59 2006 +0200 Merge branch 'master' commit 9d21f09ca03d1142f1988001f228d02581d8986c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9d21f09ca03d1142f1988001f228d02581d8986c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9d21f09ca03d1142f1988001f228d02581d8986c Merge: f5b40e3... 74fae12... Author: Linus Torvalds <tor...@g5...> Date: Sun May 7 17:32:57 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000 [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h [ARM] 3504/1: Fix clcd includes for aaec2000 [ARM] 3503/1: Fix map_desc structure for aaec2000 [ARM] 3501/1: i.MX: fix lowlevel debug macros [ARM] rtc-sa1100: fix compiler warnings and error cleanup [ARM] Allow SA1100 RTC alarm to be configured for wakeup commit 74fae122eb9f0db8b8718b9851c31c2f374fb134 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=74fae122eb9f0db8b8718b9851c31c2f374fb134 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=74fae122eb9f0db8b8718b9851c31c2f374fb134 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:24 2006 +0100 [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000 Patch from Bellido Nicolas aaed2000 map_desc.pfn conversion Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 9a708becafe99fa32211e8c53dbacefdb4b11718 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9a708becafe99fa32211e8c53dbacefdb4b11718 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9a708becafe99fa32211e8c53dbacefdb4b11718 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:23 2006 +0100 [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h Patch from Bellido Nicolas Include hardware.h in debug-macro.S, otherwise io_p2v is undefined. Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 201be92a4243e58bcc6c0878489bcc2aaaf51c80 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=201be92a4243e58bcc6c0878489bcc2aaaf51c80 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=201be92a4243e58bcc6c0878489bcc2aaaf51c80 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:22 2006 +0100 [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h Patch from Bellido Nicolas Since git commit 2b78838842346da390e8547cd37035184376d506, entry-macro.S needs to include asm/arch/irqs.h Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 8a33b224ecb576e27695ff8922c8e579dbf7070e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8a33b224ecb576e27695ff8922c8e579dbf7070e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8a33b224ecb576e27695ff8922c8e579dbf7070e Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:21 2006 +0100 [ARM] 3504/1: Fix clcd includes for aaec2000 Patch from Bellido Nicolas Since this patch: [ARM] 3366/1: Allow the 16bpp mode configuration in the CLCD control register linux/amba/bus.h needs to be included before linux/amba/clcd.h Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 16b6dd4419cdef637a907cfc26594e4ebe688975 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=16b6dd4419cdef637a907cfc26594e4ebe688975 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=16b6dd4419cdef637a907cfc26594e4ebe688975 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:21 2006 +0100 [ARM] 3503/1: Fix map_desc structure for aaec2000 Patch from Bellido Nicolas Patch: [ARM] 2982/1: Replace map_desc.physical with map_desc.pfn: aaec2000 incorrectly expanded the struct map_desc for aaec2000. Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 216251cff98838f2b79c53fc8a9e76884944be7d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=216251cff98838f2b79c53fc8a9e76884944be7d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=216251cff98838f2b79c53fc8a9e76884944be7d Author: Sascha Hauer <sa...@sa...> Date: Sun May 7 18:56:27 2006 +0100 [ARM] 3501/1: i.MX: fix lowlevel debug macros Patch from Sascha Hauer This patch fixes the addruart macro to work with both mmu enabled and disabled. Signed-off-by: Sascha Hauer <s....@pe...> Signed-off-by: Russell King <rmk...@ar...> commit f5b40e363ad6041a96e3da32281d8faa191597b9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f5b40e363ad6041a96e3da32281d8faa191597b9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f5b40e363ad6041a96e3da32281d8faa191597b9 Author: Linus Torvalds <tor...@g5...> Date: Sun May 7 10:49:33 2006 -0700 Fix ptrace_attach()/ptrace_traceme()/de_thread() race This holds the task lock (and, for ptrace_attach, the tasklist_lock) over the actual attach event, which closes a race between attacking to a thread that is either doing a PTRACE_TRACEME or getting de-threaded. Thanks to Oleg Nesterov for reminding me about this, and Chris Wright for noticing a lost return value in my first version. Signed-off-by: Linus Torvalds <tor...@os...> commit f12267011d16b1722e71aa12cd3e89eb70a9edd6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f12267011d16b1722e71aa12cd3e89eb70a9edd6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f12267011d16b1722e71aa12cd3e89eb70a9edd6 Author: Russell King <rm...@dy...> Date: Sat May 6 11:29:21 2006 +0100 [ARM] rtc-sa1100: fix compiler warnings and error cleanup Fix: drivers/rtc/rtc-sa1100.c: In function `sa1100_rtc_proc': drivers/rtc/rtc-sa1100.c:298: warning: unsigned int format, long unsigned int arg (arg 3) and arrange for sa1100_rtc_open() to pass the devid to free_irq() rather than NULL. Signed-off-by: Russell King <rmk...@ar...> commit 19ca5d27e15c10d8529984ecd98dcba2637edcd2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=19ca5d27e15c10d8529984ecd98dcba2637edcd2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=19ca5d27e15c10d8529984ecd98dcba2637edcd2 Author: Russell King <rm...@dy...> Date: Sat May 6 11:26:30 2006 +0100 [ARM] Allow SA1100 RTC alarm to be configured for wakeup The SA1100 RTC alarm can be configured to wake up the CPU from sleep mode, and the RTC driver has been using the API to configure this mode. Unfortunately, the code was which sets the required bit in the hardware was missing. Signed-off-by: Russell King <rmk...@ar...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-05-08 06:30:29
|
arch/arm/mach-aaec2000/aaed2000.c | 7 ++++- arch/arm/mach-aaec2000/core.c | 5 +-- arch/arm/mach-aaec2000/core.h | 1 arch/arm/mach-imx/mx1ads.c | 2 - arch/arm/mach-sa1100/irq.c | 16 +++++++++++ drivers/rtc/rtc-sa1100.c | 6 ++-- include/asm-arm/arch-aaec2000/debug-macro.S | 1 include/asm-arm/arch-aaec2000/entry-macro.S | 1 include/asm-arm/arch-imx/debug-macro.S | 2 - kernel/ptrace.c | 39 +++++++++++++++------------- 10 files changed, 53 insertions(+), 27 deletions(-) New commits: commit b913f05212dd0c5a779f5a904da335a0521e548a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b913f05212dd0c5a779f5a904da335a0521e548a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b913f05212dd0c5a779f5a904da335a0521e548a Merge: 6e58f44... 9d21f09... Author: Jan-Benedict Glaw <jb...@d2...> Date: Mon May 8 08:28:59 2006 +0200 Merge branch 'master' commit 9d21f09ca03d1142f1988001f228d02581d8986c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9d21f09ca03d1142f1988001f228d02581d8986c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9d21f09ca03d1142f1988001f228d02581d8986c Merge: f5b40e3... 74fae12... Author: Linus Torvalds <tor...@g5...> Date: Sun May 7 17:32:57 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000 [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h [ARM] 3504/1: Fix clcd includes for aaec2000 [ARM] 3503/1: Fix map_desc structure for aaec2000 [ARM] 3501/1: i.MX: fix lowlevel debug macros [ARM] rtc-sa1100: fix compiler warnings and error cleanup [ARM] Allow SA1100 RTC alarm to be configured for wakeup commit 74fae122eb9f0db8b8718b9851c31c2f374fb134 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=74fae122eb9f0db8b8718b9851c31c2f374fb134 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=74fae122eb9f0db8b8718b9851c31c2f374fb134 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:24 2006 +0100 [ARM] 3507/1: Replace map_desc.physical with map_desc.pfn: aaed2000 Patch from Bellido Nicolas aaed2000 map_desc.pfn conversion Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 9a708becafe99fa32211e8c53dbacefdb4b11718 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9a708becafe99fa32211e8c53dbacefdb4b11718 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9a708becafe99fa32211e8c53dbacefdb4b11718 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:23 2006 +0100 [ARM] 3506/1: aaec2000: debug-macro.S needs hardware.h Patch from Bellido Nicolas Include hardware.h in debug-macro.S, otherwise io_p2v is undefined. Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 201be92a4243e58bcc6c0878489bcc2aaaf51c80 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=201be92a4243e58bcc6c0878489bcc2aaaf51c80 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=201be92a4243e58bcc6c0878489bcc2aaaf51c80 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:22 2006 +0100 [ARM] 3505/1: aaec2000: entry-macro.S needs asm/arch/irqs.h Patch from Bellido Nicolas Since git commit 2b78838842346da390e8547cd37035184376d506, entry-macro.S needs to include asm/arch/irqs.h Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 8a33b224ecb576e27695ff8922c8e579dbf7070e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8a33b224ecb576e27695ff8922c8e579dbf7070e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8a33b224ecb576e27695ff8922c8e579dbf7070e Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:21 2006 +0100 [ARM] 3504/1: Fix clcd includes for aaec2000 Patch from Bellido Nicolas Since this patch: [ARM] 3366/1: Allow the 16bpp mode configuration in the CLCD control register linux/amba/bus.h needs to be included before linux/amba/clcd.h Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 16b6dd4419cdef637a907cfc26594e4ebe688975 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=16b6dd4419cdef637a907cfc26594e4ebe688975 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=16b6dd4419cdef637a907cfc26594e4ebe688975 Author: Bellido Nicolas <ml...@ac...> Date: Sun May 7 22:49:21 2006 +0100 [ARM] 3503/1: Fix map_desc structure for aaec2000 Patch from Bellido Nicolas Patch: [ARM] 2982/1: Replace map_desc.physical with map_desc.pfn: aaec2000 incorrectly expanded the struct map_desc for aaec2000. Signed-off-by: Nicolas Bellido <ml...@ac...> Signed-off-by: Russell King <rmk...@ar...> commit 216251cff98838f2b79c53fc8a9e76884944be7d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=216251cff98838f2b79c53fc8a9e76884944be7d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=216251cff98838f2b79c53fc8a9e76884944be7d Author: Sascha Hauer <sa...@sa...> Date: Sun May 7 18:56:27 2006 +0100 [ARM] 3501/1: i.MX: fix lowlevel debug macros Patch from Sascha Hauer This patch fixes the addruart macro to work with both mmu enabled and disabled. Signed-off-by: Sascha Hauer <s....@pe...> Signed-off-by: Russell King <rmk...@ar...> commit f5b40e363ad6041a96e3da32281d8faa191597b9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f5b40e363ad6041a96e3da32281d8faa191597b9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f5b40e363ad6041a96e3da32281d8faa191597b9 Author: Linus Torvalds <tor...@g5...> Date: Sun May 7 10:49:33 2006 -0700 Fix ptrace_attach()/ptrace_traceme()/de_thread() race This holds the task lock (and, for ptrace_attach, the tasklist_lock) over the actual attach event, which closes a race between attacking to a thread that is either doing a PTRACE_TRACEME or getting de-threaded. Thanks to Oleg Nesterov for reminding me about this, and Chris Wright for noticing a lost return value in my first version. Signed-off-by: Linus Torvalds <tor...@os...> commit f12267011d16b1722e71aa12cd3e89eb70a9edd6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f12267011d16b1722e71aa12cd3e89eb70a9edd6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f12267011d16b1722e71aa12cd3e89eb70a9edd6 Author: Russell King <rm...@dy...> Date: Sat May 6 11:29:21 2006 +0100 [ARM] rtc-sa1100: fix compiler warnings and error cleanup Fix: drivers/rtc/rtc-sa1100.c: In function `sa1100_rtc_proc': drivers/rtc/rtc-sa1100.c:298: warning: unsigned int format, long unsigned int arg (arg 3) and arrange for sa1100_rtc_open() to pass the devid to free_irq() rather than NULL. Signed-off-by: Russell King <rmk...@ar...> commit 19ca5d27e15c10d8529984ecd98dcba2637edcd2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=19ca5d27e15c10d8529984ecd98dcba2637edcd2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=19ca5d27e15c10d8529984ecd98dcba2637edcd2 Author: Russell King <rm...@dy...> Date: Sat May 6 11:26:30 2006 +0100 [ARM] Allow SA1100 RTC alarm to be configured for wakeup The SA1100 RTC alarm can be configured to wake up the CPU from sleep mode, and the RTC driver has been using the API to configure this mode. Unfortunately, the code was which sets the required bit in the hardware was missing. Signed-off-by: Russell King <rmk...@ar...> |
|
From: Jan-Benedict G. <jb...@he...> - 2006-05-06 23:00:31
|
CREDITS | 10 Documentation/sound/alsa/Audiophile-Usb.txt | 81 +- Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 4 arch/arm/Kconfig | 2 arch/arm/boot/compressed/misc.c | 4 arch/arm/kernel/asm-offsets.c | 6 arch/arm/kernel/head-nommu.S | 4 arch/arm/kernel/head.S | 8 arch/arm/mach-imx/generic.c | 52 - arch/arm/mach-imx/mx1ads.c | 74 + arch/arm/mach-ixp4xx/Kconfig | 15 arch/arm/mach-ixp4xx/Makefile | 3 arch/arm/mach-pxa/dma.c | 17 arch/arm/vfp/vfpmodule.c | 2 arch/i386/kernel/acpi/boot.c | 5 arch/i386/kernel/apic.c | 4 arch/i386/kernel/ptrace.c | 7 arch/i386/kernel/setup.c | 4 arch/i386/kernel/timers/timer_tsc.c | 4 arch/i386/kernel/vm86.c | 2 arch/ia64/kernel/ptrace.c | 4 arch/mips/kernel/ptrace.c | 4 arch/powerpc/kernel/kprobes.c | 14 arch/powerpc/kernel/prom.c | 70 + arch/powerpc/kernel/ptrace.c | 5 arch/powerpc/kernel/sysfs.c | 18 arch/powerpc/mm/numa.c | 32 arch/powerpc/platforms/cell/Kconfig | 3 arch/powerpc/platforms/cell/setup.c | 78 -- arch/powerpc/platforms/cell/spu_base.c | 91 +- arch/powerpc/platforms/pseries/eeh_event.c | 8 arch/ppc/platforms/mpc866ads_setup.c | 2 arch/s390/kernel/ptrace.c | 5 arch/s390/kernel/signal.c | 5 arch/sparc/kernel/systbls.S | 2 arch/sparc64/kernel/ptrace.c | 5 arch/sparc64/kernel/sys32.S | 1 arch/sparc64/kernel/systbls.S | 4 arch/sparc64/mm/tlb.c | 5 arch/um/Kconfig | 14 arch/um/Kconfig.i386 | 19 arch/um/Makefile | 19 arch/um/defconfig | 240 ++++-- arch/um/drivers/cow_user.c | 2 arch/um/kernel/irq.c | 93 +- arch/um/kernel/physmem.c | 2 arch/um/kernel/ptrace.c | 6 arch/um/kernel/skas/Makefile | 10 arch/um/kernel/time_kern.c | 2 arch/um/os-Linux/file.c | 2 arch/um/os-Linux/irq.c | 47 - arch/um/os-Linux/main.c | 30 arch/um/os-Linux/process.c | 17 arch/um/os-Linux/skas/process.c | 6 arch/um/os-Linux/sys-i386/registers.c | 4 arch/um/os-Linux/sys-x86_64/registers.c | 4 arch/um/os-Linux/umid.c | 4 arch/um/os-Linux/user_syms.c | 7 arch/um/scripts/Makefile.rules | 12 arch/um/sys-i386/Makefile | 13 arch/um/sys-x86_64/Makefile | 13 arch/x86_64/ia32/ia32entry.S | 1 arch/x86_64/kernel/ptrace.c | 6 arch/x86_64/kernel/setup.c | 19 block/genhd.c | 2 drivers/char/genrtc.c | 8 drivers/char/keyboard.c | 38 - drivers/edac/e752x_edac.c | 17 drivers/infiniband/hw/ipath/ipath_debug.h | 15 drivers/infiniband/hw/ipath/ipath_diag.c | 3 drivers/infiniband/hw/ipath/ipath_driver.c | 18 drivers/infiniband/hw/ipath/ipath_init_chip.c | 36 drivers/infiniband/hw/ipath/ipath_intr.c | 21 drivers/infiniband/hw/ipath/ipath_kernel.h | 10 drivers/infiniband/hw/ipath/ipath_layer.c | 6 drivers/infiniband/hw/ipath/ipath_pe800.c | 4 drivers/infiniband/hw/ipath/ipath_registers.h | 31 drivers/infiniband/hw/ipath/ipath_ruc.c | 15 drivers/infiniband/hw/ipath/ipath_sysfs.c | 14 drivers/infiniband/hw/ipath/ipath_ud.c | 6 drivers/infiniband/hw/ipath/ipath_verbs.c | 39 - drivers/infiniband/hw/ipath/ipath_verbs.h | 3 drivers/infiniband/hw/ipath/ips_common.h | 2 drivers/infiniband/hw/mthca/mthca_provider.c | 2 drivers/input/evdev.c | 21 drivers/input/input.c | 11 drivers/input/keyboard/spitzkbd.c | 4 drivers/input/misc/wistron_btns.c | 30 drivers/input/mouse/psmouse-base.c | 4 drivers/input/touchscreen/ads7846.c | 414 ++++++++--- drivers/input/touchscreen/corgi_ts.c | 2 drivers/md/raid1.c | 29 drivers/md/raid10.c | 46 - drivers/media/video/cx88/cx88-alsa.c | 2 drivers/mmc/at91_mci.c | 3 drivers/mmc/au1xmmc.c | 4 drivers/mmc/imxmmc.c | 60 + drivers/mmc/mmc.c | 62 + drivers/mmc/mmc_block.c | 6 drivers/mmc/mmci.c | 3 drivers/mmc/pxamci.c | 13 drivers/mmc/sdhci.c | 4 drivers/mmc/wbsd.c | 4 drivers/net/forcedeth.c | 312 ++++++-- drivers/net/hamradio/dmascc.c | 1 drivers/net/hamradio/scc.c | 1 drivers/net/hamradio/yam.c | 1 drivers/net/mv643xx_eth.c | 2 drivers/net/tg3.c | 82 +- drivers/net/tg3.h | 1 drivers/net/via-rhine.c | 6 drivers/rtc/rtc-dev.c | 17 drivers/s390/net/qeth_main.c | 1 drivers/s390/s390mach.c | 3 drivers/serial/cpm_uart/cpm_uart.h | 19 drivers/serial/cpm_uart/cpm_uart_core.c | 37 drivers/serial/cpm_uart/cpm_uart_cpm1.c | 2 drivers/serial/cpm_uart/cpm_uart_cpm2.c | 2 drivers/serial/imx.c | 40 - drivers/sn/ioc3.c | 2 drivers/sn/ioc4.c | 2 fs/block_dev.c | 2 fs/compat.c | 20 fs/ext3/inode.c | 13 fs/pipe.c | 190 +++-- fs/splice.c | 207 ++--- include/asm-arm/arch-imx/imx-uart.h | 10 include/asm-arm/arch-ixp4xx/io.h | 7 include/asm-arm/arch-ixp4xx/memory.h | 2 include/asm-arm/arch-pxa/dma.h | 26 include/asm-arm/bug.h | 1 include/asm-arm/unistd.h | 23 include/asm-powerpc/spu.h | 1 include/asm-powerpc/topology.h | 24 include/asm-powerpc/uaccess.h | 19 include/asm-ppc/commproc.h | 1 include/asm-ppc/cpm2.h | 2 include/asm-sparc/unistd.h | 2 include/asm-sparc64/tlbflush.h | 2 include/asm-sparc64/unistd.h | 2 include/linux/audit.h | 22 include/linux/fs_uart_pd.h | 60 + include/linux/input.h | 109 +- include/linux/list.h | 2 include/linux/mmc/card.h | 1 include/linux/mod_devicetable.h | 48 + include/linux/netfilter/x_tables.h | 8 include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h | 2 include/linux/netlink.h | 1 include/linux/pipe_fs_i.h | 30 include/linux/security.h | 16 include/linux/selinux.h | 177 ++++ include/linux/spi/ads7846.h | 7 include/net/ax25.h | 10 include/net/inet_timewait_sock.h | 2 include/net/netrom.h | 8 include/net/rose.h | 14 include/net/sctp/structs.h | 1 include/net/sock.h | 2 include/sound/pcm.h | 6 include/sound/pcm_oss.h | 2 init/main.c | 2 ipc/msg.c | 11 ipc/sem.c | 11 ipc/shm.c | 19 ipc/util.c | 7 kernel/audit.c | 160 +++- kernel/audit.h | 10 kernel/auditfilter.c | 289 ++++++- kernel/auditsc.c | 269 +++---- kernel/exit.c | 3 kernel/fork.c | 2 mm/memory_hotplug.c | 6 mm/migrate.c | 11 mm/sparse.c | 9 net/ax25/af_ax25.c | 93 +- net/ax25/ax25_addr.c | 9 net/ax25/ax25_ds_timer.c | 3 net/ax25/ax25_iface.c | 13 net/ax25/ax25_ip.c | 3 net/ax25/ax25_out.c | 3 net/ax25/ax25_route.c | 2 net/ax25/ax25_timer.c | 3 net/ax25/ax25_uid.c | 4 net/ax25/sysctl_net_ax25.c | 10 net/bridge/br_input.c | 1 net/dccp/proto.c | 13 net/decnet/dn_neigh.c | 5 net/ipv4/af_inet.c | 2 net/ipv4/netfilter/ip_conntrack_helper_h323.c | 2 net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c | 10 net/ipv4/netfilter/ip_conntrack_proto_sctp.c | 11 net/ipv4/netfilter/ip_nat_standalone.c | 2 net/ipv4/netfilter/ip_tables.c | 39 - net/ipv4/tcp.c | 13 net/ipv4/tcp_highspeed.c | 2 net/ipv4/tcp_output.c | 2 net/ipv4/xfrm4_output.c | 2 net/ipv6/route.c | 5 net/netfilter/nf_conntrack_proto_sctp.c | 11 net/netfilter/x_tables.c | 4 net/netlink/af_netlink.c | 3 net/netrom/af_netrom.c | 18 net/netrom/nr_dev.c | 1 net/rose/af_rose.c | 13 net/rose/rose_dev.c | 1 net/rose/rose_link.c | 6 net/rose/rose_route.c | 7 net/sched/sch_netem.c | 2 net/sctp/inqueue.c | 1 net/sctp/sm_statefuns.c | 59 + net/sctp/sm_statetable.c | 10 net/sctp/ulpqueue.c | 27 net/socket.c | 2 net/x25/x25_timer.c | 4 net/xfrm/xfrm_policy.c | 16 net/xfrm/xfrm_state.c | 8 scripts/mod/file2alias.c | 36 security/dummy.c | 6 security/selinux/Makefile | 2 security/selinux/avc.c | 13 security/selinux/exports.c | 74 + security/selinux/hooks.c | 11 security/selinux/include/security.h | 5 security/selinux/ss/mls.c | 30 security/selinux/ss/mls.h | 4 security/selinux/ss/services.c | 235 ++++++ sound/core/Kconfig | 12 sound/core/oss/pcm_oss.c | 8 sound/core/pcm.c | 12 sound/core/pcm_lib.c | 6 sound/core/pcm_memory.c | 8 sound/drivers/dummy.c | 14 sound/drivers/mpu401/mpu401.c | 14 sound/drivers/serial-u16550.c | 14 sound/drivers/virmidi.c | 14 sound/isa/opti9xx/miro.c | 3 sound/pci/ad1889.c | 3 sound/pci/ali5451/ali5451.c | 2 sound/pci/als300.c | 2 sound/pci/als4000.c | 2 sound/pci/atiixp.c | 2 sound/pci/atiixp_modem.c | 2 sound/pci/au88x0/au8810.c | 2 sound/pci/au88x0/au8820.c | 2 sound/pci/au88x0/au8830.c | 2 sound/pci/azt3328.c | 2 sound/pci/bt87x.c | 4 sound/pci/ca0106/ca0106_main.c | 2 sound/pci/cmipci.c | 2 sound/pci/cs4281.c | 2 sound/pci/cs46xx/cs46xx.c | 2 sound/pci/cs5535audio/cs5535audio.c | 2 sound/pci/emu10k1/emu10k1.c | 2 sound/pci/emu10k1/emu10k1x.c | 3 sound/pci/ens1370.c | 2 sound/pci/es1938.c | 2 sound/pci/es1968.c | 3 sound/pci/fm801.c | 2 sound/pci/hda/hda_intel.c | 2 sound/pci/hda/patch_analog.c | 13 sound/pci/hda/patch_realtek.c | 1 sound/pci/hda/patch_sigmatel.c | 4 sound/pci/ice1712/ice1712.c | 3 sound/pci/ice1712/ice1724.c | 2 sound/pci/intel8x0.c | 8 sound/pci/intel8x0m.c | 2 sound/pci/korg1212/korg1212.c | 2 sound/pci/maestro3.c | 3 sound/pci/mixart/mixart.c | 3 sound/pci/nm256/nm256.c | 2 sound/pci/pcxhr/pcxhr.c | 3 sound/pci/pcxhr/pcxhr_hwdep.c | 4 sound/pci/riptide/riptide.c | 4 sound/pci/rme32.c | 2 sound/pci/rme96.c | 2 sound/pci/rme9652/hdsp.c | 2 sound/pci/rme9652/hdspm.c | 2 sound/pci/rme9652/rme9652.c | 2 sound/pci/sonicvibes.c | 2 sound/pci/trident/trident.c | 2 sound/pci/via82xx.c | 18 sound/pci/via82xx_modem.c | 2 sound/pci/vx222/vx222.c | 2 sound/pci/ymfpci/ymfpci.c | 2 sound/pcmcia/Kconfig | 4 sound/usb/usbquirks.h | 9 287 files changed, 4044 insertions(+), 1768 deletions(-) New commits: commit 030f4767d4ab5a7f14921f081a473f3aca64a828 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=030f4767d4ab5a7f14921f081a473f3aca64a828 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=030f4767d4ab5a7f14921f081a473f3aca64a828 Merge: 0468931... 6e58f44... Author: Jan-Benedict Glaw <jb...@d2...> Date: Sun May 7 00:58:17 2006 +0200 Merge branch 'vax4linus' commit 6e58f448601ac13f68932a66ce0cba5843e70ec6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6e58f448601ac13f68932a66ce0cba5843e70ec6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6e58f448601ac13f68932a66ce0cba5843e70ec6 Merge: abbf542... 5528e56... Author: Jan-Benedict Glaw <jb...@d2...> Date: Sun May 7 00:54:51 2006 +0200 Merge branch 'master' commit 5528e568a760442e0ec8fd2dea1f0791875a066b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5528e568a760442e0ec8fd2dea1f0791875a066b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5528e568a760442e0ec8fd2dea1f0791875a066b Author: John Heffner <jhe...@ps...> Date: Fri May 5 17:41:44 2006 -0700 [TCP]: Fix snd_cwnd adjustments in tcp_highspeed.c Xiaoliang (David) Wei wrote: > Hi gurus, > > I am reading the code of tcp_highspeed.c in the kernel and have a > question on the hstcp_cong_avoid function, specifically the following > AI part (line 136~143 in net/ipv4/tcp_highspeed.c ): > > /* Do additive increase */ > if (tp->snd_cwnd < tp->snd_cwnd_clamp) { > tp->snd_cwnd_cnt += ca->ai; > if (tp->snd_cwnd_cnt >= tp->snd_cwnd) { > tp->snd_cwnd++; > tp->snd_cwnd_cnt -= tp->snd_cwnd; > } > } > > In this part, when (tp->snd_cwnd_cnt == tp->snd_cwnd), > snd_cwnd_cnt will be -1... snd_cwnd_cnt is defined as u16, will this > small chance of getting -1 becomes a problem? > Shall we change it by reversing the order of the cwnd++ and cwnd_cnt -= > cwnd? Absolutely correct. Thanks. Signed-off-by: John Heffner <jhe...@ps...> Signed-off-by: David S. Miller <da...@da...> commit f530937b2cccdb131cb459977943c98421ab09b3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f530937b2cccdb131cb459977943c98421ab09b3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f530937b2cccdb131cb459977943c98421ab09b3 Author: Ralf Baechle <ra...@li...> Date: Fri May 5 17:19:26 2006 -0700 [NETROM/ROSE]: Kill module init version kernel log messages. There are out of date and don't tell the user anything useful. The similar messages which IPV4 and the core networking used to output were killed a long time ago. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 134af34632a7b3b0a98a79a2e56bf9cc927e0eac gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=134af34632a7b3b0a98a79a2e56bf9cc927e0eac gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=134af34632a7b3b0a98a79a2e56bf9cc927e0eac Author: Herbert Xu <he...@go...> Date: Fri May 5 17:09:13 2006 -0700 [DCCP]: Fix sock_orphan dead lock Calling sock_orphan inside bh_lock_sock in dccp_close can lead to dead locks. For example, the inet_diag code holds sk_callback_lock without disabling BH. If an inbound packet arrives during that admittedly tiny window, it will cause a dead lock on bh_lock_sock. Another possible path would be through sock_wfree if the network device driver frees the tx skb in process context with BH enabled. We can fix this by moving sock_orphan out of bh_lock_sock. The tricky bit is to work out when we need to destroy the socket ourselves and when it has already been destroyed by someone else. By moving sock_orphan before the release_sock we can solve this problem. This is because as long as we own the socket lock its state cannot change. So we simply record the socket state before the release_sock and then check the state again after we regain the socket lock. If the socket state has transitioned to DCCP_CLOSED in the time being, we know that the socket has been destroyed. Otherwise the socket is still ours to keep. This problem was discoverd by Ingo Molnar using his lock validator. Signed-off-by: Herbert Xu <he...@go...> Signed-off-by: David S. Miller <da...@da...> commit 1c29fc4989bc2a3838b2837adc12b8aeb0feeede gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1c29fc4989bc2a3838b2837adc12b8aeb0feeede gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1c29fc4989bc2a3838b2837adc12b8aeb0feeede Author: Stephen Hemminger <she...@os...> Date: Fri May 5 17:07:13 2006 -0700 [BRIDGE]: keep track of received multicast packets It makes sense to add this simple statistic to keep track of received multicast packets. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: David S. Miller <da...@da...> commit 35d63edb1c807bc5317e49592260e84637bc432e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=35d63edb1c807bc5317e49592260e84637bc432e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=35d63edb1c807bc5317e49592260e84637bc432e Author: Sridhar Samudrala <sr...@us...> Date: Fri May 5 17:05:23 2006 -0700 [SCTP]: Fix state table entries for chunks received in CLOSED state. Discard an unexpected chunk in CLOSED state rather can calling BUG(). Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 62b08083ec3dbfd7e533c8d230dd1d8191a6e813 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=62b08083ec3dbfd7e533c8d230dd1d8191a6e813 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=62b08083ec3dbfd7e533c8d230dd1d8191a6e813 Author: Sridhar Samudrala <sr...@us...> Date: Fri May 5 17:04:43 2006 -0700 [SCTP]: Fix panic's when receiving fragmented SCTP control chunks. Use pskb_pull() to handle incoming COOKIE_ECHO and HEARTBEAT chunks that are received as skb's with fragment list. Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 672e7cca17ed6036a1756ed34cf20dbd72d5e5f6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=672e7cca17ed6036a1756ed34cf20dbd72d5e5f6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=672e7cca17ed6036a1756ed34cf20dbd72d5e5f6 Author: Vladislav Yasevich <vla...@hp...> Date: Fri May 5 17:03:49 2006 -0700 [SCTP]: Prevent possible infinite recursion with multiple bundled DATA. There is a rare situation that causes lksctp to go into infinite recursion and crash the system. The trigger is a packet that contains at least the first two DATA fragments of a message bundled together. The recursion is triggered when the user data buffer is smaller that the full data message. The problem is that we clone the skb for every fragment in the message. When reassembling the full message, we try to link skbs from the "first fragment" clone using the frag_list. However, since the frag_list is shared between two clones in this rare situation, we end up setting the frag_list pointer of the second fragment to point to itself. This causes sctp_skb_pull() to potentially recurse indefinitely. Proposed solution is to make a copy of the skb when attempting to link things using frag_list. Signed-off-by: Vladislav Yasevich <vla...@hp...> Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 7c3ceb4fb9667f34f1599a062efecf4cdc4a4ce5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7c3ceb4fb9667f34f1599a062efecf4cdc4a4ce5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7c3ceb4fb9667f34f1599a062efecf4cdc4a4ce5 Author: Neil Horman <nh...@tu...> Date: Fri May 5 17:02:09 2006 -0700 [SCTP]: Allow spillover of receive buffer to avoid deadlock. This patch fixes a deadlock situation in the receive path by allowing temporary spillover of the receive buffer. - If the chunk we receive has a tsn that immediately follows the ctsn, accept it even if we run out of receive buffer space and renege data with higher TSNs. - Once we accept one chunk in a packet, accept all the remaining chunks even if we run out of receive buffer space. Signed-off-by: Neil Horman <nh...@tu...> Acked-by: Mark Butler <bu...@mi...> Acked-by: Vlad Yasevich <vla...@hp...> Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 91ef5d2d6e934762db9c3e0d9e5b2862e40ea429 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=91ef5d2d6e934762db9c3e0d9e5b2862e40ea429 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=91ef5d2d6e934762db9c3e0d9e5b2862e40ea429 Merge: 568cb09... 56cf650... Author: Linus Torvalds <tor...@g5...> Date: Fri May 5 14:53:48 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [BLOCK] Fix oops on removal of SD/MMC card commit 568cb09b9d889b6f2852ede19772b8e9eed36c1e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=568cb09b9d889b6f2852ede19772b8e9eed36c1e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=568cb09b9d889b6f2852ede19772b8e9eed36c1e Author: Nicolas Pitre <ni...@ca...> Date: Fri May 5 22:35:05 2006 +0100 [ARM] 3495/1: EABI: undefine removed syscalls, but... Patch from Nicolas Pitre ... but only for user space. Signed-off-by: Nicolas Pitre <ni...@ca...> Signed-off-by: Russell King <rmk...@ar...> commit 99532559dc7a8e686b2cef14c780a7ad5dbd4a31 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=99532559dc7a8e686b2cef14c780a7ad5dbd4a31 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=99532559dc7a8e686b2cef14c780a7ad5dbd4a31 Author: Nicolas Pitre <ni...@ca...> Date: Fri May 5 22:32:24 2006 +0100 [ARM] 3500/1: fix PXA27x DMA allocation priority Patch from Nicolas Pitre Intel PXA27x developers manual section 5.4.1.1 lists a priority distribution for the DMA channels differently than what the code currently assumes. This patch fixes that. Noticed by Simon Vogl <vo...@so...> Signed-off-by: Nicolas Pitre <ni...@ca...> Signed-off-by: Russell King <rmk...@ar...> commit b7d7ef87e15dea105be59ec8f14e2f92182dd421 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b7d7ef87e15dea105be59ec8f14e2f92182dd421 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b7d7ef87e15dea105be59ec8f14e2f92182dd421 Author: George G. Davis <da...@mv...> Date: Fri May 5 22:32:23 2006 +0100 [ARM] 3499/1: Fix VFP FPSCR corruption for double exception case Patch from George G. Davis The ARM VFP FPSCR register is corrupted when a condition flags modifying VFP instruction is followed by a non-condition flags modifying VFP instruction and both instructions raise exceptions. The fix is to read the current FPSCR in between emulation of these two instructions and use the current FPSCR value when handling the second exception. Signed-off-by: George G. Davis <gd...@mv...> Signed-off-by: Russell King <rmk...@ar...> commit 56cf6504fc1c0c221b82cebc16a444b684140fb7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=56cf6504fc1c0c221b82cebc16a444b684140fb7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=56cf6504fc1c0c221b82cebc16a444b684140fb7 Author: Russell King <rm...@dy...> Date: Fri May 5 17:57:52 2006 +0100 [BLOCK] Fix oops on removal of SD/MMC card The block layer keeps a reference (driverfs_dev) to the struct device associated with the block device, and uses it internally for generating uevents in block_uevent. Block device uevents include umounting the partition, which can occur after the backing device has been removed. Unfortunately, this reference is not counted. This means that if the struct device is removed from the device tree, the block layers reference will become stale. Guard against this by holding a reference to the struct device in add_disk(), and only drop the reference when we're releasing the gendisk kobject - in other words when we can be sure that no further uevents will be generated for this block device. Signed-off-by: Russell King <rmk...@ar...> Acked-by: Jens Axboe <ax...@su...> commit 2eb9d3157107497fdccb51e1570fea677f6e3c82 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2eb9d3157107497fdccb51e1570fea677f6e3c82 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2eb9d3157107497fdccb51e1570fea677f6e3c82 Author: Uwe Zeisberger <Uwe...@di...> Date: Fri May 5 15:11:14 2006 +0100 [ARM] 3496/1: more constants for asm-offsets.h Patch from Uwe Zeisberger added the following constants: - MACHINFO_TYPE - MACHINFO_NAME - MACHINFO_PHYSIO - MACHINFO_PGOFFIO - PROCINFO_INITFUNC - PROCINFO_MMUFLAGS and removed their definition from head.S and head-nommu.S Signed-off-by: Uwe Zeisberger <Uwe...@di...> Signed-off-by: Russell King <rmk...@ar...> commit ff10952a547dad934d9ed9afc5cf579ed1ccb53a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ff10952a547dad934d9ed9afc5cf579ed1ccb53a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ff10952a547dad934d9ed9afc5cf579ed1ccb53a Author: Nicolas Pitre <ni...@ca...> Date: Fri May 5 15:11:14 2006 +0100 [ARM] 3494/1: asm-arm/bug.h needs linux/stddef.h Patch from Nicolas Pitre ... for the definition of NULL. Signed-off-by: Nicolas Pitre <ni...@ca...> Signed-off-by: Russell King <rmk...@ar...> commit d98550e334715b2d9e45f8f0f4e1608720108640 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d98550e334715b2d9e45f8f0f4e1608720108640 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d98550e334715b2d9e45f8f0f4e1608720108640 Merge: f9cc847... d205819... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 15:09:52 2006 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] powerpc: Use the ibm,pa-features property if available powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses [PATCH] ppc32 CPM_UART: fixes and improvements [PATCH] ppc32 CPM_UART: Fixed break send on SCC [PATCH] powerpc/kprobes: fix singlestep out-of-line [PATCH] powerpc/pseries: avoid crash in PCI code if mem system not up commit f9cc8475e7595dbb41a9567f83288e2cd7445b6c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f9cc8475e7595dbb41a9567f83288e2cd7445b6c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f9cc8475e7595dbb41a9567f83288e2cd7445b6c Merge: 6fc56cc... 5b80234... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 14:52:43 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3490/1: i.MX: move uart resources to board files [ARM] 3488/1: make icedcc_putc do the right thing [ARM] 3487/1: IXP4xx: Support non-PCI systems [ARM] 3486/1: Mark memory as clobbered by the ARM _syscallX() macros commit 6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 Merge: cbdf811... 920e70c... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 14:52:27 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Move set_ios debugging into mmc.c [MMC] Correct mmc_request_done comments [MMC] PXA: reduce the number of lines PXAMCI debug uses [MMC] PXA and i.MX: don't avoid sending stop command on error [MMC] extend data timeout for writes [ARM] 3485/1: i.MX: MX1 SD/MMC fix of unintentional double start possibility commit cbdf811c77cf2906a099b8da92e9f6f335b68a73 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cbdf811c77cf2906a099b8da92e9f6f335b68a73 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cbdf811c77cf2906a099b8da92e9f6f335b68a73 Merge: 936ef1d... 98232d5... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 13:25:40 2006 -0400 Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block * 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] compat_sys_vmsplice: one-off in UIO_MAXIOV check [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST [PATCH] splice: rename remaining info variables to pipe [PATCH] splice: LRU fixups [PATCH] splice: fix unlocking of page on error ->prepare_write() commit 936ef1d48ac9a9fc90746bacd93624969711775a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=936ef1d48ac9a9fc90746bacd93624969711775a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=936ef1d48ac9a9fc90746bacd93624969711775a Merge: 0de2a93... d1a6498... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 13:25:19 2006 -0400 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [DECNET]: Fix level1 router hello [TCP]: Fix sock_orphan dead lock [ROSE]: Eleminate HZ from ROSE kernel interfaces [NETROM]: Eleminate HZ from NET/ROM kernel interfaces [AX.25]: Eleminate HZ from AX.25 kernel interfaces [ROSE]: Fix routing table locking in rose_remove_neigh. [AX.25]: Move AX.25 symbol exports [HAMRADIO]: Remove remaining SET_MODULE_OWNER calls from hamradio drivers. [AX25, ROSE]: Remove useless SET_MODULE_OWNER calls. [AX.25]: Spelling fix [ROSE]: Remove useless prototype for rose_remove_neigh(). [NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat layer [NETFILTER]: H.323 helper: Change author's email address [NETFILTER]: NAT: silence unused variable warnings with CONFIG_XFRM=n [NETFILTER]: H.323 helper: fix use of uninitialized data [NETFILTER]: H.323 helper: fix endless loop caused by invalid TPKT len commit 0de2a93e80917c70716c20b8b6a75e5350da3f71 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0de2a93e80917c70716c20b8b6a75e5350da3f71 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0de2a93e80917c70716c20b8b6a75e5350da3f71 Merge: fed3be9... 8c45112... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 13:25:05 2006 -0400 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Hook up vmsplice into syscall tables. commit fed3be9bd56e67c9b9324277b7f95c32e73a75bb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fed3be9bd56e67c9b9324277b7f95c32e73a75bb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fed3be9bd56e67c9b9324277b7f95c32e73a75bb Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 13:23:40 2006 -0400 CREDITS file update (Tristan Greaves) By request from Tristan. Signed-off-by: Linus Torvalds <tor...@os...> commit 920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 Author: Russell King <rm...@dy...> Date: Thu May 4 18:22:51 2006 +0100 [MMC] Move set_ios debugging into mmc.c Rather than having every driver duplicate the set_ios debugging, provide a single version in mmc.c which can be expanded as we add additional functionality. Signed-off-by: Russell King <rmk...@ar...> commit 5b802344357338a4d645beac8ca97470bcbe3542 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5b802344357338a4d645beac8ca97470bcbe3542 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5b802344357338a4d645beac8ca97470bcbe3542 Author: Sascha Hauer <sa...@sa...> Date: Thu May 4 14:07:42 2006 +0100 [ARM] 3490/1: i.MX: move uart resources to board files Patch from Sascha Hauer This patch moves the i.MX uart resources and the gpio pin setup to the board files. This allows the boards to decide how many internal uarts are connected to the outside world and whether they use rts/cts or not. Signed-off-by: Sascha Hauer <s....@pe...> Signed-off-by: Russell King <rmk...@ar...> commit fe10c6abea8bc83291a13e0580b3e4c355710b09 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fe10c6abea8bc83291a13e0580b3e4c355710b09 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fe10c6abea8bc83291a13e0580b3e4c355710b09 Author: Russell King <rm...@dy...> Date: Thu May 4 13:51:45 2006 +0100 [MMC] Correct mmc_request_done comments mmc_request_done should be called at the end of handling a request, not between the data and initial command parts of the request. Signed-off-by: Russell King <rmk...@ar...> commit 98232d504db0a1f91ecaa93686ed3bf61963103b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=98232d504db0a1f91ecaa93686ed3bf61963103b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=98232d504db0a1f91ecaa93686ed3bf61963103b Author: Jens Axboe <ax...@su...> Date: Thu May 4 09:13:49 2006 +0200 [PATCH] compat_sys_vmsplice: one-off in UIO_MAXIOV check nr_segs may not be > UIO_MAXIOV, however it may be equal to. This makes the behaviour identical to the real sys_vmsplice(). The other foov syscalls also agree that this is the way to go. Signed-off-by: Jens Axboe <ax...@su...> commit d1a649838802edd94b6335834919463c6ae61f40 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d1a649838802edd94b6335834919463c6ae61f40 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d1a649838802edd94b6335834919463c6ae61f40 Author: Patrick Caulfield <pa...@ty...> Date: Wed May 3 23:36:23 2006 -0700 [DECNET]: Fix level1 router hello This patch fixes hello messages sent when a node is a level 1 router. Slightly contrary to the spec (maybe) VMS ignores hello messages that do not name level2 routers that it also knows about. So, here we simply name all the routers that the node knows about rather just other level1 routers. (I hope the patch is clearer than the description. sorry). Signed-off-by: Patrick Caulfield <pa...@ty...> Signed-off-by: David S. Miller <da...@da...> commit 75c2d9077c63ac21488129cc23561d4f4fd0f5e5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=75c2d9077c63ac21488129cc23561d4f4fd0f5e5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=75c2d9077c63ac21488129cc23561d4f4fd0f5e5 Author: Herbert Xu <he...@go...> Date: Wed May 3 23:31:35 2006 -0700 [TCP]: Fix sock_orphan dead lock Calling sock_orphan inside bh_lock_sock in tcp_close can lead to dead locks. For example, the inet_diag code holds sk_callback_lock without disabling BH. If an inbound packet arrives during that admittedly tiny window, it will cause a dead lock on bh_lock_sock. Another possible path would be through sock_wfree if the network device driver frees the tx skb in process context with BH enabled. We can fix this by moving sock_orphan out of bh_lock_sock. The tricky bit is to work out when we need to destroy the socket ourselves and when it has already been destroyed by someone else. By moving sock_orphan before the release_sock we can solve this problem. This is because as long as we own the socket lock its state cannot change. So we simply record the socket state before the release_sock and then check the state again after we regain the socket lock. If the socket state has transitioned to TCP_CLOSE in the time being, we know that the socket has been destroyed. Otherwise the socket is still ours to keep. Note that I've also moved the increment on the orphan count forward. This may look like a problem as we're increasing it even if the socket is just about to be destroyed where it'll be decreased again. However, this simply enlarges a window that already exists. This also changes the orphan count test by one. Considering what the orphan count is meant to do this is no big deal. This problem was discoverd by Ingo Molnar using his lock validator. Signed-off-by: Herbert Xu <he...@go...> Signed-off-by: David S. Miller <da...@da...> commit 82e84249f0ee098e004c8bd6d90a1640bd56cfbb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=82e84249f0ee098e004c8bd6d90a1640bd56cfbb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=82e84249f0ee098e004c8bd6d90a1640bd56cfbb Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:28:20 2006 -0700 [ROSE]: Eleminate HZ from ROSE kernel interfaces Convert all ROSE sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:27:47 2006 -0700 [NETROM]: Eleminate HZ from NET/ROM kernel interfaces Convert all NET/ROM sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit e1fdb5b39656ea2be8cadde565e543649a988af9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e1fdb5b39656ea2be8cadde565e543649a988af9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e1fdb5b39656ea2be8cadde565e543649a988af9 Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:27:16 2006 -0700 [AX.25]: Eleminate HZ from AX.25 kernel interfaces Convert all AX.25 sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:26:20 2006 -0700 [ROSE]: Fix routing table locking in rose_remove_neigh. The locking rule for rose_remove_neigh() are that the caller needs to hold rose_neigh_list_lock, so we better don't take it yet again in rose_neigh_list_lock. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 70868eace5031298c6f6e991a40a2106957f582c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=70868eace5031298c6f6e991a40a2106957f582c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=70868eace5031298c6f6e991a40a2106957f582c Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:25:17 2006 -0700 [AX.25]: Move AX.25 symbol exports Move AX.25 symbol exports to next to their definitions where they're supposed to be these days. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 3ab33dcc82e014c69ebad3b524d0053378ef76c3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3ab33dcc82e014c69ebad3b524d0053378ef76c3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3ab33dcc82e014c69ebad3b524d0053378ef76c3 Author: Ralf Baechle DL5RB <ra...@li...> Date: Wed May 3 23:24:35 2006 -0700 [HAMRADIO]: Remove remaining SET_MODULE_OWNER calls from hamradio drivers. Signed-off-by: Ralf Baechle DL5RB <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 86cfcb95ec60e910d7efcb35ae89bf3403befaad gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=86cfcb95ec60e910d7efcb35ae89bf3403befaad gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=86cfcb95ec60e910d7efcb35ae89bf3403befaad Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:23:48 2006 -0700 [AX25, ROSE]: Remove useless SET_MODULE_OWNER calls. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 3f072310d0ca85891323e9d325c37c76de389387 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3f072310d0ca85891323e9d325c37c76de389387 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3f072310d0ca85891323e9d325c37c76de389387 Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:22:36 2006 -0700 [AX.25]: Spelling fix Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 0cc5ae24af08abe8e2a467f45b54c48a0f52670f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0cc5ae24af08abe8e2a467f45b54c48a0f52670f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0cc5ae24af08abe8e2a467f45b54c48a0f52670f Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:22:01 2006 -0700 [ROSE]: Remove useless prototype for rose_remove_neigh(). Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 7800007c1e2d42cd4120b87b0ba3f3480f17f30a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7800007c1e2d42cd4120b87b0ba3f3480f17f30a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7800007c1e2d42cd4120b87b0ba3f3480f17f30a Author: Patrick McHardy <ka...@tr...> Date: Wed May 3 23:20:27 2006 -0700 [NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat layer Noticed by Linus Torvalds <tor...@os...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 7582e9d17edbabab6cbe59467c5d1b5e8c04fca8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7582e9d17edbabab6cbe59467c5d1b5e8c04fca8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7582e9d17edbabab6cbe59467c5d1b5e8c04fca8 Author: Jing Min Zhao <zha...@us...> Date: Wed May 3 23:19:59 2006 -0700 [NETFILTER]: H.323 helper: Change author's email address Signed-off-by: Jing Min Zhao <zha...@us...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 2354feaeb2acb78f6aabdf8410d55b44492a7949 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2354feaeb2acb78f6aabdf8410d55b44492a7949 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2354feaeb2acb78f6aabdf8410d55b44492a7949 Author: Patrick McHardy <ka...@tr...> Date: Wed May 3 23:19:26 2006 -0700 [NETFILTER]: NAT: silence unused variable warnings with CONFIG_XFRM=n net/ipv4/netfilter/ip_nat_standalone.c: In function 'ip_nat_out': net/ipv4/netfilter/ip_nat_standalone.c:223: warning: unused variable 'ctinfo' net/ipv4/netfilter/ip_nat_standalone.c:222: warning: unused variable 'ct' Surprisingly no complaints so far .. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7 Author: Patrick McHardy <ka...@tr...> Date: Wed May 3 23:17:11 2006 -0700 [NETFILTER]: H.323 helper: fix use of uninitialized data When a Choice element contains an unsupported choice no error is returned and parsing continues normally, but the choice value is not set and contains data from the last parsed message. This may in turn lead to parsing of more stale data and following crashes. Fixes a crash triggered by testcase 0003243 from the PROTOS c07-h2250v4 testsuite following random other testcases: CPU: 0 EIP: 0060:[<c01a9554>] Not tainted VLI EFLAGS: 00210646 (2.6.17-rc2 #3) EIP is at memmove+0x19/0x22 eax: d7be0307 ebx: d7be0307 ecx: e841fcf9 edx: d7be0307 esi: bfffffff edi: bfffffff ebp: da5eb980 esp: c0347e2c ds: 007b es: 007b ss: 0068 Process events/0 (pid: 4, threadinfo=c0347000 task=dff86a90) Stack: <0>00000006 c0347ea6 d7be0301 e09a6b2c 00000006 da5eb980 d7be003e d7be0052 c0347f6c e09a6d9c 00000006 c0347ea6 00000006 00000000 d7b9a548 00000000 c0347f6c d7b9a548 00000004 e0a1a119 0000028f 00000006 c0347ea6 00000006 Call Trace: [<e09a6b2c>] mangle_contents+0x40/0xd8 [ip_nat] [<e09a6d9c>] ip_nat_mangle_tcp_packet+0xa1/0x191 [ip_nat] [<e0a1a119>] set_addr+0x60/0x14d [ip_nat_h323] [<e0ab6e66>] q931_help+0x2da/0x71a [ip_conntrack_h323] [<e0ab6e98>] q931_help+0x30c/0x71a [ip_conntrack_h323] [<e09af242>] ip_conntrack_help+0x22/0x2f [ip_conntrack] [<c022934a>] nf_iterate+0x2e/0x5f [<c025d357>] xfrm4_output_finish+0x0/0x39f [<c02294ce>] nf_hook_slow+0x42/0xb0 [<c025d357>] xfrm4_output_finish+0x0/0x39f [<c025d732>] xfrm4_output+0x3c/0x4e [<c025d357>] xfrm4_output_finish+0x0/0x39f [<c0230370>] ip_forward+0x1c2/0x1fa [<c022f417>] ip_rcv+0x388/0x3b5 [<c02188f9>] netif_receive_skb+0x2bc/0x2ec [<c0218994>] process_backlog+0x6b/0xd0 [<c021675a>] net_rx_action+0x4b/0xb7 [<c0115606>] __do_softirq+0x35/0x7d [<c0104294>] do_softirq+0x38/0x3f Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 6fd737031eb6869430d0f3cf6bf1440adf7aedf5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6fd737031eb6869430d0f3cf6bf1440adf7aedf5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6fd737031eb6869430d0f3cf6bf1440adf7aedf5 Author: Patrick McHardy <ka...@tr...> Date: Wed May 3 23:16:29 2006 -0700 [NETFILTER]: H.323 helper: fix endless loop caused by invalid TPKT len When the TPKT len included in the packet is below the lowest valid value of 4 an underflow occurs which results in an endless loop. Found by testcase 0000058 from the PROTOS c07-h2250v4 testsuite. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit a0548871ed267ae12eb1c860c5aaebd9e466b34e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a0548871ed267ae12eb1c860c5aaebd9e466b34e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a0548871ed267ae12eb1c860c5aaebd9e466b34e Author: Jens Axboe <ax...@su...> Date: Wed May 3 10:58:22 2006 +0200 [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST This can happen quite easily, if several processes are trying to splice the same file at the same time. It's not a failure, it just means someone raced with us in allocating this file page. So just dump the allocated page and relookup the original. Signed-off-by: Jens Axboe <ax...@su...> commit 76ad4d11105ccd40a536db1057083f28326019fd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=76ad4d11105ccd40a536db1057083f28326019fd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=76ad4d11105ccd40a536db1057083f28326019fd Author: Jens Axboe <ax...@su...> Date: Wed May 3 10:41:33 2006 +0200 [PATCH] splice: rename remaining info v... [truncated message content] |
|
From: Jan-Benedict G. <jb...@he...> - 2006-05-06 23:00:31
|
CREDITS | 10 Documentation/sound/alsa/Audiophile-Usb.txt | 81 +- Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 4 arch/arm/Kconfig | 2 arch/arm/boot/compressed/misc.c | 4 arch/arm/kernel/asm-offsets.c | 6 arch/arm/kernel/head-nommu.S | 4 arch/arm/kernel/head.S | 8 arch/arm/mach-imx/generic.c | 52 - arch/arm/mach-imx/mx1ads.c | 74 + arch/arm/mach-ixp4xx/Kconfig | 15 arch/arm/mach-ixp4xx/Makefile | 3 arch/arm/mach-pxa/dma.c | 17 arch/arm/vfp/vfpmodule.c | 2 arch/i386/kernel/acpi/boot.c | 5 arch/i386/kernel/apic.c | 4 arch/i386/kernel/ptrace.c | 7 arch/i386/kernel/setup.c | 4 arch/i386/kernel/timers/timer_tsc.c | 4 arch/i386/kernel/vm86.c | 2 arch/ia64/kernel/ptrace.c | 4 arch/mips/kernel/ptrace.c | 4 arch/powerpc/kernel/kprobes.c | 14 arch/powerpc/kernel/prom.c | 70 + arch/powerpc/kernel/ptrace.c | 5 arch/powerpc/kernel/sysfs.c | 18 arch/powerpc/mm/numa.c | 32 arch/powerpc/platforms/cell/Kconfig | 3 arch/powerpc/platforms/cell/setup.c | 78 -- arch/powerpc/platforms/cell/spu_base.c | 91 +- arch/powerpc/platforms/pseries/eeh_event.c | 8 arch/ppc/platforms/mpc866ads_setup.c | 2 arch/s390/kernel/ptrace.c | 5 arch/s390/kernel/signal.c | 5 arch/sparc/kernel/systbls.S | 2 arch/sparc64/kernel/ptrace.c | 5 arch/sparc64/kernel/sys32.S | 1 arch/sparc64/kernel/systbls.S | 4 arch/sparc64/mm/tlb.c | 5 arch/um/Kconfig | 14 arch/um/Kconfig.i386 | 19 arch/um/Makefile | 19 arch/um/defconfig | 240 ++++-- arch/um/drivers/cow_user.c | 2 arch/um/kernel/irq.c | 93 +- arch/um/kernel/physmem.c | 2 arch/um/kernel/ptrace.c | 6 arch/um/kernel/skas/Makefile | 10 arch/um/kernel/time_kern.c | 2 arch/um/os-Linux/file.c | 2 arch/um/os-Linux/irq.c | 47 - arch/um/os-Linux/main.c | 30 arch/um/os-Linux/process.c | 17 arch/um/os-Linux/skas/process.c | 6 arch/um/os-Linux/sys-i386/registers.c | 4 arch/um/os-Linux/sys-x86_64/registers.c | 4 arch/um/os-Linux/umid.c | 4 arch/um/os-Linux/user_syms.c | 7 arch/um/scripts/Makefile.rules | 12 arch/um/sys-i386/Makefile | 13 arch/um/sys-x86_64/Makefile | 13 arch/x86_64/ia32/ia32entry.S | 1 arch/x86_64/kernel/ptrace.c | 6 arch/x86_64/kernel/setup.c | 19 block/genhd.c | 2 drivers/char/genrtc.c | 8 drivers/char/keyboard.c | 38 - drivers/edac/e752x_edac.c | 17 drivers/infiniband/hw/ipath/ipath_debug.h | 15 drivers/infiniband/hw/ipath/ipath_diag.c | 3 drivers/infiniband/hw/ipath/ipath_driver.c | 18 drivers/infiniband/hw/ipath/ipath_init_chip.c | 36 drivers/infiniband/hw/ipath/ipath_intr.c | 21 drivers/infiniband/hw/ipath/ipath_kernel.h | 10 drivers/infiniband/hw/ipath/ipath_layer.c | 6 drivers/infiniband/hw/ipath/ipath_pe800.c | 4 drivers/infiniband/hw/ipath/ipath_registers.h | 31 drivers/infiniband/hw/ipath/ipath_ruc.c | 15 drivers/infiniband/hw/ipath/ipath_sysfs.c | 14 drivers/infiniband/hw/ipath/ipath_ud.c | 6 drivers/infiniband/hw/ipath/ipath_verbs.c | 39 - drivers/infiniband/hw/ipath/ipath_verbs.h | 3 drivers/infiniband/hw/ipath/ips_common.h | 2 drivers/infiniband/hw/mthca/mthca_provider.c | 2 drivers/input/evdev.c | 21 drivers/input/input.c | 11 drivers/input/keyboard/spitzkbd.c | 4 drivers/input/misc/wistron_btns.c | 30 drivers/input/mouse/psmouse-base.c | 4 drivers/input/touchscreen/ads7846.c | 414 ++++++++--- drivers/input/touchscreen/corgi_ts.c | 2 drivers/md/raid1.c | 29 drivers/md/raid10.c | 46 - drivers/media/video/cx88/cx88-alsa.c | 2 drivers/mmc/at91_mci.c | 3 drivers/mmc/au1xmmc.c | 4 drivers/mmc/imxmmc.c | 60 + drivers/mmc/mmc.c | 62 + drivers/mmc/mmc_block.c | 6 drivers/mmc/mmci.c | 3 drivers/mmc/pxamci.c | 13 drivers/mmc/sdhci.c | 4 drivers/mmc/wbsd.c | 4 drivers/net/forcedeth.c | 312 ++++++-- drivers/net/hamradio/dmascc.c | 1 drivers/net/hamradio/scc.c | 1 drivers/net/hamradio/yam.c | 1 drivers/net/mv643xx_eth.c | 2 drivers/net/tg3.c | 82 +- drivers/net/tg3.h | 1 drivers/net/via-rhine.c | 6 drivers/rtc/rtc-dev.c | 17 drivers/s390/net/qeth_main.c | 1 drivers/s390/s390mach.c | 3 drivers/serial/cpm_uart/cpm_uart.h | 19 drivers/serial/cpm_uart/cpm_uart_core.c | 37 drivers/serial/cpm_uart/cpm_uart_cpm1.c | 2 drivers/serial/cpm_uart/cpm_uart_cpm2.c | 2 drivers/serial/imx.c | 40 - drivers/sn/ioc3.c | 2 drivers/sn/ioc4.c | 2 fs/block_dev.c | 2 fs/compat.c | 20 fs/ext3/inode.c | 13 fs/pipe.c | 190 +++-- fs/splice.c | 207 ++--- include/asm-arm/arch-imx/imx-uart.h | 10 include/asm-arm/arch-ixp4xx/io.h | 7 include/asm-arm/arch-ixp4xx/memory.h | 2 include/asm-arm/arch-pxa/dma.h | 26 include/asm-arm/bug.h | 1 include/asm-arm/unistd.h | 23 include/asm-powerpc/spu.h | 1 include/asm-powerpc/topology.h | 24 include/asm-powerpc/uaccess.h | 19 include/asm-ppc/commproc.h | 1 include/asm-ppc/cpm2.h | 2 include/asm-sparc/unistd.h | 2 include/asm-sparc64/tlbflush.h | 2 include/asm-sparc64/unistd.h | 2 include/linux/audit.h | 22 include/linux/fs_uart_pd.h | 60 + include/linux/input.h | 109 +- include/linux/list.h | 2 include/linux/mmc/card.h | 1 include/linux/mod_devicetable.h | 48 + include/linux/netfilter/x_tables.h | 8 include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h | 2 include/linux/netlink.h | 1 include/linux/pipe_fs_i.h | 30 include/linux/security.h | 16 include/linux/selinux.h | 177 ++++ include/linux/spi/ads7846.h | 7 include/net/ax25.h | 10 include/net/inet_timewait_sock.h | 2 include/net/netrom.h | 8 include/net/rose.h | 14 include/net/sctp/structs.h | 1 include/net/sock.h | 2 include/sound/pcm.h | 6 include/sound/pcm_oss.h | 2 init/main.c | 2 ipc/msg.c | 11 ipc/sem.c | 11 ipc/shm.c | 19 ipc/util.c | 7 kernel/audit.c | 160 +++- kernel/audit.h | 10 kernel/auditfilter.c | 289 ++++++- kernel/auditsc.c | 269 +++---- kernel/exit.c | 3 kernel/fork.c | 2 mm/memory_hotplug.c | 6 mm/migrate.c | 11 mm/sparse.c | 9 net/ax25/af_ax25.c | 93 +- net/ax25/ax25_addr.c | 9 net/ax25/ax25_ds_timer.c | 3 net/ax25/ax25_iface.c | 13 net/ax25/ax25_ip.c | 3 net/ax25/ax25_out.c | 3 net/ax25/ax25_route.c | 2 net/ax25/ax25_timer.c | 3 net/ax25/ax25_uid.c | 4 net/ax25/sysctl_net_ax25.c | 10 net/bridge/br_input.c | 1 net/dccp/proto.c | 13 net/decnet/dn_neigh.c | 5 net/ipv4/af_inet.c | 2 net/ipv4/netfilter/ip_conntrack_helper_h323.c | 2 net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c | 10 net/ipv4/netfilter/ip_conntrack_proto_sctp.c | 11 net/ipv4/netfilter/ip_nat_standalone.c | 2 net/ipv4/netfilter/ip_tables.c | 39 - net/ipv4/tcp.c | 13 net/ipv4/tcp_highspeed.c | 2 net/ipv4/tcp_output.c | 2 net/ipv4/xfrm4_output.c | 2 net/ipv6/route.c | 5 net/netfilter/nf_conntrack_proto_sctp.c | 11 net/netfilter/x_tables.c | 4 net/netlink/af_netlink.c | 3 net/netrom/af_netrom.c | 18 net/netrom/nr_dev.c | 1 net/rose/af_rose.c | 13 net/rose/rose_dev.c | 1 net/rose/rose_link.c | 6 net/rose/rose_route.c | 7 net/sched/sch_netem.c | 2 net/sctp/inqueue.c | 1 net/sctp/sm_statefuns.c | 59 + net/sctp/sm_statetable.c | 10 net/sctp/ulpqueue.c | 27 net/socket.c | 2 net/x25/x25_timer.c | 4 net/xfrm/xfrm_policy.c | 16 net/xfrm/xfrm_state.c | 8 scripts/mod/file2alias.c | 36 security/dummy.c | 6 security/selinux/Makefile | 2 security/selinux/avc.c | 13 security/selinux/exports.c | 74 + security/selinux/hooks.c | 11 security/selinux/include/security.h | 5 security/selinux/ss/mls.c | 30 security/selinux/ss/mls.h | 4 security/selinux/ss/services.c | 235 ++++++ sound/core/Kconfig | 12 sound/core/oss/pcm_oss.c | 8 sound/core/pcm.c | 12 sound/core/pcm_lib.c | 6 sound/core/pcm_memory.c | 8 sound/drivers/dummy.c | 14 sound/drivers/mpu401/mpu401.c | 14 sound/drivers/serial-u16550.c | 14 sound/drivers/virmidi.c | 14 sound/isa/opti9xx/miro.c | 3 sound/pci/ad1889.c | 3 sound/pci/ali5451/ali5451.c | 2 sound/pci/als300.c | 2 sound/pci/als4000.c | 2 sound/pci/atiixp.c | 2 sound/pci/atiixp_modem.c | 2 sound/pci/au88x0/au8810.c | 2 sound/pci/au88x0/au8820.c | 2 sound/pci/au88x0/au8830.c | 2 sound/pci/azt3328.c | 2 sound/pci/bt87x.c | 4 sound/pci/ca0106/ca0106_main.c | 2 sound/pci/cmipci.c | 2 sound/pci/cs4281.c | 2 sound/pci/cs46xx/cs46xx.c | 2 sound/pci/cs5535audio/cs5535audio.c | 2 sound/pci/emu10k1/emu10k1.c | 2 sound/pci/emu10k1/emu10k1x.c | 3 sound/pci/ens1370.c | 2 sound/pci/es1938.c | 2 sound/pci/es1968.c | 3 sound/pci/fm801.c | 2 sound/pci/hda/hda_intel.c | 2 sound/pci/hda/patch_analog.c | 13 sound/pci/hda/patch_realtek.c | 1 sound/pci/hda/patch_sigmatel.c | 4 sound/pci/ice1712/ice1712.c | 3 sound/pci/ice1712/ice1724.c | 2 sound/pci/intel8x0.c | 8 sound/pci/intel8x0m.c | 2 sound/pci/korg1212/korg1212.c | 2 sound/pci/maestro3.c | 3 sound/pci/mixart/mixart.c | 3 sound/pci/nm256/nm256.c | 2 sound/pci/pcxhr/pcxhr.c | 3 sound/pci/pcxhr/pcxhr_hwdep.c | 4 sound/pci/riptide/riptide.c | 4 sound/pci/rme32.c | 2 sound/pci/rme96.c | 2 sound/pci/rme9652/hdsp.c | 2 sound/pci/rme9652/hdspm.c | 2 sound/pci/rme9652/rme9652.c | 2 sound/pci/sonicvibes.c | 2 sound/pci/trident/trident.c | 2 sound/pci/via82xx.c | 18 sound/pci/via82xx_modem.c | 2 sound/pci/vx222/vx222.c | 2 sound/pci/ymfpci/ymfpci.c | 2 sound/pcmcia/Kconfig | 4 sound/usb/usbquirks.h | 9 287 files changed, 4044 insertions(+), 1768 deletions(-) New commits: commit 6e58f448601ac13f68932a66ce0cba5843e70ec6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6e58f448601ac13f68932a66ce0cba5843e70ec6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6e58f448601ac13f68932a66ce0cba5843e70ec6 Merge: abbf542... 5528e56... Author: Jan-Benedict Glaw <jb...@d2...> Date: Sun May 7 00:54:51 2006 +0200 Merge branch 'master' commit 5528e568a760442e0ec8fd2dea1f0791875a066b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5528e568a760442e0ec8fd2dea1f0791875a066b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5528e568a760442e0ec8fd2dea1f0791875a066b Author: John Heffner <jhe...@ps...> Date: Fri May 5 17:41:44 2006 -0700 [TCP]: Fix snd_cwnd adjustments in tcp_highspeed.c Xiaoliang (David) Wei wrote: > Hi gurus, > > I am reading the code of tcp_highspeed.c in the kernel and have a > question on the hstcp_cong_avoid function, specifically the following > AI part (line 136~143 in net/ipv4/tcp_highspeed.c ): > > /* Do additive increase */ > if (tp->snd_cwnd < tp->snd_cwnd_clamp) { > tp->snd_cwnd_cnt += ca->ai; > if (tp->snd_cwnd_cnt >= tp->snd_cwnd) { > tp->snd_cwnd++; > tp->snd_cwnd_cnt -= tp->snd_cwnd; > } > } > > In this part, when (tp->snd_cwnd_cnt == tp->snd_cwnd), > snd_cwnd_cnt will be -1... snd_cwnd_cnt is defined as u16, will this > small chance of getting -1 becomes a problem? > Shall we change it by reversing the order of the cwnd++ and cwnd_cnt -= > cwnd? Absolutely correct. Thanks. Signed-off-by: John Heffner <jhe...@ps...> Signed-off-by: David S. Miller <da...@da...> commit f530937b2cccdb131cb459977943c98421ab09b3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f530937b2cccdb131cb459977943c98421ab09b3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f530937b2cccdb131cb459977943c98421ab09b3 Author: Ralf Baechle <ra...@li...> Date: Fri May 5 17:19:26 2006 -0700 [NETROM/ROSE]: Kill module init version kernel log messages. There are out of date and don't tell the user anything useful. The similar messages which IPV4 and the core networking used to output were killed a long time ago. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 134af34632a7b3b0a98a79a2e56bf9cc927e0eac gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=134af34632a7b3b0a98a79a2e56bf9cc927e0eac gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=134af34632a7b3b0a98a79a2e56bf9cc927e0eac Author: Herbert Xu <he...@go...> Date: Fri May 5 17:09:13 2006 -0700 [DCCP]: Fix sock_orphan dead lock Calling sock_orphan inside bh_lock_sock in dccp_close can lead to dead locks. For example, the inet_diag code holds sk_callback_lock without disabling BH. If an inbound packet arrives during that admittedly tiny window, it will cause a dead lock on bh_lock_sock. Another possible path would be through sock_wfree if the network device driver frees the tx skb in process context with BH enabled. We can fix this by moving sock_orphan out of bh_lock_sock. The tricky bit is to work out when we need to destroy the socket ourselves and when it has already been destroyed by someone else. By moving sock_orphan before the release_sock we can solve this problem. This is because as long as we own the socket lock its state cannot change. So we simply record the socket state before the release_sock and then check the state again after we regain the socket lock. If the socket state has transitioned to DCCP_CLOSED in the time being, we know that the socket has been destroyed. Otherwise the socket is still ours to keep. This problem was discoverd by Ingo Molnar using his lock validator. Signed-off-by: Herbert Xu <he...@go...> Signed-off-by: David S. Miller <da...@da...> commit 1c29fc4989bc2a3838b2837adc12b8aeb0feeede gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1c29fc4989bc2a3838b2837adc12b8aeb0feeede gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1c29fc4989bc2a3838b2837adc12b8aeb0feeede Author: Stephen Hemminger <she...@os...> Date: Fri May 5 17:07:13 2006 -0700 [BRIDGE]: keep track of received multicast packets It makes sense to add this simple statistic to keep track of received multicast packets. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: David S. Miller <da...@da...> commit 35d63edb1c807bc5317e49592260e84637bc432e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=35d63edb1c807bc5317e49592260e84637bc432e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=35d63edb1c807bc5317e49592260e84637bc432e Author: Sridhar Samudrala <sr...@us...> Date: Fri May 5 17:05:23 2006 -0700 [SCTP]: Fix state table entries for chunks received in CLOSED state. Discard an unexpected chunk in CLOSED state rather can calling BUG(). Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 62b08083ec3dbfd7e533c8d230dd1d8191a6e813 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=62b08083ec3dbfd7e533c8d230dd1d8191a6e813 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=62b08083ec3dbfd7e533c8d230dd1d8191a6e813 Author: Sridhar Samudrala <sr...@us...> Date: Fri May 5 17:04:43 2006 -0700 [SCTP]: Fix panic's when receiving fragmented SCTP control chunks. Use pskb_pull() to handle incoming COOKIE_ECHO and HEARTBEAT chunks that are received as skb's with fragment list. Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 672e7cca17ed6036a1756ed34cf20dbd72d5e5f6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=672e7cca17ed6036a1756ed34cf20dbd72d5e5f6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=672e7cca17ed6036a1756ed34cf20dbd72d5e5f6 Author: Vladislav Yasevich <vla...@hp...> Date: Fri May 5 17:03:49 2006 -0700 [SCTP]: Prevent possible infinite recursion with multiple bundled DATA. There is a rare situation that causes lksctp to go into infinite recursion and crash the system. The trigger is a packet that contains at least the first two DATA fragments of a message bundled together. The recursion is triggered when the user data buffer is smaller that the full data message. The problem is that we clone the skb for every fragment in the message. When reassembling the full message, we try to link skbs from the "first fragment" clone using the frag_list. However, since the frag_list is shared between two clones in this rare situation, we end up setting the frag_list pointer of the second fragment to point to itself. This causes sctp_skb_pull() to potentially recurse indefinitely. Proposed solution is to make a copy of the skb when attempting to link things using frag_list. Signed-off-by: Vladislav Yasevich <vla...@hp...> Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 7c3ceb4fb9667f34f1599a062efecf4cdc4a4ce5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7c3ceb4fb9667f34f1599a062efecf4cdc4a4ce5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7c3ceb4fb9667f34f1599a062efecf4cdc4a4ce5 Author: Neil Horman <nh...@tu...> Date: Fri May 5 17:02:09 2006 -0700 [SCTP]: Allow spillover of receive buffer to avoid deadlock. This patch fixes a deadlock situation in the receive path by allowing temporary spillover of the receive buffer. - If the chunk we receive has a tsn that immediately follows the ctsn, accept it even if we run out of receive buffer space and renege data with higher TSNs. - Once we accept one chunk in a packet, accept all the remaining chunks even if we run out of receive buffer space. Signed-off-by: Neil Horman <nh...@tu...> Acked-by: Mark Butler <bu...@mi...> Acked-by: Vlad Yasevich <vla...@hp...> Signed-off-by: Sridhar Samudrala <sr...@us...> Signed-off-by: David S. Miller <da...@da...> commit 91ef5d2d6e934762db9c3e0d9e5b2862e40ea429 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=91ef5d2d6e934762db9c3e0d9e5b2862e40ea429 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=91ef5d2d6e934762db9c3e0d9e5b2862e40ea429 Merge: 568cb09... 56cf650... Author: Linus Torvalds <tor...@g5...> Date: Fri May 5 14:53:48 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [BLOCK] Fix oops on removal of SD/MMC card commit 568cb09b9d889b6f2852ede19772b8e9eed36c1e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=568cb09b9d889b6f2852ede19772b8e9eed36c1e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=568cb09b9d889b6f2852ede19772b8e9eed36c1e Author: Nicolas Pitre <ni...@ca...> Date: Fri May 5 22:35:05 2006 +0100 [ARM] 3495/1: EABI: undefine removed syscalls, but... Patch from Nicolas Pitre ... but only for user space. Signed-off-by: Nicolas Pitre <ni...@ca...> Signed-off-by: Russell King <rmk...@ar...> commit 99532559dc7a8e686b2cef14c780a7ad5dbd4a31 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=99532559dc7a8e686b2cef14c780a7ad5dbd4a31 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=99532559dc7a8e686b2cef14c780a7ad5dbd4a31 Author: Nicolas Pitre <ni...@ca...> Date: Fri May 5 22:32:24 2006 +0100 [ARM] 3500/1: fix PXA27x DMA allocation priority Patch from Nicolas Pitre Intel PXA27x developers manual section 5.4.1.1 lists a priority distribution for the DMA channels differently than what the code currently assumes. This patch fixes that. Noticed by Simon Vogl <vo...@so...> Signed-off-by: Nicolas Pitre <ni...@ca...> Signed-off-by: Russell King <rmk...@ar...> commit b7d7ef87e15dea105be59ec8f14e2f92182dd421 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=b7d7ef87e15dea105be59ec8f14e2f92182dd421 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=b7d7ef87e15dea105be59ec8f14e2f92182dd421 Author: George G. Davis <da...@mv...> Date: Fri May 5 22:32:23 2006 +0100 [ARM] 3499/1: Fix VFP FPSCR corruption for double exception case Patch from George G. Davis The ARM VFP FPSCR register is corrupted when a condition flags modifying VFP instruction is followed by a non-condition flags modifying VFP instruction and both instructions raise exceptions. The fix is to read the current FPSCR in between emulation of these two instructions and use the current FPSCR value when handling the second exception. Signed-off-by: George G. Davis <gd...@mv...> Signed-off-by: Russell King <rmk...@ar...> commit 56cf6504fc1c0c221b82cebc16a444b684140fb7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=56cf6504fc1c0c221b82cebc16a444b684140fb7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=56cf6504fc1c0c221b82cebc16a444b684140fb7 Author: Russell King <rm...@dy...> Date: Fri May 5 17:57:52 2006 +0100 [BLOCK] Fix oops on removal of SD/MMC card The block layer keeps a reference (driverfs_dev) to the struct device associated with the block device, and uses it internally for generating uevents in block_uevent. Block device uevents include umounting the partition, which can occur after the backing device has been removed. Unfortunately, this reference is not counted. This means that if the struct device is removed from the device tree, the block layers reference will become stale. Guard against this by holding a reference to the struct device in add_disk(), and only drop the reference when we're releasing the gendisk kobject - in other words when we can be sure that no further uevents will be generated for this block device. Signed-off-by: Russell King <rmk...@ar...> Acked-by: Jens Axboe <ax...@su...> commit 2eb9d3157107497fdccb51e1570fea677f6e3c82 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2eb9d3157107497fdccb51e1570fea677f6e3c82 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2eb9d3157107497fdccb51e1570fea677f6e3c82 Author: Uwe Zeisberger <Uwe...@di...> Date: Fri May 5 15:11:14 2006 +0100 [ARM] 3496/1: more constants for asm-offsets.h Patch from Uwe Zeisberger added the following constants: - MACHINFO_TYPE - MACHINFO_NAME - MACHINFO_PHYSIO - MACHINFO_PGOFFIO - PROCINFO_INITFUNC - PROCINFO_MMUFLAGS and removed their definition from head.S and head-nommu.S Signed-off-by: Uwe Zeisberger <Uwe...@di...> Signed-off-by: Russell King <rmk...@ar...> commit ff10952a547dad934d9ed9afc5cf579ed1ccb53a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=ff10952a547dad934d9ed9afc5cf579ed1ccb53a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=ff10952a547dad934d9ed9afc5cf579ed1ccb53a Author: Nicolas Pitre <ni...@ca...> Date: Fri May 5 15:11:14 2006 +0100 [ARM] 3494/1: asm-arm/bug.h needs linux/stddef.h Patch from Nicolas Pitre ... for the definition of NULL. Signed-off-by: Nicolas Pitre <ni...@ca...> Signed-off-by: Russell King <rmk...@ar...> commit d98550e334715b2d9e45f8f0f4e1608720108640 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d98550e334715b2d9e45f8f0f4e1608720108640 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d98550e334715b2d9e45f8f0f4e1608720108640 Merge: f9cc847... d205819... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 15:09:52 2006 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [PATCH] powerpc: Use the ibm,pa-features property if available powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses [PATCH] ppc32 CPM_UART: fixes and improvements [PATCH] ppc32 CPM_UART: Fixed break send on SCC [PATCH] powerpc/kprobes: fix singlestep out-of-line [PATCH] powerpc/pseries: avoid crash in PCI code if mem system not up commit f9cc8475e7595dbb41a9567f83288e2cd7445b6c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f9cc8475e7595dbb41a9567f83288e2cd7445b6c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f9cc8475e7595dbb41a9567f83288e2cd7445b6c Merge: 6fc56cc... 5b80234... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 14:52:43 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3490/1: i.MX: move uart resources to board files [ARM] 3488/1: make icedcc_putc do the right thing [ARM] 3487/1: IXP4xx: Support non-PCI systems [ARM] 3486/1: Mark memory as clobbered by the ARM _syscallX() macros commit 6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 Merge: cbdf811... 920e70c... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 14:52:27 2006 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Move set_ios debugging into mmc.c [MMC] Correct mmc_request_done comments [MMC] PXA: reduce the number of lines PXAMCI debug uses [MMC] PXA and i.MX: don't avoid sending stop command on error [MMC] extend data timeout for writes [ARM] 3485/1: i.MX: MX1 SD/MMC fix of unintentional double start possibility commit cbdf811c77cf2906a099b8da92e9f6f335b68a73 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cbdf811c77cf2906a099b8da92e9f6f335b68a73 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cbdf811c77cf2906a099b8da92e9f6f335b68a73 Merge: 936ef1d... 98232d5... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 13:25:40 2006 -0400 Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block * 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] compat_sys_vmsplice: one-off in UIO_MAXIOV check [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST [PATCH] splice: rename remaining info variables to pipe [PATCH] splice: LRU fixups [PATCH] splice: fix unlocking of page on error ->prepare_write() commit 936ef1d48ac9a9fc90746bacd93624969711775a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=936ef1d48ac9a9fc90746bacd93624969711775a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=936ef1d48ac9a9fc90746bacd93624969711775a Merge: 0de2a93... d1a6498... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 13:25:19 2006 -0400 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [DECNET]: Fix level1 router hello [TCP]: Fix sock_orphan dead lock [ROSE]: Eleminate HZ from ROSE kernel interfaces [NETROM]: Eleminate HZ from NET/ROM kernel interfaces [AX.25]: Eleminate HZ from AX.25 kernel interfaces [ROSE]: Fix routing table locking in rose_remove_neigh. [AX.25]: Move AX.25 symbol exports [HAMRADIO]: Remove remaining SET_MODULE_OWNER calls from hamradio drivers. [AX25, ROSE]: Remove useless SET_MODULE_OWNER calls. [AX.25]: Spelling fix [ROSE]: Remove useless prototype for rose_remove_neigh(). [NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat layer [NETFILTER]: H.323 helper: Change author's email address [NETFILTER]: NAT: silence unused variable warnings with CONFIG_XFRM=n [NETFILTER]: H.323 helper: fix use of uninitialized data [NETFILTER]: H.323 helper: fix endless loop caused by invalid TPKT len commit 0de2a93e80917c70716c20b8b6a75e5350da3f71 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0de2a93e80917c70716c20b8b6a75e5350da3f71 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0de2a93e80917c70716c20b8b6a75e5350da3f71 Merge: fed3be9... 8c45112... Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 13:25:05 2006 -0400 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Hook up vmsplice into syscall tables. commit fed3be9bd56e67c9b9324277b7f95c32e73a75bb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fed3be9bd56e67c9b9324277b7f95c32e73a75bb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fed3be9bd56e67c9b9324277b7f95c32e73a75bb Author: Linus Torvalds <tor...@g5...> Date: Thu May 4 13:23:40 2006 -0400 CREDITS file update (Tristan Greaves) By request from Tristan. Signed-off-by: Linus Torvalds <tor...@os...> commit 920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 Author: Russell King <rm...@dy...> Date: Thu May 4 18:22:51 2006 +0100 [MMC] Move set_ios debugging into mmc.c Rather than having every driver duplicate the set_ios debugging, provide a single version in mmc.c which can be expanded as we add additional functionality. Signed-off-by: Russell King <rmk...@ar...> commit 5b802344357338a4d645beac8ca97470bcbe3542 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5b802344357338a4d645beac8ca97470bcbe3542 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5b802344357338a4d645beac8ca97470bcbe3542 Author: Sascha Hauer <sa...@sa...> Date: Thu May 4 14:07:42 2006 +0100 [ARM] 3490/1: i.MX: move uart resources to board files Patch from Sascha Hauer This patch moves the i.MX uart resources and the gpio pin setup to the board files. This allows the boards to decide how many internal uarts are connected to the outside world and whether they use rts/cts or not. Signed-off-by: Sascha Hauer <s....@pe...> Signed-off-by: Russell King <rmk...@ar...> commit fe10c6abea8bc83291a13e0580b3e4c355710b09 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fe10c6abea8bc83291a13e0580b3e4c355710b09 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fe10c6abea8bc83291a13e0580b3e4c355710b09 Author: Russell King <rm...@dy...> Date: Thu May 4 13:51:45 2006 +0100 [MMC] Correct mmc_request_done comments mmc_request_done should be called at the end of handling a request, not between the data and initial command parts of the request. Signed-off-by: Russell King <rmk...@ar...> commit 98232d504db0a1f91ecaa93686ed3bf61963103b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=98232d504db0a1f91ecaa93686ed3bf61963103b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=98232d504db0a1f91ecaa93686ed3bf61963103b Author: Jens Axboe <ax...@su...> Date: Thu May 4 09:13:49 2006 +0200 [PATCH] compat_sys_vmsplice: one-off in UIO_MAXIOV check nr_segs may not be > UIO_MAXIOV, however it may be equal to. This makes the behaviour identical to the real sys_vmsplice(). The other foov syscalls also agree that this is the way to go. Signed-off-by: Jens Axboe <ax...@su...> commit d1a649838802edd94b6335834919463c6ae61f40 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d1a649838802edd94b6335834919463c6ae61f40 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d1a649838802edd94b6335834919463c6ae61f40 Author: Patrick Caulfield <pa...@ty...> Date: Wed May 3 23:36:23 2006 -0700 [DECNET]: Fix level1 router hello This patch fixes hello messages sent when a node is a level 1 router. Slightly contrary to the spec (maybe) VMS ignores hello messages that do not name level2 routers that it also knows about. So, here we simply name all the routers that the node knows about rather just other level1 routers. (I hope the patch is clearer than the description. sorry). Signed-off-by: Patrick Caulfield <pa...@ty...> Signed-off-by: David S. Miller <da...@da...> commit 75c2d9077c63ac21488129cc23561d4f4fd0f5e5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=75c2d9077c63ac21488129cc23561d4f4fd0f5e5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=75c2d9077c63ac21488129cc23561d4f4fd0f5e5 Author: Herbert Xu <he...@go...> Date: Wed May 3 23:31:35 2006 -0700 [TCP]: Fix sock_orphan dead lock Calling sock_orphan inside bh_lock_sock in tcp_close can lead to dead locks. For example, the inet_diag code holds sk_callback_lock without disabling BH. If an inbound packet arrives during that admittedly tiny window, it will cause a dead lock on bh_lock_sock. Another possible path would be through sock_wfree if the network device driver frees the tx skb in process context with BH enabled. We can fix this by moving sock_orphan out of bh_lock_sock. The tricky bit is to work out when we need to destroy the socket ourselves and when it has already been destroyed by someone else. By moving sock_orphan before the release_sock we can solve this problem. This is because as long as we own the socket lock its state cannot change. So we simply record the socket state before the release_sock and then check the state again after we regain the socket lock. If the socket state has transitioned to TCP_CLOSE in the time being, we know that the socket has been destroyed. Otherwise the socket is still ours to keep. Note that I've also moved the increment on the orphan count forward. This may look like a problem as we're increasing it even if the socket is just about to be destroyed where it'll be decreased again. However, this simply enlarges a window that already exists. This also changes the orphan count test by one. Considering what the orphan count is meant to do this is no big deal. This problem was discoverd by Ingo Molnar using his lock validator. Signed-off-by: Herbert Xu <he...@go...> Signed-off-by: David S. Miller <da...@da...> commit 82e84249f0ee098e004c8bd6d90a1640bd56cfbb gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=82e84249f0ee098e004c8bd6d90a1640bd56cfbb gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=82e84249f0ee098e004c8bd6d90a1640bd56cfbb Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:28:20 2006 -0700 [ROSE]: Eleminate HZ from ROSE kernel interfaces Convert all ROSE sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4d8937d0b113e8ec39f7d18cf13804f3b5fb8fd4 Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:27:47 2006 -0700 [NETROM]: Eleminate HZ from NET/ROM kernel interfaces Convert all NET/ROM sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit e1fdb5b39656ea2be8cadde565e543649a988af9 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e1fdb5b39656ea2be8cadde565e543649a988af9 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e1fdb5b39656ea2be8cadde565e543649a988af9 Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:27:16 2006 -0700 [AX.25]: Eleminate HZ from AX.25 kernel interfaces Convert all AX.25 sysctl time values from jiffies to ms as units. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4cc7c2734e2b4032103e47d8f3e8b6fa3360d3f1 Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:26:20 2006 -0700 [ROSE]: Fix routing table locking in rose_remove_neigh. The locking rule for rose_remove_neigh() are that the caller needs to hold rose_neigh_list_lock, so we better don't take it yet again in rose_neigh_list_lock. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 70868eace5031298c6f6e991a40a2106957f582c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=70868eace5031298c6f6e991a40a2106957f582c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=70868eace5031298c6f6e991a40a2106957f582c Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:25:17 2006 -0700 [AX.25]: Move AX.25 symbol exports Move AX.25 symbol exports to next to their definitions where they're supposed to be these days. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 3ab33dcc82e014c69ebad3b524d0053378ef76c3 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3ab33dcc82e014c69ebad3b524d0053378ef76c3 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3ab33dcc82e014c69ebad3b524d0053378ef76c3 Author: Ralf Baechle DL5RB <ra...@li...> Date: Wed May 3 23:24:35 2006 -0700 [HAMRADIO]: Remove remaining SET_MODULE_OWNER calls from hamradio drivers. Signed-off-by: Ralf Baechle DL5RB <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 86cfcb95ec60e910d7efcb35ae89bf3403befaad gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=86cfcb95ec60e910d7efcb35ae89bf3403befaad gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=86cfcb95ec60e910d7efcb35ae89bf3403befaad Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:23:48 2006 -0700 [AX25, ROSE]: Remove useless SET_MODULE_OWNER calls. Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 3f072310d0ca85891323e9d325c37c76de389387 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3f072310d0ca85891323e9d325c37c76de389387 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3f072310d0ca85891323e9d325c37c76de389387 Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:22:36 2006 -0700 [AX.25]: Spelling fix Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 0cc5ae24af08abe8e2a467f45b54c48a0f52670f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0cc5ae24af08abe8e2a467f45b54c48a0f52670f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0cc5ae24af08abe8e2a467f45b54c48a0f52670f Author: Ralf Baechle <ra...@li...> Date: Wed May 3 23:22:01 2006 -0700 [ROSE]: Remove useless prototype for rose_remove_neigh(). Signed-off-by: Ralf Baechle <ra...@li...> Signed-off-by: David S. Miller <da...@da...> commit 7800007c1e2d42cd4120b87b0ba3f3480f17f30a gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7800007c1e2d42cd4120b87b0ba3f3480f17f30a gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7800007c1e2d42cd4120b87b0ba3f3480f17f30a Author: Patrick McHardy <ka...@tr...> Date: Wed May 3 23:20:27 2006 -0700 [NETFILTER]: x_tables: don't use __copy_{from,to}_user on unchecked memory in compat layer Noticed by Linus Torvalds <tor...@os...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 7582e9d17edbabab6cbe59467c5d1b5e8c04fca8 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=7582e9d17edbabab6cbe59467c5d1b5e8c04fca8 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=7582e9d17edbabab6cbe59467c5d1b5e8c04fca8 Author: Jing Min Zhao <zha...@us...> Date: Wed May 3 23:19:59 2006 -0700 [NETFILTER]: H.323 helper: Change author's email address Signed-off-by: Jing Min Zhao <zha...@us...> Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 2354feaeb2acb78f6aabdf8410d55b44492a7949 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2354feaeb2acb78f6aabdf8410d55b44492a7949 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2354feaeb2acb78f6aabdf8410d55b44492a7949 Author: Patrick McHardy <ka...@tr...> Date: Wed May 3 23:19:26 2006 -0700 [NETFILTER]: NAT: silence unused variable warnings with CONFIG_XFRM=n net/ipv4/netfilter/ip_nat_standalone.c: In function 'ip_nat_out': net/ipv4/netfilter/ip_nat_standalone.c:223: warning: unused variable 'ctinfo' net/ipv4/netfilter/ip_nat_standalone.c:222: warning: unused variable 'ct' Surprisingly no complaints so far .. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4228e2a9890cd01b0c8cc58af6fd9e08a4b5e8a7 Author: Patrick McHardy <ka...@tr...> Date: Wed May 3 23:17:11 2006 -0700 [NETFILTER]: H.323 helper: fix use of uninitialized data When a Choice element contains an unsupported choice no error is returned and parsing continues normally, but the choice value is not set and contains data from the last parsed message. This may in turn lead to parsing of more stale data and following crashes. Fixes a crash triggered by testcase 0003243 from the PROTOS c07-h2250v4 testsuite following random other testcases: CPU: 0 EIP: 0060:[<c01a9554>] Not tainted VLI EFLAGS: 00210646 (2.6.17-rc2 #3) EIP is at memmove+0x19/0x22 eax: d7be0307 ebx: d7be0307 ecx: e841fcf9 edx: d7be0307 esi: bfffffff edi: bfffffff ebp: da5eb980 esp: c0347e2c ds: 007b es: 007b ss: 0068 Process events/0 (pid: 4, threadinfo=c0347000 task=dff86a90) Stack: <0>00000006 c0347ea6 d7be0301 e09a6b2c 00000006 da5eb980 d7be003e d7be0052 c0347f6c e09a6d9c 00000006 c0347ea6 00000006 00000000 d7b9a548 00000000 c0347f6c d7b9a548 00000004 e0a1a119 0000028f 00000006 c0347ea6 00000006 Call Trace: [<e09a6b2c>] mangle_contents+0x40/0xd8 [ip_nat] [<e09a6d9c>] ip_nat_mangle_tcp_packet+0xa1/0x191 [ip_nat] [<e0a1a119>] set_addr+0x60/0x14d [ip_nat_h323] [<e0ab6e66>] q931_help+0x2da/0x71a [ip_conntrack_h323] [<e0ab6e98>] q931_help+0x30c/0x71a [ip_conntrack_h323] [<e09af242>] ip_conntrack_help+0x22/0x2f [ip_conntrack] [<c022934a>] nf_iterate+0x2e/0x5f [<c025d357>] xfrm4_output_finish+0x0/0x39f [<c02294ce>] nf_hook_slow+0x42/0xb0 [<c025d357>] xfrm4_output_finish+0x0/0x39f [<c025d732>] xfrm4_output+0x3c/0x4e [<c025d357>] xfrm4_output_finish+0x0/0x39f [<c0230370>] ip_forward+0x1c2/0x1fa [<c022f417>] ip_rcv+0x388/0x3b5 [<c02188f9>] netif_receive_skb+0x2bc/0x2ec [<c0218994>] process_backlog+0x6b/0xd0 [<c021675a>] net_rx_action+0x4b/0xb7 [<c0115606>] __do_softirq+0x35/0x7d [<c0104294>] do_softirq+0x38/0x3f Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit 6fd737031eb6869430d0f3cf6bf1440adf7aedf5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6fd737031eb6869430d0f3cf6bf1440adf7aedf5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6fd737031eb6869430d0f3cf6bf1440adf7aedf5 Author: Patrick McHardy <ka...@tr...> Date: Wed May 3 23:16:29 2006 -0700 [NETFILTER]: H.323 helper: fix endless loop caused by invalid TPKT len When the TPKT len included in the packet is below the lowest valid value of 4 an underflow occurs which results in an endless loop. Found by testcase 0000058 from the PROTOS c07-h2250v4 testsuite. Signed-off-by: Patrick McHardy <ka...@tr...> Signed-off-by: David S. Miller <da...@da...> commit a0548871ed267ae12eb1c860c5aaebd9e466b34e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=a0548871ed267ae12eb1c860c5aaebd9e466b34e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=a0548871ed267ae12eb1c860c5aaebd9e466b34e Author: Jens Axboe <ax...@su...> Date: Wed May 3 10:58:22 2006 +0200 [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST This can happen quite easily, if several processes are trying to splice the same file at the same time. It's not a failure, it just means someone raced with us in allocating this file page. So just dump the allocated page and relookup the original. Signed-off-by: Jens Axboe <ax...@su...> commit 76ad4d11105ccd40a536db1057083f28326019fd gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=76ad4d11105ccd40a536db1057083f28326019fd gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=76ad4d11105ccd40a536db1057083f28326019fd Author: Jens Axboe <ax...@su...> Date: Wed May 3 10:41:33 2006 +0200 [PATCH] splice: rename remaining info variables to pipe Same thing was done in fs/pipe.c and most of fs/splice.c, but we had a few missing still. Signed-off-by: Jens Axboe <ax...@su...> commit 1432873af7ae29d4bb3c56114c05b539d078ca62 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1432873af7ae29d4bb3c56114c05b539d078ca62 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1432873af7ae29d4bb3c56114c05b5... [truncated message content] |
