)]}' { "log": [ { "commit": "2ca9bf453bdd478bcb6c01aa2d0bd4c2f4350563", "tree": "b9f6051059a2a90547a4501bf296b0cf3c9dbc76", "parents": [ "8761afd49ebff8ae04c1a7888af090177441d07d" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Fri Jul 08 13:23:44 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jul 11 11:05:33 2011 +1000" }, "message": "TOMOYO: Allow using executable\u0027s realpath and symlink\u0027s target as conditions.\n\nThis patch adds support for permission checks using executable file\u0027s realpath\nupon execve() and symlink\u0027s target upon symlink(). Hooks are in the last patch\nof this pathset.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "8761afd49ebff8ae04c1a7888af090177441d07d", "tree": "f43b52e1b8467eeea465762d2f9d0b81a336faa0", "parents": [ "2066a36125fcbf5220990173b9d8e8bc49ad7538" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Fri Jul 08 13:22:41 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jul 11 11:05:32 2011 +1000" }, "message": "TOMOYO: Allow using owner/group etc. of file objects as conditions.\n\nThis patch adds support for permission checks using file object\u0027s DAC\nattributes (e.g. owner/group) when checking file\u0027s pathnames. Hooks for passing\nfile object\u0027s pointers are in the last patch of this pathset.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "2066a36125fcbf5220990173b9d8e8bc49ad7538", "tree": "c8ea3a6d92a8b4b68cda986601336e8e8f58553e", "parents": [ "5c4274f13819b40e726f6ee4ef13b4952cff5010" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Fri Jul 08 13:21:37 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Mon Jul 11 11:05:32 2011 +1000" }, "message": "TOMOYO: Allow using UID/GID etc. of current thread as conditions.\n\nThis patch adds support for permission checks using current thread\u0027s UID/GID\netc. in addition to pathnames.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "5c4274f13819b40e726f6ee4ef13b4952cff5010", "tree": "c32b5d2932369f24fbfbeb62908b09c505a01186", "parents": [ "ea504819122a76a236f8b95d1556f807a0a41397" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Thu Jul 07 21:20:35 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Jul 08 09:25:36 2011 +1000" }, "message": "TOMOYO: Remove /sys/kernel/security/tomoyo/.domain_status interface.\n\n/sys/kernel/security/tomoyo/.domain_status can be easily emulated using\n/sys/kernel/security/tomoyo/domain_policy . We can remove this interface by\nupdating /usr/sbin/tomoyo-setprofile utility.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "ea504819122a76a236f8b95d1556f807a0a41397", "tree": "d741222691d3ab119a76a3ce816f4fd49ffdf872", "parents": [ "ad599f9cf0187e823bc92bc83f3867a38fa266b9" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Thu Jun 30 17:32:30 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Jul 01 09:25:47 2011 +1000" }, "message": "TOMOYO: Fix wrong domainname in tomoyo_init_log().\n\nCommit eadd99cc \"TOMOYO: Add auditing interface.\" by error replaced\n\"struct tomoyo_request_info\"-\u003edomain with tomoyo_domain().\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "ad599f9cf0187e823bc92bc83f3867a38fa266b9", "tree": "cb018d0a4ec10e3710e1048624998d84ee58ca88", "parents": [ "3ddf17f08cf2f0d7ff06858eb07d1cc3db8994de" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Wed Jun 29 14:53:56 2011 -0400" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jun 30 19:08:14 2011 +1000" }, "message": "encrypted-keys: move ecryptfs documentation to proper location\n\nMove keys-ecryptfs.txt to Documentation/security.\n\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "3ddf17f08cf2f0d7ff06858eb07d1cc3db8994de", "tree": "c992dea8b1aaddf5f406826b40d53eb5534d1044", "parents": [ "3a6297abf3b179ae19b849e429841a7646711b70" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Wed Jun 29 14:22:37 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jun 30 18:49:25 2011 +1000" }, "message": "TOMOYO: Cleanup header file.\n\nSort by alphabetic order.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "3a6297abf3b179ae19b849e429841a7646711b70", "tree": "7ce7529d07376ded05a575342bd501e600f9b492", "parents": [ "7986cf28bc5050967a7056d6eadda7f16f84eaab" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Wed Jun 29 14:17:31 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jun 30 18:48:57 2011 +1000" }, "message": "TOMOYO: Update MAINTAINERS file.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "7986cf28bc5050967a7056d6eadda7f16f84eaab", "tree": "7330d23c10e04c0c8319f37335e87e9fd0f22b4b", "parents": [ "da3f1c7b7d34e66cf571a613525ca0d23f92d42f" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Wed Jun 29 13:07:52 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jun 30 18:48:37 2011 +1000" }, "message": "TOMOYO: Fix build error with CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER\u003dy .\n\nI forgot to add #ifndef in commit 0e4ae0e0 \"TOMOYO: Make several options\nconfigurable.\", resulting\n\n security/built-in.o: In function `tomoyo_bprm_set_creds\u0027:\n tomoyo.c:(.text+0x4698e): undefined reference to `tomoyo_load_policy\u0027\n\nerror.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "da3f1c7b7d34e66cf571a613525ca0d23f92d42f", "tree": "0233826259cbe4cd44755ccc893b77a3e8ac5213", "parents": [ "5b944a71a192977c1c018bbcfa0c52dca48e2368", "25e75dff519bcce2cb35023105e7df51d7b9e691" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jun 30 18:44:55 2011 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jun 30 18:44:55 2011 +1000" }, "message": "Merge branch \u0027for-security\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev into next\n" }, { "commit": "5b944a71a192977c1c018bbcfa0c52dca48e2368", "tree": "9f234c4a93bb28890ad086c846d2bf0b35f7f7ae", "parents": [ "0e4ae0e0dec634b2ae53ac57d14141b140467dbe", "c017d0d1351f916c0ced3f358afc491fdcf490b4" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jun 30 18:43:56 2011 +1000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jun 30 18:43:56 2011 +1000" }, "message": "Merge branch \u0027linus\u0027 into next\n" }, { "commit": "c017d0d1351f916c0ced3f358afc491fdcf490b4", "tree": "047c833e33d96e7ae500a155c1e59adbde1aaf51", "parents": [ "c7735471837b35a6205f6052a34ded3bdc1db505", "cb16c348760ad2bc79b67b20aefac05529569ed7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 29 11:07:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 29 11:07:20 2011 -0700" }, "message": "Merge branch \u0027kvm-updates/3.0\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/3.0\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: x86 emulator: fix %rip-relative addressing with immediate source operand\n" }, { "commit": "c7735471837b35a6205f6052a34ded3bdc1db505", "tree": "c6f7a367d893f8194f624f321530fa010604d5c5", "parents": [ "78a3cc38f72cb0e6938ed8e796041d6d1beb8a28", "cd823db8b1161ef0d756514d280715a576d65cc3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 29 11:07:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 29 11:07:02 2011 -0700" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n i2c/pca954x: Initialize the mux to disconnected state\n i2c-taos-evm: Fix log messages\n" }, { "commit": "78a3cc38f72cb0e6938ed8e796041d6d1beb8a28", "tree": "400bf76711d46155b78090371d96a2d8b6ed994e", "parents": [ "49743170556e13156a64f8f20fa412805771b4e1", "76462232c21dc011462522387ddad0598a4f11e4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 29 11:03:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 29 11:03:27 2011 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n arch/powerpc: use printk_ratelimited instead of printk_ratelimit\n powerpc/rtas-rtc: remove sideeffects of printk_ratelimit\n powerpc/pseries: remove duplicate SCSI_BNX2_ISCSI in pseries_defconfig\n powerpc/e500: fix breakage with fsl_rio_mcheck_exception\n powerpc/p1022ds: fix audio-related properties in the device tree\n powerpc/85xx: fix NAND_CMD_READID read bytes number\n" }, { "commit": "49743170556e13156a64f8f20fa412805771b4e1", "tree": "6289b5daebd02f3b87c71c88e0ac76a4a802252f", "parents": [ "0d72c6fcb5cd215eeab824fac216ea42c5b574aa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 29 10:10:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 29 10:10:07 2011 -0700" }, "message": "ahci: change \u0027masking port_map\u0027 printk to KERN_WARNING level\n\nIt\u0027s not so much an error as a warning about normal Marvell crazines.\nSo don\u0027t use KERN_ERR that ends up spamming the console even in quiet\nmode, it\u0027s not _that_ critical.\n\nExplained by Jeff:\n\n \"Long explanation, it\u0027s a mess:\n\n Marvell took standard AHCI, and bastardized it to include a weird mode\n whereby PATA devices appear inside the AHCI DMA and interrupt\n infrastructure you\u0027re familiar with.\n\n So, PATA devices appear via pata_marvell driver, using basic legacy\n IDE programming interface. But SATA devices, which might also be\n attached to this chip, either work in under-performing mode or\n simply don\u0027t work at all (e.g. newer 6 Gbps devices or port\n multiplier attachments, NCQ, ...)\n\n On the other hand, \u0027ahci\u0027 driver loads and works with the chip\u0027s\n attached SATA devices quite beautifully, but is completely unable to\n drive any attached PATA devices, due to the Marvell-specific\n PATA-under-AHCI interface.\n\n The \"masking port_map 0x7 -\u003e 0x3\" message is the ahci driver \"hiding\"\n the PATA port(s) from itself, making sure it will only drive the SATA\n ports it knows how to drive.\"\n\nAcked-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cd823db8b1161ef0d756514d280715a576d65cc3", "tree": "96eb9acd38c9206be203219023df5bde4700ce88", "parents": [ "9b640f2e154268cb516efcaf9c434f2e73c6783e" ], "author": { "name": "Petri Gynther", "email": "pgynther@google.com", "time": "Wed Jun 29 11:36:11 2011 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed Jun 29 11:36:11 2011 +0200" }, "message": "i2c/pca954x: Initialize the mux to disconnected state\n\npca954x power-on default is channel 0 connected. If multiple pca954x\nmuxes are connected to the same physical I2C bus, the parent bus will\nsee channel 0 devices behind both muxes by default. This is bad.\n\nScenario:\n -- pca954x @ 0x70 -- ch 0 (I2C-bus-101) -- EEPROM @ 0x50\n |\nI2C-bus-1 ---\n |\n -- pca954x @ 0x71 -- ch 0 (I2C-bus-111) -- EEPROM @ 0x50\n\n1. Load I2C bus driver: creates I2C-bus-1\n2. Load pca954x driver: creates virtual I2C-bus-101 and I2C-bus-111\n3. Load eeprom driver\n4. Try to read EEPROM @ 0x50 on I2C-bus-101. The transaction will also bleed\n onto I2C-bus-111 because pca954x @ 0x71 channel 0 is connected by default.\n\nFix: Initialize pca954x to disconnected state in pca954x_probe()\n\nSigned-off-by: Petri Gynther \u003cpgynther@google.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: stable@kernel.org\n" }, { "commit": "9b640f2e154268cb516efcaf9c434f2e73c6783e", "tree": "363896bb37573fc13af8ca4e68b5a861bf77ac24", "parents": [ "b0af8dfdd67699e25083478c63eedef2e72ebd85" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Wed Jun 29 11:36:10 2011 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@endymion.delvare", "time": "Wed Jun 29 11:36:10 2011 +0200" }, "message": "i2c-taos-evm: Fix log messages\n\n* Print all error and information messages even when debugging is\n disabled.\n* Don\u0027t use adapter device to log messages before it is ready.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: stable@kernel.org\n" }, { "commit": "cb16c348760ad2bc79b67b20aefac05529569ed7", "tree": "64a3928c22676e0e09d5d514708c98cd20aa5a44", "parents": [ "b0af8dfdd67699e25083478c63eedef2e72ebd85" ], "author": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Sun Jun 19 19:21:11 2011 +0300" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Wed Jun 29 10:09:25 2011 +0300" }, "message": "KVM: x86 emulator: fix %rip-relative addressing with immediate source operand\n\n%rip-relative addressing is relative to the first byte of the next instruction,\nso we need to add %rip only after we\u0027ve fetched any immediate bytes.\n\nBased on original patch by Li Xin \u003cxin.li@intel.com\u003e.\n\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\nAcked-by: Li Xin \u003cxin.li@intel.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "76462232c21dc011462522387ddad0598a4f11e4", "tree": "a21be7280dd159e44f5a9a387c586a059a84485b", "parents": [ "9a8f99fab02db296815d7f0ae8ba8ce169df0063" ], "author": { "name": "Christian Dietrich", "email": "christian.dietrich@informatik.uni-erlangen.de", "time": "Sat Jun 04 05:36:54 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 29 15:31:01 2011 +1000" }, "message": "arch/powerpc: use printk_ratelimited instead of printk_ratelimit\n\nSince printk_ratelimit() shouldn\u0027t be used anymore (see comment in\ninclude/linux/printk.h), replace it with printk_ratelimited.\n\nSigned-off-by: Christian Dietrich \u003cchristian.dietrich@informatik.uni-erlangen.de\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "9a8f99fab02db296815d7f0ae8ba8ce169df0063", "tree": "5f1bfc1bf3febaded62f6ab64afe1b7a6b3d15ba", "parents": [ "937c190ccdd29855828529fc2b4b3e5f1282ff23" ], "author": { "name": "Christian Dietrich", "email": "christian.dietrich@informatik.uni-erlangen.de", "time": "Sat Jun 04 05:35:47 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 29 15:30:43 2011 +1000" }, "message": "powerpc/rtas-rtc: remove sideeffects of printk_ratelimit\n\nDon\u0027t use printk_ratelimit() as an additional condition for returning\non an error. Because when the ratelimit is reached, printk_ratelimit\nwill return 0 and e.g. in rtas_get_boot_time won\u0027t check for an error\ncondition.\n\nSigned-off-by: Christian Dietrich \u003cchristian.dietrich@informatik.uni-erlangen.de\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "25e75dff519bcce2cb35023105e7df51d7b9e691", "tree": "14cb61f6510af1440782fc5f3a81e37aad0c4be5", "parents": [ "04fdc099f9c80c7775dbac388fc97e156d4d47e7" ], "author": { "name": "John Johansen", "email": "john.johansen@canonical.com", "time": "Sat Jun 25 16:57:07 2011 +0100" }, "committer": { "name": "John Johansen", "email": "john.johansen@canonical.com", "time": "Wed Jun 29 02:04:44 2011 +0100" }, "message": "AppArmor: Fix masking of capabilities in complain mode\n\nAppArmor is masking the capabilities returned by capget against the\ncapabilities mask in the profile. This is wrong, in complain mode the\nprofile has effectively all capabilities, as the profile restrictions are\nnot being enforced, merely tested against to determine if an access is\nknown by the profile.\n\nThis can result in the wrong behavior of security conscience applications\nlike sshd which examine their capability set, and change their behavior\naccordingly. In this case because of the masked capability set being\nreturned sshd fails due to DAC checks, even when the profile is in complain\nmode.\n\nKernels affected: 2.6.36 - 3.0.\n\nSigned-off-by: John Johansen \u003cjohn.johansen@canonical.com\u003e\n" }, { "commit": "04fdc099f9c80c7775dbac388fc97e156d4d47e7", "tree": "886a4176abfe4a4c4e3ee7b62da520914bf666e0", "parents": [ "b0af8dfdd67699e25083478c63eedef2e72ebd85" ], "author": { "name": "John Johansen", "email": "john.johansen@canonical.com", "time": "Tue Jun 28 15:06:38 2011 +0100" }, "committer": { "name": "John Johansen", "email": "john.johansen@canonical.com", "time": "Wed Jun 29 02:02:03 2011 +0100" }, "message": "AppArmor: Fix reference to rcu protected pointer outside of rcu_read_lock\n\nThe pointer returned from tracehook_tracer_task() is only valid inside\nthe rcu_read_lock. However the tracer pointer obtained is being passed\nto aa_may_ptrace outside of the rcu_read_lock critical section.\n\nMover the aa_may_ptrace test into the rcu_read_lock critical section, to\nfix this.\n\nKernels affected: 2.6.36 - 3.0\n\nReported-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John Johansen \u003cjohn.johansen@canonical.com\u003e\n" }, { "commit": "0e4ae0e0dec634b2ae53ac57d14141b140467dbe", "tree": "9a3b46dd03ea21422359d3948514771d0cc9d72d", "parents": [ "efe836ab2b514ae7b59528af36d452978b42d266" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:22:59 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:22 2011 +1000" }, "message": "TOMOYO: Make several options configurable.\n\nTo be able to start using enforcing mode from the early stage of boot sequence,\nthis patch adds support for activating access control without calling external\npolicy loader program. This will be useful for systems where operations which\ncan lead to the hijacking of the boot sequence are needed before loading the\npolicy. For example, you can activate immediately after loading the fixed part\nof policy which will allow only operations needed for mounting a partition\nwhich contains the variant part of policy and verifying (e.g. running GPG\ncheck) and loading the variant part of policy. Since you can start using\nenforcing mode from the beginning, you can reduce the possibility of hijacking\nthe boot sequence.\n\nThis patch makes several variables configurable on build time. This patch also\nadds TOMOYO_loader\u003d and TOMOYO_trigger\u003d kernel command line option to boot the\nsame kernel in two different init systems (BSD-style init and systemd).\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "efe836ab2b514ae7b59528af36d452978b42d266", "tree": "5e2434b25b0d53c4852fad7c9c07db9e99a38b07", "parents": [ "b22b8b9fd90eecfb7133e56b4e113595f09f4492" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:22:18 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:22 2011 +1000" }, "message": "TOMOYO: Add built-in policy support.\n\nTo be able to start using enforcing mode from the early stage of boot sequence,\nthis patch adds support for built-in policy configuration (and next patch adds\nsupport for activating access control without calling external policy loader\nprogram).\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "b22b8b9fd90eecfb7133e56b4e113595f09f4492", "tree": "6e15e497a05aa219c598b8b8690fbdb5ae5f0b0a", "parents": [ "2c47ab9353242b0f061959318f83c55360b88fa4" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:21:50 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:22 2011 +1000" }, "message": "TOMOYO: Rename meminfo to stat and show more statistics.\n\nShow statistics such as last policy update time and last policy violation time\nin addition to memory usage.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "2c47ab9353242b0f061959318f83c55360b88fa4", "tree": "03693079bf04572d30ef0ca37f717ae8acc29863", "parents": [ "2e503bbb435ae418aebbe4aeede1c6f2a33d6f74" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:21:19 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:21 2011 +1000" }, "message": "TOMOYO: Cleanup part 4.\n\nGather string constants to one file in order to make the object size smaller.\nUse unsigned type where appropriate.\nread()/write() returns ssize_t.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "2e503bbb435ae418aebbe4aeede1c6f2a33d6f74", "tree": "c6b783c245716cf87b337b2a855e742133afb7ac", "parents": [ "5625f2e3266319fd29fe4f1c76ccd3f550c79ac4" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:20:55 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:21 2011 +1000" }, "message": "TOMOYO: Fix lockdep warning.\n\nCurrently TOMOYO holds SRCU lock upon open() and releases it upon close()\nbecause list elements stored in the \"struct tomoyo_io_buffer\" instances are\naccessed until close() is called. However, such SRCU usage causes lockdep to\ncomplain about leaving the kernel with SRCU lock held.\n\nThis patch solves the warning by holding/releasing SRCU upon each\nread()/write(). This patch is doing something similar to calling kfree()\nwithout calling synchronize_srcu(), by selectively deferring kfree() by keeping\ntrack of the \"struct tomoyo_io_buffer\" instances.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "5625f2e3266319fd29fe4f1c76ccd3f550c79ac4", "tree": "190e96d956213b22da705872094ebdf5272af972", "parents": [ "bd03a3e4c9a9df0c6b007045fa7fc8889111a478" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:20:23 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:21 2011 +1000" }, "message": "TOMOYO: Change pathname for non-rename()able filesystems.\n\nTOMOYO wants to use /proc/self/ rather than /proc/$PID/ if $PID matches current\nthread\u0027s process ID in order to prevent current thread from accessing other\nprocess\u0027s information unless needed.\n\nBut since procfs can be mounted on various locations (e.g. /proc/ /proc2/ /p/\n/tmp/foo/100/p/ ), TOMOYO cannot tell that whether the numeric part in the\nstring returned by __d_path() represents process ID or not.\n\nTherefore, to be able to convert from $PID to self no matter where procfs is\nmounted, this patch changes pathname representations for filesystems which do\nnot support rename() operation (e.g. proc, sysfs, securityfs).\n\nExamples:\n /proc/self/mounts \u003d\u003e proc:/self/mounts\n /sys/kernel/security/ \u003d\u003e sys:/kernel/security/\n /dev/pts/0 \u003d\u003e devpts:/0\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "bd03a3e4c9a9df0c6b007045fa7fc8889111a478", "tree": "9d78290c878e6466fe3e0bda7ee5989c0dc39e40", "parents": [ "32997144fd9925fc4d506a16990a0c405f766526" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:19:52 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:21 2011 +1000" }, "message": "TOMOYO: Add policy namespace support.\n\nMauras Olivier reported that it is difficult to use TOMOYO in LXC environments,\nfor TOMOYO cannot distinguish between environments outside the container and\nenvironments inside the container since LXC environments are created using\npivot_root(). To address this problem, this patch introduces policy namespace.\n\nEach policy namespace has its own set of domain policy, exception policy and\nprofiles, which are all independent of other namespaces. This independency\nallows users to develop policy without worrying interference among namespaces.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "32997144fd9925fc4d506a16990a0c405f766526", "tree": "52332d25e9317250a1af1b06008d7eae18717c70", "parents": [ "eadd99cc85347b4f9eb10122ac90032eb4971b02" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:19:28 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:20 2011 +1000" }, "message": "TOMOYO: Add ACL group support.\n\nACL group allows administrator to globally grant not only \"file read\"\npermission but also other permissions.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "eadd99cc85347b4f9eb10122ac90032eb4971b02", "tree": "fa6075ad4917422288222ee52bfcb66b7ed30a0e", "parents": [ "d5ca1725ac9ba876c2dd614bb9826d0c4e13d818" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:18:58 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:20 2011 +1000" }, "message": "TOMOYO: Add auditing interface.\n\nAdd /sys/kernel/security/tomoyo/audit interface. This interface generates audit\nlogs in the form of domain policy so that /usr/sbin/tomoyo-auditd can reuse\naudit logs for appending to /sys/kernel/security/tomoyo/domain_policy\ninterface.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "d5ca1725ac9ba876c2dd614bb9826d0c4e13d818", "tree": "fbff7fe1e39597c5bac981f63a2be659f4ec84e7", "parents": [ "0d2171d711cbfca84cc0001121be8a6cc8e4d148" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:18:21 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:20 2011 +1000" }, "message": "TOMOYO: Simplify profile structure.\n\nRemove global preference from profile structure in order to make code simpler.\n\nDue to this structure change, printk() warnings upon policy violation are\ntemporarily disabled. They will be replaced by\n/sys/kernel/security/tomoyo/audit by next patch.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "0d2171d711cbfca84cc0001121be8a6cc8e4d148", "tree": "998c6fb0c61e15686a7b70276e17ad9e396741f4", "parents": [ "a238cf5b89ed5285be8de56335665d023972f7d5" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:17:46 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:20 2011 +1000" }, "message": "TOMOYO: Rename directives.\n\nConvert \"allow_...\" style directives to \"file ...\" style directives.\nBy converting to the latter style, we can pack policy like\n\"file read/write/execute /path/to/file\".\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "a238cf5b89ed5285be8de56335665d023972f7d5", "tree": "cd2594f5c80345b5f880a3ccd445d15fb6b7d6cd", "parents": [ "0df7e8b8f1c25c10820bdc679555f2fbfb897ca0" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:17:10 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:20 2011 +1000" }, "message": "TOMOYO: Use struct for passing ACL line.\n\nUse structure for passing ACL line, in preparation for supporting policy\nnamespace and conditional parameters.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "0df7e8b8f1c25c10820bdc679555f2fbfb897ca0", "tree": "626a0304fceec0bbee93e43a24bc0f813fe230b7", "parents": [ "b5bc60b4ce313b6dbb42e7d32915dcf0a07c2a68" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:16:36 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:19 2011 +1000" }, "message": "TOMOYO: Cleanup part 3.\n\nUse common structure for ACL with \"struct list_head\" + \"atomic_t\".\nUse array/struct where possible.\nRemove is_group from \"struct tomoyo_name_union\"/\"struct tomoyo_number_union\".\nPass \"struct file\"-\u003eprivate_data rather than \"struct file\".\nUpdate some of comments.\nBring tomoyo_same_acl_head() from common.h to domain.c .\nBring tomoyo_invalid()/tomoyo_valid() from common.h to util.c .\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "b5bc60b4ce313b6dbb42e7d32915dcf0a07c2a68", "tree": "4a6a4f4cf1b6d0e5fa22c974fb4cf87d59a88e21", "parents": [ "7c75964f432d14062d8eccfc916aa290f56b5aab" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:16:03 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:19 2011 +1000" }, "message": "TOMOYO: Cleanup part 2.\n\nUpdate (or temporarily remove) comments.\nRemove or replace some of #define lines.\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "7c75964f432d14062d8eccfc916aa290f56b5aab", "tree": "8aecdb96f9f079dd36735c3acccb79f3d10d6559", "parents": [ "1252cc3b232e582e887623dc5f70979418caaaa2" ], "author": { "name": "Tetsuo Handa", "email": "penguin-kernel@I-love.SAKURA.ne.jp", "time": "Sun Jun 26 23:15:31 2011 +0900" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jun 29 09:31:19 2011 +1000" }, "message": "TOMOYO: Cleanup part 1.\n\nIn order to synchronize with TOMOYO 1.8\u0027s syntax,\n\n(1) Remove special handling for allow_read/write permission.\n(2) Replace deny_rewrite/allow_rewrite permission with allow_append permission.\n(3) Remove file_pattern keyword.\n(4) Remove allow_read permission from exception policy.\n(5) Allow creating domains in enforcing mode without calling supervisor.\n(6) Add permission check for opening directory for reading.\n(7) Add permission check for stat() operation.\n(8) Make \"cat \u003c /sys/kernel/security/tomoyo/self_domain\" behave as if\n \"cat /sys/kernel/security/tomoyo/self_domain\".\n\nSigned-off-by: Tetsuo Handa \u003cpenguin-kernel@I-love.SAKURA.ne.jp\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "937c190ccdd29855828529fc2b4b3e5f1282ff23", "tree": "aa00289bf6722bc26f39300124f3433c16da4702", "parents": [ "82a9a4809f4cb4ce3f17da99a8150df8455fa096" ], "author": { "name": "Michael Neuling", "email": "mikey@neuling.org", "time": "Mon Jun 27 19:55:30 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jun 29 09:28:52 2011 +1000" }, "message": "powerpc/pseries: remove duplicate SCSI_BNX2_ISCSI in pseries_defconfig\n\nRemove duplicate assignment of SCSI_BNX2_ISCSI in pseries_defconfig\nintroduced by:\n 37e0c21e powerpc/pseries: Enable iSCSI support for a number of cards\n\ncauses warning:\narch/powerpc/configs/pseries_defconfig:151:warning: override: reassigning to symbol SCSI_BNX2_ISCSI\n\nSigned-off-by: Michael Neuling \u003cmikey@neuling.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "0d72c6fcb5cd215eeab824fac216ea42c5b574aa", "tree": "b2777db7513e14b0341088eea96c869a8071abc4", "parents": [ "c89b857ce6d803905b2c9d71bc9effdd286c45ed", "f01c22fd59aa10a3738ede20fd4b9b6fd1e2eac3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:57 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:57 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:\n drm/i915: Use chipset-specific irq installers\n drm/i915: forcewake fix after reset\n drm/i915: add Ivy Bridge page flip support\n drm/i915: split page flip queueing into per-chipset functions\n" }, { "commit": "c89b857ce6d803905b2c9d71bc9effdd286c45ed", "tree": "6cf4a6e23f68f3b65906210dccb272ab2f9c5c74", "parents": [ "2e34b429a404675dc4fc4ad2ee339eea028da3ca", "663dd6dcaf7e95526e469e91f41972a9c0cca30c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:36 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:36 2011 -0700" }, "message": "Merge branch \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* \u0027driver-core-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:\n Connector: Correctly set the error code in case of success when dispatching receive callbacks\n Connector: Set the CN_NETLINK_USERS correctly\n pti: PTI semantics fix in pti_tty_cleanup.\n pti: ENXIO error case memory leak PTI fix.\n pti: double-free security PTI fix\n drivers:misc: ti-st: fix skipping of change remote baud\n drivers/base/platform.c: don\u0027t mark platform_device_register_resndata() as __init_or_module\n st_kim: Handle case of no device found for ID 0\n firmware: fix GOOGLE_SMI kconfig dependency warning\n" }, { "commit": "2e34b429a404675dc4fc4ad2ee339eea028da3ca", "tree": "93c9595fa65bf1e676f9b2a2b03bc8c187c25d06", "parents": [ "04b905942b482092a547798a2477f21e32a8f65d", "857aab34f04ff86666aa80e751ee696eff0113dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:15:17 2011 -0700" }, "message": "Merge branch \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* \u0027usb-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:\n MAINTAINERS: add myself as maintainer of USB/IP\n usb: r8a66597-hcd: fix cannot detect low/full speed device\n USB: ehci-ath79: fix a NULL pointer dereference\n USB: Add new FT232H chip to drivers/usb/serial/ftdi_sio.c\n usb/isp1760: Fix bug preventing the unlinking of control urbs\n USB: Fix up URB error codes to reflect implementation.\n xhci: Always set urb-\u003estatus to zero for isoc endpoints.\n xhci: Add reset on resume quirk for asrock p67 host\n xHCI 1.0: Incompatible Device Error\n USB: don\u0027t let errors prevent system sleep\n USB: don\u0027t let the hub driver prevent system sleep\n USB: change maintainership of ohci-hcd and ehci-hcd\n xHCI 1.0: Force Stopped Event(FSE)\n xhci: Don\u0027t warn about zeroed bMaxBurst descriptor field.\n USB: Free bandwidth when usb_disable_device is called.\n xhci: Reject double add of active endpoints.\n USB: TI 3410/5052 USB Serial Driver: Fix mem leak when firmware is too big.\n usb: musb: gadget: clear TXPKTRDY flag when set FLUSHFIFO\n usb: musb: host: compare status for negative error values\n" }, { "commit": "04b905942b482092a547798a2477f21e32a8f65d", "tree": "9ad2837587f5ce284f830432fec3569ecf44fbcb", "parents": [ "d90ce8711ceb516de823ae878270e5a21d11dede", "3bc46b312b1486b1fe2db4246a34a30160d26d8d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:14:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:14:55 2011 -0700" }, "message": "Merge branch \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:\n serial: bcm63xx_uart: fix irq storm after rx fifo overrun.\n amba pl011: platform data for reg lockup and glitch v2\n amba pl011: workaround for uart registers lockup\n tty: n_gsm: improper skb_pull() use was leaking framed data\n tty: n_gsm: Fixed logic to decode break signal from modem status\n TTY: ntty, add one more sanity check\n TTY: ldisc, do not close until there are readers\n 8250: Fix capabilities when changing the port type\n 8250_pci: Fix missing const from merges\n ARM: SAMSUNG: serial: Fix on handling of one clock source for UART\n serial: ioremap warning fix for jsm driver.\n 8250_pci: add -ENODEV code for Intel EG20T PCH\n" }, { "commit": "d90ce8711ceb516de823ae878270e5a21d11dede", "tree": "28182cc7dbfe8b32dca9c127555e387ff2a4bdc1", "parents": [ "505cb6bc027ea8ae3782d2fdc47aa1915924ba80", "a73738e9f85fa6ba3f1f9a6ea95b5e5fa99579a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:14:22 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:14:22 2011 -0700" }, "message": "Merge branch \u0027staging-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6\n\n* \u0027staging-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:\n Staging: comedi: fix build breakages on some platforms\n Staging: brcm80211: disable drivers except for X86 or MIPS platforms\n Staging: brcm80211: disable drivers for PPC platforms\n Staging: iio: Make IIO depend on GENERIC_HARDIRQS\n Staging: mei: fix suspend failure\n Staging: fix iio builds when IIO_RING_BUFFER is not enabled\n Staging: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE\n Staging: fix more iio builds when IIO_RING_BUFFER is not enabled\n" }, { "commit": "505cb6bc027ea8ae3782d2fdc47aa1915924ba80", "tree": "718e811d7fd83132a34a24721bafe0c76850db21", "parents": [ "1d1221f375c94ef961ba8574ac4f85c8870ddd51", "4274215d24633df7302069e51426659d4759c5ed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:14:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 11:14:00 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://neil.brown.name/md\n\n* \u0027for-linus\u0027 of git://neil.brown.name/md:\n md: avoid endless recovery loop when waiting for fail device to complete.\n" }, { "commit": "f01c22fd59aa10a3738ede20fd4b9b6fd1e2eac3", "tree": "f305fa0368e2c94fc438d5bdf700eb65e1284299", "parents": [ "25732821cb965f00475922ca46e84f78e4bada95" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jun 28 11:48:51 2011 +0100" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jun 28 10:20:06 2011 -0700" }, "message": "drm/i915: Use chipset-specific irq installers\n\nKonstantin Belousov pointed out that 4697995b98417 replaced the generic\ni915_driver_irq_*install() functions with chipset specific routines\naccessible only through driver-\u003eirq_*install(). So update the sanity\ncheck in i915_request_wait() to match.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "25732821cb965f00475922ca46e84f78e4bada95", "tree": "e265e7fe4cb531722b2bfe8ddb17e521f6e460b8", "parents": [ "7c9017e5b77118439952fe8dc22809bae4fae4b6" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Fri Jun 24 14:31:47 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Tue Jun 28 09:44:55 2011 -0700" }, "message": "drm/i915: forcewake fix after reset\n\nThe failure is as follows:\n\n1. Userspace gets forcewake lock, lock count \u003e\u003d1\n2. GPU hang/reset occurs (forcewake bit is reset)\n3. count is now incorrect\n\nThe failure can only occur when using the forcewake userspace lock.\n\nThis has the unfortunate consequence of messing up the driver as well as\nuserspace, unless userspace closes the debugfs file, the kernel will\nnever end up waking the GT since the refcount will be \u003e 1.\n\nThe solution is to try to recover the correct forcewake state based on\nthe refcount. There is a period of time where userspace reads/writes may\noccur after the reset, before the GT has been forcewaked. The interface\nwas never designed to be a perfect solution for userspace reads/writes,\nand the kernel portion is fixed by this patch.\n\nSuggested-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "1d1221f375c94ef961ba8574ac4f85c8870ddd51", "tree": "1e05f1c33bef03a88745c55ac9891b8423ae1795", "parents": [ "b0af8dfdd67699e25083478c63eedef2e72ebd85" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Fri Jun 24 16:08:38 2011 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 28 09:39:11 2011 -0700" }, "message": "proc: restrict access to /proc/PID/io\n\n/proc/PID/io may be used for gathering private information. E.g. for\nopenssh and vsftpd daemons wchars/rchars may be used to learn the\nprecise password length. Restrict it to processes being able to ptrace\nthe target process.\n\nptrace_may_access() is needed to prevent keeping open file descriptor of\n\"io\" file, executing setuid binary and gathering io information of the\nsetuid\u0027ed process.\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4274215d24633df7302069e51426659d4759c5ed", "tree": "c21fff5f11201eaaea0e44cf81a38df21dd63ffd", "parents": [ "2992c4bd5742b31a0ee00a76eee9c1c284507418" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Jun 28 16:59:42 2011 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Jun 28 16:59:42 2011 +1000" }, "message": "md: avoid endless recovery loop when waiting for fail device to complete.\n\nIf a device fails in a way that causes pending request to take a while\nto complete, md will not be able to immediately remove it from the\narray in remove_and_add_spares.\nIt will then incorrectly look like a spare device and md will try to\nrecover it even though it is failed.\nThis leads to a recovery process starting and instantly aborting over\nand over again.\n\nWe should check if the device is faulty before considering it to be a\nspare. This will avoid trying to start a recovery that cannot\nproceed.\n\nThis bug was introduced in 2.6.26 so that patch is suitable for any\nkernel since then.\n\nCc: stable@kernel.org\nReported-by: Jim Paradis \u003cjames.paradis@stratus.com\u003e\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "b0af8dfdd67699e25083478c63eedef2e72ebd85", "tree": "f20d9e2415fc97137ee3090bea373c8412099015", "parents": [ "ecbec53b1d00ba582f71b210ed96cafc05ebd189" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 19:12:22 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 19:12:22 2011 -0700" }, "message": "Linux 3.0-rc5\n" }, { "commit": "ecbec53b1d00ba582f71b210ed96cafc05ebd189", "tree": "d03418464a270e05b769413c8a8183c328f26210", "parents": [ "e2377fe0b65e3c7577ff6df1701c56ef477d336f" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:20 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:14 2011 -0700" }, "message": "drm/i915: more struct_mutex locking\n\nWhen auditing the locking in i915_gem.c (for a prospective change which\nI then abandoned), I noticed two places where struct_mutex is not held\nacross GEM object manipulations that would usually require it.\n\nSince one is in initial setup and the other in driver unload, I\u0027m\nguessing the mutex is not required for either; but post a patch in case\nit is.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e2377fe0b65e3c7577ff6df1701c56ef477d336f", "tree": "ba110d07556128a0eff42496294c7dd4880ecfd7", "parents": [ "5949eac4d9b5bf936c12cb7ec3a09084c1326834" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:19 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:14 2011 -0700" }, "message": "drm/i915: use shmem_truncate_range\n\nThe interface to -\u003etruncate_range is changing very slightly: once \"tmpfs:\ntake control of its truncate_range\" has been applied, this can be applied.\n For now there is only a slight inefficiency while this remains unapplied,\nbut it will soon become essential for managing shmem\u0027s use of swap.\n\nChange i915_gem_object_truncate() to use shmem_truncate_range() directly:\nwhich should also spare i915 later change if we switch from\ninode_operations-\u003etruncate_range to file_operations-\u003efallocate.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Keith Packard \u003ckeithp@keithp.com\u003e\nCc: Dave Airlie \u003cairlied@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": "5949eac4d9b5bf936c12cb7ec3a09084c1326834", "tree": "1cb391ffd8ebab379e4c37953923baeeff9d3b65", "parents": [ "3142b651ad2232cf0e375c291ee4b893c8559df5" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:18 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "drm/i915: use shmem_read_mapping_page\n\nSoon tmpfs will stop supporting -\u003ereadpage and read_cache_page_gfp(): once\n\"tmpfs: add shmem_read_mapping_page_gfp\" has been applied, this patch can\nbe applied to ease the transition.\n\nMake i915_gem_object_get_pages_gtt() use shmem_read_mapping_page_gfp() in\nthe one place it\u0027s needed; elsewhere use shmem_read_mapping_page(), with\nthe mapping\u0027s gfp_mask properly initialized.\n\nForget about __GFP_COLD: since tmpfs initializes its pages with memset,\nasking for a cold page is counter-productive.\n\nInclude linux/shmem_fs.h also in drm_gem.c: with shmem_file_setup() now\ndeclared there too, we shall remove the prototype from linux/mm.h later.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Keith Packard \u003ckeithp@keithp.com\u003e\nCc: Dave Airlie \u003cairlied@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": "3142b651ad2232cf0e375c291ee4b893c8559df5", "tree": "ec8038ccadc92cbceee37e084c77f73fb61d1d53", "parents": [ "a39bce7bf60e728cb33b6b0415c3f44e7f1a102b" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "drm/ttm: use shmem_read_mapping_page\n\nSoon tmpfs will stop supporting -\u003ereadpage and read_mapping_page(): once\n\"tmpfs: add shmem_read_mapping_page_gfp\" has been applied, this patch can\nbe applied to ease the transition.\n\nttm_tt_swapin() and ttm_tt_swapout() use shmem_read_mapping_page() in\nplace of read_mapping_page(), since their swap_space has been created with\nshmem_file_setup().\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nCc: Dave Airlie \u003cairlied@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": "a39bce7bf60e728cb33b6b0415c3f44e7f1a102b", "tree": "174bdb951546f67880f13936d64f992d87d7b47a", "parents": [ "1fc6e987d8f606371337211f52ff74c6753298a6" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Mon Jun 27 16:18:16 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "drivers/tty/serial/8250_pci.c: fix warning\n\nFis the warning\n\n drivers/tty/serial/8250_pci.c:1457: warning: initialization from incompatible pointer type\n\nCc: Greg KH \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1fc6e987d8f606371337211f52ff74c6753298a6", "tree": "29222b9ec135a747575a14438ee4889b0f1b96b5", "parents": [ "33721bd3d00e7a235f70ba4ec19eb64bcd060c0b" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Mon Jun 27 16:18:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "drivers/misc/ioc4.c: fix section mismatch / race condition\n\nFix this section mismatch:\n\n WARNING: drivers/misc/ioc4.o(.data+0x144): Section mismatch in reference from the variable ioc4_load_modules_work to the function .devinit.text:ioc4_load_modules()\n The variable ioc4_load_modules_work references\n the function __devinit ioc4_load_modules()\n If the reference is valid then annotate the\n variable with __init* or __refdata (see linux/init.h) or name the variable:\n *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console\n\nThis one is potentially fatal; by the time ioc4_load_modules is invoked\nit may already have been freed. For that reason ioc4_load_modules_work\ncan\u0027t be turned to __devinitdata but also because it\u0027s referenced in\nioc4_exit.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nAcked-by: Brent Casavant \u003cbcasavan@sgi.com\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": "33721bd3d00e7a235f70ba4ec19eb64bcd060c0b", "tree": "1c01b043804b8aca6dabbe54387f7380382a8a2b", "parents": [ "5286bd953645408634daa880d04c73dd18d0224a" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Mon Jun 27 16:18:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "drivers/leds/leds-lp5523.c: fix section mismatches\n\nFix this section mismatch:\n\n WARNING: drivers/leds/leds-lp5523.o(.text+0x12f4): Section mismatch in reference from the function lp5523_probe() to the function .init.text:lp5523_init_led()\n The function lp5523_probe() references\n the function __init lp5523_init_led().\n This is often because lp5523_probe lacks a __init\n annotation or the annotation of lp5523_init_led is wrong.\n\nFixing this one triggers one more mismatch, fix that one as well.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5286bd953645408634daa880d04c73dd18d0224a", "tree": "ef7fd3a9201617acb91804e449e7a78425b2d5a1", "parents": [ "ac34a1a3c39da0a1b9188d12a9ce85506364ed2a" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Mon Jun 27 16:18:13 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "drivers/leds/leds-lp5521.c: fix section mismatches\n\nFix this section mismatch:\n\n WARNING: drivers/leds/leds-lp5521.o(.text+0xf2c): Section mismatch in reference from the function lp5521_probe() to the function .init.text:lp5521_init_led()\n The function lp5521_probe() references\n the function __init lp5521_init_led().\n This is often because lp5521_probe lacks a __init\n annotation or the annotation of lp5521_init_led is wrong.\n\nFixing this mismatch triggers one more mismatch, fix that one as well.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ac34a1a3c39da0a1b9188d12a9ce85506364ed2a", "tree": "f74f34047c6bc516e29196685cc8671aff4a02d2", "parents": [ "26c4caea9d697043cc5a458b96411b86d7f6babd" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Mon Jun 27 16:18:12 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "memcg: fix direct softlimit reclaim to be called in limit path\n\nCommit d149e3b25d7c (\"memcg: add the soft_limit reclaim in global direct\nreclaim\") adds a softlimit hook to shrink_zones(). By this, soft limit\nis called as\n\n try_to_free_pages()\n do_try_to_free_pages()\n shrink_zones()\n mem_cgroup_soft_limit_reclaim()\n\nThen, direct reclaim is memcg softlimit hint aware, now.\n\nBut, the memory cgroup\u0027s \"limit\" path can call softlimit shrinker.\n\n try_to_free_mem_cgroup_pages()\n do_try_to_free_pages()\n shrink_zones()\n mem_cgroup_soft_limit_reclaim()\n\nThis will cause a global reclaim when a memcg hits limit.\n\nThis is bug. soft_limit_reclaim() should be called when\nscanning_global_lru(sc) \u003d\u003d true.\n\nAnd the commit adds a variable \"total_scanned\" for counting softlimit\nscanned pages....it\u0027s not \"total\". This patch removes the variable and\nupdate sc-\u003enr_scanned instead of it. This will affect shrink_slab()\u0027s\nscan condition but, global LRU is scanned by softlimit and I think this\nchange makes sense.\n\nTODO: avoid too much scanning of a zone when softlimit did enough work.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "26c4caea9d697043cc5a458b96411b86d7f6babd", "tree": "cf4de2553fbfcafc41eb4f84bc9ee1eb69adf725", "parents": [ "08142579b6ca35883c1ed066a2681de6f6917062" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Mon Jun 27 16:18:11 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "taskstats: don\u0027t allow duplicate entries in listener mode\n\nCurrently a single process may register exit handlers unlimited times.\nIt may lead to a bloated listeners chain and very slow process\nterminations.\n\nEg after 10KK sent TASKSTATS_CMD_ATTR_REGISTER_CPUMASKs ~300 Mb of\nkernel memory is stolen for the handlers chain and \"time id\" shows 2-7\nseconds instead of normal 0.003. It makes it possible to exhaust all\nkernel memory and to eat much of CPU time by triggerring numerous exits\non a single CPU.\n\nThe patch limits the number of times a single process may register\nitself on a single CPU to one.\n\nOne little issue is kept unfixed - as taskstats_exit() is called before\nexit_files() in do_exit(), the orphaned listener entry (if it was not\nexplicitly deregistered) is kept until the next someone\u0027s exit() and\nimplicit deregistration in send_cpu_listeners(). So, if a process\nregistered itself as a listener exits and the next spawned process gets\nthe same pid, it would inherit taskstats attributes.\n\nSigned-off-by: Vasiliy Kulikov \u003csegooon@gmail.com\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.com\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": "08142579b6ca35883c1ed066a2681de6f6917062", "tree": "00735ed37753533f3b645714770b4fb036b5f7e0", "parents": [ "9b679320a5fbf46454011e5c62e0b8991b0956d1" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Mon Jun 27 16:18:10 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "mm: fix assertion mapping-\u003enrpages \u003d\u003d 0 in end_writeback()\n\nUnder heavy memory and filesystem load, users observe the assertion\nmapping-\u003enrpages \u003d\u003d 0 in end_writeback() trigger. This can be caused by\npage reclaim reclaiming the last page from a mapping in the following\nrace:\n\n\tCPU0\t\t\t\tCPU1\n ...\n shrink_page_list()\n __remove_mapping()\n __delete_from_page_cache()\n radix_tree_delete()\n\t\t\t\t\tevict_inode()\n\t\t\t\t\t truncate_inode_pages()\n\t\t\t\t\t truncate_inode_pages_range()\n\t\t\t\t\t pagevec_lookup() - finds nothing\n\t\t\t\t\t end_writeback()\n\t\t\t\t\t mapping-\u003enrpages !\u003d 0 -\u003e BUG\n page-\u003emapping \u003d NULL\n mapping-\u003enrpages--\n\nFix the problem by doing a reliable check of mapping-\u003enrpages under\nmapping-\u003etree_lock in end_writeback().\n\nAnalyzed by Jay \u003cjinshan.xiong@whamcloud.com\u003e, lost in LKML, and dug out\nby Miklos Szeredi \u003cmszeredi@suse.de\u003e.\n\nCc: Jay \u003cjinshan.xiong@whamcloud.com\u003e\nCc: Miklos Szeredi \u003cmszeredi@suse.de\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\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": "9b679320a5fbf46454011e5c62e0b8991b0956d1", "tree": "49ea7be5e8bb669ef99533a18c73555e2882efc5", "parents": [ "aa2c96d6f329e66cc59352b0f12e8f04e6a9593b" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Mon Jun 27 16:18:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "mm/memory-failure.c: fix spinlock vs mutex order\n\nWe cannot take a mutex while holding a spinlock, so flip the order and\nfix the locking documentation.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Andi Kleen \u003cak@linux.intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "aa2c96d6f329e66cc59352b0f12e8f04e6a9593b", "tree": "0d7db978da167df605b14d4880969b39caf5e0f4", "parents": [ "507c5f1224014f9956e604ee8703b3bbea7da4a4" ], "author": { "name": "Josh Hunt", "email": "johunt@akamai.com", "time": "Mon Jun 27 16:18:08 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "drivers/misc/lkdtm.c: fix race when crashpoint is hit multiple times before checking count\n\nWe observed the crash point count going negative in cases where the\ncrash point is hit multiple times before the check of \"count \u003d\u003d 0\" is\ndone. Because of this we never call lkdtm_do_action(). This patch just\nadds a spinlock to protect count.\n\nReported-by: Tapan Dhimant \u003ctdhimant@akamai.com\u003e\nSigned-off-by: Josh Hunt \u003cjohunt@akamai.com\u003e\nAcked-by: Ankita Garg \u003cankita@in.ibm.com\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": "507c5f1224014f9956e604ee8703b3bbea7da4a4", "tree": "8af568077785c6159d5698741215b282788d661c", "parents": [ "2b4b2482e70eba10dd98653a3a5ac68126565e24" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Mon Jun 27 16:18:07 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:13 2011 -0700" }, "message": "include/linux/compat.h: declare compat_sys_sendmmsg()\n\nThis is required for tilegx to be able to use the compat unistd.h header\nwhere compat_sys_sendmmsg() is now mentioned.\n\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2b4b2482e70eba10dd98653a3a5ac68126565e24", "tree": "81f933ce6291135529cda6581c59c55386d2832e", "parents": [ "8c95aa60d2ae3c4e63705ee0f18e155898b09662" ], "author": { "name": "Bob Liu", "email": "lliubbo@gmail.com", "time": "Mon Jun 27 16:18:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "romfs: fix romfs_get_unmapped_area() argument check\n\nromfs_get_unmapped_area() checks argument `len\u0027 without considering\nPAGE_ALIGN which will cause do_mmap_pgoff() return -EINVAL error after\ncommit f67d9b1576c (\"nommu: add page_align to mmap\").\n\nFix the check by changing it in same way ramfs_nommu_get_unmapped_area()\nwas changed in ramfs/file-nommu.c.\n\nSigned-off-by: Bob Liu \u003clliubbo@gmail.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nAcked-by: Greg Ungerer \u003cgerg@snapgear.com\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": "8c95aa60d2ae3c4e63705ee0f18e155898b09662", "tree": "409dc8ef68a1487c02b6fff29c0a73393a5fc152", "parents": [ "31c1771cdbf0edea96e109e24dae387d331b6d96" ], "author": { "name": "Richard Weinberger", "email": "richard@nod.at", "time": "Mon Jun 27 16:18:05 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "um: add asm/percpu.h\n\nTo make SLUB work on UML we need this_cpu_cmpxchg from\nasm-generic/percpu.h.\n\nSigned-off-by: Richard Weinberger \u003crichard@nod.at\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "31c1771cdbf0edea96e109e24dae387d331b6d96", "tree": "90086ac87189feb25f4549afc2c0980ddd6b163f", "parents": [ "d9d90e5eb70e09903dadff42099b6c948f814050" ], "author": { "name": "Priyanka Jain", "email": "Priyanka.Jain@freescale.com", "time": "Mon Jun 27 16:18:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "drivers/rtc/rtc-ds1307.c: add support for RTC device pt7c4338\n\nPT7C4338 chip is being manufactured by Pericom Technology Inc. It is a\nserial real-time clock which provides:\n\n1) Low-power clock/calendar.\n2) Programmable square-wave output.\n\nIt has 56 bytes of nonvolatile RAM. Its register set is same as that of\nrtc device: DS1307.\n\nSigned-off-by: Priyanka Jain \u003cPriyanka.Jain@freescale.com\u003e\nAcked-by: Timur Tabi \u003ctimur@freescale.com\u003e\nReviewed-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d9d90e5eb70e09903dadff42099b6c948f814050", "tree": "c3ab73df6dee61f9403bfd819a6b0cb9f3ca6085", "parents": [ "94c1e62df4494b79782cb9c7279f827212d1de70" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "tmpfs: add shmem_read_mapping_page_gfp\n\nAlthough it is used (by i915) on nothing but tmpfs, read_cache_page_gfp()\nis unsuited to tmpfs, because it inserts a page into pagecache before\ncalling the filesystem\u0027s -\u003ereadpage: tmpfs may have pages in swapcache\nwhich only it knows how to locate and switch to filecache.\n\nAt present tmpfs provides a -\u003ereadpage method, and copes with this by\ncopying pages; but soon we can simplify it by removing its -\u003ereadpage.\nProvide shmem_read_mapping_page_gfp() now, ready for that transition,\n\nExport shmem_read_mapping_page_gfp() and add it to list in shmem_fs.h,\nwith shmem_read_mapping_page() inline for the common mapping_gfp case.\n\n(shmem_read_mapping_page_gfp or shmem_read_cache_page_gfp? Generally the\nread_mapping_page functions use the mapping\u0027s -\u003ereadpage, and the\nread_cache_page functions use the supplied filler, so I think\nread_cache_page_gfp was slightly misnamed.)\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "94c1e62df4494b79782cb9c7279f827212d1de70", "tree": "43013fb403e592c535e6a7770be105b635ac9b63", "parents": [ "072441e21ddcd1140606b7d4ef6eab579a86b0b3" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:03 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "tmpfs: take control of its truncate_range\n\n2.6.35\u0027s new truncate convention gave tmpfs the opportunity to control\nits file truncation, no longer enforced from outside by vmtruncate().\nWe shall want to build upon that, to handle pagecache and swap together.\n\nSlightly redefine the -\u003etruncate_range interface: let it now be called\nbetween the unmap_mapping_range()s, with the filesystem responsible for\ndoing the truncate_inode_pages_range() from it - just as the filesystem\nis nowadays responsible for doing that from its -\u003esetattr.\n\nLet\u0027s rename shmem_notify_change() to shmem_setattr(). Instead of\ncalling the generic truncate_setsize(), bring that code in so we can\ncall shmem_truncate_range() - which will later be updated to perform its\nown variant of truncate_inode_pages_range().\n\nRemove the punch_hole unmap_mapping_range() from shmem_truncate_range():\nnow that the COW\u0027s unmap_mapping_range() comes after -\u003etruncate_range,\nthere is no need to call it a third time.\n\nExport shmem_truncate_range() and add it to the list in shmem_fs.h, so\nthat i915_gem_object_truncate() can call it explicitly in future; get\nthis patch in first, then update drm/i915 once this is available (until\nthen, i915 will just be doing the truncate_inode_pages() twice).\n\nThough introduced five years ago, no other filesystem is implementing\n-\u003etruncate_range, and its only other user is madvise(,,MADV_REMOVE): we\nexpect to convert it to fallocate(,FALLOC_FL_PUNCH_HOLE,,) shortly,\nwhereupon -\u003etruncate_range can be removed from inode_operations -\nshmem_truncate_range() will help i915 across that transition too.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "072441e21ddcd1140606b7d4ef6eab579a86b0b3", "tree": "6f059ad83c09dfbeb1def29e805839db3e5bf85f", "parents": [ "5b8ba10198a109f8a02380648c5d29000caa9c55" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:02 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "mm: move shmem prototypes to shmem_fs.h\n\nBefore adding any more global entry points into shmem.c, gather such\nprototypes into shmem_fs.h. Remove mm\u0027s own declarations from swap.h,\nbut for now leave the ones in mm.h: because shmem_file_setup() and\nshmem_zero_setup() are called from various places, and we should not\nforce other subsystems to update immediately.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5b8ba10198a109f8a02380648c5d29000caa9c55", "tree": "1e4328d86395baa3d429c0d9911b7d7e1272629d", "parents": [ "4d258b25d947521c8b913154db61ec55198243f8" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Mon Jun 27 16:18:01 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 18:00:12 2011 -0700" }, "message": "mm: move vmtruncate_range to truncate.c\n\nYou would expect to find vmtruncate_range() next to vmtruncate() in\nmm/truncate.c: move it there.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4d258b25d947521c8b913154db61ec55198243f8", "tree": "4f74f744797e92a0555705dc121ac8aaa041e750", "parents": [ "a64227b0855c42b5c037011afa80580ca3228527" ], "author": { "name": "Vitaliy Ivanov", "email": "vitalivanov@gmail.com", "time": "Mon Jun 27 19:07:08 2011 +0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 16:06:19 2011 -0700" }, "message": "Fix some kernel-doc warnings\n\nFix \u0027make htmldocs\u0027 warnings:\n\n Warning(/include/linux/hrtimer.h:153): No description found for parameter \u0027clockid\u0027\n Warning(/include/linux/device.h:604): Excess struct/union/enum/typedef member \u0027of_match\u0027 description in \u0027device\u0027\n Warning(/include/net/sock.h:349): Excess struct/union/enum/typedef member \u0027sk_rmem_alloc\u0027 description in \u0027sock\u0027\n\nSigned-off-by: Vitaliy Ivanov \u003cvitalivanov@gmail.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a64227b0855c42b5c037011afa80580ca3228527", "tree": "8633fc0989fd6e53c9f3f0bb5774c1a54bd5f18e", "parents": [ "c6830c22603aaecf65405af23f6da2d55892f9cb", "c31b55cd4eaf050bb5a15bd8251da1b3c7edeb1c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:55:43 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:55:43 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:\n mmc: queue: bring discard_granularity/alignment into line with SCSI\n mmc: queue: append partition subname to queue thread name\n mmc: core: make erase timeout calculation allow for gated clock\n mmc: block: switch card to User Data Area when removing the block driver\n mmc: sdio: reset card during power_restore\n mmc: cb710: fix #ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS\n mmc: sdhi: DMA slave ID 0 is invalid\n mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling\n mmc: omap_hsmmc: use original sg_len for dma_unmap_sg\n mmc: omap_hsmmc: fix ocr mask usage\n mmc: sdio: fix runtime PM path during driver removal\n mmc: Add PCI fixup quirks for Ricoh 1180:e823 reader\n mmc: sdhi: fix module unloading\n mmc: of_mmc_spi: add NO_IRQ define to of_mmc_spi.c\n mmc: vub300: fix null dereferences in error handling\n" }, { "commit": "a73738e9f85fa6ba3f1f9a6ea95b5e5fa99579a2", "tree": "1abb0512c8291fea61e299eb2df35597047dee31", "parents": [ "d4620396d7e9759dd3f37a8155827477cf2b5309" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 14:43:34 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 14:43:34 2011 -0700" }, "message": "Staging: comedi: fix build breakages on some platforms\n\nSome platforms do not have virt_to_bus(), so properly depend on\nCONFIG_VIRT_TO_BUS for the Comedi drivers that need this function.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "d4620396d7e9759dd3f37a8155827477cf2b5309", "tree": "394e8ba0caad84d1425e6b383ed2d48dbe7b70a9", "parents": [ "15e5201dfd4eebfce5e50b068ed40cb5f574fee6" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 14:34:42 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 14:34:42 2011 -0700" }, "message": "Staging: brcm80211: disable drivers except for X86 or MIPS platforms\n\nAs David points out, the driver is also broken on SPARC, so might\nas well just only enable it on platforms where people have reported it\nworking, instead of trying to list all of the ones where it doesn\u0027t\nwork, as the working platform list is much smaller...\n\nReported-by: David Miller \u003cdavem@davemloft.net\u003e\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Henry Ptasinski \u003chenryp@broadcom.com\u003e\nCc: Brett Rudley \u003cbrudley@broadcom.com\u003e\nCc: Roland Vossen \u003crvossen@broadcom.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "15e5201dfd4eebfce5e50b068ed40cb5f574fee6", "tree": "beaf9996183107eda153470029fa16b54486a729", "parents": [ "928f9111662574c1ac1dfa221c4e502ec713aed9" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Jun 09 13:16:13 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 14:19:21 2011 -0700" }, "message": "Staging: brcm80211: disable drivers for PPC platforms\n\nRight now, bad things happen if you try to build these drivers for the\nPPC platform as it seems that the code only has been tested and built on\nthe MIPS big endian platform.\n\nSo disable it on the PPC32 and PPC64 platforms for now, hopefully this\nwill be resolved in the future as I\u0027m sure someone will want to use\nthese chips with that platform someday.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Henry Ptasinski \u003chenryp@broadcom.com\u003e\nCc: Brett Rudley \u003cbrudley@broadcom.com\u003e\nCc: Roland Vossen \u003crvossen@broadcom.com\u003e\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "928f9111662574c1ac1dfa221c4e502ec713aed9", "tree": "eaa6f2a51304a596a0d279d0fbaa29b71d9e3689", "parents": [ "a534bb6eea72c0d082dd2faab85450e5554ba1c8" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue May 31 11:37:40 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 14:19:21 2011 -0700" }, "message": "Staging: iio: Make IIO depend on GENERIC_HARDIRQS\n\nOn m68k (which doesn\u0027t support generic hardirqs yet):\n\ndrivers/staging/iio/industrialio-trigger.c: In function ‘iio_trigger_poll’:\ndrivers/staging/iio/industrialio-trigger.c:180: error: implicit declaration of function ‘generic_handle_irq’\ndrivers/staging/iio/industrialio-trigger.c: In function ‘iio_trigger_poll_chained’:\ndrivers/staging/iio/industrialio-trigger.c:200: error: implicit declaration of function ‘handle_nested_irq’\ndrivers/staging/iio/industrialio-trigger.c: In function ‘iio_trig_release’:\ndrivers/staging/iio/industrialio-trigger.c:379: error: implicit declaration of function ‘irq_modify_status’\ndrivers/staging/iio/industrialio-trigger.c:382: error: implicit declaration of function ‘irq_set_chip’\ndrivers/staging/iio/industrialio-trigger.c:384: error: implicit declaration of function ‘irq_set_handler’\ndrivers/staging/iio/industrialio-trigger.c:388: error: implicit declaration of function ‘irq_free_descs’\ndrivers/staging/iio/industrialio-trigger.c: In function ‘iio_trig_subirqmask’:\ndrivers/staging/iio/industrialio-trigger.c:402: error: implicit declaration of function ‘irq_data_get_irq_chip’\ndrivers/staging/iio/industrialio-trigger.c:402: warning: initialization makes pointer from integer without a cast\ndrivers/staging/iio/industrialio-trigger.c: In function ‘iio_trig_subirqunmask’:\ndrivers/staging/iio/industrialio-trigger.c:411: warning: initialization makes pointer from integer without a cast\ndrivers/staging/iio/industrialio-trigger.c: In function ‘iio_allocate_trigger’:\ndrivers/staging/iio/industrialio-trigger.c:432: error: implicit declaration of function ‘irq_alloc_descs’\ndrivers/staging/iio/industrialio-trigger.c:455: error: ‘handle_simple_irq’ undeclared (first use in this function)\ndrivers/staging/iio/industrialio-trigger.c:455: error: (Each undeclared identifier is reported only once\ndrivers/staging/iio/industrialio-trigger.c:455: error: for each function it appears in.)\n\nHence IIO_TRIGGER should depend on GENERIC_HARDIRQS.\nBut as IIO_TRIGGER and IIO_RING_BUFFER form a maze of dependencies and selects,\njust make the whole IIO subsystem depend on GENERIC_HARDIRQS.\n\nThis dependency also covers !S390, so that one can be removed again.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "a534bb6eea72c0d082dd2faab85450e5554ba1c8", "tree": "45e650f49f1df01f2f8ff96e37ab83fbb54fc570", "parents": [ "fdf2df0e8ce634c9ee5f740a9303e8518ca78932" ], "author": { "name": "Tomas Winkler", "email": "tomas.winkler@intel.com", "time": "Mon Jun 13 16:39:31 2011 +0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 14:19:21 2011 -0700" }, "message": "Staging: mei: fix suspend failure\n\nwait_event_interruptible_timeout return value was wrongly used.\nThe remaining timeout was used as the error code.\nThis fix translated wait_event_interruptible_timeout return value\ninto error code that can be propagated.\n\n[10291.674121] pci_pm_suspend(): mei_pci_suspend+0x0/0x8b [mei] returns 2500\nIt\u0027s thinkpad t400 with\n00:03.0 Communication controller [0780]: Intel Corporation Mobile 4 Series Chipset MEI Controller [8086:2a44] (rev 07)\n\nReported-by: Arkadiusz Miskiewicz \u003ca.miskiewicz@gmail.com\u003e\nSigned-off-by: Tomas Winkler \u003ctomas.winkler@intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "fdf2df0e8ce634c9ee5f740a9303e8518ca78932", "tree": "d0ca33c778e042f237ac2878a98bc704e1782279", "parents": [ "6fab3e1fbc83e6d61e8c28ceab513274183a96f6" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Jun 14 15:00:18 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 14:19:21 2011 -0700" }, "message": "Staging: fix iio builds when IIO_RING_BUFFER is not enabled\n\nFix build by moving enum list outside of\n#ifdef CONFIG_IIO_RING_BUFFER.\n\ndrivers/staging/iio/accel/adis16201_core.c:413: error: \u0027ADIS16201_SCAN_SUPPLY\u0027 undeclared here (not in a function)\ndrivers/staging/iio/accel/adis16201_core.c:417: error: \u0027ADIS16201_SCAN_TEMP\u0027 undeclared here (not in a function)\ndrivers/staging/iio/accel/adis16201_core.c:422: error: \u0027ADIS16201_SCAN_ACC_X\u0027 undeclared here (not in a function)\ndrivers/staging/iio/accel/adis16201_core.c:427: error: \u0027ADIS16201_SCAN_ACC_Y\u0027 undeclared here (not in a function)\ndrivers/staging/iio/accel/adis16201_core.c:432: error: \u0027ADIS16201_SCAN_AUX_ADC\u0027 undeclared here (not in a function)\ndrivers/staging/iio/accel/adis16201_core.c:436: error: \u0027ADIS16201_SCAN_INCLI_X\u0027 undeclared here (not in a function)\ndrivers/staging/iio/accel/adis16201_core.c:441: error: \u0027ADIS16201_SCAN_INCLI_Y\u0027 undeclared here (not in a function)\n\nvers/staging/iio/accel/adis16203_core.c:374: error: \u0027ADIS16203_SCAN_SUPPLY\u0027 undeclared here (not in a function)\ndrivers/staging/iio/accel/adis16203_core.c:378: error: \u0027ADIS16203_SCAN_AUX_ADC\u0027 undeclared here (not in a function)\ndrivers/staging/iio/accel/adis16203_core.c:382: error: \u0027ADIS16203_SCAN_INCLI_X\u0027 undeclared here (not in a function)\ndrivers/staging/iio/accel/adis16203_core.c:388: error: \u0027ADIS16203_SCAN_INCLI_Y\u0027 undeclared here (not in a function)\ndrivers/staging/iio/accel/adis16203_core.c:392: error: \u0027ADIS16203_SCAN_TEMP\u0027 undeclared here (not in a function)\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nAcked-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "6fab3e1fbc83e6d61e8c28ceab513274183a96f6", "tree": "626290498b9b0541dc8823b7c2cd0835d2ebbd42", "parents": [ "89089158d191ba0195b33ebf35f91ed217d44848" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Thu Jun 23 12:45:37 2011 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 14:19:20 2011 -0700" }, "message": "Staging: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE\n\nOn architectures that don\u0027t define PAGE_KERNEL_NOCACHE, the Comedi driver turns\ninto tragedy:\n\n CC [M] drivers/staging/comedi/drivers.o\ndrivers/staging/comedi/drivers.c: In function ‘comedi_buf_alloc’:\ndrivers/staging/comedi/drivers.c:505:41: error: ‘PAGE_KERNEL_NOCACHE’ undeclared (first use in this function)\ndrivers/staging/comedi/drivers.c:505:41: note: each undeclared identifier is rep orted only once for each function it appears in\nmake[3]: *** [drivers/staging/comedi/drivers.o] Error 1\n\nRestrict the driver to only those architectures that define PAGE_KERNEL_NOCACHE.\n\nPAGE_KERNEL_NOCACHE is a kludge - some system architectures such as SGI IP27\nare even uable to offer uncached operation - at least in the way an unwitting\ndriver might assume. I haven\u0027t looked in details how the driver is using\nthe area vmaped with PAGE_KERNEL_NOCACHE but maybe doing it XFS-style using\ncached memory and the flush_kernel_vmap_range / invalidate_kernel_vmap_range\nAPIs in conjunction with the DMA API is a practical alternative.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nReported-by: David Miller \u003cdavem@davemloft.net\u003e\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Martyn Welch \u003cmartyn.welch@ge.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "89089158d191ba0195b33ebf35f91ed217d44848", "tree": "457df791a4d5d2842de4d105cd25f1a31c2ef61f", "parents": [ "2c53b436a30867eb6b47dd7bab23ba638d1fb0d2" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Fri Jun 24 09:28:32 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 14:19:20 2011 -0700" }, "message": "Staging: fix more iio builds when IIO_RING_BUFFER is not enabled\n\nFix lots more build errors in staging/iio when CONFIG_IIO_RING_BUFFER\nis not enabled by moving enums and defines outside of the\nCONFIG_IIO_RING_BUFFER ifdef block.\n\nExamples (one from each driver; there were 116 total errors):\n\ndrivers/staging/iio/accel/adis16204_core.c:437: error: \u0027ADIS16204_SCAN_SUPPLY\u0027 undeclared here (not in a function)\ndrivers/staging/iio/accel/adis16209_core.c:410: error: \u0027ADIS16209_SCAN_SUPPLY\u0027 undeclared here (not in a function)\ndrivers/staging/iio/gyro/adis16260_core.c:420: error: \u0027ADIS16260_SCAN_GYRO\u0027 undeclared here (not in a function)\ndrivers/staging/iio/imu/adis16400_core.c:565: error: \u0027ADIS16400_SCAN_SUPPLY\u0027 undeclared here (not in a function)\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nAcked-by: Jonathan Cameron \u003cjic23@cam.ac.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "c6830c22603aaecf65405af23f6da2d55892f9cb", "tree": "19458ebc7c32bef8a4ed59630cabb5785b1bdc11", "parents": [ "af4087e0e682df12bdffec5cfafc2fec9208716e" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Thu Jun 16 17:28:07 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 14:13:09 2011 -0700" }, "message": "Fix node_start/end_pfn() definition for mm/page_cgroup.c\n\ncommit 21a3c96 uses node_start/end_pfn(nid) for detection start/end\nof nodes. But, it\u0027s not defined in linux/mmzone.h but defined in\n/arch/???/include/mmzone.h which is included only under\nCONFIG_NEED_MULTIPLE_NODES\u003dy.\n\nThen, we see\n mm/page_cgroup.c: In function \u0027page_cgroup_init\u0027:\n mm/page_cgroup.c:308: error: implicit declaration of function \u0027node_start_pfn\u0027\n mm/page_cgroup.c:309: error: implicit declaration of function \u0027node_end_pfn\u0027\n\nSo, fixiing page_cgroup.c is an idea...\n\nBut node_start_pfn()/node_end_pfn() is a very generic macro and\nshould be implemented in the same manner for all archs.\n(m32r has different implementation...)\n\nThis patch removes definitions of node_start/end_pfn() in each archs\nand defines a unified one in linux/mmzone.h. It\u0027s not under\nCONFIG_NEED_MULTIPLE_NODES, now.\n\nA result of macro expansion is here (mm/page_cgroup.c)\n\nfor !NUMA\n start_pfn \u003d ((\u0026contig_page_data)-\u003enode_start_pfn);\n end_pfn \u003d ({ pg_data_t *__pgdat \u003d (\u0026contig_page_data); __pgdat-\u003enode_start_pfn + __pgdat-\u003enode_spanned_pages;});\n\nfor NUMA (x86-64)\n start_pfn \u003d ((node_data[nid])-\u003enode_start_pfn);\n end_pfn \u003d ({ pg_data_t *__pgdat \u003d (node_data[nid]); __pgdat-\u003enode_start_pfn + __pgdat-\u003enode_spanned_pages;});\n\nChangelog:\n - fixed to avoid using \"nid\" twice in node_end_pfn() macro.\n\nReported-and-acked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nReported-and-tested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: Mel Gorman \u003cmgorman@suse.de\u003e\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "857aab34f04ff86666aa80e751ee696eff0113dd", "tree": "0a71b518be64238598a51b4ff75f6e273e137ab7", "parents": [ "87abd0a92c72eea71542d6c972c67e39e584e989" ], "author": { "name": "matt mooney", "email": "mfm@muteddisk.com", "time": "Fri Jun 17 15:50:46 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 13:50:01 2011 -0700" }, "message": "MAINTAINERS: add myself as maintainer of USB/IP\n\nSigned-off-by: matt mooney \u003cmfm@muteddisk.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "87abd0a92c72eea71542d6c972c67e39e584e989", "tree": "556fb2566196ad54b7b62c0a8293fe4d66c85a56", "parents": [ "c27d5368ef1f7ea40bcd1fb2626f4c99d77e0080" ], "author": { "name": "Yoshihiro Shimoda", "email": "yoshihiro.shimoda.uh@renesas.com", "time": "Tue Jun 21 13:24:42 2011 +0900" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 13:46:44 2011 -0700" }, "message": "usb: r8a66597-hcd: fix cannot detect low/full speed device\n\nThis controller can control \"Transaction Translators\", but\nthe hcd-\u003ehas_tt is not set.\nSince the commit d199c96d41d80a567493e12b8e96ea056a1350c1\n(\"USB: prevent buggy from crashing the USB stack\") has checked it,\nthe driver could not work the low/full speed device.\n\nSigned-off-by: Yoshihiro Shimoda \u003cyoshihiro.shimoda.uh@renesas.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "c27d5368ef1f7ea40bcd1fb2626f4c99d77e0080", "tree": "5389426a08143ec7357f38e97ec255be672fbaa1", "parents": [ "309427b6351b763917caac3e4b2ab5651df99823" ], "author": { "name": "Gabor Juhos", "email": "juhosg@openwrt.org", "time": "Mon Jun 20 17:22:36 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 13:46:44 2011 -0700" }, "message": "USB: ehci-ath79: fix a NULL pointer dereference\n\nLoading the ehci-hcd module on the ath79 platform causes\na NULL pointer dereference:\n\nCPU 0 Unable to handle kernel paging request at virtual address 00000000, epc \u003d\u003d c0252928, ra \u003d\u003d c00de968\nOops[#1]:\nCpu 0\n$ 0 : 00000000 00000070 00000001 00000000\n$ 4 : 802cf870 0000117e ffffffff 8019c7bc\n$ 8 : 0000000a 00000002 00000001 fffffffb\n$12 : 8026ef20 0000000f ffffff80 802dad3c\n$16 : 8077a2d4 8077a200 c00f3484 8019ed84\n$20 : c00f0000 00000003 000000a0 80262c2c\n$24 : 00000002 80079da0\n$28 : 80788000 80789c80 80262b14 c00de968\nHi : 00000000\nLo : b61f0000\nepc : c0252928 __mod_vermagic5+0xc260/0xc7e8 [ehci_hcd]\n Not tainted\nra : c00de968 usb_add_hcd+0x2a4/0x858 [usbcore]\nStatus: 1000c003 KERNEL EXL IE\nCause : 00800008\nBadVA : 00000000\nPrId : 00019374 (MIPS 24Kc)\nModules linked in: ehci_hcd(+) pppoe pppox ipt_REJECT xt_TCPMSS ipt_LOG\nxt_comment xt_multiport xt_mac xt_limit iptable_mangle iptable_filte\nr ip_tables xt_tcpudp x_tables ppp_async ppp_generic slhc ath mac80211\nusbcore nls_base input_polldev crc_ccitt cfg80211 compat input_core a\nrc4 aes_generic crypto_algapi\nProcess insmod (pid: 379, threadinfo\u003d80788000, task\u003d80ca2180,\ntls\u003d77fe52d0)\nStack : c0253184 80c57d80 80789cac 8077a200 00000001 8019edc0 807fa800 8077a200\n 8077a290 c00f3484 8019ed84 c00f0000 00000003 000000a0 80262c2c c00de968\n 802d0000 800878cc c0253228 c02528e4 c0253184 80c57d80 80bf6800 80ca2180\n 8007b75c 00000000 8077a200 802cf830 802d0000 00000003 fffffff4 00000015\n 00000348 00000124 800b189c c024bb4c c0255000 801a27e8 c0253228 c02528e4\n ...\nCall Trace:\n[\u003cc0252928\u003e] __mod_vermagic5+0xc260/0xc7e8 [ehci_hcd]\n\nIt is caused by:\n\n commit c430131a02d677aa708f56342c1565edfdacb3c0\n Author: Jan Andersson \u003cjan@gaisler.com\u003e\n Date: Tue May 3 20:11:57 2011 +0200\n\n USB: EHCI: Support controllers with big endian capability regs\n\n The two first HC capability registers (CAPLENGTH and HCIVERSION)\n are defined as one 8-bit and one 16-bit register. Most HC\n implementations have selected to treat these registers as part\n of a 32-bit register, giving the same layout for both big and\n small endian systems.\n\n This patch adds a new quirk, big_endian_capbase, to support\n controllers with big endian register interfaces that treat\n HCIVERSION and CAPLENGTH as individual registers.\n\n Signed-off-by: Jan Andersson \u003cjan@gaisler.com\u003e\n Acked-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\nThe reading of the HC capability register has been moved by that\ncommit to a place where the ehci-\u003ecaps field is not initialized\nyet. This patch moves the reading of the register back to the\noriginal place.\n\nAcked-by: Jan Andersson \u003cjan@gaisler.com\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Gabor Juhos \u003cjuhosg@openwrt.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "309427b6351b763917caac3e4b2ab5651df99823", "tree": "62e9e5a67fff16390a99db8390fbde1470ce0250", "parents": [ "8b1ab60c767f33d79894ef66037ef851a7a88fc8" ], "author": { "name": "Uwe Bonnes", "email": "bon@elektron.ikp.physik.tu-darmstadt.de", "time": "Fri Jun 17 17:30:23 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 13:46:44 2011 -0700" }, "message": "USB: Add new FT232H chip to drivers/usb/serial/ftdi_sio.c\n\nappended patch adds support for the new FTDI FT232H chip. This chip is a\nsingle channel version of the dual FT2232H/quad FT4232H, coming with it\u0027s\nown default PID 0x6014 (FT2232H uses the same PID 0x6010 like FT2232C,\nFT4232H has also it\u0027s own PID).\n\nThe patch was checked on an UM232H module and a terminal program with TX/RX\nshorted to that typing in the terminal reproduced the characters.\n\nSigned-off-by: Uwe Bonnes \u003cbon@elektron.ikp.physik.tu-darmstadt.de\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "8b1ab60c767f33d79894ef66037ef851a7a88fc8", "tree": "12e4573f1a411fd162294fb54a39aadfd3153cd4", "parents": [ "95a2424ff9221624c3944f3732f6cfacbb522ae4" ], "author": { "name": "Arvid Brodin", "email": "arvid.brodin@enea.com", "time": "Fri Jun 17 18:45:37 2011 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 13:46:43 2011 -0700" }, "message": "usb/isp1760: Fix bug preventing the unlinking of control urbs\n\nBoth control and bulk transfers use isp1760 slots of type ATL, but the\ndriver unlink code for ATL slots only acts on urbs describing a bulk\ntransfer, letting the code for INT slots take care of the unlink instead,\nwhich often ended up removing the interrupt transfer for root hub events\ninstead. That\u0027s not good, and gets fixed by this patch.\n\nSigned-off-by: Arvid Brodin \u003carvid.brodin@enea.com\u003e\nCc: Sebastian Andrzej Siewior \u003cbigeasy@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "95a2424ff9221624c3944f3732f6cfacbb522ae4", "tree": "4ad6cb7607d9dba7f76d3cbb8f8ac305d359c9ea", "parents": [ "0af212ba8f123c2eba151af7726c34a50b127962", "a9e758634f464ffb09344821a9f0b5a5c6df2b3e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 13:35:23 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Jun 27 13:36:47 2011 -0700" }, "message": "Merge branch \u0027for-usb-linus\u0027 of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus\n\n* \u0027for-usb-linus\u0027 of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/sarah/xhci:\n USB: Fix up URB error codes to reflect implementation.\n xhci: Always set urb-\u003estatus to zero for isoc endpoints.\n xhci: Add reset on resume quirk for asrock p67 host\n xHCI 1.0: Incompatible Device Error\n xHCI 1.0: Force Stopped Event(FSE)\n xhci: Don\u0027t warn about zeroed bMaxBurst descriptor field.\n USB: Free bandwidth when usb_disable_device is called.\n xhci: Reject double add of active endpoints.\n" }, { "commit": "af4087e0e682df12bdffec5cfafc2fec9208716e", "tree": "564622df71c8b5666be24cbfd93f58516791d180", "parents": [ "4699d4423c07a1db35ea9453eac3a07e818338f9", "2f7e33d432d097a2a7f467b031bf18be91cb3d49" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 13:32:14 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 13:32:14 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:\n btrfs: fix inconsonant inode information\n Btrfs: make sure to update total_bitmaps when freeing cache V3\n Btrfs: fix type mismatch in find_free_extent()\n Btrfs: make sure to record the transid in new inodes\n" }, { "commit": "4699d4423c07a1db35ea9453eac3a07e818338f9", "tree": "a16641f1a1ef5d4a03122d58a1a4ff6514d21b4f", "parents": [ "375ac3e09640fb16b6e6f1a1f1ee8aec30183fdf", "4a33821236f2ef3af0081e8a5eec1301cbed3125" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 09:01:29 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 09:01:29 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs\n\n* \u0027for-linus\u0027 of git://oss.sgi.com/xfs/xfs:\n xfs: prevent bogus assert when trying to remove non-existent attribute\n xfs: clear XFS_IDIRTY_RELEASE on truncate down\n xfs: reset inode per-lifetime state when recycling it\n" }, { "commit": "375ac3e09640fb16b6e6f1a1f1ee8aec30183fdf", "tree": "e6964eff8ecfc21ec1752f176c7d1a001074de4b", "parents": [ "edcda265225b90c8700b21758fffcba61d19e046", "c3ead6de4f6bd1c08a81f84e629e3dbf4a9078f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 09:00:50 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 09:00:50 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:\n HID: hid-multitouch: add support for a new Lumio dual-touch panel\n HID: hid-multitouch: correct VID for Stantum panels\n HID: hid-multitouch: ensure slots are initialized\n" }, { "commit": "edcda265225b90c8700b21758fffcba61d19e046", "tree": "5bc62e95df24004c46b9893b636296091c2f824a", "parents": [ "9c317b3bed40fed07e2ed536afca3b58952ac432", "111b20d01346b9635b3223c7af4e40e43bee8dc6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 08:58:23 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 08:58:23 2011 -0700" }, "message": "Merge branch \u0027fixes\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027fixes\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: pm: ensure ARMv7 CPUs save and restore the TLS register\n ARM: pm: proc-v7: fix missing struct processor pointers for suspend code\n ARM: 6969/1: plat-iop: fix build error\n ARM: 6961/1: zImage: Add build-time check for correctly-sized proc_type entries\n ARM: SMP: wait for CPU to be marked active\n ARM: 6963/1: Thumb-2: Relax relocation requirements for non-function symbols\n ARM: 6962/1: mach-h720x: fix build error\n ARM: 6959/1: SMP build fix for entry-macro-multi.S\n" }, { "commit": "9c317b3bed40fed07e2ed536afca3b58952ac432", "tree": "9c3cc35a09cca665bdfcb85b1a1da37e221cc914", "parents": [ "258e43fdb00c73d424b114ae3850accd55b27cbb", "859c965149ab5004b58b1fffd98190b6664cb717" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 08:57:46 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 27 08:57:46 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6:\n [S390] allow setting of upper 32 bit in smp_ctl_set_bit\n [S390] hwsampler: Set a sane default sampling rate\n [S390] s390: enforce HW limits for the initial sampling rate\n [S390] kvm-s390: fix kconfig dependencies\n" }, { "commit": "2f7e33d432d097a2a7f467b031bf18be91cb3d49", "tree": "a1729a436b3c9921390e23cae35e5b837653dfe4", "parents": [ "9b90f5135320bc74dc6c9a8c74d69fd4821d9282" ], "author": { "name": "Miao Xie", "email": "miaox@cn.fujitsu.com", "time": "Thu Jun 23 07:27:13 2011 +0000" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Mon Jun 27 11:34:27 2011 -0400" }, "message": "btrfs: fix inconsonant inode information\n\nWhen iputting the inode, We may leave the delayed nodes if they have some\ndelayed items that have not been dealt with. So when the inode is read again,\nwe must look up the relative delayed node, and use the information in it to\ninitialize the inode. Or we will get inconsonant inode information, it may\ncause that the same directory index number is allocated again, and hit the\nfollowing oops:\n\n[ 5447.554187] err add delayed dir index item(name: pglog_0.965_0) into the\ninsertion tree of the delayed node(root id: 262, inode id: 258, errno: -17)\n[ 5447.569766] ------------[ cut here ]------------\n[ 5447.575361] kernel BUG at fs/btrfs/delayed-inode.c:1301!\n[SNIP]\n[ 5447.790721] Call Trace:\n[ 5447.793191] [\u003cffffffffa0641c4e\u003e] btrfs_insert_dir_item+0x189/0x1bb [btrfs]\n[ 5447.800156] [\u003cffffffffa0651a45\u003e] btrfs_add_link+0x12b/0x191 [btrfs]\n[ 5447.806517] [\u003cffffffffa0651adc\u003e] btrfs_add_nondir+0x31/0x58 [btrfs]\n[ 5447.812876] [\u003cffffffffa0651d6a\u003e] btrfs_create+0xf9/0x197 [btrfs]\n[ 5447.818961] [\u003cffffffff8111f840\u003e] vfs_create+0x72/0x92\n[ 5447.824090] [\u003cffffffff8111fa8c\u003e] do_last+0x22c/0x40b\n[ 5447.829133] [\u003cffffffff8112076a\u003e] path_openat+0xc0/0x2ef\n[ 5447.834438] [\u003cffffffff810c58e2\u003e] ? __perf_event_task_sched_out+0x24/0x44\n[ 5447.841216] [\u003cffffffff8103ecdd\u003e] ? perf_event_task_sched_out+0x59/0x67\n[ 5447.847846] [\u003cffffffff81121a79\u003e] do_filp_open+0x3d/0x87\n[ 5447.853156] [\u003cffffffff811e126c\u003e] ? strncpy_from_user+0x43/0x4d\n[ 5447.859072] [\u003cffffffff8111f1f5\u003e] ? getname_flags+0x2e/0x80\n[ 5447.864636] [\u003cffffffff8111f179\u003e] ? do_getname+0x14b/0x173\n[ 5447.870112] [\u003cffffffff8111f1b7\u003e] ? audit_getname+0x16/0x26\n[ 5447.875682] [\u003cffffffff8112b1ab\u003e] ? spin_lock+0xe/0x10\n[ 5447.880882] [\u003cffffffff81112d39\u003e] do_sys_open+0x69/0xae\n[ 5447.886153] [\u003cffffffff81112db1\u003e] sys_open+0x20/0x22\n[ 5447.891114] [\u003cffffffff813b9aab\u003e] system_call_fastpath+0x16/0x1b\n\nFix it by reusing the old delayed node.\n\nReported-by: Jim Schutt \u003cjaschut@sandia.gov\u003e\nSigned-off-by: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nTested-by: Jim Schutt \u003cjaschut@sandia.gov\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "1252cc3b232e582e887623dc5f70979418caaaa2", "tree": "bd3a266d7c53ce46a37a7907d7a2b6c8bcb8a6ae", "parents": [ "79a73d188726b473ca3bf483244bc96096831905" ], "author": { "name": "Roberto Sassu", "email": "roberto.sassu@polito.it", "time": "Mon Jun 27 13:45:45 2011 +0200" }, "committer": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Mon Jun 27 09:11:21 2011 -0400" }, "message": "eCryptfs: added support for the encrypted key type\n\nThe function ecryptfs_keyring_auth_tok_for_sig() has been modified in order\nto search keys of both \u0027user\u0027 and \u0027encrypted\u0027 types.\n\nSigned-off-by: Roberto Sassu \u003croberto.sassu@polito.it\u003e\nAcked-by: Gianluca Ramunno \u003cramunno@polito.it\u003e\nAcked-by: Tyler Hicks \u003ctyhicks@linux.vnet.ibm.com\u003e\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\n" }, { "commit": "79a73d188726b473ca3bf483244bc96096831905", "tree": "787ba050c91981cae2524b1e95e415424b067e64", "parents": [ "f8f8527103a264b5e4ab2ce5c1743b28f3219d90" ], "author": { "name": "Roberto Sassu", "email": "roberto.sassu@polito.it", "time": "Mon Jun 27 13:45:44 2011 +0200" }, "committer": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Mon Jun 27 09:11:17 2011 -0400" }, "message": "encrypted-keys: add ecryptfs format support\n\nThe \u0027encrypted\u0027 key type defines its own payload format which contains a\nsymmetric key randomly generated that cannot be used directly to mount\nan eCryptfs filesystem, because it expects an authentication token\nstructure.\n\nThis patch introduces the new format \u0027ecryptfs\u0027 that allows to store an\nauthentication token structure inside the encrypted key payload containing\na randomly generated symmetric key, as the same for the format \u0027default\u0027.\n\nMore details about the usage of encrypted keys with the eCryptfs\nfilesystem can be found in the file \u0027Documentation/keys-ecryptfs.txt\u0027.\n\nSigned-off-by: Roberto Sassu \u003croberto.sassu@polito.it\u003e\nAcked-by: Gianluca Ramunno \u003cramunno@polito.it\u003e\nAcked-by: Tyler Hicks \u003ctyhicks@linux.vnet.ibm.com\u003e\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\n" }, { "commit": "f8f8527103a264b5e4ab2ce5c1743b28f3219d90", "tree": "b10b58c812409c60223716fe8514a76a924a30aa", "parents": [ "4e561d388feff18e4b798cef6a1a84a2cc7f20c2" ], "author": { "name": "Roberto Sassu", "email": "roberto.sassu@polito.it", "time": "Mon Jun 27 13:45:43 2011 +0200" }, "committer": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Mon Jun 27 09:11:02 2011 -0400" }, "message": "eCryptfs: export global eCryptfs definitions to include/linux/ecryptfs.h\n\nSome eCryptfs specific definitions, such as the current version and the\nauthentication token structure, are moved to the new include file\n\u0027include/linux/ecryptfs.h\u0027, in order to be available for all kernel\nsubsystems.\n\nSigned-off-by: Roberto Sassu \u003croberto.sassu@polito.it\u003e\nAcked-by: Gianluca Ramunno \u003cramunno@polito.it\u003e\nAcked-by: Tyler Hicks \u003ctyhicks@linux.vnet.ibm.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\n" }, { "commit": "4e561d388feff18e4b798cef6a1a84a2cc7f20c2", "tree": "9208588c7d0e5e75766dd2c98e960840fdc8681e", "parents": [ "7103dff0e598cd634767f17a2958302c515700ca" ], "author": { "name": "Roberto Sassu", "email": "roberto.sassu@polito.it", "time": "Mon Jun 27 13:45:42 2011 +0200" }, "committer": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Mon Jun 27 09:10:45 2011 -0400" }, "message": "encrypted-keys: add key format support\n\nThis patch introduces a new parameter, called \u0027format\u0027, that defines the\nformat of data stored by encrypted keys. The \u0027default\u0027 format identifies\nencrypted keys containing only the symmetric key, while other formats can\nbe defined to support additional information. The \u0027format\u0027 parameter is\nwritten in the datablob produced by commands \u0027keyctl print\u0027 or\n\u0027keyctl pipe\u0027 and is integrity protected by the HMAC.\n\nSigned-off-by: Roberto Sassu \u003croberto.sassu@polito.it\u003e\nAcked-by: Gianluca Ramunno \u003cramunno@polito.it\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\n" }, { "commit": "7103dff0e598cd634767f17a2958302c515700ca", "tree": "cbbacf38aee2ecd3ad6d004307197186dd35ab73", "parents": [ "08fa2aa54e72ddde8076cc77126bace8d4780e0f" ], "author": { "name": "Roberto Sassu", "email": "roberto.sassu@polito.it", "time": "Mon Jun 27 13:45:41 2011 +0200" }, "committer": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Mon Jun 27 09:10:34 2011 -0400" }, "message": "encrypted-keys: added additional debug messages\n\nSome debug messages have been added in the function datablob_parse() in\norder to better identify errors returned when dealing with \u0027encrypted\u0027\nkeys.\n\nChangelog from version v4:\n- made the debug messages more understandable \n\nSigned-off-by: Roberto Sassu \u003croberto.sassu@polito.it\u003e\nAcked-by: Gianluca Ramunno \u003cramunno@polito.it\u003e\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\n" }, { "commit": "08fa2aa54e72ddde8076cc77126bace8d4780e0f", "tree": "5ced9b831123e37b6e91367ed5f56e4acd095a0c", "parents": [ "f91c2c5cfa2950a20265b45bcc13e49ed9e49aac" ], "author": { "name": "Roberto Sassu", "email": "roberto.sassu@polito.it", "time": "Mon Jun 27 13:45:40 2011 +0200" }, "committer": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Mon Jun 27 09:08:52 2011 -0400" }, "message": "encrypted-keys: fixed valid_master_desc() function description\n\nValid key type prefixes for the parameter \u0027key-type\u0027 are: \u0027trusted\u0027 and\n\u0027user\u0027.\n\nSigned-off-by: Roberto Sassu \u003croberto.sassu@polito.it\u003e\nAcked-by: Gianluca Ramunno \u003cramunno@polito.it\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\n" }, { "commit": "f91c2c5cfa2950a20265b45bcc13e49ed9e49aac", "tree": "f5ed8f02cc44dfe9274440c8cdcd50b4345621e6", "parents": [ "4d67431f80b1b822f0286afc9123ee453eac7334" ], "author": { "name": "Roberto Sassu", "email": "roberto.sassu@polito.it", "time": "Mon Jun 27 13:45:39 2011 +0200" }, "committer": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Mon Jun 27 09:08:39 2011 -0400" }, "message": "encrypted_keys: avoid dumping the master key if the request fails\n\nDo not dump the master key if an error is encountered during the request.\n\nSigned-off-by: Roberto Sassu \u003croberto.sassu@polito.it\u003e\nAcked-by: Gianluca Ramunno \u003cramunno@polito.it\u003e\nSigned-off-by: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\n" } ], "next": "258e43fdb00c73d424b114ae3850accd55b27cbb" }