6823cfe5531f7507cca5699cda4abd0f65a78bcf Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/9fa7eb283c5cdc2b0f4a8cfe6387ed82e5e9a3d3 9fa7eb283c5cdc2b0f4a8cfe6387ed82e5e9a3d3 2009-06-02T20:07:25-07:00 2009-06-02T20:07:25-07:00 Linux 2.6.30-rc8 adca75b632334d241b085a2ed8a04e4596fa5dc1 Linus Torvalds torvalds@linux-foundation.org 05ad709d04799125ed85dd816fdb558258102172 60e59f68824102c87e64c5f51c4e57c0b8a61e46 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/6823cfe5531f7507cca5699cda4abd0f65a78bcf 6823cfe5531f7507cca5699cda4abd0f65a78bcf 2009-06-02T18:06:10-07:00 2009-06-02T18:06:10-07:00 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/pmac: Update PowerMac 32-bit defconfig ba1913690fbb7e93052b9c96d3d09a8d63972207 Linus Torvalds torvalds@linux-foundation.org d3ae33efb8e2f277f9007eb060c9d0b91ab38ae1 Alan Cox alan@etchedpixels.co.uk http://github.com/github/linux-2.6/commit/05ad709d04799125ed85dd816fdb558258102172 05ad709d04799125ed85dd816fdb558258102172 2009-06-02T09:53:22-07:00 2009-06-02T08:58:10-07:00 parport: quickfix the proc registration bug Ideally we should have a directory of drivers and a link to the 'active' driver. For now just show the first device which is effectively the existing semantics without a warning. This is an update on the original buggy patch that I then forgot to resubmit. Confusingly it was proposed by Red Hat, written by Etched Pixels fixed and submitted by Intel ... Resolves-Bug: http://bugzilla.kernel.org/show_bug.cgi?id=9749 Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> a2fffcedd4d9178663175dcc3816d86734336505 Linus Torvalds torvalds@linux-foundation.org ca55bd7e2905d344bf697f7c2cc347cb42999e7a Alan Cox alan@linux.intel.com http://github.com/github/linux-2.6/commit/d3ae33efb8e2f277f9007eb060c9d0b91ab38ae1 d3ae33efb8e2f277f9007eb060c9d0b91ab38ae1 2009-06-02T09:49:46-07:00 2009-06-02T04:34:31-07:00 pata_netcell: LBA48 force identify bits correct This matches Bartlomiej's patch for ide_pci_generic: c339dfdd65b52bfd947ab29d1210314a2f6d622d In the libata case netcell has its own mini driver. I suspect this fix is actually only needed for some firmware revs but it does no harm either way. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 1664f7e899a558d39a66b9b958332776a9f875ec Linus Torvalds torvalds@linux-foundation.org 4157fd85fc794bb7896b65c0cf686aa89d711d57 12186be7d2e1106cede1cc728526e3d7998cbe94 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/ca55bd7e2905d344bf697f7c2cc347cb42999e7a ca55bd7e2905d344bf697f7c2cc347cb42999e7a 2009-06-02T09:49:06-07:00 2009-06-02T09:49:06-07:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: net_cls: fix unconfigured struct tcf_proto keeps chaining and avoid kernel panic when we use cls_cgroup e1000: add missing length check to e1000 receive routine forcedeth: add phy_power_down parameter, leave phy powered up by default (v2) Bluetooth: Remove useless flush_work() causing lockdep warnings f2b45dcfd55e72398d29320d2b3b9c3bace94a85 Linus Torvalds torvalds@linux-foundation.org e7c4f03b839ba4b64ce0a7c71d71a8e1b086c840 1b17d766463d51904cb242f194a780737e5f73ef Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/4157fd85fc794bb7896b65c0cf686aa89d711d57 4157fd85fc794bb7896b65c0cf686aa89d711d57 2009-06-02T09:47:21-07:00 2009-06-02T09:47:21-07:00 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: prevent deadlock in xfs_qm_shake() xfs: fix overflow in xfs_growfs_data_private xfs: fix double unlock in xfs_swap_extents() 4ba3ebbea7bcaaa6d7a4ad1c5501c3c4a8d08745 Linus Torvalds torvalds@linux-foundation.org ea30e11970a96cfe5e32c03a29332554573b4a10 Minoru Usui usui@mxm.nes.nec.co.jp http://github.com/github/linux-2.6/commit/12186be7d2e1106cede1cc728526e3d7998cbe94 12186be7d2e1106cede1cc728526e3d7998cbe94 2009-06-02T02:17:34-07:00 2009-06-02T02:17:34-07:00 net_cls: fix unconfigured struct tcf_proto keeps chaining and avoid kernel panic when we use cls_cgroup This patch fixes a bug which unconfigured struct tcf_proto keeps chaining in tc_ctl_tfilter(), and avoids kernel panic in cls_cgroup_classify() when we use cls_cgroup. When we execute 'tc filter add', tcf_proto is allocated, initialized by classifier's init(), and chained. After it's chained, tc_ctl_tfilter() calls classifier's change(). When classifier's change() fails, tc_ctl_tfilter() does not free and keeps tcf_proto. In addition, cls_cgroup is initialized in change() not in init(). It accesses unconfigured struct tcf_proto which is chained before change(), then hits Oops. Signed-off-by: Minoru Usui <usui@mxm.nes.nec.co.jp> Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Tested-by: Minoru Usui <usui@mxm.nes.nec.co.jp> Signed-off-by: David S. Miller <davem@davemloft.net> a27e9c1cf720fbd31d67c27ea1426a0ae891733b David S. Miller davem@davemloft.net 5a9a8e32ebe269c71d8d3e78f9435fe7729f38e9 Neil Horman nhorman@tuxdriver.com http://github.com/github/linux-2.6/commit/ea30e11970a96cfe5e32c03a29332554573b4a10 ea30e11970a96cfe5e32c03a29332554573b4a10 2009-06-02T01:29:58-07:00 2009-06-02T01:29:58-07:00 e1000: add missing length check to e1000 receive routine Patch to fix bad length checking in e1000. E1000 by default does two things: 1) Spans rx descriptors for packets that don't fit into 1 skb on recieve 2) Strips the crc from a frame by subtracting 4 bytes from the length prior to doing an skb_put Since the e1000 driver isn't written to support receiving packets that span multiple rx buffers, it checks the End of Packet bit of every frame, and discards it if its not set. This places us in a situation where, if we have a spanning packet, the first part is discarded, but the second part is not (since it is the end of packet, and it passes the EOP bit test). If the second part of the frame is small (4 bytes or less), we subtract 4 from it to remove its crc, underflow the length, and wind up in skb_over_panic, when we try to skb_put a huge number of bytes into the skb. This amounts to a remote DOS attack through careful selection of frame size in relation to interface MTU. The fix for this is already in the e1000e driver, as well as the e1000 sourceforge driver, but no one ever pushed it to e1000. This is lifted straight from e1000e, and prevents small frames from causing the underflow described above Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Tested-by: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: David S. Miller <davem@davemloft.net> b4e90ff7bb784d1b4dbd65ee8c17249b993b0c51 David S. Miller davem@davemloft.net fc23ffe075365d2f21b1046048ad0d342bbb41be Ed Swierk eswierk@aristanetworks.com http://github.com/github/linux-2.6/commit/5a9a8e32ebe269c71d8d3e78f9435fe7729f38e9 5a9a8e32ebe269c71d8d3e78f9435fe7729f38e9 2009-06-02T00:19:52-07:00 2009-06-02T00:19:52-07:00 forcedeth: add phy_power_down parameter, leave phy powered up by default (v2) Add a phy_power_down parameter to forcedeth: set to 1 to power down the phy and disable the link when an interface goes down; set to 0 to always leave the phy powered up. The phy power state persists across reboots; Windows, some BIOSes, and older versions of Linux don't bother to power up the phy again, forcing users to remove all power to get the interface working (see http://bugzilla.kernel.org/show_bug.cgi?id=13072). Leaving the phy powered on is the safest default behavior. Users accustomed to seeing the link state reflect the interface state and/or wanting to minimize power consumption can set phy_power_down=1 if compatibility with other OSes is not an issue. Signed-off-by: Ed Swierk <eswierk@aristanetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net> 37d22a060fd62528d028cba40b2278c289736cea David S. Miller davem@davemloft.net e6da7c9fed111ba1243297ee6eda8e24ae11c384 Felix Blyakher felixb@sgi.com http://github.com/github/linux-2.6/commit/1b17d766463d51904cb242f194a780737e5f73ef 1b17d766463d51904cb242f194a780737e5f73ef 2009-06-01T20:59:45-07:00 2009-06-01T11:13:24-07:00 xfs: prevent deadlock in xfs_qm_shake() It's possible to recurse into filesystem from the memory allocation, which deadlocks in xfs_qm_shake(). Add check for __GFP_FS, and bail out if it is not set. Signed-off-by: Felix Blyakher <felixb@sgi.com> Signed-off-by: Hedi Berriche <hedi@sgi.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Felix Blyakher <felixb@sgi.com> 25d43875b8c539d080141479a0695ab1ff24965c Felix Blyakher felixb@sgi.com 1f23920dbf1377fa9e4aef4f3d20c34a06a71a35 Eric Sandeen sandeen@sandeen.net http://github.com/github/linux-2.6/commit/e6da7c9fed111ba1243297ee6eda8e24ae11c384 e6da7c9fed111ba1243297ee6eda8e24ae11c384 2009-06-01T20:59:38-07:00 2009-05-23T12:30:12-07:00 xfs: fix overflow in xfs_growfs_data_private In the case where growing a filesystem would leave the last AG too small, the fixup code has an overflow in the calculation of the new size with one fewer ag, because "nagcount" is a 32 bit number. If the new filesystem has > 2^32 blocks in it this causes a problem resulting in an EINVAL return from growfs: # xfs_io -f -c "truncate 19998630180864" fsfile # mkfs.xfs -f -bsize=4096 -dagsize=76288719b,size=3905982455b fsfile # mount -o loop fsfile /mnt # xfs_growfs /mnt meta-data=/dev/loop0 isize=256 agcount=52, agsize=76288719 blks = sectsz=512 attr=2 data = bsize=4096 blocks=3905982455, imaxpct=5 = sunit=0 swidth=0 blks naming =version 2 bsize=4096 ascii-ci=0 log =internal bsize=4096 blocks=32768, version=2 = sectsz=512 sunit=0 blks, lazy-count=0 realtime =none extsz=4096 blocks=0, rtextents=0 xfs_growfs: XFS_IOC_FSGROWFSDATA xfsctl failed: Invalid argument Reported-by: richard.ems@cape-horn-eng.com Signed-off-by: Eric Sandeen <sandeen@sandeen.net> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Felix Blyakher <felixb@sgi.com> Signed-off-by: Felix Blyakher <felixb@sgi.com> 7e683f4591bdb349eef6ea6f80517b71965143b8 Felix Blyakher felixb@sgi.com 28e211700a81b0a934b6c7a4b8e7dda843634d2f Felix Blyakher felixb@sgi.com http://github.com/github/linux-2.6/commit/1f23920dbf1377fa9e4aef4f3d20c34a06a71a35 1f23920dbf1377fa9e4aef4f3d20c34a06a71a35 2009-06-01T20:59:29-07:00 2009-05-07T17:49:45-07:00 xfs: fix double unlock in xfs_swap_extents() Regreesion from commit ef8f7fc, which rearranged the code in xfs_swap_extents() leading to double unlock of xfs inode ilock. That resulted in xfs_fsr deadlocking itself on platforms, which don't handle double unlock of rw_semaphore nicely. It caused the count go negative, which represents the write holder, without really having one. ia64 is one of the platforms where deadlock was easily reproduced and the fix was tested. Signed-off-by: Eric Sandeen <sandeen@sandeen.net> Reviewed-by: Eric Sandeen <sandeen@sandeen.net> Signed-off-by: Felix Blyakher <felixb@sgi.com> 0fa80478499f1c42b2dc649659e1d1f22c6862f2 Felix Blyakher felixb@sgi.com d9244b5d2fbfe9fa540024b410047af13ceec90f Benjamin Herrenschmidt benh@kernel.crashing.org http://github.com/github/linux-2.6/commit/60e59f68824102c87e64c5f51c4e57c0b8a61e46 60e59f68824102c87e64c5f51c4e57c0b8a61e46 2009-06-01T18:12:35-07:00 2009-05-24T13:34:10-07:00 powerpc/pmac: Update PowerMac 32-bit defconfig This mostly adds back AppleTouch support and adds CONFIG_HIGHMEM by default. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> 510e63d4a546665637573fef9d4c3892e6ad8ed0 Benjamin Herrenschmidt benh@kernel.crashing.org cf9f6e21c155d5add733b969c695837ead79eeab 4c713189485dbea875aecd1990daed74908e181d David S. Miller davem@davemloft.net http://github.com/github/linux-2.6/commit/fc23ffe075365d2f21b1046048ad0d342bbb41be fc23ffe075365d2f21b1046048ad0d342bbb41be 2009-06-01T14:32:08-07:00 2009-06-01T14:32:08-07:00 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6 164889c120908fbfeae36790f7bbee0271a30873 David S. Miller davem@davemloft.net d9244b5d2fbfe9fa540024b410047af13ceec90f d315a0e09f1c8b833cacd5e72f3edea419978138 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/e7c4f03b839ba4b64ce0a7c71d71a8e1b086c840 e7c4f03b839ba4b64ce0a7c71d71a8e1b086c840 2009-06-01T09:12:44-07:00 2009-06-01T09:12:44-07:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: hash - Fix handling of sg entry that crosses page boundary b9724a621b17e505bf6954732c2251ef6261d697 Linus Torvalds torvalds@linux-foundation.org 65039a31f4e44630f96f1b602c43cc8ad180d4fe d54d462472a16fc07adb53a2fcd6c0c2a9a8dd1d Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/d9244b5d2fbfe9fa540024b410047af13ceec90f d9244b5d2fbfe9fa540024b410047af13ceec90f 2009-06-01T08:03:09-07:00 2009-06-01T08:03:09-07:00 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: Update documentation on fan_max hwmon: (lm78) Add missing __devexit_p() d0fd7ce9146e89685d7fe2ee543450df83a0024f Linus Torvalds torvalds@linux-foundation.org 6e429101849416551150dad451f7e8625317ae09 6373fffc5d555caf3acf7c5796cec9820aaf7479 Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/65039a31f4e44630f96f1b602c43cc8ad180d4fe 65039a31f4e44630f96f1b602c43cc8ad180d4fe 2009-06-01T08:02:31-07:00 2009-06-01T08:02:31-07:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix section attribute warnings. sparc64: Fix SET_PERSONALITY to not clip bits outside of PER_MASK. 33d671501970281f3587d97e7aba31c8f2e21cd6 Linus Torvalds torvalds@linux-foundation.org c4e51e465796e60b8416d05572bee57a25e000ae cf9f6e21c155d5add733b969c695837ead79eeab Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/6e429101849416551150dad451f7e8625317ae09 6e429101849416551150dad451f7e8625317ae09 2009-06-01T08:02:05-07:00 2009-06-01T08:02:05-07:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: 3c509: Add missing EISA IDs MAINTAINERS: take maintainership of the cpmac Ethernet driver net/firmare: Ignore .cis files ath1e: add new device id for asus hardware mlx4_en: Fix a kernel panic when waking tx queue rtl8187: add USB ID for Linksys WUSB54GC-EU v2 USB wifi dongle at76c50x-usb: avoid mutex deadlock in at76_dwork_hw_scan mac8390: fix build with NET_POLL_CONTROLLER cxgb3: link fault fixes cxgb3: fix dma mapping regression netfilter: nfnetlink_log: fix wrong skbuff size calculation netfilter: xt_hashlimit does a wrong SEQ_SKIP bfin_mac: fix build error due to net_device_ops convert atlx: move modinfo data from atlx.h to atl1.c gianfar: fix babbling rx error event bug cls_cgroup: read classid atomically in classifier netfilter: nf_ct_dccp: add missing DCCP protocol changes in event cache netfilter: nf_ct_tcp: fix accepting invalid RST segments 8b677b7b56e0f8ede9e8c11368b1dc6c666dd2e6 Linus Torvalds torvalds@linux-foundation.org 700d4558fc947542218e6acbc20d1347981ea399 d280cc989ad591607e812cd5c5dfde702b5f191a Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/c4e51e465796e60b8416d05572bee57a25e000ae c4e51e465796e60b8416d05572bee57a25e000ae 2009-06-01T08:01:42-07:00 2009-06-01T08:01:42-07:00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6: headers_check fix: linux/net_dropmon.h headers_check fix: linux/auto_fs.h b39d5a632a3e720d1127c328711c0b8384df3f41 Linus Torvalds torvalds@linux-foundation.org 39d8bbedb9571a89d638f5b05358f26ab503d7a6 Christian Engelmayer Christian.Engelmayer@frequentis.com http://github.com/github/linux-2.6/commit/d54d462472a16fc07adb53a2fcd6c0c2a9a8dd1d d54d462472a16fc07adb53a2fcd6c0c2a9a8dd1d 2009-06-01T04:46:50-07:00 2009-06-01T04:46:50-07:00 hwmon: Update documentation on fan_max Add fan_max description. Add fan limit alarm 'max_alarm' to the alarm section. Signed-off-by: Christian Engelmayer <christian.engelmayer@frequentis.com> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> 0a8bb5ef786e3d1209af7282e135ba882013e5a2 Jean Delvare khali@linux-fr.org 3218911f839b6c85acbf872ad264ea69aa4d89ad Mike Frysinger vapier@gentoo.org http://github.com/github/linux-2.6/commit/39d8bbedb9571a89d638f5b05358f26ab503d7a6 39d8bbedb9571a89d638f5b05358f26ab503d7a6 2009-06-01T04:46:49-07:00 2009-06-01T04:46:49-07:00 hwmon: (lm78) Add missing __devexit_p() The remove function uses __devexit, so the .remove assignment needs __devexit_p() to fix a build error with hotplug disabled. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Jean Delvare <khali@linux-fr.org> 9868e75fa933a384d90e80c26ee369a6cf2cc8ad Jean Delvare khali@linux-fr.org 4371ee353c3fc41aad9458b8e8e627eb508bc9a3 Maciej W. Rozycki macro@linux-mips.org http://github.com/github/linux-2.6/commit/cf9f6e21c155d5add733b969c695837ead79eeab cf9f6e21c155d5add733b969c695837ead79eeab 2009-06-01T03:12:04-07:00 2009-06-01T03:12:04-07:00 3c509: Add missing EISA IDs Several EISA device IDs for 3c509 family network cards are missing from the driver, making the cards unusable in their EISA mode. Here's a fix to add them based on the EISA configuration files distributed by 3Com and our eisa.ids database. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net> 0e5e77a5b74241a1569c8eb79def560c6527ca67 David S. Miller davem@davemloft.net cf4ae4e3de83e2c7394af70b46f4f50e5f0fb90c Florian Fainelli florian@openwrt.org http://github.com/github/linux-2.6/commit/4371ee353c3fc41aad9458b8e8e627eb508bc9a3 4371ee353c3fc41aad9458b8e8e627eb508bc9a3 2009-06-01T02:43:17-07:00 2009-06-01T02:43:17-07:00 MAINTAINERS: take maintainership of the cpmac Ethernet driver This patch adds me as the maintainer of the CPMAC (AR7) Ethernet driver. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net> e76a77a9f9abd2eea523b47d09c1dd156c182ce1 David S. Miller davem@davemloft.net 52bb25a620e1925bb53d41d0ed28571b3de98a31 Jaswinder Singh Rajput jaswinderrajput@gmail.com http://github.com/github/linux-2.6/commit/d280cc989ad591607e812cd5c5dfde702b5f191a d280cc989ad591607e812cd5c5dfde702b5f191a 2009-05-31T23:23:25-07:00 2009-05-31T23:23:25-07:00 headers_check fix: linux/net_dropmon.h fix the following 'make headers_check' warnings: usr/include/linux/net_dropmon.h:7: found __[us]{8,16,32,64} type without #include <linux/types.h> Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> 44a5d5cee8702b49a8653bb4f0cbd82b1c99dbb6 Jaswinder Singh Rajput jaswinderrajput@gmail.com 3218911f839b6c85acbf872ad264ea69aa4d89ad Jaswinder Singh Rajput jaswinderrajput@gmail.com http://github.com/github/linux-2.6/commit/52bb25a620e1925bb53d41d0ed28571b3de98a31 52bb25a620e1925bb53d41d0ed28571b3de98a31 2009-05-31T23:21:13-07:00 2009-05-31T23:21:13-07:00 headers_check fix: linux/auto_fs.h fix the following 'make headers_check' warnings: usr/include/linux/auto_fs.h:17: include of <linux/types.h> is preferred over <asm/types.h> Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> d6fe38475ec9df22c4acfe297d19ceb9e0ca824f Jaswinder Singh Rajput jaswinderrajput@gmail.com 3218911f839b6c85acbf872ad264ea69aa4d89ad Herbert Xu herbert@gondor.apana.org.au http://github.com/github/linux-2.6/commit/d315a0e09f1c8b833cacd5e72f3edea419978138 d315a0e09f1c8b833cacd5e72f3edea419978138 2009-05-31T06:09:22-07:00 2009-05-31T06:09:22-07:00 crypto: hash - Fix handling of sg entry that crosses page boundary A quirk that we've always supported is having an sg entry that's bigger than a page, or more generally an sg entry that crosses page boundaries. Even though it would be better to explicitly have to sg entries for this, we need to support it for the existing users, in particular, IPsec. The new ahash sg walking code did try to handle this, but there was a bug where we didn't increment the page so kept on walking on the first page over an dover again. This patch fixes it. Tested-by: Martin Willi <martin@strongswan.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 335d0d482ef10584320a1ab6b139fe729f031b5b Herbert Xu herbert@gondor.apana.org.au b4566ac52484a5eef1d73e310f28235cd1b0685a c339dfdd65b52bfd947ab29d1210314a2f6d622d Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/700d4558fc947542218e6acbc20d1347981ea399 700d4558fc947542218e6acbc20d1347981ea399 2009-05-30T15:25:30-07:00 2009-05-30T15:25:30-07:00 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide_pci_generic: add quirk for Netcell ATA RAID 294f67372cd6b4ecf3b951fe499a802e8d3dc22a Linus Torvalds torvalds@linux-foundation.org 5993856e53fbc4b4f28e2d481deaebeb715b1267 Bartlomiej Zolnierkiewicz bzolnier@gmail.com http://github.com/github/linux-2.6/commit/c339dfdd65b52bfd947ab29d1210314a2f6d622d c339dfdd65b52bfd947ab29d1210314a2f6d622d 2009-05-30T11:06:54-07:00 2009-05-30T11:06:54-07:00 ide_pci_generic: add quirk for Netcell ATA RAID We need to explicitly mark words 85-87 as valid ones since firmware doesn't do it. This should fix support for LBA48 and FLUSH CACHE [EXT] command which stopped working after we applied more strict checking of identify words in: commit 942dcd85bf8edf38cdc3745306ca250684d99a61 ("ide: idedisk_supports_lba48() -> ata_id_lba48_enabled()") and commit 4b58f17d7c45a8e5f4acda641bec388398b9c0fa ("ide: ide_id_has_flush_cache() -> ata_id_flush_enabled()") Reported-and-tested-by: "Trevor Hemsley" <trevor.hemsley@ntlworld.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> 00e096764387f8ba41c5917a3e826eeaec75c34e Bartlomiej Zolnierkiewicz bzolnier@gmail.com 3b798a5231be15411225b99dc1217580e8d6ae1f 62013ab5d5df297a01ae5863b5c26d758ec0af7f Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/b4566ac52484a5eef1d73e310f28235cd1b0685a b4566ac52484a5eef1d73e310f28235cd1b0685a 2009-05-30T08:04:15-07:00 2009-05-30T08:04:15-07:00 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix bh leak in nilfs_cpfile_delete_checkpoints function b49c6ee4973801b96751fcda97d7df68f4afafaf Linus Torvalds torvalds@linux-foundation.org 228b60acaa4529c2208ee7a420f6a12b464ce285 6afec830acc75a4dc4a7547c66fbf18152c946ef Linus Torvalds torvalds@linux-foundation.org http://github.com/github/linux-2.6/commit/3b798a5231be15411225b99dc1217580e8d6ae1f 3b798a5231be15411225b99dc1217580e8d6ae1f 2009-05-30T07:57:44-07:00 2009-05-30T07:57:44-07:00 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI, i915: build fix (v2) acpi-cpufreq: fix printk typo and indentation ACPI processor: remove spurious newline from warning message drm/i915: acpi/video.c fix section mismatch warning ACPI: video: DMI workaround broken Acer 5315 BIOS enabling display brightness ACPI: video: DMI workaround broken eMachines E510 BIOS enabling display brightness ACPI: sanity check _PSS frequency to prevent cpufreq crash i7300_idle: allow testing on i5000-series hardware w/o re-compile PCI/ACPI: fix wrong ref count handling in acpi_pci_bind() cpuidle: fix AMD C1E suspend hang cpuidle: makes AMD C1E work in acpi_idle 848bb9a60c0c2cf733b425c31d84c9d651b9e65e Linus Torvalds torvalds@linux-foundation.org