)]}' { "log": [ { "commit": "70dd6beac02f43a5099fcf5fddf68cfee0cbf479", "tree": "53d70a87157eafdf62612922a137fcc365439688", "parents": [ "31f46717997a83bdf6db0dd04810c0a329eb3148" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Thu May 27 19:58:37 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Thu May 27 19:58:37 2010 +0200" }, "message": "hwmon: (asus_atk0110) Don\u0027t load if ACPI resources aren\u0027t enforced\n\nWhen the user passes the kernel parameter acpi_enforce_resources\u003dlax,\nthe ACPI resources are no longer protected, so a native driver can\nmake use of them. In that case, we do not want the asus_atk0110 to be\nloaded. Unfortunately, this driver loads automatically due to its\nMODULE_DEVICE_TABLE, so the user ends up with two drivers loaded for\nthe same device - this is bad.\n\nSo I suggest that we prevent the asus_atk0110 driver from loading if\nacpi_enforce_resources\u003dlax.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Luca Tettamanti \u003ckronos.it@gmail.com\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\n" }, { "commit": "13da9e200fe4740b02cd51e07ab454627e228920", "tree": "e65f37a59c2a0e1695d5094a8f5509839e1d30cc", "parents": [ "4e89e8f61bcdff82a7b63b80ed83a6725028d61b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 26 08:30:15 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 26 08:30:15 2010 -0700" }, "message": "Revert \"endian: #define __BYTE_ORDER\"\n\nThis reverts commit b3b77c8caef1750ebeea1054e39e358550ea9f55, which was\nalso totally broken (see commit 0d2daf5cc858 that reverted the crc32\nversion of it). As reported by Stephen Rothwell, it causes problems on\nbig-endian machines:\n\n\u003e In file included from fs/jfs/jfs_types.h:33,\n\u003e from fs/jfs/jfs_incore.h:26,\n\u003e from fs/jfs/file.c:22:\n\u003e fs/jfs/endian24.h:36:101: warning: \"__LITTLE_ENDIAN\" is not defined\n\nThe kernel has never had that crazy \"__BYTE_ORDER \u003d\u003d __LITTLE_ENDIAN\"\nmodel. It\u0027s not how we do things, and it isn\u0027t how we _should_ do\nthings. So don\u0027t go there.\n\nRequested-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b1cdc4670b9508fcd47a15fbd12f70d269880b37", "tree": "fea9e2650170886d539488f8b1e064f6ca60ad36", "parents": [ "ce7d0226198aac42ed311dd2783232adc16b296d", "f925b1303e0672effc78547353bd2ddfe11f5b5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 16:59:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 16:59:51 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (63 commits)\n drivers/net/usb/asix.c: Fix pointer cast.\n be2net: Bug fix to avoid disabling bottom half during firmware upgrade.\n proc_dointvec: write a single value\n hso: add support for new products\n Phonet: fix potential use-after-free in pep_sock_close()\n ath9k: remove VEOL support for ad-hoc\n ath9k: change beacon allocation to prefer the first beacon slot\n sock.h: fix kernel-doc warning\n cls_cgroup: Fix build error when built-in\n macvlan: do proper cleanup in macvlan_common_newlink() V2\n be2net: Bug fix in init code in probe\n net/dccp: expansion of error code size\n ath9k: Fix rx of mcast/bcast frames in PS mode with auto sleep\n wireless: fix sta_info.h kernel-doc warnings\n wireless: fix mac80211.h kernel-doc warnings\n iwlwifi: testing the wrong variable in iwl_add_bssid_station()\n ath9k_htc: rare leak in ath9k_hif_usb_alloc_tx_urbs()\n ath9k_htc: dereferencing before check in hif_usb_tx_cb()\n rt2x00: Fix rt2800usb TX descriptor writing.\n rt2x00: Fix failed SLEEP-\u003eAWAKE and AWAKE-\u003eSLEEP transitions.\n ...\n" }, { "commit": "578454ff7eab61d13a26b568f99a89a2c9edc881", "tree": "6abdaf9acdd797767c92cb53e04574d3c755779e", "parents": [ "ec96e2fe954c23a54bfdf2673437a39e193a1822" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Thu May 20 18:07:20 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue May 25 15:08:26 2010 -0700" }, "message": "driver core: add devname module aliases to allow module on-demand auto-loading\n\nThis adds:\n alias: devname:\u003cname\u003e\nto some common kernel modules, which will allow the on-demand loading\nof the kernel module when the device node is accessed.\n\nIdeally all these modules would be compiled-in, but distros seems too\nmuch in love with their modularization that we need to cover the common\ncases with this new facility. It will allow us to remove a bunch of pretty\nuseless init scripts and modprobes from init scripts.\n\nThe static device node aliases will be carried in the module itself. The\nprogram depmod will extract this information to a file in the module directory:\n $ cat /lib/modules/2.6.34-00650-g537b60d-dirty/modules.devname\n # Device nodes to trigger on-demand module loading.\n microcode cpu/microcode c10:184\n fuse fuse c10:229\n ppp_generic ppp c108:0\n tun net/tun c10:200\n dm_mod mapper/control c10:235\n\nUdev will pick up the depmod created file on startup and create all the\nstatic device nodes which the kernel modules specify, so that these modules\nget automatically loaded when the device node is accessed:\n $ /sbin/udevd --debug\n ...\n static_dev_create_from_modules: mknod \u0027/dev/cpu/microcode\u0027 c10:184\n static_dev_create_from_modules: mknod \u0027/dev/fuse\u0027 c10:229\n static_dev_create_from_modules: mknod \u0027/dev/ppp\u0027 c108:0\n static_dev_create_from_modules: mknod \u0027/dev/net/tun\u0027 c10:200\n static_dev_create_from_modules: mknod \u0027/dev/mapper/control\u0027 c10:235\n udev_rules_apply_static_dev_perms: chmod \u0027/dev/net/tun\u0027 0666\n udev_rules_apply_static_dev_perms: chmod \u0027/dev/fuse\u0027 0666\n\nA few device nodes are switched to statically allocated numbers, to allow\nthe static nodes to work. This might also useful for systems which still run\na plain static /dev, which is completely unsafe to use with any dynamic minor\nnumbers.\n\nNote:\nThe devname aliases must be limited to the *common* and *single*instance*\ndevice nodes, like the misc devices, and never be used for conceptually limited\nsystems like the loop devices, which should rather get fixed properly and get a\ncontrol node for losetup to talk to, instead of creating a random number of\ndevice nodes in advance, regardless if they are ever used.\n\nThis facility is to hide the mess distros are creating with too modualized\nkernels, and just to hide that these modules are not compiled-in, and not to\npaper-over broken concepts. Thanks! :)\n\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Miklos Szeredi \u003cmiklos@szeredi.hu\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nCc: Alasdair G Kergon \u003cagk@redhat.com\u003e\nCc: Tigran Aivazian \u003ctigran@aivazian.fsnet.co.uk\u003e\nCc: Ian Kent \u003craven@themaw.net\u003e\nSigned-Off-By: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "a261af927df64523925c98369106de15af9d7b5e", "tree": "3c8fb8be59b8a4733eb5b63ecf567976185c9f58", "parents": [ "acfbe96a3035639619a6533e04d88ed4ef9ccb61", "a65e4cb402b5f3e120570ba1faca4354d47e8f2f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 13:15:11 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 13:15:11 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "ec96e2fe954c23a54bfdf2673437a39e193a1822", "tree": "e4041c68ef20a3337c56aefc8db785156307edd1", "parents": [ "8e9815a0f8882aaa68645b001bb7538db8886802", "f949c0edd84101bfd30b3e7389c1a12b067e561d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 12:06:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 12:06:33 2010 -0700" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)\n ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900\n ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline\n ARM: 6140/1: silence a bogus sparse warning in unwind.c\n ARM: mach-at91: duplicated include\n ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup\n ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup\n ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup\n ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup\n ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup\n ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup\n ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup\n ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup\n ARM: SPEAR6xx: remove duplicated #include\n ARM: s3c6400_defconfig: Add NAND driver\n ARM: s3c6400_defconfig: enable sound as modules\n ARM: s3c6400_defconfig: enable power management\n ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34\n ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34\n ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34\n ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34\n ...\n" }, { "commit": "8e9815a0f8882aaa68645b001bb7538db8886802", "tree": "5654a4f982ea681158185b21321acd470cb9b87c", "parents": [ "702c0b04978ce316ec05f4d0a9c148fac124335b", "acdc30b56abc0db7d409a13e9b6c72ea23b6f90d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 12:05:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 12:05:17 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n RDMA/nes: Fix incorrect unlock in nes_process_mac_intr()\n RDMA/nes: Async event for closed QP causes crash\n RDMA/nes: Have ethtool read hardware registers for rx/tx stats\n RDMA/cxgb4: Only insert sq qid in lookup table\n RDMA/cxgb4: Support IB_WR_READ_WITH_INV opcode\n RDMA/cxgb4: Set fence flag for inv-local-stag work requests\n RDMA/cxgb4: Update some HW limits\n RDMA/cxgb4: Don\u0027t limit fastreg page list depth\n RDMA/cxgb4: Return proper errors in fastreg mr/pbl allocation\n RDMA/cxgb4: Fix overflow bug in CQ arm\n RDMA/cxgb4: Optimize CQ overflow detection\n RDMA/cxgb4: CQ size must be IQ size - 2\n RDMA/cxgb4: Register RDMA provider based on LLD state_change events\n RDMA/cxgb4: Detach from the LLD after unregistering RDMA device\n IB/ipath: Remove support for QLogic PCIe QLE devices\n IB/qib: Add new qib driver for QLogic PCIe InfiniBand adapters\n IB/mad: Make needlessly global mad_sendq_size/mad_recvq_size static\n IB/core: Allow device-specific per-port sysfs files\n mlx4_core: Clean up mlx4_alloc_icm() a bit\n mlx4_core: Fix possible chunk sg list overflow in mlx4_alloc_icm()\n" }, { "commit": "702c0b04978ce316ec05f4d0a9c148fac124335b", "tree": "3908c5821221d950a6b1a7e2e898899e63e7d437", "parents": [ "c19eb8f0d1bd442ed1aff0b413dd822620771c29", "bf6a67ee3427ab142136e03e90d0b67ecbca5ff2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 12:04:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 12:04:17 2010 -0700" }, "message": "Merge branch \u0027next-spi\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-spi\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/xilinx: Fix compile error\n spi/davinci: Fix clock prescale factor computation\n spi: move bitbang txrx utility functions to private header\n spi/mpc5121: Add SPI master driver for MPC5121 PSC\n powerpc/mpc5121: move PSC FIFO memory init to platform code\n spi/ep93xx: implemented driver for Cirrus EP93xx SPI controller\n Documentation/spi/* compile warning fix\n spi/omap2_mcspi: Check params before dereference or use\n spi/omap2_mcspi: add turbo mode support\n spi/omap2_mcspi: change default DMA_MIN_BYTES value to 160\n spi/pl022: fix stop queue procedure\n spi/pl022: add support for the PL023 derivate\n spi/pl022: fix up differences between ARM and ST versions\n spi/spi_mpc8xxx: Do not use map_tx_dma to unmap rx_dma\n spi/spi_mpc8xxx: Fix QE mode Litte Endian\n spi/spi_mpc8xxx: fix potential memory corruption.\n" }, { "commit": "99765cc7e393c8637abaaf0c73f28ec63370d35c", "tree": "c386ff98390afe9a5f2626dbd3c49b7371a020eb", "parents": [ "51e618c357b39597b474165c5d17067afe8f16a6", "500b4ac90d1103a7c302d5bb16c53f4ffc45d057" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 11:49:41 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 11:49:41 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:\n regulator: return set_mode is same mode is requested\n Regulators: ab3100/bq24022: add a missing .owner field in regulator_desc\n twl6030: regulator: Remove vsel tables and use formula for calculation\n mc13783-regulator: fix vaild voltage range checking for mc13783_fixed_regulator_set_voltage\n regulator: use voltage number array in 88pm860x\n regulator: make 88pm860x sharing one driver structure\n regulator: simplify regulator_register() error handling\n regulator: fix unset_regulator_supplies() to remove all matches\n regulator: prevent registration of matching regulator consumer supplies\n regulator: Allow regulator-regulator supplies to be specified by name\n" }, { "commit": "49c39b4953e545ce3b5957cce22e1ade01c6e642", "tree": "7ed545609a4abd9cf818d27a08019e0c821f8d48", "parents": [ "1f9c3e1f07e39c8af3bf42236fc553b5bb0f83f1" ], "author": { "name": "Grazvydas Ignotas", "email": "notasas@gmail.com", "time": "Mon May 24 14:34:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:09 2010 -0700" }, "message": "fbdev: move FBIO_WAITFORVSYNC to linux/fb.h\n\nFBIO_WAITFORVSYNC is currently implemented by matroxfb, atyfb, intelfb and\nmore. All of them keep redefining the same FBIO_WAITFORVSYNC macro over\nand over again, so move it to linux/fb.h and clean up those duplicate\ndefines.\n\nSigned-off-by: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nCc: Ville Syrjala \u003csyrjala@sci.fi\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Maik Broemme \u003cmbroemme@plusserver.de\u003e\nCc: Petr Vandrovec \u003cvandrove@vc.cvut.cz\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@poczta.fm\u003e\nCc: \"Hiremath, Vaibhav\" \u003chvaibhav@ti.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1f9c3e1f07e39c8af3bf42236fc553b5bb0f83f1", "tree": "e7933cec5b2200f3fc0c55b47a7af5bfac558596", "parents": [ "fb6cb3270af8f2ad3dd556906a9c52aa85754849" ], "author": { "name": "Martin Ambrose", "email": "martin@ti.com", "time": "Mon May 24 14:34:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:09 2010 -0700" }, "message": "fbdev: da8xx/omap-l1xx: implement double buffering\n\nThis work includes the following:\n\n- Implement handler for FBIO_WAITFORVSYNC ioctl.\n\n- Allocate the data and palette buffers separately. A consequence of\n this is that the palette and data loading is now done in different\n phases. And that the LCD must be disabled temporarily after the palette\n is loaded but this will only happen once after init and each time the\n palette is changed. I think this is OK.\n\n- Allocate two (ping and pong) framebuffers from memory.\n\n- Add pan_display handler which toggles the LCDC DMA registers between\n the ping and pong buffers.\n\nSigned-off-by: Martin Ambrose \u003cmartin@ti.com\u003e\nCc: Chaithrika U S \u003cchaithrika@ti.com\u003e\nCc: Sudhakar Rajashekhara \u003csudhakar.raj@ti.com\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@poczta.fm\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6d94d4081048756df78444a07201156f4930fe48", "tree": "7bfecedff2b04284ab45764d0ce6ec183a6594b3", "parents": [ "92ba4fe4b53b4fa5ac71ec4d80572348fca85796" ], "author": { "name": "Samu Onkalo", "email": "samu.p.onkalo@nokia.com", "time": "Mon May 24 14:33:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:07 2010 -0700" }, "message": "lis3: interrupt handlers for 8bit wakeup and click events\n\nContent for the 8bit device threaded interrupt handlers. Depending on the\ninterrupt line and chip configuration, either click or wakeup / freefall\nhandler is called. In case of click, BTN_ event is sent via input device.\n In case of wakeup or freefall, input device ABS_ events are updated\nimmediatelly.\n\nIt is still possible to configure interrupt line 1 for fast freefall\ndetection and use the second line either for click or threshold based\ninterrupts. Or both lines can be used for click / threshold interrupts.\n\nPolled input device can be set to stopped state and still get coordinate\nupdates via input device using interrupt based method. Polled mode and\ninterrupt mode can also be used parallel.\n\nBTN_ events are remapped based on existing axis remapping information.\n\nSigned-off-by: Samu Onkalo \u003csamu.p.onkalo@nokia.com\u003e\nAcked-by: Eric Piel \u003ceric.piel@tremplin-utc.net\u003e\nCc: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "92ba4fe4b53b4fa5ac71ec4d80572348fca85796", "tree": "c18630d8aac05eacd7320bee91a40d101d72cf5c", "parents": [ "342c5f128140d54961c435d1702eadcaba97a37a" ], "author": { "name": "Samu Onkalo", "email": "samu.p.onkalo@nokia.com", "time": "Mon May 24 14:33:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:06 2010 -0700" }, "message": "lis3: add skeletons for interrupt handlers\n\nOriginal lis3 driver didn\u0027t provide interrupt handler(s) for click or\nthreshold event handling. This patch adds threaded handlers for one or\ntwo interrupt lines for 8 bit device. Actual content for interrupt\nhandling is provided in the separate patch.\n\nSigned-off-by: Samu Onkalo \u003csamu.p.onkalo@nokia.com\u003e\nTested-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nAcked-by: Eric Piel \u003ceric.piel@tremplin-utc.net\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "342c5f128140d54961c435d1702eadcaba97a37a", "tree": "884b712d67b3319c9d8d747d5dd0cd5e0234f842", "parents": [ "ecc437aeee65afeea2e1bed963ccf6c384c555ea" ], "author": { "name": "Samu Onkalo", "email": "samu.p.onkalo@nokia.com", "time": "Mon May 24 14:33:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:06 2010 -0700" }, "message": "lis3: introduce platform data for second ff / wu unit\n\n8 bit device has two wakeup / free fall units. It was not possible to\nconfigure the second unit. This patch introduces configuration entry to\nthe platform data and also corresponding changes to the 8 bit setup\nfunction.\n\nHigh pass filters were enabled by default. Patch introduces configuration\noption for high pass filter cut off frequency and also possibility to\ndisable or enable the filter via platform data. Since the control is a\nnew one and default state was filter enabled, new option is used to\ndisable the filter. This way old platform data is still compatible with\nthe change.\n\nSigned-off-by: Samu Onkalo \u003csamu.p.onkalo@nokia.com\u003e\nAcked-by: Eric Piel \u003ceric.piel@tremplin-utc.net\u003e\nTested-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "903788892ea0fc7fcaf7e8e5fac9a77379fc215b", "tree": "6945c6e623bf6fec7cdcd895a881c4d5bf405fa6", "parents": [ "db0fd97c270f1e80321f7ae55234643ca0978c54" ], "author": { "name": "Andy Shevchenko", "email": "ext-andriy.shevchenko@nokia.com", "time": "Mon May 24 14:33:23 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:05 2010 -0700" }, "message": "lib: introduce common method to convert hex digits\n\nhex_to_bin() is a little method which converts hex digit to its actual\nvalue. There are plenty of places where such functionality is needed.\n\n[akpm@linux-foundation.org: use tolower(), saving 3 bytes, test the more common case first - it\u0027s quicker]\n[akpm@linux-foundation.org: relocate tolower to make it even faster! (Joe)]\nSigned-off-by: Andy Shevchenko \u003cext-andriy.shevchenko@nokia.com\u003e\nCc: Tilman Schmidt \u003ctilman@imap.cc\u003e\nCc: Duncan Sands \u003cduncan.sands@free.fr\u003e\nCc: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: \"Richard Russon (FlatCap)\" \u003cldm@flatcap.org\u003e\nCc: John W. Linville \u003clinville@tuxdriver.com\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2b2f68b5383ea107295d7f1483256866e2daa1e3", "tree": "ab643941ab96fce48117479d321adfa3d9510d23", "parents": [ "ea46c8f774f295c45fac48101d54be347d3d453b" ], "author": { "name": "Florian Ragwitz", "email": "rafl@debian.org", "time": "Mon May 24 14:33:21 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:05 2010 -0700" }, "message": "DYNAMIC_DEBUG: fix documentation errors\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Florian Ragwitz \u003crafl@debian.org\u003e\nCc: Jason Baron \u003cjbaron@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f40c396a9ab04eae526990e2b2cef875b424ed4e", "tree": "92b87fb6feb9470f9aa3cacc9344f7907ab2489c", "parents": [ "d8521fcc5e0ad3e79bbc4231bb20a6cdc2b50164" ], "author": { "name": "OGAWA Hirofumi", "email": "hirofumi@mail.parknet.co.jp", "time": "Mon May 24 14:33:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:03 2010 -0700" }, "message": "ratelimit: add ratelimit_state_init()\n\nFor now, all users of ratelimit_state allocates it statically, so\nDEFINE_RATELIMIT_STATE() is enough. But, I want to use ratelimit_state\nfor fs, i.e. per super_block to suppress too many error reports.\n\nSo, this adds ratelimit_state_init() to initialize ratelimite_state\nwhich is dynamically allocated, instead of opencoding.\n\nSigned-off-by: OGAWA Hirofumi \u003chirofumi@mail.parknet.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d8521fcc5e0ad3e79bbc4231bb20a6cdc2b50164", "tree": "7469b407cb8a87d26733cea33a1570c2433e014b", "parents": [ "fa1f68db6ca7ebb6fc4487ac215bffba06c01c28" ], "author": { "name": "OGAWA Hirofumi", "email": "hirofumi@mail.parknet.co.jp", "time": "Mon May 24 14:33:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:03 2010 -0700" }, "message": "printk_ratelimited(): fix uninitialized spinlock\n\nratelimit_state initialization of printk_ratelimited() seems broken. This\nfixes it by using DEFINE_RATELIMIT_STATE() to initialize spinlock\nproperly.\n\nSigned-off-by: OGAWA Hirofumi \u003chirofumi@mail.parknet.co.jp\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6c5e303afdf2910e58aeda56c10506342545a5af", "tree": "d8c57ef05b6d157044cb457b22ed1375a44deaae", "parents": [ "37682177af68478fa83429b735fa16913c2fbb2b" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Mon May 24 14:33:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:03 2010 -0700" }, "message": "include/asm-generic/kmap_types.h: add helpful reminder\n\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "37682177af68478fa83429b735fa16913c2fbb2b", "tree": "989ad96f1e5ca0b47e1a44111e1eb110a33a79eb", "parents": [ "fc62f2f19edf46c9bdbd1a54725b56b18c43e94f" ], "author": { "name": "Peter Fritzsche", "email": "peter.fritzsche@gmx.de", "time": "Mon May 24 14:33:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:03 2010 -0700" }, "message": "asm-generic: don\u0027t warn that atomic_t is only 24 bit\n\n32-bit Sparc used to only allow usage of 24-bit of it\u0027s atomic_t type.\nThis was corrected with linux 2.6.3 when Keith M Wesolowski changed the\nimplementation to use the parisc approach of having an array of spinlocks\nto protect the atomic_t.\n\nThese warnings were also removed from the sparc implementation when the\nnew implementation was merged in BKrev:402e4949VThdc6D3iaosSFUgabMfvw, but\nthe warning still remained in some other places without any 24-bit-only\natomic_t implementation inside the kernel.\n\nWe should remove these warnings to allow users to rely on the full 32-bit\nrange of atomic_t.\n\nSigned-off-by: Peter Fritzsche \u003cpeter.fritzsche@gmx.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fc62f2f19edf46c9bdbd1a54725b56b18c43e94f", "tree": "1742d181c4c44825df436982cb2f9ea4c386a5f3", "parents": [ "4c99000ac47cbd097e62f1b5cafad745622cedc3" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon May 24 14:33:08 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:03 2010 -0700" }, "message": "kernel.h: add pr_warn for symmetry to dev_warn, netdev_warn\n\nThe current logging macros are\npr_\u003clevel\u003e, dev_\u003clevel\u003e, netdev_\u003clevel\u003e, and netif_\u003clevel\u003e.\npr_ uses warning, the other use warn.\n\nStandardize these logging macros a bit more by adding pr_warn and\npr_warn_ratelimited.\n\nRight now, there are:\n\n$ for level in emerg alert crit err warn warning notice info ; do \\\n for prefix in pr dev netdev netif ; do \\\n echo -n \"${prefix}_${level}:\t`git grep -w \"${prefix}_${level}\" | wc -l`\t\" ; \\\n done ; \\\n echo ; \\\n done\npr_emerg: \t45\tdev_emerg: \t4\tnetdev_emerg: \t1\tnetif_emerg: \t4\npr_alert: \t24\tdev_alert: \t36\tnetdev_alert: \t1\tnetif_alert: \t6\npr_crit: \t24\tdev_crit: \t22\tnetdev_crit: \t1\tnetif_crit: \t4\npr_err: \t2013\tdev_err: \t8467\tnetdev_err: \t267\tnetif_err: \t240\npr_warn: \t0\tdev_warn: \t1818\tnetdev_warn: \t126\tnetif_warn: \t23\npr_warning: \t773\tdev_warning: \t0\tnetdev_warning:\t0\tnetif_warning: \t0\npr_notice: \t148\tdev_notice: \t111\tnetdev_notice: \t9\tnetif_notice: \t3\npr_info: \t1717\tdev_info: \t3007\tnetdev_info: \t101\tnetif_info: \t85\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4be929be34f9bdeffa40d815d32d7d60d2c7f03b", "tree": "4d2c6e2b8ef766e565e2e050ee151de2e02081d3", "parents": [ "940370fc86b920b51a34217a1facc3e9e97c2456" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon May 24 14:33:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:02 2010 -0700" }, "message": "kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN\n\n- C99 knows about USHRT_MAX/SHRT_MAX/SHRT_MIN, not\n USHORT_MAX/SHORT_MAX/SHORT_MIN.\n\n- Make SHRT_MIN of type s16, not int, for consistency.\n\n[akpm@linux-foundation.org: fix drivers/dma/timb_dma.c]\n[akpm@linux-foundation.org: fix security/keys/keyring.c]\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nAcked-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b3b77c8caef1750ebeea1054e39e358550ea9f55", "tree": "9026ca0b3453226434a4ca8878832a4910b48664", "parents": [ "e47103b1af5df52fa69e18b14d3012472f78817d" ], "author": { "name": "Joakim Tjernlund", "email": "Joakim.Tjernlund@transmode.se", "time": "Mon May 24 14:33:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:02 2010 -0700" }, "message": "endian: #define __BYTE_ORDER\n\nLinux does not define __BYTE_ORDER in its endian header files which makes\nsome header files bend backwards to get at the current endian. Lets\n#define __BYTE_ORDER in big_endian.h/litte_endian.h to make it easier for\nheader files that are used in user space too.\n\nIn userspace the convention is that\n\n 1. _both_ __LITTLE_ENDIAN and __BIG_ENDIAN are defined,\n 2. you have to test for e.g. __BYTE_ORDER \u003d\u003d __BIG_ENDIAN.\n\nSigned-off-by: Joakim Tjernlund \u003cJoakim.Tjernlund@transmode.se\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e47103b1af5df52fa69e18b14d3012472f78817d", "tree": "6652e56e361415a85ab5a7b888492e5ceef0cd94", "parents": [ "1f85f87d4f81d1e5a2d502d48316a1bdc5acac0b" ], "author": { "name": "Jani Nikula", "email": "ext-jani.1.nikula@nokia.com", "time": "Mon May 24 14:33:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:02 2010 -0700" }, "message": "err.h: add __must_check to error pointer handlers\n\nAdd __must_check to error pointer handlers to have the compiler warn about\nmistakes like:\n\n\tif (err)\n\t\tERR_PTR(err);\n\nIt found two bugs:\n\nMar 12 Nikula Jani [PATCH] enclosure: fix error path - actually return ERR_PTR() on error\nMar 12 Nikula Jani [PATCH] sunrpc: fix error path - actually return ERR_PTR() on error\n\nSigned-off-by: Jani Nikula \u003cext-jani.1.nikula@nokia.com\u003e\nCc: Phil Carmody \u003cext-phil.2.carmody@nokia.com\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c6f6b596a5a73e63e5e930c414375c0c389199ab", "tree": "900d4b3a6d198edc2045511b5b8d6001755bcfbf", "parents": [ "4eaf3f64397c3db3c5785eee508270d62a9fabd9" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Mon May 24 14:32:53 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:02 2010 -0700" }, "message": "mm: make lowmem_page_address() use PFN_PHYS() for improved portability\n\nThis ensures that platforms with lowmem PAs above 32 bits work correctly\nby avoiding truncating the PA during a left shift.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Barry Song \u003c21cnbao@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4eaf3f64397c3db3c5785eee508270d62a9fabd9", "tree": "bfd986a7e974876755ea6fe0de394199c68e2e36", "parents": [ "1f522509c77a5dea8dc384b735314f03908a6415" ], "author": { "name": "Haicheng Li", "email": "haicheng.li@linux.intel.com", "time": "Mon May 24 14:32:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:02 2010 -0700" }, "message": "mem-hotplug: fix potential race while building zonelist for new populated zone\n\nAdd global mutex zonelists_mutex to fix the possible race:\n\n CPU0 CPU1 CPU2\n(1) zone-\u003epresent_pages +\u003d online_pages;\n(2) build_all_zonelists();\n(3) alloc_page();\n(4) free_page();\n(5) build_all_zonelists();\n(6) __build_all_zonelists();\n(7) zone-\u003epageset \u003d alloc_percpu();\n\nIn step (3,4), zone-\u003epageset still points to boot_pageset, so bad\nthings may happen if 2+ nodes are in this state. Even if only 1 node\nis accessing the boot_pageset, (3) may still consume too much memory\nto fail the memory allocations in step (7).\n\nBesides, atomic operation ensures alloc_percpu() in step (7) will never fail\nsince there is a new fresh memory block added in step(6).\n\n[haicheng.li@linux.intel.com: hold zonelists_mutex when build_all_zonelists]\nSigned-off-by: Haicheng Li \u003chaicheng.li@linux.intel.com\u003e\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nReviewed-by: Andi Kleen \u003candi.kleen@intel.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1f522509c77a5dea8dc384b735314f03908a6415", "tree": "4b848527b90877a8a64c46e8e2d76723405c319d", "parents": [ "319774e25fa4b7641bdc3b0a464dd84e62103347" ], "author": { "name": "Haicheng Li", "email": "haicheng.li@linux.intel.com", "time": "Mon May 24 14:32:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:01 2010 -0700" }, "message": "mem-hotplug: avoid multiple zones sharing same boot strapping boot_pageset\n\nFor each new populated zone of hotadded node, need to update its pagesets\nwith dynamically allocated per_cpu_pageset struct for all possible CPUs:\n\n 1) Detach zone-\u003epageset from the shared boot_pageset\n at end of __build_all_zonelists().\n\n 2) Use mutex to protect zone-\u003epageset when it\u0027s still\n shared in onlined_pages()\n\nOtherwises, multiple zones of different nodes would share same boot strapping\nboot_pageset for same CPU, which will finally cause below kernel panic:\n\n ------------[ cut here ]------------\n kernel BUG at mm/page_alloc.c:1239!\n invalid opcode: 0000 [#1] SMP\n ...\n Call Trace:\n [\u003cffffffff811300c1\u003e] __alloc_pages_nodemask+0x131/0x7b0\n [\u003cffffffff81162e67\u003e] alloc_pages_current+0x87/0xd0\n [\u003cffffffff81128407\u003e] __page_cache_alloc+0x67/0x70\n [\u003cffffffff811325f0\u003e] __do_page_cache_readahead+0x120/0x260\n [\u003cffffffff81132751\u003e] ra_submit+0x21/0x30\n [\u003cffffffff811329c6\u003e] ondemand_readahead+0x166/0x2c0\n [\u003cffffffff81132ba0\u003e] page_cache_async_readahead+0x80/0xa0\n [\u003cffffffff8112a0e4\u003e] generic_file_aio_read+0x364/0x670\n [\u003cffffffff81266cfa\u003e] nfs_file_read+0xca/0x130\n [\u003cffffffff8117b20a\u003e] do_sync_read+0xfa/0x140\n [\u003cffffffff8117bf75\u003e] vfs_read+0xb5/0x1a0\n [\u003cffffffff8117c151\u003e] sys_read+0x51/0x80\n [\u003cffffffff8103c032\u003e] system_call_fastpath+0x16/0x1b\n RIP [\u003cffffffff8112ff13\u003e] get_page_from_freelist+0x883/0x900\n RSP \u003cffff88000d1e78a8\u003e\n ---[ end trace 4bda28328b9990db ]\n\n[akpm@linux-foundation.org: merge fix]\nSigned-off-by: Haicheng Li \u003chaicheng.li@linux.intel.com\u003e\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nReviewed-by: Andi Kleen \u003candi.kleen@intel.com\u003e\nReviewed-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0faa56389c793cda7f967117415717bbab24fe4e", "tree": "b0d5f12579a4448adff2b6e462488f3cc6d75326", "parents": [ "ff3d58c22b6827039983911d3460cf0c1657f8cc" ], "author": { "name": "Marcelo Roberto Jimenez", "email": "mroberto@cpti.cetuc.puc-rio.br", "time": "Mon May 24 14:32:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:01 2010 -0700" }, "message": "mm: fix NR_SECTION_ROOTS \u003d\u003d 0 when using using sparsemem extreme.\n\nGot this while compiling for ARM/SA1100:\n\nmm/sparse.c: In function \u0027__section_nr\u0027:\nmm/sparse.c:135: warning: \u0027root\u0027 is used uninitialized in this function\n\nThis patch follows Russell King\u0027s suggestion for a new calculation for\nNR_SECTION_ROOTS. Thanks also to Sergei Shtylyov for pointing out the\nexistence of the macro DIV_ROUND_UP.\n\nAtsushi Nemoto observed:\n: This fix doesn\u0027t just silence the warning - it fixes a real problem.\n:\n: Without this fix, mem_section[] might have 0 size so mem_section[0]\n: will share other variable area. For example, I got:\n:\n: c030c700 b __warned.16478\n: c030c700 B mem_section\n: c030c701 b __warned.16483\n:\n: This might cause very strange behavior. Your patch actually fixes it.\n\nSigned-off-by: Marcelo Roberto Jimenez \u003cmroberto@cpti.cetuc.puc-rio.br\u003e\nCc: Atsushi Nemoto \u003canemo@mba.ocn.ne.jp\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Sergei Shtylyov \u003csshtylyov@mvista.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ff3d58c22b6827039983911d3460cf0c1657f8cc", "tree": "bed2f2f98760425976a45858326de80aa5e7760b", "parents": [ "fd23855e38d2a7275a786238459c070b4e9f7975" ], "author": { "name": "Akinobu Mita", "email": "akinobu.mita@gmail.com", "time": "Mon May 24 14:32:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:01 2010 -0700" }, "message": "highmem: remove unneeded #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT for debug_kmap_atomic()\n\nIn f4112de6b679d84bd9b9681c7504be7bdfb7c7d5 (\"mm: introduce\ndebug_kmap_atomic\") I said that debug_kmap_atomic() needs\nCONFIG_TRACE_IRQFLAGS_SUPPORT.\n\nIt was wrong. (I thought irqs_disabled() is only available when the\narchitecture has CONFIG_TRACE_IRQFLAGS_SUPPORT)\n\nRemove the #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT check to enable\nkmap_atomic() debugging for the architectures which do not have\nCONFIG_TRACE_IRQFLAGS_SUPPORT.\n\nReported-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fd23855e38d2a7275a786238459c070b4e9f7975", "tree": "e390a91f70a428b2a70bb1fa95fcb53dd662908a", "parents": [ "263ff5d8e82e577202d2b8393585b0e2436b7ffc" ], "author": { "name": "matt mooney", "email": "mfmooney@gmail.com", "time": "Mon May 24 14:32:45 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:01 2010 -0700" }, "message": "include/linux/gfp.h: fix coding style\n\nAdd parenthesis in a define. This doesn\u0027t change functionality.\n\ncheckpatch errors:\n1) white space fixes\n2) add spaces after comas\n\nSigned-off-by: matt mooney \u003cmfm@muteddisk.com\u003e\nCc: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "263ff5d8e82e577202d2b8393585b0e2436b7ffc", "tree": "d8a1c1e7f854ae09bef85a280b365d7bb2340583", "parents": [ "cf23422b9d76215316855253da491d4c9f294372" ], "author": { "name": "matt mooney", "email": "mfmooney@gmail.com", "time": "Mon May 24 14:32:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:00 2010 -0700" }, "message": "include/linux/gfp.h: spelling fixes\n\nFix minor spelling errors in a few comments; no code changes.\n\nSigned-off-by: matt mooney \u003cmfm@muteddisk.com\u003e\nCc: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cf23422b9d76215316855253da491d4c9f294372", "tree": "5663d2519d83d830d24dffdf2571d58d3e55d3f6", "parents": [ "8b25c6d2231b978ccce9c401e771932bde79aa9f" ], "author": { "name": "minskey guo", "email": "chaohong_guo@linux.intel.com", "time": "Mon May 24 14:32:41 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:00 2010 -0700" }, "message": "cpu/mem hotplug: enable CPUs online before local memory online\n\nEnable users to online CPUs even if the CPUs belongs to a numa node which\ndoesn\u0027t have onlined local memory.\n\nThe zonlists(pg_data_t.node_zonelists[]) of a numa node are created either\nin system boot/init period, or at the time of local memory online. For a\nnuma node without onlined local memory, its zonelists are not initialized\nat present. As a result, any memory allocation operations executed by\nCPUs within this node will fail. In fact, an out-of-memory error is\ntriggered when attempt to online CPUs before memory comes to online.\n\nThis patch tries to create zonelists for such numa nodes, so that the\nmemory allocation for this node can be fallback\u0027ed to other nodes.\n\n[akpm@linux-foundation.org: remove unneeded export]\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: minskey guo\u003cchaohong.guo@intel.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Yasunori Goto \u003cy-goto@jp.fujitsu.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8b25c6d2231b978ccce9c401e771932bde79aa9f", "tree": "13845799e14e49465de1529680df7def59dcfeb8", "parents": [ "0aeb2339e54e40d0788a7017ecaeac7f5271e262" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Mon May 24 14:32:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:00 2010 -0700" }, "message": "vmscan: remove isolate_pages callback scan control\n\nFor now, we have global isolation vs. memory control group isolation, do\nnot allow the reclaim entry function to set an arbitrary page isolation\ncallback, we do not need that flexibility.\n\nAnd since we already pass around the group descriptor for the memory\ncontrol group isolation case, just use it to decide which one of the two\nisolator functions to use.\n\nThe decisions can be merged into nearby branches, so no extra cost there.\nIn fact, we save the indirect calls.\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4f92e2586b43a2402e116055d4edda704f911b5b", "tree": "6a765ebeba951c02a7878bcea52a4769ad2e45c2", "parents": [ "5e7719058079a1423ccce56148b0aaa56b2df821" ], "author": { "name": "Mel Gorman", "email": "mel@csn.ul.ie", "time": "Mon May 24 14:32:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:00 2010 -0700" }, "message": "mm: compaction: defer compaction using an exponential backoff when compaction fails\n\nThe fragmentation index may indicate that a failure is due to external\nfragmentation but after a compaction run completes, it is still possible\nfor an allocation to fail. There are two obvious reasons as to why\n\n o Page migration cannot move all pages so fragmentation remains\n o A suitable page may exist but watermarks are not met\n\nIn the event of compaction followed by an allocation failure, this patch\ndefers further compaction in the zone (1 \u003c\u003c compact_defer_shift) times.\nIf the next compaction attempt also fails, compact_defer_shift is\nincreased up to a maximum of 6. If compaction succeeds, the defer\ncounters are reset again.\n\nThe zone that is deferred is the first zone in the zonelist - i.e. the\npreferred zone. To defer compaction in the other zones, the information\nwould need to be stored in the zonelist or implemented similar to the\nzonelist_cache. This would impact the fast-paths and is not justified at\nthis time.\n\nSigned-off-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5e7719058079a1423ccce56148b0aaa56b2df821", "tree": "3666cb3d5540dcaa3d8e7df8c293a0ad603a181c", "parents": [ "56de7263fcf3eb10c8dcdf8d59a9cec831795f3f" ], "author": { "name": "Mel Gorman", "email": "mel@csn.ul.ie", "time": "Mon May 24 14:32:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:59 2010 -0700" }, "message": "mm: compaction: add a tunable that decides when memory should be compacted and when it should be reclaimed\n\nThe kernel applies some heuristics when deciding if memory should be\ncompacted or reclaimed to satisfy a high-order allocation. One of these\nis based on the fragmentation. If the index is below 500, memory will not\nbe compacted. This choice is arbitrary and not based on data. To help\noptimise the system and set a sensible default for this value, this patch\nadds a sysctl extfrag_threshold. The kernel will only compact memory if\nthe fragmentation index is above the extfrag_threshold.\n\n[randy.dunlap@oracle.com: Fix build errors when proc fs is not configured]\nSigned-off-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "56de7263fcf3eb10c8dcdf8d59a9cec831795f3f", "tree": "164637c0b678e20adfdcec4129563d9234faf405", "parents": [ "ed4a6d7f0676db50b5023cc01f6cda82a2f2a307" ], "author": { "name": "Mel Gorman", "email": "mel@csn.ul.ie", "time": "Mon May 24 14:32:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:59 2010 -0700" }, "message": "mm: compaction: direct compact when a high-order allocation fails\n\nOrdinarily when a high-order allocation fails, direct reclaim is entered\nto free pages to satisfy the allocation. With this patch, it is\ndetermined if an allocation failed due to external fragmentation instead\nof low memory and if so, the calling process will compact until a suitable\npage is freed. Compaction by moving pages in memory is considerably\ncheaper than paging out to disk and works where there are locked pages or\nno swap. If compaction fails to free a page of a suitable size, then\nreclaim will still occur.\n\nDirect compaction returns as soon as possible. As each block is\ncompacted, it is checked if a suitable page has been freed and if so, it\nreturns.\n\n[akpm@linux-foundation.org: Fix build errors]\n[aarcange@redhat.com: fix count_vm_event preempt in memory compaction direct reclaim]\nSigned-off-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ed4a6d7f0676db50b5023cc01f6cda82a2f2a307", "tree": "6496343ba964e105cf30f8703714471f22edc806", "parents": [ "76ab0f530e4a01d4dc20cdc1d5e87753c579dc18" ], "author": { "name": "Mel Gorman", "email": "mel@csn.ul.ie", "time": "Mon May 24 14:32:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:59 2010 -0700" }, "message": "mm: compaction: add /sys trigger for per-node memory compaction\n\nAdd a per-node sysfs file called compact. When the file is written to,\neach zone in that node is compacted. The intention that this would be\nused by something like a job scheduler in a batch system before a job\nstarts so that the job can allocate the maximum number of hugepages\nwithout significant start-up cost.\n\nSigned-off-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "76ab0f530e4a01d4dc20cdc1d5e87753c579dc18", "tree": "8e1566df85e02f67876685c36d217fec4845f79f", "parents": [ "748446bb6b5a9390b546af38ec899c868a9dbcf0" ], "author": { "name": "Mel Gorman", "email": "mel@csn.ul.ie", "time": "Mon May 24 14:32:28 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:59 2010 -0700" }, "message": "mm: compaction: add /proc trigger for memory compaction\n\nAdd a proc file /proc/sys/vm/compact_memory. When an arbitrary value is\nwritten to the file, all zones are compacted. The expected user of such a\ntrigger is a job scheduler that prepares the system before the target\napplication runs.\n\nSigned-off-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "748446bb6b5a9390b546af38ec899c868a9dbcf0", "tree": "4c27d0805a5e094b39ff938ad60dd270b953a79f", "parents": [ "c175a0ce7584e5b498fff8cbdb9aa7912aa9fbba" ], "author": { "name": "Mel Gorman", "email": "mel@csn.ul.ie", "time": "Mon May 24 14:32:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:59 2010 -0700" }, "message": "mm: compaction: memory compaction core\n\nThis patch is the core of a mechanism which compacts memory in a zone by\nrelocating movable pages towards the end of the zone.\n\nA single compaction run involves a migration scanner and a free scanner.\nBoth scanners operate on pageblock-sized areas in the zone. The migration\nscanner starts at the bottom of the zone and searches for all movable\npages within each area, isolating them onto a private list called\nmigratelist. The free scanner starts at the top of the zone and searches\nfor suitable areas and consumes the free pages within making them\navailable for the migration scanner. The pages isolated for migration are\nthen migrated to the newly isolated free pages.\n\n[aarcange@redhat.com: Fix unsafe optimisation]\n[mel@csn.ul.ie: do not schedule work on other CPUs for compaction]\nSigned-off-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c175a0ce7584e5b498fff8cbdb9aa7912aa9fbba", "tree": "dd924daef4a9e0ac9729c5b61c30b8e3cc96f971", "parents": [ "f1a5ab1210579e2d3ac8c0c227645823af5aafb0" ], "author": { "name": "Mel Gorman", "email": "mel@csn.ul.ie", "time": "Mon May 24 14:32:26 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:59 2010 -0700" }, "message": "mm: move definition for LRU isolation modes to a header\n\nCurrently, vmscan.c defines the isolation modes for __isolate_lru_page().\nMemory compaction needs access to these modes for isolating pages for\nmigration. This patch exports them.\n\nSigned-off-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a8bef8ff6ea15fa4c67433cab0f5f3484574ef7c", "tree": "3ea9c122e02f523379d4560ee2134124d097895c", "parents": [ "e9e96b39f932a065e14f5d5bab0797ae261d03b5" ], "author": { "name": "Mel Gorman", "email": "mel@csn.ul.ie", "time": "Mon May 24 14:32:24 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:59 2010 -0700" }, "message": "mm: migration: avoid race between shift_arg_pages() and rmap_walk() during migration by not migrating temporary stacks\n\nPage migration requires rmap to be able to find all ptes mapping a page\nat all times, otherwise the migration entry can be instantiated, but it\nis possible to leave one behind if the second rmap_walk fails to find\nthe page. If this page is later faulted, migration_entry_to_page() will\ncall BUG because the page is locked indicating the page was migrated by\nthe migration PTE not cleaned up. For example\n\n kernel BUG at include/linux/swapops.h:105!\n invalid opcode: 0000 [#1] PREEMPT SMP\n ...\n Call Trace:\n [\u003cffffffff810e951a\u003e] handle_mm_fault+0x3f8/0x76a\n [\u003cffffffff8130c7a2\u003e] do_page_fault+0x44a/0x46e\n [\u003cffffffff813099b5\u003e] page_fault+0x25/0x30\n [\u003cffffffff8114de33\u003e] load_elf_binary+0x152a/0x192b\n [\u003cffffffff8111329b\u003e] search_binary_handler+0x173/0x313\n [\u003cffffffff81114896\u003e] do_execve+0x219/0x30a\n [\u003cffffffff8100a5c6\u003e] sys_execve+0x43/0x5e\n [\u003cffffffff8100320a\u003e] stub_execve+0x6a/0xc0\n RIP [\u003cffffffff811094ff\u003e] migration_entry_wait+0xc1/0x129\n\nThere is a race between shift_arg_pages and migration that triggers this\nbug. A temporary stack is setup during exec and later moved. If\nmigration moves a page in the temporary stack and the VMA is then removed\nbefore migration completes, the migration PTE may not be found leading to\na BUG when the stack is faulted.\n\nThis patch causes pages within the temporary stack during exec to be\nskipped by migration. It does this by marking the VMA covering the\ntemporary stack with an otherwise impossible combination of VMA flags.\nThese flags are cleared when the temporary stack is moved to its final\nlocation.\n\n[kamezawa.hiroyu@jp.fujitsu.com: idea for having migration skip temporary stacks]\nSigned-off-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7f60c214fd3a360461f3286c6908084f7f8b1950", "tree": "dba48cf988a22a40796187c7274f7903a288f7f4", "parents": [ "3f6c82728f4e31a97c3a1b32abccb512fed0b573" ], "author": { "name": "Mel Gorman", "email": "mel@csn.ul.ie", "time": "Mon May 24 14:32:18 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:58 2010 -0700" }, "message": "mm: migration: share the anon_vma ref counts between KSM and page migration\n\nFor clarity of review, KSM and page migration have separate refcounts on\nthe anon_vma. While clear, this is a waste of memory. This patch gets\nKSM and page migration to share their toys in a spirit of harmony.\n\nSigned-off-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3f6c82728f4e31a97c3a1b32abccb512fed0b573", "tree": "4b577e789a5daef91e40d10bc71c8134b3874ae8", "parents": [ "e325c90ffc13b698fa2814102e05275b21c26bec" ], "author": { "name": "Mel Gorman", "email": "mel@csn.ul.ie", "time": "Mon May 24 14:32:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:58 2010 -0700" }, "message": "mm: migration: take a reference to the anon_vma before migrating\n\nThis patchset is a memory compaction mechanism that reduces external\nfragmentation memory by moving GFP_MOVABLE pages to a fewer number of\npageblocks. The term \"compaction\" was chosen as there are is a number of\nmechanisms that are not mutually exclusive that can be used to defragment\nmemory. For example, lumpy reclaim is a form of defragmentation as was\nslub \"defragmentation\" (really a form of targeted reclaim). Hence, this\nis called \"compaction\" to distinguish it from other forms of\ndefragmentation.\n\nIn this implementation, a full compaction run involves two scanners\noperating within a zone - a migration and a free scanner. The migration\nscanner starts at the beginning of a zone and finds all movable pages\nwithin one pageblock_nr_pages-sized area and isolates them on a\nmigratepages list. The free scanner begins at the end of the zone and\nsearches on a per-area basis for enough free pages to migrate all the\npages on the migratepages list. As each area is respectively migrated or\nexhausted of free pages, the scanners are advanced one area. A compaction\nrun completes within a zone when the two scanners meet.\n\nThis method is a bit primitive but is easy to understand and greater\nsophistication would require maintenance of counters on a per-pageblock\nbasis. This would have a big impact on allocator fast-paths to improve\ncompaction which is a poor trade-off.\n\nIt also does not try relocate virtually contiguous pages to be physically\ncontiguous. However, assuming transparent hugepages were in use, a\nhypothetical khugepaged might reuse compaction code to isolate free pages,\nsplit them and relocate userspace pages for promotion.\n\nMemory compaction can be triggered in one of three ways. It may be\ntriggered explicitly by writing any value to /proc/sys/vm/compact_memory\nand compacting all of memory. It can be triggered on a per-node basis by\nwriting any value to /sys/devices/system/node/nodeN/compact where N is the\nnode ID to be compacted. When a process fails to allocate a high-order\npage, it may compact memory in an attempt to satisfy the allocation\ninstead of entering direct reclaim. Explicit compaction does not finish\nuntil the two scanners meet and direct compaction ends if a suitable page\nbecomes available that would meet watermarks.\n\nThe series is in 14 patches. The first three are not \"core\" to the series\nbut are important pre-requisites.\n\nPatch 1 reference counts anon_vma for rmap_walk_anon(). Without this\n\tpatch, it\u0027s possible to use anon_vma after free if the caller is\n\tnot holding a VMA or mmap_sem for the pages in question. While\n\tthere should be no existing user that causes this problem,\n\tit\u0027s a requirement for memory compaction to be stable. The patch\n\tis at the start of the series for bisection reasons.\nPatch 2 merges the KSM and migrate counts. It could be merged with patch 1\n\tbut would be slightly harder to review.\nPatch 3 skips over unmapped anon pages during migration as there are no\n\tguarantees about the anon_vma existing. There is a window between\n\twhen a page was isolated and migration started during which anon_vma\n\tcould disappear.\nPatch 4 notes that PageSwapCache pages can still be migrated even if they\n\tare unmapped.\nPatch 5 allows CONFIG_MIGRATION to be set without CONFIG_NUMA\nPatch 6 exports a \"unusable free space index\" via debugfs. It\u0027s\n\ta measure of external fragmentation that takes the size of the\n\tallocation request into account. It can also be calculated from\n\tuserspace so can be dropped if requested\nPatch 7 exports a \"fragmentation index\" which only has meaning when an\n\tallocation request fails. It determines if an allocation failure\n\twould be due to a lack of memory or external fragmentation.\nPatch 8 moves the definition for LRU isolation modes for use by compaction\nPatch 9 is the compaction mechanism although it\u0027s unreachable at this point\nPatch 10 adds a means of compacting all of memory with a proc trgger\nPatch 11 adds a means of compacting a specific node with a sysfs trigger\nPatch 12 adds \"direct compaction\" before \"direct reclaim\" if it is\n\tdetermined there is a good chance of success.\nPatch 13 adds a sysctl that allows tuning of the threshold at which the\n\tkernel will compact or direct reclaim\nPatch 14 temporarily disables compaction if an allocation failure occurs\n\tafter compaction.\n\nTesting of compaction was in three stages. For the test, debugging,\npreempt, the sleep watchdog and lockdep were all enabled but nothing nasty\npopped out. min_free_kbytes was tuned as recommended by hugeadm to help\nfragmentation avoidance and high-order allocations. It was tested on X86,\nX86-64 and PPC64.\n\nThs first test represents one of the easiest cases that can be faced for\nlumpy reclaim or memory compaction.\n\n1. Machine freshly booted and configured for hugepage usage with\n\ta) hugeadm --create-global-mounts\n\tb) hugeadm --pool-pages-max DEFAULT:8G\n\tc) hugeadm --set-recommended-min_free_kbytes\n\td) hugeadm --set-recommended-shmmax\n\n\tThe min_free_kbytes here is important. Anti-fragmentation works best\n\twhen pageblocks don\u0027t mix. hugeadm knows how to calculate a value that\n\twill significantly reduce the worst of external-fragmentation-related\n\tevents as reported by the mm_page_alloc_extfrag tracepoint.\n\n2. Load up memory\n\ta) Start updatedb\n\tb) Create in parallel a X files of pagesize*128 in size. Wait\n\t until files are created. By parallel, I mean that 4096 instances\n\t of dd were launched, one after the other using \u0026. The crude\n\t objective being to mix filesystem metadata allocations with\n\t the buffer cache.\n\tc) Delete every second file so that pageblocks are likely to\n\t have holes\n\td) kill updatedb if it\u0027s still running\n\n\tAt this point, the system is quiet, memory is full but it\u0027s full with\n\tclean filesystem metadata and clean buffer cache that is unmapped.\n\tThis is readily migrated or discarded so you\u0027d expect lumpy reclaim\n\tto have no significant advantage over compaction but this is at\n\tthe POC stage.\n\n3. In increments, attempt to allocate 5% of memory as hugepages.\n\t Measure how long it took, how successful it was, how many\n\t direct reclaims took place and how how many compactions. Note\n\t the compaction figures might not fully add up as compactions\n\t can take place for orders other than the hugepage size\n\nX86\t\t\t\tvanilla\t\tcompaction\nFinal page count 913 916 (attempted 1002)\npages reclaimed 68296 9791\n\nX86-64\t\t\t\tvanilla\t\tcompaction\nFinal page count: 901 902 (attempted 1002)\nTotal pages reclaimed: 112599 53234\n\nPPC64\t\t\t\tvanilla\t\tcompaction\nFinal page count: 93 94 (attempted 110)\nTotal pages reclaimed: 103216 61838\n\nThere was not a dramatic improvement in success rates but it wouldn\u0027t be\nexpected in this case either. What was important is that fewer pages were\nreclaimed in all cases reducing the amount of IO required to satisfy a\nhuge page allocation.\n\nThe second tests were all performance related - kernbench, netperf, iozone\nand sysbench. None showed anything too remarkable.\n\nThe last test was a high-order allocation stress test. Many kernel\ncompiles are started to fill memory with a pressured mix of unmovable and\nmovable allocations. During this, an attempt is made to allocate 90% of\nmemory as huge pages - one at a time with small delays between attempts to\navoid flooding the IO queue.\n\n vanilla compaction\nPercentage of request allocated X86 98 99\nPercentage of request allocated X86-64 95 98\nPercentage of request allocated PPC64 55 70\n\nThis patch:\n\nrmap_walk_anon() does not use page_lock_anon_vma() for looking up and\nlocking an anon_vma and it does not appear to have sufficient locking to\nensure the anon_vma does not disappear from under it.\n\nThis patch copies an approach used by KSM to take a reference on the\nanon_vma while pages are being migrated. This should prevent rmap_walk()\nrunning into nasty surprises later because anon_vma has been freed.\n\nSigned-off-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c0ff7453bb5c7c98e0885fb94279f2571946f280", "tree": "8bb2b169a5145f0496575dbd2f48bb4b1c83f819", "parents": [ "708c1bbc9d0c3e57f40501794d9b0eed29d10fce" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Mon May 24 14:32:08 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:57 2010 -0700" }, "message": "cpuset,mm: fix no node to alloc memory when changing cpuset\u0027s mems\n\nBefore applying this patch, cpuset updates task-\u003emems_allowed and\nmempolicy by setting all new bits in the nodemask first, and clearing all\nold unallowed bits later. But in the way, the allocator may find that\nthere is no node to alloc memory.\n\nThe reason is that cpuset rebinds the task\u0027s mempolicy, it cleans the\nnodes which the allocater can alloc pages on, for example:\n\n(mpol: mempolicy)\n\ttask1\t\t\ttask1\u0027s mpol\ttask2\n\talloc page\t\t1\n\t alloc on node0? NO\t1\n\t\t\t\t1\t\tchange mems from 1 to 0\n\t\t\t\t1\t\trebind task1\u0027s mpol\n\t\t\t\t0-1\t\t set new bits\n\t\t\t\t0\t \t clear disallowed bits\n\t alloc on node1? NO\t0\n\t ...\n\tcan\u0027t alloc page\n\t goto oom\n\nThis patch fixes this problem by expanding the nodes range first(set newly\nallowed bits) and shrink it lazily(clear newly disallowed bits). So we\nuse a variable to tell the write-side task that read-side task is reading\nnodemask, and the write-side task clears newly disallowed nodes after\nread-side task ends the current memory allocation.\n\n[akpm@linux-foundation.org: fix spello]\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Ravikiran Thirumalai \u003ckiran@scalex86.org\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "708c1bbc9d0c3e57f40501794d9b0eed29d10fce", "tree": "4b19caf68c420b32abdf05af3d413b1320f04fbe", "parents": [ "971ada0f6659488c3f36aed4c6f7670ff5ce4368" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Mon May 24 14:32:07 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:57 2010 -0700" }, "message": "mempolicy: restructure rebinding-mempolicy functions\n\nNick Piggin reported that the allocator may see an empty nodemask when\nchanging cpuset\u0027s mems[1]. It happens only on the kernel that do not do\natomic nodemask_t stores. (MAX_NUMNODES \u003e BITS_PER_LONG)\n\nBut I found that there is also a problem on the kernel that can do atomic\nnodemask_t stores. The problem is that the allocator can\u0027t find a node to\nalloc page when changing cpuset\u0027s mems though there is a lot of free\nmemory. The reason is like this:\n\n(mpol: mempolicy)\n\ttask1\t\t\ttask1\u0027s mpol\ttask2\n\talloc page\t\t1\n\t alloc on node0? NO\t1\n\t\t\t\t1\t\tchange mems from 1 to 0\n\t\t\t\t1\t\trebind task1\u0027s mpol\n\t\t\t\t0-1\t\t set new bits\n\t\t\t\t0\t \t clear disallowed bits\n\t alloc on node1? NO\t0\n\t ...\n\tcan\u0027t alloc page\n\t goto oom\n\nI can use the attached program reproduce it by the following step:\n\n# mkdir /dev/cpuset\n# mount -t cpuset cpuset /dev/cpuset\n# mkdir /dev/cpuset/1\n# echo `cat /dev/cpuset/cpus` \u003e /dev/cpuset/1/cpus\n# echo `cat /dev/cpuset/mems` \u003e /dev/cpuset/1/mems\n# echo $$ \u003e /dev/cpuset/1/tasks\n# numactl --membind\u003d`cat /dev/cpuset/mems` ./cpuset_mem_hog \u003cnr_tasks\u003e \u0026\n \u003cnr_tasks\u003e \u003d max(nr_cpus - 1, 1)\n# killall -s SIGUSR1 cpuset_mem_hog\n# ./change_mems.sh\n\nseveral hours later, oom will happen though there is a lot of free memory.\n\nThis patchset fixes this problem by expanding the nodes range first(set\nnewly allowed bits) and shrink it lazily(clear newly disallowed bits). So\nwe use a variable to tell the write-side task that read-side task is\nreading nodemask, and the write-side task clears newly disallowed nodes\nafter read-side task ends the current memory allocation.\n\nThis patch:\n\nIn order to fix no node to alloc memory, when we want to update mempolicy\nand mems_allowed, we expand the set of nodes first (set all the newly\nnodes) and shrink the set of nodes lazily(clean disallowed nodes), But the\nmempolicy\u0027s rebind functions may breaks the expanding.\n\nSo we restructure the mempolicy\u0027s rebind functions and split the rebind\nwork to two steps, just like the update of cpuset\u0027s mems: The 1st step:\nexpand the set of the mempolicy\u0027s nodes. The 2nd step: shrink the set of\nthe mempolicy\u0027s nodes. It is used when there is no real lock to protect\nthe mempolicy in the read-side. Otherwise we can do rebind work at once.\n\nIn order to implement it, we define\n\n\tenum mpol_rebind_step {\n\t\tMPOL_REBIND_ONCE,\n\t\tMPOL_REBIND_STEP1,\n\t\tMPOL_REBIND_STEP2,\n\t\tMPOL_REBIND_NSTEP,\n\t};\n\nIf the mempolicy needn\u0027t be updated by two steps, we can pass\nMPOL_REBIND_ONCE to the rebind functions. Or we can pass\nMPOL_REBIND_STEP1 to do the first step of the rebind work and pass\nMPOL_REBIND_STEP2 to do the second step work.\n\nBesides that, it maybe long time between these two step and we have to\nrelease the lock that protects mempolicy and mems_allowed. If we hold the\nlock once again, we must check whether the current mempolicy is under the\nrebinding (the first step has been done) or not, because the task may\nalloc a new mempolicy when we don\u0027t hold the lock. So we defined the\nfollowing flag to identify it:\n\n#define MPOL_F_REBINDING (1 \u003c\u003c 2)\n\nThe new functions will be used in the next patch.\n\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Paul Menage \u003cmenage@google.com\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Ravikiran Thirumalai \u003ckiran@scalex86.org\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e13861d822f8f443ca0c020ea8fc2dc01039cd63", "tree": "0e1ccaa6a2d682f7636b9d5ef5d4c73a28074988", "parents": [ "4b50dc26a0a25a9d1998d206e1f7d849aa78063f" ], "author": { "name": "Minchan Kim", "email": "minchan.kim@gmail.com", "time": "Mon May 24 14:31:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:57 2010 -0700" }, "message": "mm: remove return value of putback_lru_pages()\n\nputback_lru_page() never can fail. So it doesn\u0027t matter count of \"the\nnumber of pages put back\".\n\nIn addition, users of this functions don\u0027t use return value.\n\nLet\u0027s remove unnecessary code.\n\nSigned-off-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e9d6c157385e4efa61cb8293e425c9d8beba70d3", "tree": "fca2452b46328c9005b8a4043a22b7b1b4d47d0c", "parents": [ "1f0a738868cbfe20ae53a00b7c302c04ef7ab8fc" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Mon May 24 14:31:48 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:56 2010 -0700" }, "message": "tmpfs: insert tmpfs cache pages to inactive list at first\n\nShaohua Li reported parallel file copy on tmpfs can lead to OOM killer.\nThis is regression of caused by commit 9ff473b9a7 (\"vmscan: evict\nstreaming IO first\"). Wow, It is 2 years old patch!\n\nCurrently, tmpfs file cache is inserted active list at first. This means\nthat the insertion doesn\u0027t only increase numbers of pages in anon LRU, but\nit also reduces anon scanning ratio. Therefore, vmscan will get totally\nconfused. It scans almost only file LRU even though the system has plenty\nunused tmpfs pages.\n\nHistorically, lru_cache_add_active_anon() was used for two reasons.\n1) Intend to priotize shmem page rather than regular file cache.\n2) Intend to avoid reclaim priority inversion of used once pages.\n\nBut we\u0027ve lost both motivation because (1) Now we have separate anon and\nfile LRU list. then, to insert active list doesn\u0027t help such priotize.\n(2) In past, one pte access bit will cause page activation. then to\ninsert inactive list with pte access bit mean higher priority than to\ninsert active list. Its priority inversion may lead to uninteded lru\nchun. but it was already solved by commit 645747462 (vmscan: detect\nmapped file pages used only once). (Thanks Hannes, you are great!)\n\nThus, now we can use lru_cache_add_anon() instead.\n\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReported-by: Shaohua Li \u003cshaohua.li@intel.com\u003e\nReviewed-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nReviewed-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Henrique de Moraes Holschuh \u003chmh@hmh.eng.br\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9f79e9db2e282857912bcfe7f741bcdd5c46e860", "tree": "690e0647b56032ef703112e6e03c0b65ddaea10c", "parents": [ "192bbb95ca16f2b4d4383e76b3262672e6116daa" ], "author": { "name": "Haojian Zhuang", "email": "haojian.zhuang@marvell.com", "time": "Tue May 04 09:54:51 2010 -0400" }, "committer": { "name": "Liam Girdwood", "email": "lrg@slimlogic.co.uk", "time": "Tue May 25 10:16:02 2010 +0100" }, "message": "regulator: use voltage number array in 88pm860x\n\nA lot of condition comparision statements are used in original driver. These\nstatements are used to check the boundary of voltage numbers since voltage\nnumber isn\u0027t linear.\n\nNow use array of voltage numbers instead. Clean code with simpler way.\n\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@marvell.com\u003e\nAcked-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\n" }, { "commit": "0178f3e28e2166664916265c5d4922b1376b9fa1", "tree": "00dbd793ed75ad98e8d32a5798ab243c0f5b4185", "parents": [ "7e125f7b9cbfce4101191b8076d606c517a73066" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Apr 26 15:18:14 2010 +0100" }, "committer": { "name": "Liam Girdwood", "email": "lrg@slimlogic.co.uk", "time": "Tue May 25 10:16:01 2010 +0100" }, "message": "regulator: Allow regulator-regulator supplies to be specified by name\n\nWhen one regulator supplies another allow the relationship to be specified\nusing names rather than struct regulators, in a similar manner to that\nallowed for consumer supplies. This allows static configuration at compile\ntime, reducing the need for dynamic init code.\n\nAlso change the references to LINE supply to be system supply since line\nis sometimes used for actual supplies and therefore potentially confusing.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\n" }, { "commit": "acfbe96a3035639619a6533e04d88ed4ef9ccb61", "tree": "9d0b93aef75b2a11acff9b4d240d5f3e9896f3e0", "parents": [ "937eada45fa7bd233dfa59bbd8c0b436b02b6491" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon May 24 23:54:18 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 24 23:54:18 2010 -0700" }, "message": "sock.h: fix kernel-doc warning\n\nFix sock.h kernel-doc warning:\nWarning(include/net/sock.h:1438): No description found for parameter \u0027wq\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "937eada45fa7bd233dfa59bbd8c0b436b02b6491", "tree": "9cba6c42ae469d6f157a737d706d5edec08b37d8", "parents": [ "f16d3d57486cd079b29ae7a6c3b31c90e69c9c44" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon May 24 23:53:37 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 24 23:53:37 2010 -0700" }, "message": "cls_cgroup: Fix build error when built-in\n\nThere is a typo in cgroup_cls_state when cls_cgroup is built-in.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b1e50ebcf24668e57f058deb48b0704b5391ed0f", "tree": "17e1b69b249d0738317b732186340c9dd053f1a1", "parents": [ "0c2a2ae32793e3500a15a449612485f5d17dd431", "7e125f7b9cbfce4101191b8076d606c517a73066" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 25 00:38:26 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 25 00:38:26 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-spi\n" }, { "commit": "41c4221ca6b9db8ea63d2c2323c0e7a8865eba6e", "tree": "31e12f709964805f9d73cf834297950b9ad09000", "parents": [ "6e27388f1bd60b55e0b1a83d14233e6c7ad33700" ], "author": { "name": "hartleys", "email": "hartleys@visionengravers.com", "time": "Thu May 06 20:51:04 2010 +0000" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 25 00:23:17 2010 -0600" }, "message": "spi: move bitbang txrx utility functions to private header\n\nA number of files in drivers/spi fail checkincludes.pl due to the double\ninclude of \u003clinux/spi/spi_bitbang.h\u003e.\n\nThe first include is needed to get the struct spi_bitbang definition and\nthe spi_bitbang_* function prototypes.\n\nThe second include happens after defining EXPAND_BITBANG_TXRX to get the\ninlined bitbang_txrx_* utility functions.\n\nThe \u003clinux/spi/spi_bitbang.h\u003e header is also included by a number of other\nspi drivers, as well as some arch/ code, in order to use struct spi_bitbang\nand the associated functions.\n\nTo fix the double include, and remove any potential confusion about it, move\nthe inlined bitbang_txrx_* functions to a new private header in drivers/spi\nand also remove the need to define EXPAND_BITBANG_TXRX.\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "781c7b129b1beb876905f7212927aa0ee1b022e5", "tree": "678bfc0d0a5cdd24c55024b5c2d2674eb5bea572", "parents": [ "556f4aeb7d9dfac8573d0281dd555bd3210d8366" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Fri May 07 08:40:53 2010 +0000" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 25 00:23:14 2010 -0600" }, "message": "spi/pl022: add support for the PL023 derivate\n\nThis adds support for a further ST variant of the PL022 called\nPL023. Some differences in the control registers due to being\nstripped down to SPI mode only, and a new clock feedback sample\ndelay config setting is available.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "556f4aeb7d9dfac8573d0281dd555bd3210d8366", "tree": "43103539c2cdaae5a1032168076c52049e846025", "parents": [ "338ff2982d969a8e09ca356552cb5022ad380766" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Wed May 05 09:28:15 2010 +0000" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 25 00:23:13 2010 -0600" }, "message": "spi/pl022: fix up differences between ARM and ST versions\n\nThe PL022 SPI driver did not cleanly separate between the\noriginal unmodified ARM version and the ST Microelectronics\nversions. Split this more cleanly and fix some whitespace\nmoaning from checkpatch at the same time.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4e8998f09bd777f99ea3dae6f87f2c367979e6c0", "tree": "207b06ef542375db76ac7c35ce63da019fc7a4f0", "parents": [ "96900c751dd16fc9455e7184cbe8758ac7aa7e79" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Fri May 21 11:28:33 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 24 15:07:42 2010 -0400" }, "message": "wireless: fix mac80211.h kernel-doc warnings\n\nFix kernel-doc warnings in mac80211.h:\n\nWarning(include/net/mac80211.h:838): No description found for parameter \u0027ap_addr\u0027\nWarning(include/net/mac80211.h:1726): No description found for parameter \u0027get_survey\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "3dc3fc52ea1537f5f37ab301d2b1468a0e79988f", "tree": "1d958b8f26d09c26ff4e3b05c4126e75c8f799da", "parents": [ "617f3d0d71e2eae4d8d475cefe9363b140e52083" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 24 13:36:37 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 24 14:59:27 2010 -0400" }, "message": "Revert \"ath9k: Group Key fix for VAPs\"\n\nThis reverts commit 03ceedea972a82d343fa5c2528b3952fa9e615d5.\n\nThis patch was reported to cause a regression in which connectivity is\nlost and cannot be reestablished after a suspend/resume cycle.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7e125f7b9cbfce4101191b8076d606c517a73066", "tree": "ded140947b146cc7177519cd23cf81912de32687", "parents": [ "064e297c324fff9b62226aae5dc468ebb272433c", "a9ddabc52ce3757a4331d6c1e8bf4065333cc51b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:05:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:05:29 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:\n cmd640: fix kernel oops in test_irq() method\n pdc202xx_old: ignore \"FIFO empty\" bit in test_irq() method\n pdc202xx_old: wire test_irq() method for PDC2026x\n IDE: pass IRQ flags to the IDE core\n ide: fix comment typo in ide.h\n" }, { "commit": "f13771187b9423b824f32518319f6da85d819003", "tree": "c431cf16c286065a302d5f3fb43fc1abac7e4047", "parents": [ "15953654cc312429740fd58fb37a5a3d63a54376", "9f37af654fda88a8dcca74c785f6c20e52758866" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:01:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:01:10 2010 -0700" }, "message": "Merge branch \u0027bkl/ioctl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing\n\n* \u0027bkl/ioctl\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:\n uml: Pushdown the bkl from harddog_kern ioctl\n sunrpc: Pushdown the bkl from sunrpc cache ioctl\n sunrpc: Pushdown the bkl from ioctl\n autofs4: Pushdown the bkl from ioctl\n uml: Convert to unlocked_ioctls to remove implicit BKL\n ncpfs: BKL ioctl pushdown\n coda: Clean-up whitespace problems in pioctl.c\n coda: BKL ioctl pushdown\n drivers: Push down BKL into various drivers\n isdn: Push down BKL into ioctl functions\n scsi: Push down BKL into ioctl functions\n dvb: Push down BKL into ioctl functions\n smbfs: Push down BKL into ioctl function\n coda/psdev: Remove BKL from ioctl function\n um/mmapper: Remove BKL usage\n sn_hwperf: Kill BKL usage\n hfsplus: Push down BKL into ioctl function\n" }, { "commit": "15953654cc312429740fd58fb37a5a3d63a54376", "tree": "bbb6bf8d4ea943545e29ce896848182c4f206298", "parents": [ "c3ed9ea4ab460080dea9449c709be9316c670c72", "24af3202459d9a25643009b1ab8ab5ff04d94b49" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:00:13 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 08:00:13 2010 -0700" }, "message": "Merge git://git.infradead.org/battery-2.6\n\n* git://git.infradead.org/battery-2.6:\n ds2760_battery: Document ABI change\n ds2760_battery: Make charge_now and charge_full writeable\n power_supply: Add support for writeable properties\n power_supply: Use attribute groups\n power_supply: Add test_power driver\n tosa_battery: Fix build error due to direct driver_data usage\n wm97xx_battery: Quieten sparse warning (bat_set_pdata not declared)\n ds2782_battery: Get rid of magic numbers in driver_data\n ds2782_battery: Add support for ds2786 battery gas gauge\n pda_power: Add function callbacks for suspend and resume\n wm831x_power: Use genirq\n Driver for Zipit Z2 battery chip\n ds2782_battery: Fix clientdata on removal\n" }, { "commit": "0fed2b5cb4c04336b26b0cbf6f9a8c07081f79a6", "tree": "a9be0f082d3c2f53eb2d5f9de9ad900c31236b34", "parents": [ "0163916f1db7f345963dad1af78b7628c759c6ee", "41ec7ebee14189a0424176279c227168960c28ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:58:28 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:58:28 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (25 commits)\n sh: fix up sh7785lcr_32bit_defconfig.\n arch/sh/lib/strlen.S: Checkpatch cleanup\n sh: fix up sh7786 dmaengine build.\n sh: guard cookie consistency across termination in the DMA driver\n sh: prevent the DMA driver from unloading, while in use\n sh: fix Oops in the serial SCI driver\n sh: allow platforms to specify SD-card supported voltages\n mmc: let MFD\u0027s provide supported Vdd card voltages to tmio_mmc\n sh: disable SD-card write-protection detection on kfr2r09\n mfd: pass platform flags down to the tmio_mmc driver\n tmio: add a platform flag to disable card write-protection detection\n sh: Add SDHI DMA support to migor\n sh: Add SDHI DMA support to kfr2r09\n sh: Add SDHI DMA support to ms7724se\n sh: Add SDHI DMA support to ecovec\n mmc: add DMA support to tmio_mmc driver, when used on SuperH\n sh: prepare the SDHI MFD driver to pass DMA configuration to tmio_mmc.c\n mmc: prepare tmio_mmc for passing of DMA configuration from the MFD cell\n sh: add DMA slave definitions to sh7724\n sh: add DMA slaves for two SDHI controllers to sh7722\n ...\n" }, { "commit": "a69eee4988752c7196677958b4ed8f4c2b28499a", "tree": "b676b8a05e10f5003d17091fc7085fad29910702", "parents": [ "3e766fd41ddc31c47ec5b2840c6a45803d35ff40" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:45:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:45:43 2010 -0700" }, "message": "Revert \"ath9k: Group Key fix for VAPs\"\n\nThis reverts commit 03ceedea972a82d343fa5c2528b3952fa9e615d5, since it\nbreaks resume from suspend-to-ram on Rafael\u0027s Acer Ferrari One.\nNetworkManager thinks everything is ok, but it can\u0027t connect to the AP\nto get an IP address after the resume.\n\nIn fact, it even breaks resume for non-ath9k chipsets: reverting it also\nfixes Rafael\u0027s Toshiba Protege R500 with the iwlagn driver. As Johannes\nsays:\n\n \"Indeed, this patch needs to be reverted. That mac80211 change is wrong\n and completely unnecessary.\"\n\nReported-and-requested-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nCc: Daniel Yingqiang Ma \u003cyma.cool@gmail.com\u003e\nCc: John W. Linville \u003clinville@tuxdriver.com\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4fd5ec509bd486b5dd8cac1a4d4d7e2cbdf7c546", "tree": "a8ddfdcc4bfb702457e8eeff57fd6b5a2f4249b2", "parents": [ "6e188240ebc2a132d70924942d7c8b9acb46e11a", "6d27e64d74e14c1cf2b4af438d7e8a77017bd654" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:41:13 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:41:13 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:\n 9p: Optimize TCREATE by eliminating a redundant fid clone.\n 9p: cleanup: remove unneeded assignment\n 9p: Add mksock support\n fs/9p: Make sure we properly instantiate dentry.\n 9p: add 9P2000.L rename operation\n 9p: add 9P2000.L statfs operation\n 9p: VFS switches for 9p2000.L: VFS switches\n 9p: VFS switches for 9p2000.L: protocol and client changes\n" }, { "commit": "62a11ae3405b6da2535d28e5facc2de5af4a7e62", "tree": "6b68f0e74fe08c0e87488ec0653d59c653e46745", "parents": [ "cedfb2db7b2d6b2c780999536aa1e2650fadee36", "cf9b59e9d3e008591d1f54830f570982bb307a0d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:37:38 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:37:38 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6:\n of: change of_match_device to work with struct device\n of: Remove duplicate fields from of_platform_driver\n drivercore: Add of_match_table to the common device drivers\n arch/microblaze: Move dma_mask from of_device into pdev_archdata\n arch/powerpc: Move dma_mask from of_device into pdev_archdata\n of: eliminate of_device-\u003enode and dev_archdata-\u003e{of,prom}_node\n of: Always use \u0027struct device.of_node\u0027 to get device node pointer.\n i2c/of: Allow device node to be passed via i2c_board_info\n driver-core: Add device node pointer to struct device\n of: protect contents of of_platform.h and of_device.h\n of/flattree: Make unflatten_device_tree() safe to call from any arch\n of/flattree: make of_fdt.h safe to unconditionally include.\n" }, { "commit": "5eb32bd059379530fc3809a7fcf183feca75f601", "tree": "66b1cc6d4cbd57287efbb63eb23bca341fe94e8b", "parents": [ "8286274284e15b11b0f531b6ceeef21fbe00a8dd" ], "author": { "name": "Baruch Siach", "email": "baruch@tkos.co.il", "time": "Mon May 24 00:36:13 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 24 00:36:13 2010 -0700" }, "message": "fec: add support for PHY interface platform data\n\nThe i.MX25 PDK uses RMII to communicate with its PHY. This patch adds\nthe ability to configure RMII, based on platform data.\n\nSigned-off-by: Baruch Siach \u003cbaruch@tkos.co.il\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f845172531fb7410c7fb7780b1a6e51ee6df7d52", "tree": "ef1030d0ad9d9dbc8fe800a145c587f04be50ade", "parents": [ "eda6e6f86b5f95b982ac7ebf7cf5be2a29a291e9" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon May 24 00:12:34 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 24 00:12:34 2010 -0700" }, "message": "cls_cgroup: Store classid in struct sock\n\nUp until now cls_cgroup has relied on fetching the classid out of\nthe current executing thread. This runs into trouble when a packet\nprocessing is delayed in which case it may execute out of another\nthread\u0027s context.\n\nFurthermore, even when a packet is not delayed we may fail to\nclassify it if soft IRQs have been disabled, because this scenario\nis indistinguishable from one where a packet unrelated to the\ncurrent thread is processed by a real soft IRQ.\n\nIn fact, the current semantics is inherently broken, as a single\nskb may be constructed out of the writes of two different tasks.\nA different manifestation of this problem is when the TCP stack\ntransmits in response of an incoming ACK. This is currently\nunclassified.\n\nAs we already have a concept of packet ownership for accounting\npurposes in the skb-\u003esk pointer, this is a natural place to store\nthe classid in a persistent manner.\n\nThis patch adds the cls_cgroup classid in struct sock, filling up\nan existing hole on 64-bit :)\n\nThe value is set at socket creation time. So all sockets created\nvia socket(2) automatically gains the ID of the thread creating it.\nWhenever another process touches the socket by either reading or\nwriting to it, we will change the socket classid to that of the\nprocess if it has a valid (non-zero) classid.\n\nFor sockets created on inbound connections through accept(2), we\ninherit the classid of the original listening socket through\nsk_clone, possibly preceding the actual accept(2) call.\n\nIn order to minimise risks, I have not made this the authoritative\nclassid. For now it is only used as a backup when we execute\nwith soft IRQs disabled. Once we\u0027re completely happy with its\nsemantics we can use it as the sole classid.\n\nFootnote: I have rearranged the error path on cls_group module\ncreation. If we didn\u0027t do this, then there is a window where\nsomeone could create a tc rule using cls_group before the cgroup\nsubsystem has been registered.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7aecf4944f2c05aafb73b4820e469c74b4ec8517", "tree": "b3237c96401a0f35c76798c1b04b19eef129a6da", "parents": [ "9e4b816bc31962ebbb8784d602acd5fa25a08ad8" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Fri May 21 02:16:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 23 23:57:41 2010 -0700" }, "message": "caif: Bugfix - use standard Linux lists\n\nDiscovered bug when running high number of parallel connect requests.\nReplace buggy home brewed list with linux/list.h.\n\nSigned-off-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a4ed89cb92f93d406ac45fe5507228a2475e32ba", "tree": "b4effecbd79311832676c756d3acedeb84ba931a", "parents": [ "7f267de41fde594500cbbccb1b29acb4475f2da2" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue May 18 06:56:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 23 23:21:13 2010 -0700" }, "message": "net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is not defined\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bb0fe533514c1d480c6c16f8bad070270a73a96c", "tree": "34de95399380a4043d16cf77466cabae343daf3b", "parents": [ "a2b14dc9615c215a8cf4f2041f6c0c3fff5fc486" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed May 19 18:37:36 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Sat May 22 17:05:22 2010 +0900" }, "message": "sh: allow platforms to specify SD-card supported voltages\n\nBoards can have different supplied voltages on different SD card slots. This\ninformation has to be passed down to the SD/MMC driver.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Ian Molton \u003cian@mnementh.co.uk\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "a2b14dc9615c215a8cf4f2041f6c0c3fff5fc486", "tree": "b4958eebca382ca616622e3abf148853e4f84f5e", "parents": [ "8f4b3036d1b9bdb6f5fa0b920e0163d64a990327" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed May 19 18:37:25 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Sat May 22 17:05:21 2010 +0900" }, "message": "mmc: let MFD\u0027s provide supported Vdd card voltages to tmio_mmc\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Ian Molton \u003cian@mnementh.co.uk\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "f87c20a9db43f6f731270eeef616e1bcc266c2d4", "tree": "a8409e44117a95cc24c86af5cb3ca1e173edbd9b", "parents": [ "ac8fb3e8627d5494f3d2221925a82be4c1778b0e" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed May 19 18:36:08 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Sat May 22 17:05:21 2010 +0900" }, "message": "mfd: pass platform flags down to the tmio_mmc driver\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Ian Molton \u003cian@mnementh.co.uk\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "ac8fb3e8627d5494f3d2221925a82be4c1778b0e", "tree": "5e2e62928e4eeb67aac2363b613ec087546912d6", "parents": [ "65a1b0347a329422e939e14daae6dad9a29e9cf2" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed May 19 18:36:02 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Sat May 22 17:05:21 2010 +0900" }, "message": "tmio: add a platform flag to disable card write-protection detection\n\nWrite-protection status is not always available, e.g., micro-SD cards do not\nhave a write-protection switch at all. This patch adds a flag to let platforms\nforce tmio_mmc to consider the card writable.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Ian Molton \u003cian@mnementh.co.uk\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "bb4f6b0cd7524ad7d56709723eaf8a7bf5a87b57", "tree": "df58d2c4c1f01f9bf5aa19e6a6d329b872b1f72a", "parents": [ "f4b87dee923342505e1ddba8d34ce9de33e75050", "ec49fdbd354cb133340e25ff84d88284bb17e99a", "e92dd4fd1aa1cd081dac03973b33c972637d5b7a", "5c5e3b33b7cb959a401f823707bee006caadd76e", "8f9f8d9e8080a2ff46caa7decef47810d093d252", "6b65aaf3027c4e02b42aaefd900aa79136a30681" ], "author": { "name": "Pekka Enberg", "email": "penberg@cs.helsinki.fi", "time": "Sat May 22 10:57:52 2010 +0300" }, "committer": { "name": "Pekka Enberg", "email": "penberg@cs.helsinki.fi", "time": "Sat May 22 10:57:52 2010 +0300" }, "message": "Merge branches \u0027slab/align\u0027, \u0027slab/cleanups\u0027, \u0027slab/fixes\u0027, \u0027slab/memhotadd\u0027 and \u0027slub/fixes\u0027 into slab-for-linus\n" }, { "commit": "056676dabd9f4c69a6adcad208e9aa2ca7241400", "tree": "0113922d7128d285e052cd08156f283365ec86df", "parents": [ "42a4533976d922ff3272fad17dd52fe3682899dd" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed May 19 18:34:16 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Sat May 22 16:51:18 2010 +0900" }, "message": "sh: prepare the SDHI MFD driver to pass DMA configuration to tmio_mmc.c\n\nPass DMA slave IDs from platform down to the tmio_mmc driver, to be used\nfor dmaengine configuration.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "42a4533976d922ff3272fad17dd52fe3682899dd", "tree": "2c420853dd7e0194542edf9101cbf7e9f7e47904", "parents": [ "d62b8a985b74ac741233396b847562dacc45a5c1" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Wed May 19 18:34:11 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Sat May 22 16:51:18 2010 +0900" }, "message": "mmc: prepare tmio_mmc for passing of DMA configuration from the MFD cell\n\nAfter this patch, if the \"dma\" pointer in struct tmio_mmc_data is not NULL, it\npoints to a struct, containing two tokens, that have to be passed to the\ndmaengine driver for channel configuration.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nAcked-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "44504b2bebf8b5823c59484e73096a7d6574471d", "tree": "c4d901f026b499f6f0f5c64f4ecbdee297f5db1e", "parents": [ "4018294b53d1dae026880e45f174c1cc63b5d435" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:22 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:41 2010 -0600" }, "message": "of: change of_match_device to work with struct device\n\nThe of_node pointer is now stored directly in struct device, so\nof_match_device() should work with any device, not just struct of_device.\n\nThis patch changes the interface to of_match_device() to accept a\nstruct device instead of struct of_device.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4018294b53d1dae026880e45f174c1cc63b5d435", "tree": "6db3538eaf91b653381720a6d92f4f15634a93d0", "parents": [ "597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:02 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:40 2010 -0600" }, "message": "of: Remove duplicate fields from of_platform_driver\n\n.name, .match_table and .owner are duplicated in both of_platform_driver\nand device_driver. This patch is a removes the extra copies from struct\nof_platform_driver and converts all users to the device_driver members.\n\nThis patch is a pretty mechanical change. The usage model doesn\u0027t change\nand if any drivers have been missed, or if anything has been fixed up\nincorrectly, then it will fail with a compile time error, and the fixup\nwill be trivial. This patch looks big and scary because it touches so\nmany files, but it should be pretty safe.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sean MacLennan \u003csmaclennan@pikatech.com\u003e\n\n" }, { "commit": "597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a", "tree": "373f1f1387143b0ea8811ca6e2a6812f0a86d933", "parents": [ "173b3a7a059a6998a6c0733710818c473cc0de4c" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:01 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:40 2010 -0600" }, "message": "drivercore: Add of_match_table to the common device drivers\n\nOF-style matching can be available to any device, on any type of bus.\nThis patch allows any driver to provide an OF match table when CONFIG_OF\nis enabled so that drivers can be bound against devices described in\nthe device tree.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "2faa4cf76e7d229016240b79b50a43d81f458323", "tree": "587b7ccc902ef1f6946e57a6ccdbb4fa7e16bf41", "parents": [ "e8bebe2f71d26871b0970ae1d9cf0ed3cdd9569d" ], "author": { "name": "Roland McGrath", "email": "roland@redhat.com", "time": "Fri May 21 20:16:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 20:29:10 2010 -0700" }, "message": "linux/elfcore.h: hide kernel functions\n\nThe declarations for elf_core_extra_phdrs() et al got added on the\nwrong side of #ifdef __KERNEL__ in linux/elfcore.h so they leak into\nthe user header copy and we get a warning at build time about it.\n\nSigned-off-by: Roland McGrath \u003croland@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e8bebe2f71d26871b0970ae1d9cf0ed3cdd9569d", "tree": "c0d82cbd11daaf579b74121c6641d58947091094", "parents": [ "6109e2ce2600e2db26cd0424bb9c6ed019723288", "82f3952c02add60b15eea9151d4d99b6b82066c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 19:37:45 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 19:37:45 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (69 commits)\n fix handling of offsets in cris eeprom.c, get rid of fake on-stack files\n get rid of home-grown mutex in cris eeprom.c\n switch ecryptfs_write() to struct inode *, kill on-stack fake files\n switch ecryptfs_get_locked_page() to struct inode *\n simplify access to ecryptfs inodes in -\u003ereadpage() and friends\n AFS: Don\u0027t put struct file on the stack\n Ban ecryptfs over ecryptfs\n logfs: replace inode uid,gid,mode initialization with helper function\n ufs: replace inode uid,gid,mode initialization with helper function\n udf: replace inode uid,gid,mode init with helper\n ubifs: replace inode uid,gid,mode initialization with helper function\n sysv: replace inode uid,gid,mode initialization with helper function\n reiserfs: replace inode uid,gid,mode initialization with helper function\n ramfs: replace inode uid,gid,mode initialization with helper function\n omfs: replace inode uid,gid,mode initialization with helper function\n bfs: replace inode uid,gid,mode initialization with helper function\n ocfs2: replace inode uid,gid,mode initialization with helper function\n nilfs2: replace inode uid,gid,mode initialization with helper function\n minix: replace inode uid,gid,mode init with helper\n ext4: replace inode uid,gid,mode init with helper\n ...\n\nTrivial conflict in fs/fs-writeback.c (mark bitfields unsigned)\n" }, { "commit": "6109e2ce2600e2db26cd0424bb9c6ed019723288", "tree": "54b5d347bf12e0a987edfb52f287399f748a9a38", "parents": [ "0961d6581c870850342ad6ea25263763433d666f", "ac81860ea073daed50246af54db706c6e491f240" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 18:58:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 18:58:52 2010 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (36 commits)\n PCI: hotplug: pciehp: Removed check for hotplug of display devices\n PCI: read memory ranges out of Broadcom CNB20LE host bridge\n PCI: Allow manual resource allocation for PCI hotplug bridges\n x86/PCI: make ACPI MCFG reserved error messages ACPI specific\n PCI hotplug: Use kmemdup\n PM/PCI: Update PCI power management documentation\n PCI: output FW warning in pci_read/write_vpd\n PCI: fix typos pci_device_dis/enable to pci_dis/enable_device in comments\n PCI quirks: disable msi on AMD rs4xx internal gfx bridges\n PCI: Disable MSI for MCP55 on P5N32-E SLI\n x86/PCI: irq and pci_ids patch for additional Intel Cougar Point DeviceIDs\n PCI: aerdrv: trivial cleanup for aerdrv_core.c\n PCI: aerdrv: trivial cleanup for aerdrv.c\n PCI: aerdrv: introduce default_downstream_reset_link\n PCI: aerdrv: rework find_aer_service\n PCI: aerdrv: remove is_downstream\n PCI: aerdrv: remove magical ROOT_ERR_STATUS_MASKS\n PCI: aerdrv: redefine PCI_ERR_ROOT_*_SRC\n PCI: aerdrv: rework do_recovery\n PCI: aerdrv: rework get_e_source()\n ...\n" }, { "commit": "0961d6581c870850342ad6ea25263763433d666f", "tree": "371c61fd7f621397907983031003e784a040402e", "parents": [ "1756ac3d3c41341297ea25b818b7fce505bb2a9a", "fd0c8894893cba722bdea12de25b49f980795d06" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:25:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:25:01 2010 -0700" }, "message": "Merge git://git.infradead.org/iommu-2.6\n\n* git://git.infradead.org/iommu-2.6:\n intel-iommu: Set a more specific taint flag for invalid BIOS DMAR tables\n intel-iommu: Combine the BIOS DMAR table warning messages\n panic: Add taint flag TAINT_FIRMWARE_WORKAROUND (\u0027I\u0027)\n panic: Allow warnings to set different taint flags\n intel-iommu: intel_iommu_map_range failed at very end of address space\n intel-iommu: errors with smaller iommu widths\n intel-iommu: Fix boot inside 64bit virtualbox with io-apic disabled\n intel-iommu: use physfn to search drhd for VF\n intel-iommu: Print out iommu seq_id\n intel-iommu: Don\u0027t complain that ACPI_DMAR_SCOPE_TYPE_IOAPIC is not supported\n intel-iommu: Avoid global flushes with caching mode.\n intel-iommu: Use correct domain ID when caching mode is enabled\n intel-iommu mistakenly uses offset_pfn when caching mode is enabled\n intel-iommu: use for_each_set_bit()\n intel-iommu: Fix section mismatch dmar_ir_support() uses dmar_tbl.\n" }, { "commit": "1756ac3d3c41341297ea25b818b7fce505bb2a9a", "tree": "96382220afbb82fd5c576c4c08b3c3e13282851f", "parents": [ "98edb6ca4174f17a64890a02f44c211c8b44fb3c", "0643e4c6e4fd67778fa886a89e6ec2320e0ff4d3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:22:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:22:52 2010 -0700" }, "message": "Merge branch \u0027virtio\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* \u0027virtio\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (27 commits)\n drivers/char: Eliminate use after free\n virtio: console: Accept console size along with resize control message\n virtio: console: Store each console\u0027s size in the console structure\n virtio: console: Resize console port 0 on config intr only if multiport is off\n virtio: console: Add support for nonblocking write()s\n virtio: console: Rename wait_is_over() to will_read_block()\n virtio: console: Don\u0027t always create a port 0 if using multiport\n virtio: console: Use a control message to add ports\n virtio: console: Move code around for future patches\n virtio: console: Remove config work handler\n virtio: console: Don\u0027t call hvc_remove() on unplugging console ports\n virtio: console: Return -EPIPE to hvc_console if we lost the connection\n virtio: console: Let host know of port or device add failures\n virtio: console: Add a __send_control_msg() that can send messages without a valid port\n virtio: Revert \"virtio: disable multiport console support.\"\n virtio: add_buf_gfp\n trans_virtio: use virtqueue_xxx wrappers\n virtio-rng: use virtqueue_xxx wrappers\n virtio_ring: remove a level of indirection\n virtio_net: use virtqueue_xxx wrappers\n ...\n\nFix up conflicts in drivers/net/virtio_net.c due to new virtqueue_xxx\nwrappers changes conflicting with some other cleanups.\n" }, { "commit": "98edb6ca4174f17a64890a02f44c211c8b44fb3c", "tree": "033bc5f7da410046d28dd1cefcd2d63cda33d25b", "parents": [ "a8251096b427283c47e7d8f9568be6b388dd68ec", "8fbf065d625617bbbf6b72d5f78f84ad13c8b547" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:16:21 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:16:21 2010 -0700" }, "message": "Merge branch \u0027kvm-updates/2.6.35\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/2.6.35\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm: (269 commits)\n KVM: x86: Add missing locking to arch specific vcpu ioctls\n KVM: PPC: Add missing vcpu_load()/vcpu_put() in vcpu ioctls\n KVM: MMU: Segregate shadow pages with different cr0.wp\n KVM: x86: Check LMA bit before set_efer\n KVM: Don\u0027t allow lmsw to clear cr0.pe\n KVM: Add cpuid.txt file\n KVM: x86: Tell the guest we\u0027ll warn it about tsc stability\n x86, paravirt: don\u0027t compute pvclock adjustments if we trust the tsc\n x86: KVM guest: Try using new kvm clock msrs\n KVM: x86: export paravirtual cpuid flags in KVM_GET_SUPPORTED_CPUID\n KVM: x86: add new KVMCLOCK cpuid feature\n KVM: x86: change msr numbers for kvmclock\n x86, paravirt: Add a global synchronization point for pvclock\n x86, paravirt: Enable pvclock flags in vcpu_time_info structure\n KVM: x86: Inject #GP with the right rip on efer writes\n KVM: SVM: Don\u0027t allow nested guest to VMMCALL into host\n KVM: x86: Fix exception reinjection forced to true\n KVM: Fix wallclock version writing race\n KVM: MMU: Don\u0027t read pdptrs with mmu spinlock held in mmu_alloc_roots\n KVM: VMX: enable VMXON check with SMX enabled (Intel TXT)\n ...\n" }, { "commit": "a8251096b427283c47e7d8f9568be6b388dd68ec", "tree": "edc9747e30b4b4413aa99acfbd3104d81b1c303b", "parents": [ "27a3353a4525afe984f3b793681869d636136b69", "480b02df3aa9f07d1c7df0cd8be7a5ca73893455" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:15:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:15:44 2010 -0700" }, "message": "Merge branch \u0027modules\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* \u0027modules\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:\n module: drop the lock while waiting for module to complete initialization.\n MODULE_DEVICE_TABLE(isapnp, ...) does nothing\n hisax_fcpcipnp: fix broken isapnp device table.\n isapnp: move definitions to mod_devicetable.h so file2alias can reach them.\n" }, { "commit": "6f68fbaafbaa033205cd131d3e1f3c4b914e9b78", "tree": "56b434496064ed170f94381e3ec4c6c340b71376", "parents": [ "6e4513972a5ad28517477d21f301a02ac7a0df76", "0b28330e39bbe0ffee4c56b09fc415fcec595ea3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:05:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 17:05:46 2010 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:\n DMAENGINE: extend the control command to include an arg\n async_tx: trim dma_async_tx_descriptor in \u0027no channel switch\u0027 case\n DMAENGINE: DMA40 fix for allocation of logical channel 0\n DMAENGINE: DMA40 support paused channel status\n dmaengine: mpc512x: Use resource_size\n DMA ENGINE: Do not reset \u0027private\u0027 of channel\n ioat: Remove duplicated devm_kzalloc() calls for ioatdma_device\n ioat3: disable cacheline-unaligned transfers for raid operations\n ioat2,3: convert to producer/consumer locking\n ioat: convert to circ_buf\n DMAENGINE: Support for ST-Ericssons DMA40 block v3\n async_tx: use of kzalloc/kfree requires the include of slab.h\n dmaengine: provide helper for setting txstate\n DMAENGINE: generic channel status v2\n DMAENGINE: generic slave control v2\n dma: timb-dma: Update comment and fix compiler warning\n dma: Add timb-dma\n DMAENGINE: COH 901 318 fix bytesleft\n DMAENGINE: COH 901 318 rename confusing vars\n" }, { "commit": "454abafe9d8beb3fe7da06131b3d81d6d352a959", "tree": "4be9c50d76aecd2c43959550814fb4337d27c6d9", "parents": [ "6a9e652c88fad648ea088ac07dbc671a9813f75e" ], "author": { "name": "Dmitry Monakhov", "email": "dmonakhov@openvz.org", "time": "Thu Mar 04 17:32:18 2010 +0300" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:26 2010 -0400" }, "message": "ramfs: replace inode uid,gid,mode initialization with helper function\n\n- seems what ramfs_get_inode is only locally, make it static.\n[AV: the hell it is; it\u0027s used by shmem, so shmem needed conversion too\nand no, that function can\u0027t be made static]\n\nSigned-off-by: Dmitry Monakhov \u003cdmonakhov@openvz.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a1bd120d13e586ea1c424048fd2c8420a442852a", "tree": "fdac342d7ab0fbaaeb1dd7d61a86b457a6938672", "parents": [ "52957fe1c709d5ca3732456d73f4e4d95492c72c" ], "author": { "name": "Dmitry Monakhov", "email": "dmonakhov@openvz.org", "time": "Thu Mar 04 17:29:14 2010 +0300" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:22 2010 -0400" }, "message": "vfs: Add inode uid,gid,mode init helper\n\nSigned-off-by: Dmitry Monakhov \u003cdmonakhov@openvz.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "51ee049e771c14a29aaee8ecd6cbbe14db088f3a", "tree": "594c6676eb50a59ce82625ee09fee73fd700a5ed", "parents": [ "cc9106247de92549e50abb0ba12d6b2fdbf0be55" ], "author": { "name": "Roland Dreier", "email": "rdreier@cisco.com", "time": "Tue Apr 27 14:23:57 2010 -0700" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:22 2010 -0400" }, "message": "vfs: add lockdep annotation to s_vfs_rename_key for ecryptfs\n\n \u003e \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n \u003e [ INFO: possible recursive locking detected ]\n \u003e 2.6.31-2-generic #14~rbd3\n \u003e ---------------------------------------------\n \u003e firefox-3.5/4162 is trying to acquire lock:\n \u003e (\u0026s-\u003es_vfs_rename_mutex){+.+.+.}, at: [\u003cffffffff81139d31\u003e] lock_rename+0x41/0xf0\n \u003e\n \u003e but task is already holding lock:\n \u003e (\u0026s-\u003es_vfs_rename_mutex){+.+.+.}, at: [\u003cffffffff81139d31\u003e] lock_rename+0x41/0xf0\n \u003e\n \u003e other info that might help us debug this:\n \u003e 3 locks held by firefox-3.5/4162:\n \u003e #0: (\u0026s-\u003es_vfs_rename_mutex){+.+.+.}, at: [\u003cffffffff81139d31\u003e] lock_rename+0x41/0xf0\n \u003e #1: (\u0026sb-\u003es_type-\u003ei_mutex_key#11/1){+.+.+.}, at: [\u003cffffffff81139d5a\u003e] lock_rename+0x6a/0xf0\n \u003e #2: (\u0026sb-\u003es_type-\u003ei_mutex_key#11/2){+.+.+.}, at: [\u003cffffffff81139d6f\u003e] lock_rename+0x7f/0xf0\n \u003e\n \u003e stack backtrace:\n \u003e Pid: 4162, comm: firefox-3.5 Tainted: G C 2.6.31-2-generic #14~rbd3\n \u003e Call Trace:\n \u003e [\u003cffffffff8108ae74\u003e] print_deadlock_bug+0xf4/0x100\n \u003e [\u003cffffffff8108ce26\u003e] validate_chain+0x4c6/0x750\n \u003e [\u003cffffffff8108d2e7\u003e] __lock_acquire+0x237/0x430\n \u003e [\u003cffffffff8108d585\u003e] lock_acquire+0xa5/0x150\n \u003e [\u003cffffffff81139d31\u003e] ? lock_rename+0x41/0xf0\n \u003e [\u003cffffffff815526ad\u003e] __mutex_lock_common+0x4d/0x3d0\n \u003e [\u003cffffffff81139d31\u003e] ? lock_rename+0x41/0xf0\n \u003e [\u003cffffffff81139d31\u003e] ? lock_rename+0x41/0xf0\n \u003e [\u003cffffffff8120eaf9\u003e] ? ecryptfs_rename+0x99/0x170\n \u003e [\u003cffffffff81552b36\u003e] mutex_lock_nested+0x46/0x60\n \u003e [\u003cffffffff81139d31\u003e] lock_rename+0x41/0xf0\n \u003e [\u003cffffffff8120eb2a\u003e] ecryptfs_rename+0xca/0x170\n \u003e [\u003cffffffff81139a9e\u003e] vfs_rename_dir+0x13e/0x160\n \u003e [\u003cffffffff8113ac7e\u003e] vfs_rename+0xee/0x290\n \u003e [\u003cffffffff8113c212\u003e] ? __lookup_hash+0x102/0x160\n \u003e [\u003cffffffff8113d512\u003e] sys_renameat+0x252/0x280\n \u003e [\u003cffffffff81133eb4\u003e] ? cp_new_stat+0xe4/0x100\n \u003e [\u003cffffffff8101316a\u003e] ? sysret_check+0x2e/0x69\n \u003e [\u003cffffffff8108c34d\u003e] ? trace_hardirqs_on_caller+0x14d/0x190\n \u003e [\u003cffffffff8113d55b\u003e] sys_rename+0x1b/0x20\n \u003e [\u003cffffffff81013132\u003e] system_call_fastpath+0x16/0x1b\n\nThe trace above is totally reproducible by doing a cross-directory\nrename on an ecryptfs directory.\n\nThe issue seems to be that sys_renameat() does lock_rename() then calls\ninto the filesystem; if the filesystem is ecryptfs, then\necryptfs_rename() again does lock_rename() on the lower filesystem, and\nlockdep can\u0027t tell that the two s_vfs_rename_mutexes are different. It\nseems an annotation like the following is sufficient to fix this (it\ndoes get rid of the lockdep trace in my simple tests); however I would\nlike to make sure I\u0027m not misunderstanding the locking, hence the CC\nlist...\n\nSigned-off-by: Roland Dreier \u003crdreier@cisco.com\u003e\nCc: Tyler Hicks \u003ctyhicks@linux.vnet.ibm.com\u003e\nCc: Dustin Kirkland \u003ckirkland@canonical.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "8018ab057480974e7f26a387bf4ce040e9a5f6f1", "tree": "98298180bf60797a028eca4f24234dc67d38a9d4", "parents": [ "e970a573ce30a3976234dcfb67906c164b0df9ee" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Mon Mar 22 17:32:25 2010 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:21 2010 -0400" }, "message": "sanitize vfs_fsync calling conventions\n\nNow that the last user passing a NULL file pointer is gone we can remove\nthe redundant dentry argument and associated hacks inside vfs_fsynmc_range.\n\nThe next step will be removig the dentry argument from -\u003efsync, but given\nthe luck with the last round of method prototype changes I\u0027d rather\ndefer this until after the main merge window.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "94d09a98cdb163be12fb5c76841fa295f0bee22a", "tree": "32f8e25bd707de3fe5fd34d49329d9510d7d0af2", "parents": [ "11e27528076e7dee63f1db78bffbef6310f076f4" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Thu May 13 17:53:19 2010 -0700" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:19 2010 -0400" }, "message": "reiserfs: constify xattr_handler\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "bb4354538eb7b92f32cfedbad68c7be266c0b467", "tree": "5ecc43dabf5a0ecb511c74411272eba70415cdaf", "parents": [ "18e9e5104fcd9a973ffe3eed3816c87f2a1b6cd2" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Thu May 13 17:53:14 2010 -0700" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:18 2010 -0400" }, "message": "fs: xattr_handler table should be const\n\nThe entries in xattr handler table should be immutable (ie const)\nlike other operation tables.\n\nLater patches convert common filesystems. Uncoverted filesystems\nwill still work, but will generate a compiler warning.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "18e9e5104fcd9a973ffe3eed3816c87f2a1b6cd2", "tree": "635369c866fcb384223618c878e0b4c317790634", "parents": [ "e1e46bf1866317d4f86f66bf18d3f07317d9f9ee" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Tue Mar 23 10:34:56 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:18 2010 -0400" }, "message": "Introduce freeze_super and thaw_super for the fsfreeze ioctl\n\nCurrently the way we do freezing is by passing sb\u003es_bdev to freeze_bdev and then\nletting it do all the work. But freezing is more of an fs thing, and doesn\u0027t\nreally have much to do with the bdev at all, all the work gets done with the\nsuper. In btrfs we do not populate s_bdev, since we can have multiple bdev\u0027s\nfor one fs and setting s_bdev makes removing devices from a pool kind of tricky.\nThis means that freezing a btrfs filesystem fails, which causes us to corrupt\nwith things like tux-on-ice which use the fsfreeze mechanism. So instead of\npopulating sb-\u003es_bdev with a random bdev in our pool, I\u0027ve broken the actual fs\nfreezing stuff into freeze_super and thaw_super. These just take the\nsuper_block that we\u0027re freezing and does the appropriate work. It\u0027s basically\njust copy and pasted from freeze_bdev. I\u0027ve then converted freeze_bdev over to\nuse the new super helpers. I\u0027ve tested this with ext4 and btrfs and verified\neverything continues to work the same as before.\n\nThe only new gotcha is multiple calls to the fsfreeze ioctl will return EBUSY if\nthe fs is already frozen. I thought this was a better solution than adding a\nfreeze counter to the super_block, but if everybody hates this idea I\u0027m open to\nsuggestions. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "01a05b337a5b647909e1d6670f57e7202318a5fb", "tree": "7877f08db14877d06346c8e1ef52aa17f2483e93", "parents": [ "35cf7ba0b46dc3582a01c3860b14bff122662aa3" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 23 06:06:58 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:16 2010 -0400" }, "message": "new helper: iterate_supers()\n\n... and switch the simple \"loop over superblocks and do something\"\nloops to it.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "35cf7ba0b46dc3582a01c3860b14bff122662aa3", "tree": "2b38e9333600f468f0c8371c657c02e3aa8ec43b", "parents": [ "79893c17b45dec0d3c25bc22d28d9f319b14f573" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Mar 22 21:13:53 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:16 2010 -0400" }, "message": "Bury __put_super_and_need_restart()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "8edd64bd6089e21f47dcdebb14b598b713213ddc", "tree": "c356a358c7b823433728869ff430ad205c4b8a5d", "parents": [ "551de6f34dfeefbeeadb32909c387d393114ecc8" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Mar 22 19:56:42 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:15 2010 -0400" }, "message": "get rid of restarts in sync_filesystems()\n\nAt the same time we can kill s_need_restart and local mutex in there.\n__put_super() made public for a while; will be gone later.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "b20bd1a5e78af267dc4b6e1ffed48d5d776302c5", "tree": "d50982ee42500712d9add489435d4455580b9cac", "parents": [ "389b8be6ef419397e4f176652927ebad6ebb4b77" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Mar 22 08:53:19 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:14 2010 -0400" }, "message": "get rid of S_BIAS\n\nuse atomic_inc_not_zero(\u0026sb-\u003es_active) instead of playing games with\nchecking -\u003es_count \u003e S_BIAS\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "79d7e39ee1d4b423206f6cfd2cd2eed6253d95fe", "tree": "72cda49fac91729b68edbec086dd5f36178448d5", "parents": [ "3981f2e2a04df4b95129ddbb8bb869ef1d57bea9" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Mar 21 19:24:23 2010 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri May 21 18:31:13 2010 -0400" }, "message": "sb_entry() has been killed a couple of years ago and resurrected on mismerge\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "d79df0b1eda0099a22cbcece01ce5e7d222450de", "tree": "eb9c938fa5faf285fb091d7446508a32229ceea4", "parents": [ "6e80e8ed5eb92d0112674aabe82951266a6a1051", "c8d1a126924fcbc1d61ceb830226e0c7afdcc841" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 15:26:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 21 15:26:46 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (577 commits)\n Staging: ramzswap: Handler for swap slot free callback\n swap: Add swap slot free callback to block_device_operations\n swap: Add flag to identify block swap devices\n Staging: vt6655: use ETH_FRAME_LEN macro instead of custom one\n Staging: vt6655: use ETH_DATA_LEN macro instead of custom one\n Staging: vt6655: use ETH_FCS_LEN macro instead of custom one\n Staging: vt6656: use ETH_HLEN macro instead of custom one\n Staging: comedi: quatech_daqp_cs.c Replace eos semaphore with a completion.\n Staging: dt3155v4l: remove private memory allocator\n Staging: crystalhd: Remove typedefs from driver\n Staging: winbond: Fix for pointer name format issue in mds.c\n Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs\n Staging: vt6656: removed custom CHAR/SHORT/INT/LONG typedefs\n Staging: comedi: Altered the way printk is used in 8255.c\n staging: iio: adis16350 and similar IMU driver\n Staging: iio: max1363 Fix two bugs in single_channel_from_ring\n Staging: iio: adis16220 extract bin_attribute structures from state\n Staging: iio: adis16220 vibration sensor driver\n Staging: comedi: Kconfig dependancy fixes\n Staging: comedi: fix up build error from last Kconfig changes\n ...\n" } ], "next": "6e80e8ed5eb92d0112674aabe82951266a6a1051" }