)]}' { "log": [ { "commit": "e9aba5158a80098447ff207a452a3418ae7ee386", "tree": "fb6dd19824f908746d597128d34093a301c005e7", "parents": [ "a4834c102f4a46808630cad1a545cb0706b3b0a2" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Thu Jan 05 13:06:11 2012 +0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Jan 24 14:01:01 2012 -0800" }, "message": "tty: rework pty count limiting\n\nAfter adding devpts multiple-insrances sysctl kernel.pty.max limit pty count for\neach devpts instance independently, while kernel.pty.nr shows total pty count.\n\nThis patch restores sysctl kernel.pty.max as global limit (4096 by default),\nadds pty reseve for main devpts (mounted without \"newinstance\" argument),\nand new sysctl to tune it: kernel.pty.reserve (1024 by default)\n\nAlso it adds devpts mount option \"max\u003d%d\" to limit pty count for each devpts\ninstance independently. (by default NR_UNIX98_PTY_MAX \u003d\u003d 2^20)\n\nThus devpts instances in containers cannot eat up all available pty even if we didn\u0027t\nset any limits, while with \"max\" argument we can adjust limits more precisely.\n\nPlus, now open(\"/dev/ptmx\") return -ENOSPC in case lack of pty indexes,\nthis is more informative than -EIO.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "593a27c4b212e2afdf772a1f8dcb894e91bda0fa", "tree": "6b670f6ec0ef138fcfa6e68f3b2a456f86941efd", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Thu Jan 05 13:04:21 2012 +0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Jan 24 13:56:10 2012 -0800" }, "message": "tty: cleanup prohibition of direct opening for unix98 pty master\n\ncleanup hack added in v2.6.27-3203-g15582d3\n\ncomment from that patch:\n\n: pty: If the administrator creates a device for a ptmx slave we should not error\n:\n: The open path for ptmx slaves is via the ptmx device. Opening them any\n: other way is not allowed. Vegard Nossum found that previously this was not\n: the case and mknod foo c 128 42; cat foo would produce nasty diagnostics\n:\n: Signed-off-by: Alan Cox \u003calan@redhat.com\u003e\n: Signed-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n\ndevpts_get_tty() returns non-null only for inodes on devpts, but there is no\ninodes for master-devices, /dev/ptmx (/dev/pts/ptmx) is the only way to open them.\nThus we can completely forbid lookup for master-devices and eliminate that hack in\ntty_init_dev() because tty_open() will get EIO from tty_driver_lookup_tty().\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "456a8167e94b66f406c27400a46a707b870452b0", "tree": "6c6eedf5ff8819dc4c6346db651be9e8758e0df7", "parents": [ "f6b24579d099ebb67f39cd7924a72a7eec0ce6ae" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Jan 18 10:04:29 2012 +0000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Jan 19 16:17:35 2012 +1100" }, "message": "KEYS: Permit key_serial() to be called with a const key pointer\n\nPermit key_serial() to be called with a const key pointer.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "507a03c1cba0e32309223d23d19a1bfc0916c140", "tree": "8da15f9c635733948a73bfe35cb50e1195702952", "parents": [ "be405411f712489f2f780ab085e1069e8fb85f19", "79ba0db69c5887f1ad4ed51d58894e7e889084b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 15:51:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 15:51:48 2012 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux\n\nThis includes initial support for the recently published ACPI 5.0 spec.\nIn particular, support for the \"hardware-reduced\" bit that eliminates\nthe dependency on legacy hardware.\n\nAPEI has patches resulting from testing on real hardware.\n\nPlus other random fixes.\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (52 commits)\n acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec\n intel_idle: Split up and provide per CPU initialization func\n ACPI processor: Remove unneeded variable passed by acpi_processor_hotadd_init V2\n ACPI processor: Remove unneeded cpuidle_unregister_driver call\n intel idle: Make idle driver more robust\n intel_idle: Fix a cast to pointer from integer of different size warning in intel_idle\n ACPI: kernel-parameters.txt : Add intel_idle.max_cstate\n intel_idle: remove redundant local_irq_disable() call\n ACPI processor: Fix error path, also remove sysdev link\n ACPI: processor: fix acpi_get_cpuid for UP processor\n intel_idle: fix API misuse\n ACPI APEI: Convert atomicio routines\n ACPI: Export interfaces for ioremapping/iounmapping ACPI registers\n ACPI: Fix possible alignment issues with GAS \u0027address\u0027 references\n ACPI, ia64: Use SRAT table rev to use 8bit or 16/32bit PXM fields (ia64)\n ACPI, x86: Use SRAT table rev to use 8bit or 32bit PXM fields (x86/x86-64)\n ACPI: Store SRAT table revision\n ACPI, APEI, Resolve false conflict between ACPI NVS and APEI\n ACPI, Record ACPI NVS regions\n ACPI, APEI, EINJ, Refine the fix of resource conflict\n ...\n" }, { "commit": "92b5abbb44e05cdbc4483219f30a435dd871a8ea", "tree": "15490d1c7fd415575ec6beec1baa5ce89f747bf9", "parents": [ "ccb19d263fd1c9e34948e2158c53eacbff369344", "df3481399042200792822b6243e36a95a557b57e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 12:34:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 18 12:34:09 2012 -0800" }, "message": "Merge git://git.infradead.org/users/willy/linux-nvme\n\n* git://git.infradead.org/users/willy/linux-nvme: (105 commits)\n NVMe: Set number of queues correctly\n NVMe: Version 0.8\n NVMe: Set queue flags correctly\n NVMe: Simplify nvme_unmap_user_pages\n NVMe: Mark the end of the sg list\n NVMe: Fix DMA mapping for admin commands\n NVMe: Rename IO_TIMEOUT to NVME_IO_TIMEOUT\n NVMe: Merge the nvme_bio and nvme_prp data structures\n NVMe: Change nvme_completion_fn to take a dev\n NVMe: Change get_nvmeq to take a dev instead of a namespace\n NVMe: Simplify completion handling\n NVMe: Update Identify Controller data structure\n NVMe: Implement doorbell stride capability\n NVMe: Version 0.7\n NVMe: Don\u0027t probe namespace 0\n Fix calculation of number of pages in a PRP List\n NVMe: Create nvme_identify and nvme_get_features functions\n NVMe: Fix memory leak in nvme_dev_add()\n NVMe: Fix calls to dma_unmap_sg\n NVMe: Correct sg list setup in nvme_map_user_pages\n ...\n" }, { "commit": "ccb19d263fd1c9e34948e2158c53eacbff369344", "tree": "6683e55f183920dcbf3e1a5b749e7f9780c465b3", "parents": [ "6a488979f574cb4287880db2dbc8b13cee30c5be", "c3b5003b628d8e373262bee42c7260d6a799c73e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 22:26:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 22:26:41 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)\n tg3: Fix single-vector MSI-X code\n openvswitch: Fix multipart datapath dumps.\n ipv6: fix per device IP snmp counters\n inetpeer: initialize -\u003eredirect_genid in inet_getpeer()\n net: fix NULL-deref in WARN() in skb_gso_segment()\n net: WARN if skb_checksum_help() is called on skb requiring segmentation\n caif: Remove bad WARN_ON in caif_dev\n caif: Fix typo in Vendor/Product-ID for CAIF modems\n bnx2x: Disable AN KR work-around for BCM57810\n bnx2x: Remove AutoGrEEEn for BCM84833\n bnx2x: Remove 100Mb force speed for BCM84833\n bnx2x: Fix PFC setting on BCM57840\n bnx2x: Fix Super-Isolate mode for BCM84833\n net: fix some sparse errors\n net: kill duplicate included header\n net: sh-eth: Fix build error by the value which is not defined\n net: Use device model to get driver name in skb_gso_segment()\n bridge: BH already disabled in br_fdb_cleanup()\n net: move sock_update_memcg outside of CONFIG_INET\n mwl8k: Fixing Sparse ENDIAN CHECK warning\n ...\n" }, { "commit": "79ba0db69c5887f1ad4ed51d58894e7e889084b0", "tree": "72948278c60e0997ad2e7cc0181d469c61b62fa8", "parents": [ "cb7971756b901abd61d47f6eb1011066abfb348d", "c130bd6f82e5dda28b1a19741c4c2fe269713199", "5c2a9f06a9cd7194f884cdc88144866235dec07d", "65b7f839ceecc0a36c7969c0c9151d5748cd4242", "9f10f6a520deb3639fac78d81151a3ade88b4e7f", "553575f1ae048aa44682b46b3c51929a0b3ad337" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 18 01:15:54 2012 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 18 01:15:54 2012 -0500" }, "message": "Merge branches \u0027einj\u0027, \u0027intel_idle\u0027, \u0027misc\u0027, \u0027srat\u0027 and \u0027turbostat-ivb\u0027 into release\n" }, { "commit": "65b7f839ceecc0a36c7969c0c9151d5748cd4242", "tree": "fd98dd21fafcbeec668bbc2e61812b65bee7919e", "parents": [ "3bd81a8710710f8bf5d1a5ebac315c842c20bdd3" ], "author": { "name": "Thomas Renninger", "email": "trenn@suse.de", "time": "Tue Jan 17 22:40:08 2012 +0100" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Tue Jan 17 23:59:12 2012 -0500" }, "message": "intel_idle: Split up and provide per CPU initialization func\n\nFunction split up, should have no functional change.\n\nProvides entry point for physically hotplugged CPUs\nto initialize and activate cpuidle.\n\nSigned-off-by: Thomas Renninger \u003ctrenn@suse.de\u003e\nCC: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nCC: Shaohua Li \u003cshaohua.li@intel.com\u003e\nCC: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "57f2685c16fa8e0cb86e4bc7c8ac33bfed943819", "tree": "96a42fe632687c8486c250c4805bf1d4c9c34d19", "parents": [ "488a9d018256dc9f29e041c0360445b6d25eea9a", "e08b881a69d638175bfa99b5af4d72b731633ea7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 18:40:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 18:40:24 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\n* \u0027next\u0027 of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)\n ARM: mach-shmobile: specify CHCLR registers on SH7372\n dma: shdma: fix runtime PM: clear channel buffers on reset\n dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit\n dmaengine/ste_dma40: clear LNK on channel startup\n dmaengine: intel_mid_dma: remove legacy pm interface\n ASoC: mxs: correct \u0027direction\u0027 of device_prep_dma_cyclic\n dmaengine: intel_mid_dma: error path fix\n dmaengine: intel_mid_dma: locking and freeing fixes\n mtd: gpmi-nand: move to dma_transfer_direction\n mtd: fix compile error for gpmi-nand\n mmc: mxs-mmc: fix the dma_transfer_direction migration\n dmaengine: add DMA_TRANS_NONE to dma_transfer_direction\n dma: mxs-dma: Don\u0027t use CLKGATE bits in CTRL0 to disable DMA channels\n dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe\n dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.\n dma: mxs-dma: fix a typo in comment\n DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove\n video i.MX IPU: Fix display connections\n i.MX IPU DMA: Fix wrong burstsize settings\n dmaengine/ste_dma40: allow fixed physical channel\n ...\n\nFix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}\n\nThe conflicts looked pretty trivial, but I\u0027ll ask people to verify them.\n" }, { "commit": "a25a2b84098eb5e001cb8086603d692aa95bf2ec", "tree": "02c01b36251f7b0afb1a98093e14efb17d015910", "parents": [ "f429ee3b808118591d1f3cdf3c0d0793911a5677", "f1be242c95257b199d8b679bc952ca33487c9af6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:43:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:43:39 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:\n integrity: digital signature config option name change\n lib: Removed MPILIB, MPILIB_EXTRA, and SIGNATURE prompts\n lib: MPILIB Kconfig description update\n lib: digital signature dependency fix\n lib: digital signature config option name change\n encrypted-keys: fix rcu and sparse messages\n keys: fix trusted/encrypted keys sparse rcu_assign_pointer messages\n KEYS: Add missing smp_rmb() primitives to the keyring search code\n TOMOYO: Accept \\000 as a valid character.\n security: update MAINTAINERS file with new git repo\n" }, { "commit": "f429ee3b808118591d1f3cdf3c0d0793911a5677", "tree": "96d848f5f677d96758ecd2aee5eb6931b75bf218", "parents": [ "22b4eb5e3174efb49791c62823d0cccc35394c36", "c158a35c8a681cf68d36f22f058f9f5466386c71" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:06:51 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 16:41:31 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)\n audit: no leading space in audit_log_d_path prefix\n audit: treat s_id as an untrusted string\n audit: fix signedness bug in audit_log_execve_info()\n audit: comparison on interprocess fields\n audit: implement all object interfield comparisons\n audit: allow interfield comparison between gid and ogid\n audit: complex interfield comparison helper\n audit: allow interfield comparison in audit rules\n Kernel: Audit Support For The ARM Platform\n audit: do not call audit_getname on error\n audit: only allow tasks to set their loginuid if it is -1\n audit: remove task argument to audit_set_loginuid\n audit: allow audit matching on inode gid\n audit: allow matching on obj_uid\n audit: remove audit_finish_fork as it can\u0027t be called\n audit: reject entry,always rules\n audit: inline audit_free to simplify the look of generic code\n audit: drop audit_set_macxattr as it doesn\u0027t do anything\n audit: inline checks for not needing to collect aux records\n audit: drop some potentially inadvisable likely notations\n ...\n\nUse evil merge to fix up grammar mistakes in Kconfig file.\n\nBad speling and horrible grammar (and copious swearing) is to be\nexpected, but let\u0027s keep it to commit messages and comments, rather than\nexpose it to users in config help texts or printouts.\n" }, { "commit": "5e8898e97a5db4125d944070922164d1d09a2689", "tree": "a5319fcc60499e63fecc7a08d923a1de8f9c7622", "parents": [ "6ac6172a935d1faf7ef259802267657bc0007a62" ], "author": { "name": "Dmitry Kasatkin", "email": "dmitry.kasatkin@intel.com", "time": "Tue Jan 17 17:12:03 2012 +0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jan 18 10:46:21 2012 +1100" }, "message": "lib: digital signature config option name change\n\nIt was reported that DIGSIG is confusing name for digital signature\nmodule. It was suggested to rename DIGSIG to SIGNATURE.\n\nRequested-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSuggested-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Dmitry Kasatkin \u003cdmitry.kasatkin@intel.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "ee0b31a25a010116f44fca6c96f4516d417793dd", "tree": "d7670d202d0f4888b5213ed73d88c9a80bd05b74", "parents": [ "efde8b6e16f11e7d1681c68d86c7fd51053cada7" ], "author": { "name": "Mimi Zohar", "email": "zohar@linux.vnet.ibm.com", "time": "Tue Jan 17 20:39:51 2012 +0000" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Wed Jan 18 10:41:29 2012 +1100" }, "message": "keys: fix trusted/encrypted keys sparse rcu_assign_pointer messages\n\nDefine rcu_assign_keypointer(), which uses the key payload.rcudata instead\nof payload.data, to resolve the CONFIG_SPARSE_RCU_POINTER message:\n\"incompatible types in comparison expression (different address spaces)\"\n\nReplace the rcu_assign_pointer() calls in encrypted/trusted keys with\nrcu_assign_keypointer().\n\nSigned-off-by: Mimi Zohar \u003czohar@us.ibm.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "67175b855bfd6ed95ffeff95532173c07de6432d", "tree": "2f98cccf78987db9b319c67a523ab44edc7bde3b", "parents": [ "e268337dfe26dfc7efd422a804dbb27977a3cccc" ], "author": { "name": "James Bottomley", "email": "jbottomley@parallels.com", "time": "Tue Jan 17 21:14:05 2012 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 15:40:51 2012 -0800" }, "message": "Fix compile breakage with kref.h\n\nThis set of build failures just started appearing on parisc:\n\n In file included from drivers/input/serio/serio_raw.c:12:\n include/linux/kref.h: In function \u0027kref_get\u0027:\n include/linux/kref.h:40: error: \u0027TAINT_WARN\u0027 undeclared (first use in this function)\n include/linux/kref.h:40: error: (Each undeclared identifier is reported only once\n include/linux/kref.h:40: error: for each function it appears in.)\n include/linux/kref.h: In function \u0027kref_sub\u0027:\n include/linux/kref.h:65: error: \u0027TAINT_WARN\u0027 undeclared (first use in this function)\n\nIt happens because TAINT_WARN is defined in kernel.h and this particular\ncompile doesn\u0027t seem to include it (no idea why it\u0027s just manifesting ..\nprobably some #include file untangling exposed it).\n\nFix by adding\n\n #include \u003clinux/kernel.h\u003e\n\nto linux/kref.h\n\nSigned-off-by: James Bottomley \u003cJBottomley@Parallels.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "10d68360871657204885371cdf2594412675d2f9", "tree": "85a4fa8d3b0dc0a7bc525475325f955f75d3881d", "parents": [ "4a6633ed08af5ba67790b4d1adcdeb8ceb55677e" ], "author": { "name": "Peter Moody", "email": "pmoody@google.com", "time": "Wed Jan 04 15:24:31 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:03 2012 -0500" }, "message": "audit: comparison on interprocess fields\n\nThis allows audit to specify rules in which we compare two fields of a\nprocess. Such as is the running process uid !\u003d to the running process\neuid?\n\nSigned-off-by: Peter Moody \u003cpmoody@google.com\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "4a6633ed08af5ba67790b4d1adcdeb8ceb55677e", "tree": "8b658f732f742d3d3a40f84b39ce4aa42f70d538", "parents": [ "c9fe685f7a17a0ee8bf3fbe51e40b1c8b8e65896" ], "author": { "name": "Peter Moody", "email": "pmoody@google.com", "time": "Tue Dec 13 16:17:51 2011 -0800" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:02 2012 -0500" }, "message": "audit: implement all object interfield comparisons\n\nThis completes the matrix of interfield comparisons between uid/gid\ninformation for the current task and the uid/gid information for inodes.\naka I can audit based on differences between the euid of the process and\nthe uid of fs objects.\n\nSigned-off-by: Peter Moody \u003cpmoody@google.com\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "c9fe685f7a17a0ee8bf3fbe51e40b1c8b8e65896", "tree": "510a09bc02c5dccb7ef83c88f2a00546b17e2c17", "parents": [ "b34b039324bf081554ee8678f9b8c5d937e5206c" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:08 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:02 2012 -0500" }, "message": "audit: allow interfield comparison between gid and ogid\n\nAllow audit rules to compare the gid of the running task to the gid of the\ninode in question.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "02d86a568c6d2d335256864451ac8ce781bc5652", "tree": "3ef085bd96cc79733cff28993379dbbd4b855813", "parents": [ "29ef73b7a823b77a7cd0bdd7d7cded3fb6c2587b" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:08 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:01 2012 -0500" }, "message": "audit: allow interfield comparison in audit rules\n\nWe wish to be able to audit when a uid\u003d500 task accesses a file which is\nuid\u003d0. Or vice versa. This patch introduces a new audit filter type\nAUDIT_FIELD_COMPARE which takes as an \u0027enum\u0027 which indicates which fields\nshould be compared. At this point we only define the task-\u003euid vs\ninode-\u003euid, but other comparisons can be added.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "0a300be6d5be8f66cd96609334710c268d0bfdce", "tree": "253d0d1e0aa28a6bdf883bb92e4b62fafe263563", "parents": [ "54d3218b31aee5bc9c859ae60fbde933d922448b" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:08 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:17:00 2012 -0500" }, "message": "audit: remove task argument to audit_set_loginuid\n\nThe function always deals with current. Don\u0027t expose an option\npretending one can use it for something. You can\u0027t.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "54d3218b31aee5bc9c859ae60fbde933d922448b", "tree": "ebc383920713c283133d885191d0c19cb049afd2", "parents": [ "efaffd6e4417860c67576ac760dd6e8bbd15f006" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:59 2012 -0500" }, "message": "audit: allow audit matching on inode gid\n\nMuch like the ability to filter audit on the uid of an inode collected, we\nshould be able to filter on the gid of the inode.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "efaffd6e4417860c67576ac760dd6e8bbd15f006", "tree": "a59ee886b609bbf761fb75744e5e468264c67ab5", "parents": [ "6422e78de6880c66a82af512d9bd0c85eb62e661" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:59 2012 -0500" }, "message": "audit: allow matching on obj_uid\n\nAllow syscall exit filter matching based on the uid of the owner of an\ninode used in a syscall. aka:\n\nauditctl -a always,exit -S open -F obj_uid\u003d0 -F perm\u003dwa\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "6422e78de6880c66a82af512d9bd0c85eb62e661", "tree": "9cce4d385a6508056be7645fd3511ab019b346f4", "parents": [ "7ff68e53ece8c175d2951bb8a30b3cce8f9c5579" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:59 2012 -0500" }, "message": "audit: remove audit_finish_fork as it can\u0027t be called\n\nAudit entry,always rules are not allowed and are automatically changed in\nexit,always rules in userspace. The kernel refuses to load such rules.\n\nThus a task in the middle of a syscall (and thus in audit_finish_fork())\ncan only be in one of two states: AUDIT_BUILD_CONTEXT or AUDIT_DISABLED.\nSince the current task cannot be in AUDIT_RECORD_CONTEXT we aren\u0027t every\ngoing to actually use the code in audit_finish_fork() since it will\nreturn without doing anything. Thus drop the code.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "a4ff8dba7d8ce5ceb43fb27df66292251cc73bdc", "tree": "2c89a0a7a7dad853a2c2ec70417ef2f3f5a04fd4", "parents": [ "38cdce53daa0408a61fe6d86fe48f31515c9b840" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:58 2012 -0500" }, "message": "audit: inline audit_free to simplify the look of generic code\n\nmake the conditional a static inline instead of doing it in generic code.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "38cdce53daa0408a61fe6d86fe48f31515c9b840", "tree": "a08ff80a819432fa32e384e1960249a59cdb4f33", "parents": [ "07c49417877f8658a6aa0ad9b4e21e4fd4df11b6" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:58 2012 -0500" }, "message": "audit: drop audit_set_macxattr as it doesn\u0027t do anything\n\nunused. deleted.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "07c49417877f8658a6aa0ad9b4e21e4fd4df11b6", "tree": "59a64b96c9f35b8559db4c46b5a43d2d9510c190", "parents": [ "56179a6ec65a56e0279a58e35cb450d38f061b94" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:07 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:57 2012 -0500" }, "message": "audit: inline checks for not needing to collect aux records\n\nA number of audit hooks make function calls before they determine that\nauxilary records do not need to be collected. Do those checks as static\ninlines since the most common case is going to be that records are not\nneeded and we can skip the function call overhead.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "b05d8447e7821695bc2fa3359431f7a664232743", "tree": "da90e558279c6407aa2e08d36bea5d9a21cd959c", "parents": [ "f031cd25568a390dc2c9c3a4015054183753449a" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:06 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:56 2012 -0500" }, "message": "audit: inline audit_syscall_entry to reduce burden on archs\n\nEvery arch calls:\n\nif (unlikely(current-\u003eaudit_context))\n\taudit_syscall_entry()\n\nwhich requires knowledge about audit (the existance of audit_context) in\nthe arch code. Just do it all in static inline in audit.h so that arch\u0027s\ncan remain blissfully ignorant.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "d7e7528bcd456f5c36ad4a202ccfb43c5aa98bc4", "tree": "ef49503b1dc52c52102e728dbd979c9309d5756b", "parents": [ "85e7bac33b8d5edafc4e219c7dfdb3d48e0b4e31" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:06 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:56 2012 -0500" }, "message": "Audit: push audit success and retcode into arch ptrace.h\n\nThe audit system previously expected arches calling to audit_syscall_exit to\nsupply as arguments if the syscall was a success and what the return code was.\nAudit also provides a helper AUDITSC_RESULT which was supposed to simplify things\nby converting from negative retcodes to an audit internal magic value stating\nsuccess or failure. This helper was wrong and could indicate that a valid\npointer returned to userspace was a failed syscall. The fix is to fix the\nlayering foolishness. We now pass audit_syscall_exit a struct pt_reg and it\nin turns calls back into arch code to collect the return value and to\ndetermine if the syscall was a success or failure. We also define a generic\nis_syscall_success() macro which determines success/failure based on if the\nvalue is \u003c -MAX_ERRNO. This works for arches like x86 which do not use a\nseparate mechanism to indicate syscall failure.\n\nWe make both the is_syscall_success() and regs_return_value() static inlines\ninstead of macros. The reason is because the audit function must take a void*\nfor the regs. (uml calls theirs struct uml_pt_regs instead of just struct\npt_regs so audit_syscall_exit can\u0027t take a struct pt_regs). Since the audit\nfunction takes a void* we need to use static inlines to cast it back to the\narch correct structure to dereference it.\n\nThe other major change is that on some arches, like ia64, MIPS and ppc, we\nchange regs_return_value() to give us the negative value on syscall failure.\nTHE only other user of this macro, kretprobe_example.c, won\u0027t notice and it\nmakes the value signed consistently for the audit functions across all archs.\n\nIn arch/sh/kernel/ptrace_64.c I see that we were using regs[9] in the old\naudit code as the return value. But the ptrace_64.h code defined the macro\nregs_return_value() as regs[3]. I have no idea which one is correct, but this\npatch now uses the regs_return_value() function, so it now uses regs[3].\n\nFor powerpc we previously used regs-\u003eresult but now use the\nregs_return_value() function which uses regs-\u003egprs[3]. regs-\u003egprs[3] is\nalways positive so the regs_return_value(), much like ia64 makes it negative\nbefore calling the audit code when appropriate.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nAcked-by: H. Peter Anvin \u003chpa@zytor.com\u003e [for x86 portion]\nAcked-by: Tony Luck \u003ctony.luck@intel.com\u003e [for ia64]\nAcked-by: Richard Weinberger \u003crichard@nod.at\u003e [for uml]\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e [for sparc]\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e [for mips]\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e [for ppc]\n" }, { "commit": "85e7bac33b8d5edafc4e219c7dfdb3d48e0b4e31", "tree": "6a1f178de829d2219a65a8563e12f2c8029d4b13", "parents": [ "16c174bd95cb07c9d0ad3fcd8c70f9cea7214c9d" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Tue Jan 03 14:23:05 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 17 16:16:55 2012 -0500" }, "message": "seccomp: audit abnormal end to a process due to seccomp\n\nThe audit system likes to collect information about processes that end\nabnormally (SIGSEGV) as this may me useful intrusion detection information.\nThis patch adds audit support to collect information when seccomp forces a\ntask to exit because of misbehavior in a similar way.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "20c300b10c358daa507be335aec6aa3987ef425a", "tree": "a6b39d4003aff1c1f4a413c3e92a66b37e130d90", "parents": [ "951880e634a79884236a575b896abf55c39ae0bf" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Tue Jan 17 12:54:01 2012 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 10:30:38 2012 -0800" }, "message": "tty: remove unused tty_driver-\u003etermios_locked\n\nThis field is unused since 2.6.28 (commit fe6e29fdb1a7: \"tty: simplify\nktermios allocation\", to be exact)\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4144cb2ade46d97b9c41682fd2e9064a59f23a98", "tree": "4b5ef937b4d0dcede6b1669f03c3b6dccf57d5bc", "parents": [ "59f608d84f937cb5e2fd3a0b9f848f200d47ba85", "604c4ef1c453a1b2ea2cdf04d2b49afec421ebfa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 12:11:52 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 12:11:52 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "7d5869e78f4c9d32f834dadefbb7dcb3c9d4d85f", "tree": "136560d132409e801be0c0e0ba00da7ea9695d05", "parents": [ "685a4ef0df23b97eea1842c2698da9a2e35fc976" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 23:58:41 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 17 09:54:08 2012 -0500" }, "message": "bcma: connect the bcma bus suspend/resume to the bcma driver suspend/resume\n\nNow the low-level driver actually gets informed that it is getting suspended and resumed.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "6f68c91c55ea3576d366797fa8d45e31c4aa79f8", "tree": "c896013c1a5d63a6a20c8cc4b68eee53ce24844a", "parents": [ "bc9ffce27962c0c5fdc6adf74790ea0fcbe4a99c" ], "author": { "name": "Myron Stowe", "email": "mstowe@redhat.com", "time": "Mon Nov 07 16:23:34 2011 -0700" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Tue Jan 17 04:35:20 2012 -0500" }, "message": "ACPI: Export interfaces for ioremapping/iounmapping ACPI registers\n\nExport remapping and unmapping interfaces - acpi_os_map_generic_address()\nand acpi_os_unmap_generic_address() - for ACPI generic registers that are\nbacked by memory mapped I/O (MMIO).\n\nThe acpi_os_map_generic_address() and acpi_os_unmap_generic_address()\ndeclarations may more properly belong in include/acpi/acpiosxf.h next to\nacpi_os_read_memory() but I believe that would require the ACPI CA making\nthem an official part of the ACPI CA - OS interface.\n\nACPI Generic Address Structure (GAS) reference (ACPI\u0027s fixed/generic\nhardware registers use the GAS format):\n ACPI Specification, Revision 4.0, Section 5.2.3.1, \"Generic Address\n Structure\"\n\nSigned-off-by: Myron Stowe \u003cmyron.stowe@redhat.com\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "b54ac6d2a25084667da781c7ca2cebef52a2bcdd", "tree": "b4dbaa790dcecff6b5b0772846d43b360f6389d7", "parents": [ "b4e008dc53a31cb4bf6a12d9dbaf1d5c6070a838" ], "author": { "name": "Huang Ying", "email": "ying.huang@intel.com", "time": "Thu Dec 08 11:25:49 2011 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Tue Jan 17 03:54:44 2012 -0500" }, "message": "ACPI, Record ACPI NVS regions\n\nSome firmware will access memory in ACPI NVS region via APEI. That\nis, instructions in APEI ERST/EINJ table will read/write ACPI NVS\nregion. The original resource conflict checking in APEI code will\ncheck memory/ioport accessed by APEI via general resource management\nmechanism. But ACPI NVS region is marked as busy already, so that the\nfalse resource conflict will prevent APEI ERST/EINJ to work.\n\nTo fix this, this patch record ACPI NVS regions, so that we can avoid\nrequest resources for memory region inside it.\n\nSigned-off-by: Huang Ying \u003cying.huang@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "9bf04646b0b41c5438ed8a27c5f8dbe0ff40d756", "tree": "d06b83275667828112fc8e3d8ec9a6696a9f523c", "parents": [ "412662d204eca981458156fd64d9d5f3b533d7b6" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Sun Jan 15 16:57:12 2012 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Jan 16 14:01:23 2012 +0100" }, "message": "netfilter: revert user-space expectation helper support\n\nThis patch partially reverts:\n3d058d7 netfilter: rework user-space expectation helper support\nthat was applied during the 3.2 development cycle.\n\nAfter this patch, the tree remains just like before patch bc01bef,\nthat initially added the preliminary infrastructure.\n\nI decided to partially revert this patch because the approach\nthat I proposed to resolve this problem is broken in NAT setups.\nMoreover, a new infrastructure will be submitted for the 3.3.x\ndevelopment cycle that resolve the existing issues while\nproviding a neat solution.\n\nSince nobody has been seriously using this infrastructure in\nuser-space, the removal of this feature should affect any know\nFOSS project (to my knowledge).\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "122804ecb59493fbb4d31b3ba9ac59faaf45276f", "tree": "cff4d8a158c412e4a8d3abc8d91bb0eb52b01c9a", "parents": [ "16008d641670571ff4cd750b416c7caf2d89f467", "126400033940afb658123517a2e80eb68259fbd7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:49:56 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:49:56 2012 -0800" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)\n [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver\n mb86a20s: Add a few more register settings at the init seq\n mb86a20s: Group registers into the same line\n [media] [PATCH] don\u0027t reset the delivery system on DTV_CLEAR\n [media] [BUG] it913x-fe fix typo error making SNR levels unstable\n [media] cx23885: Query the CX25840 during enum_input for status\n [media] cx25840: Add support for g_input_status\n [media] rc-videomate-m1f.c Rename to match remote controler name\n [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828\n [media] convert drivers/media/* to use module_platform_driver()\n [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB\n [media] Exynos4 JPEG codec v4l2 driver\n [media] doc: v4l: selection: choose pixels as units for selection rectangles\n [media] v4l: s5p-tv: mixer: fix setup of VP scaling\n [media] v4l: s5p-tv: mixer: add support for selection API\n [media] v4l: emulate old crop API using extended crop/compose API\n [media] doc: v4l: add documentation for selection API\n [media] doc: v4l: add binary images for selection API\n [media] v4l: add support for selection api\n [media] hd29l2: fix review findings\n ...\n" }, { "commit": "b3c9dd182ed3bdcdaf0e42625a35924b0497afdc", "tree": "ad48ad4d923fee147c736318d0fad35b3755f4f5", "parents": [ "83c2f912b43c3a7babbb6cb7ae2a5276c1ed2a3e", "5d381efb3d1f1ef10535a31ca0dd9b22fe1e1922" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:24:45 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 12:24:45 2012 -0800" }, "message": "Merge branch \u0027for-3.3/core\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-3.3/core\u0027 of git://git.kernel.dk/linux-block: (37 commits)\n Revert \"block: recursive merge requests\"\n block: Stop using macro stubs for the bio data integrity calls\n blockdev: convert some macros to static inlines\n fs: remove unneeded plug in mpage_readpages()\n block: Add BLKROTATIONAL ioctl\n block: Introduce blk_set_stacking_limits function\n block: remove WARN_ON_ONCE() in exit_io_context()\n block: an exiting task should be allowed to create io_context\n block: ioc_cgroup_changed() needs to be exported\n block: recursive merge requests\n block, cfq: fix empty queue crash caused by request merge\n block, cfq: move icq creation and rq-\u003eelv.icq association to block core\n block, cfq: restructure io_cq creation path for io_context interface cleanup\n block, cfq: move io_cq exit/release to blk-ioc.c\n block, cfq: move icq cache management to block core\n block, cfq: move io_cq lookup to blk-ioc.c\n block, cfq: move cfqd-\u003eicq_list to request_queue and add request-\u003eelv.icq\n block, cfq: reorganize cfq_io_context into generic and cfq specific parts\n block: remove elevator_queue-\u003eops\n block: reorder elevator switch sequence\n ...\n\nFix up conflicts in:\n - block/blk-cgroup.c\n\tSwitch from can_attach_task to can_attach\n - block/cfq-iosched.c\n\tconflict with now removed cic index changes (we now use q-\u003eid instead)\n" }, { "commit": "83c2f912b43c3a7babbb6cb7ae2a5276c1ed2a3e", "tree": "eaa7f50dea154d9f19721db69c7adde64d48848f", "parents": [ "f0ed5b9a28536b8be2f578a9450cfa42ab31ccf8", "172d1b0b73256551f100fc00c69e356d047103f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 11:26:35 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 15 11:26:35 2012 -0800" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits)\n perf tools: Fix compile error on x86_64 Ubuntu\n perf report: Fix --stdio output alignment when --showcpuutilization used\n perf annotate: Get rid of field_sep check\n perf annotate: Fix usage string\n perf kmem: Fix a memory leak\n perf kmem: Add missing closedir() calls\n perf top: Add error message for EMFILE\n perf test: Change type of \u0027-v\u0027 option to INCR\n perf script: Add missing closedir() calls\n tracing: Fix compile error when static ftrace is enabled\n recordmcount: Fix handling of elf64 big-endian objects.\n perf tools: Add const.h to MANIFEST to make perf-tar-src-pkg work again\n perf tools: Add support for guest/host-only profiling\n perf kvm: Do guest-only counting by default\n perf top: Don\u0027t update total_period on process_sample\n perf hists: Stop using \u0027self\u0027 for struct hist_entry\n perf hists: Rename total_session to total_period\n x86: Add counter when debug stack is used with interrupts enabled\n x86: Allow NMIs to hit breakpoints in i386\n x86: Keep current stack in NMI breakpoints\n ...\n" }, { "commit": "c49c41a4134679cecb77362e7f6b59acb6320aa7", "tree": "45e690c036ca5846a48c8be67945d1d841b2d96d", "parents": [ "892d208bcf79e4e1058707786a7b6d486697cd78", "f423e5ba76e7e4a6fcb4836b4f072d1fdebba8b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:36:33 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:36:33 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://selinuxproject.org/~jmorris/linux-security\n\n* \u0027for-linus\u0027 of git://selinuxproject.org/~jmorris/linux-security:\n capabilities: remove __cap_full_set definition\n security: remove the security_netlink_recv hook as it is equivalent to capable()\n ptrace: do not audit capability check when outputing /proc/pid/stat\n capabilities: remove task_ns_* functions\n capabitlies: ns_capable can use the cap helpers rather than lsm call\n capabilities: style only - move capable below ns_capable\n capabilites: introduce new has_ns_capabilities_noaudit\n capabilities: call has_ns_capability from has_capability\n capabilities: remove all _real_ interfaces\n capabilities: introduce security_capable_noaudit\n capabilities: reverse arguments to security_capable\n capabilities: remove the task from capable LSM hook entirely\n selinux: sparse fix: fix several warnings in the security server cod\n selinux: sparse fix: fix warnings in netlink code\n selinux: sparse fix: eliminate warnings for selinuxfs\n selinux: sparse fix: declare selinux_disable() in security.h\n selinux: sparse fix: move selinux_complete_init\n selinux: sparse fix: make selinux_secmark_refcount static\n SELinux: Fix RCU deref check warning in sel_netport_insert()\n\nManually fix up a semantic mis-merge wrt security_netlink_recv():\n\n - the interface was removed in commit fd7784615248 (\"security: remove\n the security_netlink_recv hook as it is equivalent to capable()\")\n\n - a new user of it appeared in commit a38f7907b926 (\"crypto: Add\n userspace configuration API\")\n\ncausing no automatic merge conflict, but Eric Paris pointed out the\nissue.\n" }, { "commit": "892d208bcf79e4e1058707786a7b6d486697cd78", "tree": "15446e4d19f7f98078344ab0bc37ae6af4898c6d", "parents": [ "dca88ad6915b65f6e037f8c3e632fcd92a70bd88", "029aeff5db879afd7760f11214b6fea45f76b58e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:11:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:11:11 2012 -0800" }, "message": "Merge tag \u0027kmemleak\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux\n\nKmemleak patches\n\nMain features:\n- Handle percpu memory allocations (only scanning them, not actually\n reporting).\n- Memory hotplug support.\n\nUsability improvements:\n- Show the origin of early allocations.\n- Report previously found leaks even if kmemleak has been disabled by\n some error.\n\n* tag \u0027kmemleak\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux:\n kmemleak: Add support for memory hotplug\n kmemleak: Handle percpu memory allocation\n kmemleak: Report previously found leaks even after an error\n kmemleak: When the early log buffer is exceeded, report the actual number\n kmemleak: Show where early_log issues come from\n" }, { "commit": "dca88ad6915b65f6e037f8c3e632fcd92a70bd88", "tree": "a3dcbe53310997dcc37c7d49129c48febef53992", "parents": [ "fed474857efbed79cd390d0aee224231ca718f63", "1632b9e2a14ce9f4e08faf6c4380431d63319bd3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:03:30 2012 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.infradead.org/users/dhowells/linux-headers\n\n* \u0027for-next\u0027 of git://git.infradead.org/users/dhowells/linux-headers:\n UAPI: Split trivial #if defined(__KERNEL__) \u0026\u0026 X conditionals\n UAPI: Don\u0027t have a #elif clause in a __KERNEL__ guard in linux/soundcard.h\n UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removed\n UAPI: Make linux/patchkey.h easier to parse\n UAPI: Fix nested __KERNEL__ guards in video/edid.h\n UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter\n UAPI: Guard linux/cuda.h\n UAPI: Guard linux/pmu.h\n UAPI: Guard linux/isdn_divertif.h\n UAPI: Guard linux/sound.h\n UAPI: Rearrange definition of HZ in asm-generic/param.h\n UAPI: Make FRV use asm-generic/param.h\n UAPI: Make M32R use asm-generic/param.h\n UAPI: Make MN10300 use asm-generic/param.h\n UAPI: elf_read_implies_exec() is a kernel-only feature - so hide from userspace\n UAPI: Don\u0027t include linux/compat.h in sparc\u0027s asm/siginfo.h\n UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines\n" }, { "commit": "51be08419dc86c72486ac556aa39bc01026a403d", "tree": "50ac35ac89f207d2a732b67eb2f1e9b671e5c064", "parents": [ "ec8013beddd717d1740cfefb1a9b900deef85462", "f787f32e67e00b072f46b2ae3c454d2c0a1fcdb7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 15:11:19 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 15:11:19 2012 -0800" }, "message": "Merge branch \u0027fbdev-next\u0027 of git://github.com/schandinat/linux-2.6\n\n* \u0027fbdev-next\u0027 of git://github.com/schandinat/linux-2.6: (175 commits)\n module_param: make bool parameters really bool (drivers/video/i810)\n Revert \"atmel_lcdfb: Adjust HFP calculation so it matches the manual.\"\n OMAPDSS: HDMI: Disable DDC internal pull up\n OMAPDSS: HDMI: Move duplicate code from boardfile\n OMAPDSS: add OrtusTech COM43H4M10XTC display support\n OMAP: DSS2: Support for UMSH-8173MD TFT panel\n ASoC: OMAP: HDMI: Move HDMI codec trigger function to generic HDMI driver\n OMAPDSS: HDMI: Create function to enable HDMI audio\n ASoC: OMAP: HDMI: Correct signature of ASoC functions\n ASoC: OMAP: HDMI: Introduce driver data for audio codec\n grvga: fix section mismatch warnings\n video: s3c-fb: Don\u0027t keep device runtime active when open\n video: s3c-fb: Hold runtime PM references when touching registers\n video: s3c-fb: Take a runtime PM reference when unblanked\n video: s3c-fb: Disable runtime PM in error paths from probe\n video: s3c-fb: Use s3c_fb_enable() to enable the framebuffer\n video: s3c-fb: Make runtime PM functional again\n drivers/video: fsl-diu-fb: merge fsl_diu_alloc() into map_video_memory()\n drivers/video: fsl-diu-fb: add default platform ops functions\n drivers/video: fsl-diu-fb: remove broken reference count enabling the display\n ...\n" }, { "commit": "0bfc96cb77224736dfa35c3c555d37b3646ef35e", "tree": "af5135c929ee8e1bdb38c306b2634dbc547d5189", "parents": [ "577ebb374c78314ac4617242f509e2f5e7156649" ], "author": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Jan 12 16:01:28 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 15:07:24 2012 -0800" }, "message": "block: fail SCSI passthrough ioctls on partition devices\n\nLinux allows executing the SG_IO ioctl on a partition or LVM volume, and\nwill pass the command to the underlying block device. This is\nwell-known, but it is also a large security problem when (via Unix\npermissions, ACLs, SELinux or a combination thereof) a program or user\nneeds to be granted access only to part of the disk.\n\nThis patch lets partitions forward a small set of harmless ioctls;\nothers are logged with printk so that we can see which ioctls are\nactually sent. In my tests only CDROM_GET_CAPABILITY actually occurred.\nOf course it was being sent to a (partition on a) hard disk, so it would\nhave failed with ENOTTY and the patch isn\u0027t changing anything in\npractice. Still, I\u0027m treating it specially to avoid spamming the logs.\n\nIn principle, this restriction should include programs running with\nCAP_SYS_RAWIO. If for example I let a program access /dev/sda2 and\n/dev/sdb, it still should not be able to read/write outside the\nboundaries of /dev/sda2 independent of the capabilities. However, for\nnow programs with CAP_SYS_RAWIO will still be allowed to send the\nioctls. Their actions will still be logged.\n\nThis patch does not affect the non-libata IDE driver. That driver\nhowever already tests for bd !\u003d bd-\u003ebd_contains before issuing some\nioctl; it could be restricted further to forbid these ioctls even for\nprograms running with CAP_SYS_ADMIN/CAP_SYS_RAWIO.\n\nCc: linux-scsi@vger.kernel.org\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: James Bottomley \u003cJBottomley@parallels.com\u003e\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\n[ Make it also print the command name when warning - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "577ebb374c78314ac4617242f509e2f5e7156649", "tree": "690ae95d67bb8f9fd66bc0daebc90a46904420ac", "parents": [ "81d48f0aee544885c39ef6e1ffb1175f276e6adf" ], "author": { "name": "Paolo Bonzini", "email": "pbonzini@redhat.com", "time": "Thu Jan 12 16:01:27 2012 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 15:07:24 2012 -0800" }, "message": "block: add and use scsi_blk_cmd_ioctl\n\nIntroduce a wrapper around scsi_cmd_ioctl that takes a block device.\n\nThe function will then be enhanced to detect partition block devices\nand, in that case, subject the ioctls to whitelisting.\n\nCc: linux-scsi@vger.kernel.org\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: James Bottomley \u003cJBottomley@parallels.com\u003e\nSigned-off-by: Paolo Bonzini \u003cpbonzini@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f5e4e20faa1eee3feaa0394897bbd1aca544e809", "tree": "047a93ff025c46ed97d3192a79f55b38fa071ca1", "parents": [ "4964e0664c80680fa6b28ef91381c076a5b25c2c", "f408c985cefc9b1d99bc099e1208dd7df3445aa5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:25:23 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:25:23 2012 -0800" }, "message": "Merge tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n2nd round of GPIO changes for v3.3 merge window\n\n* tag \u0027gpio-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion\n gpio: pl061: remove combined interrupt\n gpio: pl061: convert to use generic irq chip\n GPIO: add bindings for managed devices\n ARM: realview: convert pl061 no irq to 0 instead of -1\n gpio: pl061: convert to use 0 for no irq\n gpio: pl061: use chained_irq_* functions in irq handler\n GPIO/pl061: Add suspend resume capability\n drivers/gpio/gpio-tegra.c: use devm_request_and_ioremap\n" }, { "commit": "4964e0664c80680fa6b28ef91381c076a5b25c2c", "tree": "62099c5aaeee7274bcc66bcfba35d479affa97cf", "parents": [ "0a80939b3e6af4b0dc93bf88ec02fd7e90a16f1b", "7bf6612e8a9d6a0b3b82e8e2611942be1258b307" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:05:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 13:05:21 2012 -0800" }, "message": "Merge branch \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus\n\n* \u0027upstream\u0027 of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)\n MIPS: Delete unused function add_temporary_entry.\n MIPS: Set default pci cache line size.\n MIPS: Flush huge TLB\n MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.\n MIPS: Octeon: Add support for OCTEON II PCIe\n MIPS: Octeon: Update PCI Latency timer and enable more error reporting.\n MIPS: Alchemy: Update cpu-feature-overrides\n MIPS: Alchemy: db1200: Improve PB1200 detection.\n MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.\n MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller\n MIPS: Alchemy: irq: register pm at irq init time\n MIPS: Alchemy: Touchscreen support on DB1100\n MIPS: Alchemy: Hook up IrDA on DB1000/DB1100\n net/irda: convert au1k_ir to platform driver.\n MIPS: Alchemy: remove unused board headers\n MTD: nand: make au1550nd.c a platform_driver\n MIPS: Netlogic: Mark Netlogic chips as SMT capable\n MIPS: Netlogic: Add support for XLP 3XX cores\n MIPS: Netlogic: Merge some of XLR/XLP wakup code\n MIPS: Netlogic: Add default XLP config.\n ...\n\nFix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,\ntraps.c} and drivers/tty/serial/Makefile\n" }, { "commit": "0a80939b3e6af4b0dc93bf88ec02fd7e90a16f1b", "tree": "a112335f2b2b2a51e90531c6c67e8a3b54dcf0ef", "parents": [ "0b48d42235caf627121f440b57d376f48a9af8b6", "72db395ffadb1d33233fd123c2bf87ba0198c6c1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:32:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:32:16 2012 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux\n\nAutogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999 BFCB D920 0E6C D1AD B8F1\n\n* tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux:\n module_param: check that bool parameters really are bool.\n intelfbdrv.c: bailearly is an int module_param\n paride/pcd: fix bool verbose module parameter.\n module_param: make bool parameters really bool (drivers \u0026 misc)\n module_param: make bool parameters really bool (arch)\n module_param: make bool parameters really bool (core code)\n kernel/async: remove redundant declaration.\n printk: fix unnecessary module_param_name.\n lirc_parallel: fix module parameter description.\n module_param: avoid bool abuse, add bint for special cases.\n module_param: check type correctness for module_param_array\n modpost: use linker section to generate table.\n modpost: use a table rather than a giant if/else statement.\n modules: sysfs - export: taint, coresize, initsize\n kernel/params: replace DEBUGP with pr_debug\n module: replace DEBUGP with pr_debug\n module: struct module_ref should contains long fields\n module: Fix performance regression on modules with large symbol tables\n module: Add comments describing how the \"strmap\" logic works\n\nFix up conflicts in scripts/mod/file2alias.c due to the new linker-\ngenerated table approach to adding __mod_*_device_table entries. The\nARM sa11x0 mcp bus needed to be converted to that too.\n" }, { "commit": "0b48d42235caf627121f440b57d376f48a9af8b6", "tree": "400967c5fcb1cd08bbc0e1739e229f9717590f19", "parents": [ "8e63dd6e1c589ba99a18df9cbaa41c3178607641", "7a6ef8c72314f254c107c6a9ed7cb201961ee05a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:26:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:26:41 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-3.3\u0027 of git://linux-nfs.org/~bfields/linux: (31 commits)\n nfsd4: nfsd4_create_clid_dir return value is unused\n NFSD: Change name of extended attribute containing junction\n svcrpc: don\u0027t revert to SVC_POOL_DEFAULT on nfsd shutdown\n svcrpc: fix double-free on shutdown of nfsd after changing pool mode\n nfsd4: be forgiving in the absence of the recovery directory\n nfsd4: fix spurious 4.1 post-reboot failures\n NFSD: forget_delegations should use list_for_each_entry_safe\n NFSD: Only reinitilize the recall_lru list under the recall lock\n nfsd4: initialize special stateid\u0027s at compile time\n NFSd: use network-namespace-aware cache registering routines\n SUNRPC: create svc_xprt in proper network namespace\n svcrpc: update outdated BKL comment\n nfsd41: allow non-reclaim open-by-fh\u0027s in 4.1\n svcrpc: avoid memory-corruption on pool shutdown\n svcrpc: destroy server sockets all at once\n svcrpc: make svc_delete_xprt static\n nfsd: Fix oops when parsing a 0 length export\n nfsd4: Use kmemdup rather than duplicating its implementation\n nfsd4: add a separate (lockowner, inode) lookup\n nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error\n ...\n" }, { "commit": "21ebd6c68b5511b55f4f456e4ba17c2d711e3617", "tree": "2f4f98568a7a52ab6734fb190d0cbf6f9c1c6492", "parents": [ "4b8be38cf782f8ebebc089083fa0572ade79d7ca", "74d836c4142e5d100f8d9a1b2ee3003c2ed7109d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:43:32 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:43:32 2012 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (59 commits)\n rtc: max8925: Add function to work as wakeup source\n mfd: Add pm ops to max8925\n mfd: Convert aat2870 to dev_pm_ops\n mfd: Still check other interrupts if we get a wm831x touchscreen IRQ\n mfd: Introduce missing kfree in 88pm860x probe routine\n mfd: Add S5M series configuration\n mfd: Add s5m series irq driver\n mfd: Add S5M core driver\n mfd: Improve mc13xxx dt binding document\n mfd: Fix stmpe section mismatch\n mfd: Fix stmpe build warning\n mfd: Fix STMPE I2c build failure\n mfd: Constify aat2870-core i2c_device_id table\n gpio: Add support for stmpe variant 801\n mfd: Add support for stmpe variant 801\n mfd: Add support for stmpe variant 610\n mfd: Add support for STMPE SPI interface\n mfd: Separate out STMPE controller and interface specific code\n misc: Remove max8997-muic sysfs attributes\n mfd: Remove unused wm831x_irq_data_to_mask_reg()\n ...\n\nFix up trivial conflict in drivers/leds/Kconfig due to addition of\nLEDS_MAX8997 and LEDS_TCA6507 next to each other.\n" }, { "commit": "4b8be38cf782f8ebebc089083fa0572ade79d7ca", "tree": "2f88a0a5c1c0be9121c31b5a2775ae2f979cfa66", "parents": [ "5df1b274cd2f0304339c7f5586fa16cce0fdfce2", "0db13fc2abbb0b1a8d8efee20dfbd7f3c5d54022" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:41:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 20:41:15 2012 -0800" }, "message": "Merge tag \u0027mmc-merge-for-3.3-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc\n\nMMC highlights for 3.3:\n\nCore:\n * Support for the HS200 high-speed eMMC mode.\n * Support SDIO 3.0 Ultra High Speed cards.\n * Kill pending block requests immediately if card is removed.\n * Enable the eMMC feature for locking boot partitions read-only\n until next power on, exposed via sysfs.\n\nDrivers:\n * Runtime PM support for Intel Medfield SDIO.\n * Suspend/resume support for sdhci-spear.\n * sh-mmcif now processes requests asynchronously.\n\n* tag \u0027mmc-merge-for-3.3-rc1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (58 commits)\n mmc: fix a deadlock between system suspend and MMC block IO\n mmc: sdhci: restore the enabled dma when do reset all\n mmc: dw_mmc: miscaculated the fifo-depth with wrong bit operation\n mmc: host: Adds support for eMMC 4.5 HS200 mode\n mmc: core: HS200 mode support for eMMC 4.5\n mmc: dw_mmc: fixed wrong bit operation for SDMMC_GET_FCNT()\n mmc: core: Separate the timeout value for cache-ctrl\n mmc: sdhci-spear: Fix compilation error\n mmc: sdhci: Deal with failure case in sdhci_suspend_host\n mmc: dw_mmc: Clear the DDR mode for non-DDR\n mmc: sd: Fix SDR12 timing regression\n mmc: sdhci: Fix tuning timer incorrect setting when suspending host\n mmc: core: Add option to prevent eMMC sleep command\n mmc: omap_hsmmc: use threaded irq handler for card-detect.\n mmc: sdhci-pci: enable runtime PM for Medfield SDIO\n mmc: sdhci: Always pass clock request value zero to set_clock host op\n mmc: sdhci-pci: remove SDHCI_QUIRK2_OWN_CARD_DETECTION\n mmc: sdhci-pci: get gpio numbers from platform data\n mmc: sdhci-pci: add platform data\n mmc: sdhci: prevent card detection activity for non-removable cards\n ...\n" }, { "commit": "57e6a7dde8cfca9ac1d6702cf9104d22bc11ba90", "tree": "e53318e43657531399a8d6c721760015b26aa152", "parents": [ "94b1984ab9ab61cc6047c07e074d766485299a9c", "66ad863b410efb7f537719006f9ac52400c1a5c5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 10:33:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 10:33:39 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:\n GFS2: Fix nlink setting on inode creation\n GFS2: fail mount if journal recovery fails\n GFS2: let spectator mount do read only recovery\n GFS2: Fix a use-after-free that coverity spotted\n GFS2: dlm based recovery coordination\n" }, { "commit": "1a52bb0b686844021597d190e562ab55d1210104", "tree": "7edf13509869a6a7f1f488a679f15ff6c3057c54", "parents": [ "8638094e956a47dbb9a25166705a91e9a0981d52", "83eb26af0db71f2dfe551405c55d982288fa6178" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 10:29:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 10:29:21 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n ceph: ensure prealloc_blob is in place when removing xattr\n rbd: initialize snap_rwsem in rbd_add()\n ceph: enable/disable dentry complete flags via mount option\n vfs: export symbol d_find_any_alias()\n ceph: always initialize the dentry in open_root_dentry()\n libceph: remove useless return value for osd_client __send_request()\n ceph: avoid iput() while holding spinlock in ceph_dir_fsync\n ceph: avoid useless dget/dput in encode_fh\n ceph: dereference pointer after checking for NULL\n crush: fix force for non-root TAKE\n ceph: remove unnecessary d_fsdata conditional checks\n ceph: Use kmemdup rather than duplicating its implementation\n\nFix up conflicts in fs/ceph/super.c (d_alloc_root() failure handling vs\nalways initialize the dentry in open_root_dentry)\n" }, { "commit": "7c7c7f01cc5e3e423120a4848a73dd5e4586f2f9", "tree": "bdd15c5e435b1a380adbf5c4a7d05e7ef44d7403", "parents": [ "252c3d84ed398b090ac2dace46fc6faa6cfaea99" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Jan 11 19:30:38 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 13 10:12:23 2012 -0800" }, "message": "vhost-net: add module alias (v2.1)\n\nBy adding some module aliases, programs (or users) won\u0027t have to explicitly\ncall modprobe. Vhost-net will always be available if built into the kernel.\nIt does require assigning a permanent minor number for depmod to work.\n\nAlso:\n - use C99 style initialization.\n - add missing entry in documentation for loop-control\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-By: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6898e3bd11cc9a931ef115eee9000ac9d8f8c3cf", "tree": "c33b7c04926370b604e56009c124782222fc7fe6", "parents": [ "fd83240a60ecc59849420df3393e9e6d35c77683" ], "author": { "name": "Martin K. Petersen", "email": "martin.petersen@oracle.com", "time": "Fri Jan 13 08:15:33 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Fri Jan 13 08:15:33 2012 +0100" }, "message": "block: Stop using macro stubs for the bio data integrity calls\n\nReplace preprocessor macro stubs with real function declarations to\nprevent warnings when CONFIG_BLK_DEV_INTEGRITY is disabled.\n\nSigned-off-by: Martin K. Petersen \u003cmartin.petersen@oracle.com\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" }, { "commit": "099469502f62fbe0d7e4f0b83a2f22538367f734", "tree": "5229c3818b2e6e09d35026d49314047121130536", "parents": [ "7c17d86a8502c2e30c2eea777ed1b830aa3b447b", "35f1526845a9d804206883e19bd257d3dcef758f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:42:54 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:42:54 2012 -0800" }, "message": "Merge branch \u0027akpm\u0027 (aka \"Andrew\u0027s patch-bomb, take two\")\n\nAndrew explains:\n\n - various misc stuff\n\n - Most of the rest of MM: memcg, threaded hugepages, others.\n\n - cpumask\n\n - kexec\n\n - kdump\n\n - some direct-io performance tweaking\n\n - radix-tree optimisations\n\n - new selftests code\n\n A note on this: often people will develop a new userspace-visible\n feature and will develop userspace code to exercise/test that\n feature. Then they merge the patch and the selftest code dies.\n Sometimes we paste it into the changelog. Sometimes the code gets\n thrown into Documentation/(!).\n\n This saddens me. So this patch creates a bare-bones framework which\n will henceforth allow me to ask people to include their test apps in\n the kernel tree so we can keep them alive. Then when people enhance\n or fix the feature, I can ask them to update the test app too.\n\n The infrastruture is terribly trivial at present - let\u0027s see how it\n evolves.\n\n - checkpoint/restart feature work.\n\n A note on this: this is a project by various mad Russians to perform\n c/r mainly from userspace, with various oddball helper code added\n into the kernel where the need is demonstrated.\n\n So rather than some large central lump of code, what we have is\n little bits and pieces popping up in various places which either\n expose something new or which permit something which is normally\n kernel-private to be modified.\n\n The overall project is an ongoing thing. I\u0027ve judged that the size\n and scope of the thing means that we\u0027re more likely to be successful\n with it if we integrate the support into mainline piecemeal rather\n than allowing it all to develop out-of-tree.\n\n However I\u0027m less confident than the developers that it will all\n eventually work! So what I\u0027m asking them to do is to wrap each piece\n of new code inside CONFIG_CHECKPOINT_RESTORE. So if it all\n eventually comes to tears and the project as a whole fails, it should\n be a simple matter to go through and delete all trace of it.\n\nThis lot pretty much wraps up the -rc1 merge for me.\n\n* akpm: (96 commits)\n unlzo: fix input buffer free\n ramoops: update parameters only after successful init\n ramoops: fix use of rounddown_pow_of_two()\n c/r: prctl: add PR_SET_MM codes to set up mm_struct entries\n c/r: procfs: add start_data, end_data, start_brk members to /proc/$pid/stat v4\n c/r: introduce CHECKPOINT_RESTORE symbol\n selftests: new x86 breakpoints selftest\n selftests: new very basic kernel selftests directory\n radix_tree: take radix_tree_path off stack\n radix_tree: remove radix_tree_indirect_to_ptr()\n dio: optimize cache misses in the submission path\n vfs: cache request_queue in struct block_device\n fs/direct-io.c: calculate fs_count correctly in get_more_blocks()\n drivers/parport/parport_pc.c: fix warnings\n panic: don\u0027t print redundant backtraces on oops\n sysctl: add the kernel.ns_last_pid control\n kdump: add udev events for memory online/offline\n include/linux/crash_dump.h needs elf.h\n kdump: fix crash_kexec()/smp_send_stop() race in panic()\n kdump: crashk_res init check for /sys/kernel/kexec_crash_size\n ...\n" }, { "commit": "7c17d86a8502c2e30c2eea777ed1b830aa3b447b", "tree": "353f739a33f46f9861b479e64d2a59f9b5c85868", "parents": [ "2485a4b610171f4e1c4ab0d053569747795c1bbe", "91dce7ddab99a29b600e3d792b847dc2cdbf0848" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:30:02 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:30:02 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (69 commits)\n pptp: Accept packet with seq zero\n RDS: Remove some unused iWARP code\n net: fsl: fec: handle 10Mbps speed in RMII mode\n drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: add missing iounmap\n drivers/net/ethernet/tundra/tsi108_eth.c: add missing iounmap\n ksz884x: fix mtu for VLAN\n net_sched: sfq: add optional RED on top of SFQ\n dp83640: Fix NOHZ local_softirq_pending 08 warning\n gianfar: Fix invalid TX frames returned on error queue when time stamping\n gianfar: Fix missing sock reference when processing TX time stamps\n phylib: introduce mdiobus_alloc_size()\n net: decrement memcg jump label when limit, not usage, is changed\n net: reintroduce missing rcu_assign_pointer() calls\n inet_diag: Rename inet_diag_req_compat into inet_diag_req\n inet_diag: Rename inet_diag_req into inet_diag_req_v2\n bond_alb: don\u0027t disable softirq under bond_alb_xmit\n mac80211: fix rx-\u003ekey NULL pointer dereference in promiscuous mode\n nl80211: fix old station flags compatibility\n mdio-octeon: use an unique MDIO bus name.\n mdio-gpio: use an unique MDIO bus name.\n ...\n" }, { "commit": "028ee4be34a09a6d48bdf30ab991ae933a7bc036", "tree": "455783226ceb65aee100f86afed529d4bbde1c8b", "parents": [ "b3f7f573a20081910e34e99cbc91831f4f02f1ff" ], "author": { "name": "Cyrill Gorcunov", "email": "gorcunov@openvz.org", "time": "Thu Jan 12 17:20:55 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:13 2012 -0800" }, "message": "c/r: prctl: add PR_SET_MM codes to set up mm_struct entries\n\nWhen we restore a task we need to set up text, data and data heap sizes\nfrom userspace to the values a task had at checkpoint time. This patch\nadds auxilary prctl codes for that.\n\nWhile most of them have a statistical nature (their values are involved\ninto calculation of /proc/\u003cpid\u003e/statm output) the start_brk and brk values\nare used to compute an allowed size of program data segment expansion.\nWhich means an arbitrary changes of this values might be dangerous\noperation. So to restrict access the following requirements applied to\nprctl calls:\n\n - The process has to have CAP_SYS_ADMIN capability granted.\n - For all opcodes except start_brk/brk members an appropriate\n VMA area must exist and should fit certain VMA flags,\n such as:\n - code segment must be executable but not writable;\n - data segment must not be executable.\n\nstart_brk/brk values must not intersect with data segment and must not\nexceed RLIMIT_DATA resource limit.\n\nStill the main guard is CAP_SYS_ADMIN capability check.\n\nNote the kernel should be compiled with CONFIG_CHECKPOINT_RESTORE support\notherwise these prctl calls will return -EINVAL.\n\n[akpm@linux-foundation.org: cache current-\u003emm in a local, saving 200 bytes text]\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nReviewed-by: Kees Cook \u003ckeescook@chromium.org\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Andrew Vagin \u003cavagin@openvz.org\u003e\nCc: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "928da837aca77a9d3cb5076bf07b3224b1ba293b", "tree": "741c003b608d50101fa91746d36a7c5e847a8fa5", "parents": [ "65dd2aa90aa17a26703c28652408192856aa0396" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@linux.vnet.ibm.com", "time": "Thu Jan 12 17:20:39 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:12 2012 -0800" }, "message": "radix_tree: remove radix_tree_indirect_to_ptr()\n\nIt is not used anymore, remove it\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@linux.vnet.ibm.com\u003e\nAcked-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "87192a2a49c475cf322cb143e0fa63b0102d8567", "tree": "70acf2fb1e4a9a3a62559ad9218278d2fb114599", "parents": [ "ae55e1aaa7e2e57e538cb98cf617f511c5dc4f73" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Thu Jan 12 17:20:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:12 2012 -0800" }, "message": "vfs: cache request_queue in struct block_device\n\nThis makes it possible to get from the inode to the request_queue with one\nless cache miss. Used in followon optimization.\n\nThe livetime of the pointer is the same as the gendisk.\n\nThis assumes that the queue will always stay the same in the gendisk while\nit\u0027s visible to block_devices. I think that\u0027s safe correct?\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nAcked-by: Jeff Moyer \u003cjmoyer@redhat.com\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1f536b9e9f85456df93614b3c2f6a1a2b7d7cb9b", "tree": "01ad4e6b777c7583a413a2b45cd9b3fd3f2b4d35", "parents": [ "93e13a360ba331915220f82f6e9543df961ffa1f" ], "author": { "name": "Fabio Estevam", "email": "festevam@gmail.com", "time": "Thu Jan 12 17:20:20 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "include/linux/crash_dump.h needs elf.h\n\nBuilding an ARM target we get the following warnings:\n\n CC arch/arm/kernel/setup.o\n In file included from arch/arm/kernel/setup.c:39:\n arch/arm/include/asm/elf.h:102:1: warning: \"vmcore_elf64_check_arch\" redefined\n In file included from arch/arm/kernel/setup.c:24:\n include/linux/crash_dump.h:30:1: warning: this is the location of the previous definition\n\nQuoting Russell King:\n\n\"linux/crash_dump.h makes no attempt to include asm/elf.h, but it depends\non stuff in asm/elf.h to determine how stuff inside this file is defined\nat parse time.\n\nSo, if asm/elf.h is included after linux/crash_dump.h or not at all, you\nget a different result from the situation where asm/elf.h is included\nbefore.\"\n\nSo add elf.h header to crash_dump.h to avoid this problem.\n\nThe original discussion about this can be found at:\nhttp://www.spinics.net/lists/arm-kernel/msg154113.html\n\nSigned-off-by: Fabio Estevam \u003cfabio.estevam@freescale.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t[3.2.1]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a3dd3323058d281abd584b15ad4c5b65064d7a61", "tree": "98c65337f9960db2d0ca55687314bb821f3e7c1f", "parents": [ "9512938b885304f72c847379611d6018064af840" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Thu Jan 12 17:20:11 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:11 2012 -0800" }, "message": "kexec: remove KMSG_DUMP_KEXEC\n\nKMSG_DUMP_KEXEC is useless because we already save kernel messages inside\n/proc/vmcore, and it is unsafe to allow modules to do other stuffs in a\ncrash dump scenario.\n\n[akpm@linux-foundation.org: fix powerpc build]\nSigned-off-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nReported-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1c1c53d43b387d02174911ecb42ce846577b0ea0", "tree": "bb1294b23d23f2403ab95068af6080b375cc3166", "parents": [ "4111304dab198c687bc60f2e235a9f7ee92c47c8" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Thu Jan 12 17:20:04 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:10 2012 -0800" }, "message": "mm: remove del_page_from_lru, add page_off_lru\n\ndel_page_from_lru() repeats del_page_from_lru_list(), also working out\nwhich LRU the page was on, clearing the relevant bits. Decouple those\nfunctions: remove del_page_from_lru() and add page_off_lru().\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4111304dab198c687bc60f2e235a9f7ee92c47c8", "tree": "c98fbae214f73f8475bcdc54c8116dea82cd7d14", "parents": [ "4d06f382c733f99ec67df006255e87525ac1efd3" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Thu Jan 12 17:20:01 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:10 2012 -0800" }, "message": "mm: enum lru_list lru\n\nMostly we use \"enum lru_list lru\": change those few \"l\"s to \"lru\"s.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5095ae83759f035c823fb375c6ed2de99c81d5ec", "tree": "478eb973da4fe6461cd749136a5f62bd96a0ac21", "parents": [ "2bcf887963812c075f80a14e1fad8ec7e1c67acf" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Thu Jan 12 17:19:58 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:10 2012 -0800" }, "message": "mm: fewer underscores in ____pagevec_lru_add\n\nWhat\u0027s so special about ____pagevec_lru_add() that it needs four leading\nunderscores? Nothing, it just helped to distinguish from\n__pagevec_lru_add() in 2.6.28 development. Cut two leading underscores.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2bcf887963812c075f80a14e1fad8ec7e1c67acf", "tree": "132f11eefe904653307a05b77d16f4c41866e486", "parents": [ "90b3feaec8ffb167abd8903bf111605c2f035aa8" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Thu Jan 12 17:19:56 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:10 2012 -0800" }, "message": "mm: take pagevecs off reclaim stack\n\nReplace pagevecs in putback_lru_pages() and move_active_pages_to_lru()\nby lists of pages_to_free: then apply Konstantin Khlebnikov\u0027s\nfree_hot_cold_page_list() to them instead of pagevec_release().\n\nWhich simplifies the flow (no need to drop and retake lock whenever\npagevec fills up) and reduces stale addresses in stack backtraces\n(which often showed through the pagevecs); but more importantly,\nremoves another 120 bytes from the deepest stacks in page reclaim.\nAlthough I\u0027ve not recently seen an actual stack overflow here with\na vanilla kernel, move_active_pages_to_lru() has often featured in\ndeep backtraces.\n\nHowever, free_hot_cold_page_list() does not handle compound pages\n(nor need it: a Transparent HugePage would have been split by the\ntime it reaches the call in shrink_page_list()), but it is possible\nfor putback_lru_pages() or move_active_pages_to_lru() to be left\nholding the last reference on a THP, so must exclude the unlikely\ncompound case before putting on pages_to_free.\n\nRemove pagevec_strip(), its work now done in move_active_pages_to_lru().\nThe pagevec in scan_mapping_unevictable_pages() remains in mm/vmscan.c,\nbut that is never on the reclaim path, and cannot be replaced by a list.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a6bc32b899223a877f595ef9ddc1e89ead5072b8", "tree": "a9529f7af2cf8e77bb6670acea32169c891a2b76", "parents": [ "66199712e9eef5aede09dbcd9dfff87798a66917" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Thu Jan 12 17:19:43 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:09 2012 -0800" }, "message": "mm: compaction: introduce sync-light migration for use by compaction\n\nThis patch adds a lightweight sync migrate operation MIGRATE_SYNC_LIGHT\nmode that avoids writing back pages to backing storage. Async compaction\nmaps to MIGRATE_ASYNC while sync compaction maps to MIGRATE_SYNC_LIGHT.\nFor other migrate_pages users such as memory hotplug, MIGRATE_SYNC is\nused.\n\nThis avoids sync compaction stalling for an excessive length of time,\nparticularly when copying files to a USB stick where there might be a\nlarge number of dirty pages backed by a filesystem that does not support\n-\u003ewritepages.\n\n[aarcange@redhat.com: This patch is heavily based on Andrea\u0027s work]\n[akpm@linux-foundation.org: fix fs/nfs/write.c build]\n[akpm@linux-foundation.org: fix fs/btrfs/disk-io.c build]\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nCc: Andy Isaacson \u003cadi@hexapodia.org\u003e\nCc: Nai Xia \u003cnai.xia@gmail.com\u003e\nCc: Johannes Weiner \u003cjweiner@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": "c82449352854ff09e43062246af86bdeb628f0c3", "tree": "9cb8052e425c8cdab24ac41e83bbb672832ce54e", "parents": [ "b969c4ab9f182a6e1b2a0848be349f99714947b0" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Thu Jan 12 17:19:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:09 2012 -0800" }, "message": "mm: compaction: make isolate_lru_page() filter-aware again\n\nCommit 39deaf85 (\"mm: compaction: make isolate_lru_page() filter-aware\")\nnoted that compaction does not migrate dirty or writeback pages and that\nis was meaningless to pick the page and re-add it to the LRU list. This\nhad to be partially reverted because some dirty pages can be migrated by\ncompaction without blocking.\n\nThis patch updates \"mm: compaction: make isolate_lru_page\" by skipping\nover pages that migration has no possibility of migrating to minimise LRU\ndisruption.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nReviewed-by: Rik van Riel\u003criel@redhat.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nReviewed-by: Minchan Kim \u003cminchan@kernel.org\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nCc: Andy Isaacson \u003cadi@hexapodia.org\u003e\nCc: Nai Xia \u003cnai.xia@gmail.com\u003e\nCc: Johannes Weiner \u003cjweiner@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": "b969c4ab9f182a6e1b2a0848be349f99714947b0", "tree": "dc1c6e4375cfec7b15f13a37307eba8a9e07f40f", "parents": [ "7335084d446b83cbcb15da80497d03f0c1dc9e21" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Thu Jan 12 17:19:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:09 2012 -0800" }, "message": "mm: compaction: determine if dirty pages can be migrated without blocking within -\u003emigratepage\n\nAsynchronous compaction is used when allocating transparent hugepages to\navoid blocking for long periods of time. Due to reports of stalling,\nthere was a debate on disabling synchronous compaction but this severely\nimpacted allocation success rates. Part of the reason was that many dirty\npages are skipped in asynchronous compaction by the following check;\n\n\tif (PageDirty(page) \u0026\u0026 !sync \u0026\u0026\n\t\tmapping-\u003ea_ops-\u003emigratepage !\u003d migrate_page)\n\t\t\trc \u003d -EBUSY;\n\nThis skips over all mapping aops using buffer_migrate_page() even though\nit is possible to migrate some of these pages without blocking. This\npatch updates the -\u003emigratepage callback with a \"sync\" parameter. It is\nthe responsibility of the callback to fail gracefully if migration would\nblock.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Jan Kara \u003cjack@suse.cz\u003e\nCc: Andy Isaacson \u003cadi@hexapodia.org\u003e\nCc: Nai Xia \u003cnai.xia@gmail.com\u003e\nCc: Johannes Weiner \u003cjweiner@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": "f21760b15dcd091e5afd38d0b97197b45f7ef2ea", "tree": "84dd0f9016b46630d6b67e48ff0382b78a1bc519", "parents": [ "e5591307f0c1eb733d280a0b72473e01d7f88530" ], "author": { "name": "Shaohua Li", "email": "shaohua.li@intel.com", "time": "Thu Jan 12 17:19:16 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:08 2012 -0800" }, "message": "thp: add tlb_remove_pmd_tlb_entry\n\nWe have tlb_remove_tlb_entry to indicate a pte tlb flush entry should be\nflushed, but not a corresponding API for pmd entry. This isn\u0027t a\nproblem so far because THP is only for x86 currently and tlb_flush()\nunder x86 will flush entire TLB. But this is confusion and could be\nmissed if thp is ported to other arch.\n\nAlso convert tlb-\u003eneed_flush \u003d 1 to a VM_BUG_ON(!tlb-\u003eneed_flush) in\n__tlb_remove_page() as suggested by Andrea Arcangeli. The\n__tlb_remove_page() function is supposed to be called after\ntlb_remove_xxx_tlb_entry() and we can catch any misuse.\n\nSigned-off-by: Shaohua Li \u003cshaohua.li@intel.com\u003e\nReviewed-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "38c5d72f3ebe5ddd57d2f08dc035070fc6c9a287", "tree": "6461c0dfec95dccc92191f059fbe99b5660a8860", "parents": [ "4e5f01c2b9b94321992acb09c35d34f5ee5bb274" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Thu Jan 12 17:19:01 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:07 2012 -0800" }, "message": "memcg: simplify LRU handling by new rule\n\nNow, at LRU handling, memory cgroup needs to do complicated works to see\nvalid pc-\u003emem_cgroup, which may be overwritten.\n\nThis patch is for relaxing the protocol. This patch guarantees\n - when pc-\u003emem_cgroup is overwritten, page must not be on LRU.\n\nBy this, LRU routine can believe pc-\u003emem_cgroup and don\u0027t need to check\nbits on pc-\u003eflags. This new rule may adds small overheads to swapin. But\nin most case, lru handling gets faster.\n\nAfter this patch, PCG_ACCT_LRU bit is obsolete and removed.\n\n[akpm@linux-foundation.org: remove unneeded VM_BUG_ON(), restore hannes\u0027s christmas tree]\n[akpm@linux-foundation.org: clean up code comment]\n[hughd@google.com: fix NULL mem_cgroup_try_charge]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4e5f01c2b9b94321992acb09c35d34f5ee5bb274", "tree": "4e6ac9d29539dc26468fe2630d0e64cd022b1155", "parents": [ "36b62ad539498d00c2d280a151abad5f7630fa73" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Thu Jan 12 17:18:58 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:07 2012 -0800" }, "message": "memcg: clear pc-\u003emem_cgroup if necessary.\n\nThis is a preparation before removing a flag PCG_ACCT_LRU in page_cgroup\nand reducing atomic ops/complexity in memcg LRU handling.\n\nIn some cases, pages are added to lru before charge to memcg and pages\nare not classfied to memory cgroup at lru addtion. Now, the lru where\nthe page should be added is determined a bit in page_cgroup-\u003eflags and\npc-\u003emem_cgroup. I\u0027d like to remove the check of flag.\n\nTo handle the case pc-\u003emem_cgroup may contain stale pointers if pages\nare added to LRU before classification. This patch resets\npc-\u003emem_cgroup to root_mem_cgroup before lru additions.\n\n[akpm@linux-foundation.org: fix CONFIG_CGROUP_MEM_CONT\u003dn build]\n[hughd@google.com: fix CONFIG_CGROUP_MEM_RES_CTLR\u003dy CONFIG_CGROUP_MEM_RES_CTLR_SWAP\u003dn build]\n[akpm@linux-foundation.org: ksm.c needs memcontrol.h, per Michal]\n[hughd@google.com: stop oops in mem_cgroup_reset_owner()]\n[hughd@google.com: fix page migration to reset_owner]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9fb4b7cc0724f178d4b24a2a566ea1e7cb120b82", "tree": "0f2db9102d46f5e5c8492864fb1bd21f2e7cd768", "parents": [ "40f23a21a8501c1b2c65c50c19b516488ac31313" ], "author": { "name": "Bob Liu", "email": "lliubbo@gmail.com", "time": "Thu Jan 12 17:18:48 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:07 2012 -0800" }, "message": "page_cgroup: add helper function to get swap_cgroup\n\nThere are multiple places which need to get the swap_cgroup address, so\nadd a helper function:\n\n static struct swap_cgroup *swap_cgroup_getsc(swp_entry_t ent,\n struct swap_cgroup_ctrl **ctrl);\n\nto simplify the code.\n\nSigned-off-by: Bob Liu \u003clliubbo@gmail.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Johannes Weiner \u003cjweiner@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": "72835c86ca15d0126354b73d5f29ce9194931c9b", "tree": "369f31168b405e4d597b3cd067a1fd0ac2025dbc", "parents": [ "ec0fffd84b162e0563a28a81aa049f946b31a8e2" ], "author": { "name": "Johannes Weiner", "email": "jweiner@redhat.com", "time": "Thu Jan 12 17:18:32 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:06 2012 -0800" }, "message": "mm: unify remaining mem_cont, mem, etc. variable names to memcg\n\nSigned-off-by: Johannes Weiner \u003cjweiner@redhat.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e94c8a9cbce1aee4af9e1285802785481b7f93c5", "tree": "14d496e62c2e8d59a8954ff10368d59d8dfaea03", "parents": [ "6b208e3f6e35aa76d254c395bdcd984b17c6b626" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Thu Jan 12 17:18:20 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:05 2012 -0800" }, "message": "memcg: make mem_cgroup_split_huge_fixup() more efficient\n\nIn split_huge_page(), mem_cgroup_split_huge_fixup() is called to handle\npage_cgroup modifcations. It takes move_lock_page_cgroup() and modifies\npage_cgroup and LRU accounting jobs and called HPAGE_PMD_SIZE - 1 times.\n\nBut thinking again,\n - compound_lock() is held at move_accout...then, it\u0027s not necessary\n to take move_lock_page_cgroup().\n - LRU is locked and all tail pages will go into the same LRU as\n head is now on.\n - page_cgroup is contiguous in huge page range.\n\nThis patch fixes mem_cgroup_split_huge_fixup() as to be called once per\nhugepage and reduce costs for spliting.\n\n[akpm@linux-foundation.org: fix typo, per Michal]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6b208e3f6e35aa76d254c395bdcd984b17c6b626", "tree": "f7e65f9e1fa41907bf48f05007a10c83be668b3f", "parents": [ "925b7673cce39116ce61e7a06683a4a0dad1e72a" ], "author": { "name": "Johannes Weiner", "email": "jweiner@redhat.com", "time": "Thu Jan 12 17:18:18 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:05 2012 -0800" }, "message": "mm: memcg: remove unused node/section info from pc-\u003eflags\n\nTo find the page corresponding to a certain page_cgroup, the pc-\u003eflags\nencoded the node or section ID with the base array to compare the pc\npointer to.\n\nNow that the per-memory cgroup LRU lists link page descriptors directly,\nthere is no longer any code that knows the struct page_cgroup of a PFN\nbut not the struct page.\n\n[hughd@google.com: remove unused node/section info from pc-\u003eflags fix]\nSigned-off-by: Johannes Weiner \u003cjweiner@redhat.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nReviewed-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: \"Kirill A. Shutemov\" \u003ckirill@shutemov.name\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.com\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nCc: Greg Thelen \u003cgthelen@google.com\u003e\nCc: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "925b7673cce39116ce61e7a06683a4a0dad1e72a", "tree": "66c134db836e531e196ee3dfc23c124ff74ac827", "parents": [ "6290df545814990ca2663baf6e894669132d5f73" ], "author": { "name": "Johannes Weiner", "email": "jweiner@redhat.com", "time": "Thu Jan 12 17:18:15 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:05 2012 -0800" }, "message": "mm: make per-memcg LRU lists exclusive\n\nNow that all code that operated on global per-zone LRU lists is\nconverted to operate on per-memory cgroup LRU lists instead, there is no\nreason to keep the double-LRU scheme around any longer.\n\nThe pc-\u003elru member is removed and page-\u003elru is linked directly to the\nper-memory cgroup LRU lists, which removes two pointers from a\ndescriptor that exists for every page frame in the system.\n\nSigned-off-by: Johannes Weiner \u003cjweiner@redhat.com\u003e\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Ying Han \u003cyinghan@google.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nReviewed-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.com\u003e\nCc: Greg Thelen \u003cgthelen@google.com\u003e\nCc: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.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": "6290df545814990ca2663baf6e894669132d5f73", "tree": "c62472270ba81a7146bed0854be74e2e2338c629", "parents": [ "b95a2f2d486d0d768a92879c023a03757b9c7e58" ], "author": { "name": "Johannes Weiner", "email": "jweiner@redhat.com", "time": "Thu Jan 12 17:18:10 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:05 2012 -0800" }, "message": "mm: collect LRU list heads into struct lruvec\n\nHaving a unified structure with a LRU list set for both global zones and\nper-memcg zones allows to keep that code simple which deals with LRU\nlists and does not care about the container itself.\n\nOnce the per-memcg LRU lists directly link struct pages, the isolation\nfunction and all other list manipulations are shared between the memcg\ncase and the global LRU case.\n\nSigned-off-by: Johannes Weiner \u003cjweiner@redhat.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nReviewed-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.com\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nCc: Greg Thelen \u003cgthelen@google.com\u003e\nCc: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5660048ccac8735d9bc0a46325a02e6a6518b5b2", "tree": "4b2269ddd6ca001843187a89fb91278192028d87", "parents": [ "527a5ec9a53471d855291ba9f1fdf1dd4e12a184" ], "author": { "name": "Johannes Weiner", "email": "jweiner@redhat.com", "time": "Thu Jan 12 17:17:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:05 2012 -0800" }, "message": "mm: move memcg hierarchy reclaim to generic reclaim code\n\nMemory cgroup limit reclaim and traditional global pressure reclaim will\nsoon share the same code to reclaim from a hierarchical tree of memory\ncgroups.\n\nIn preparation of this, move the two right next to each other in\nshrink_zone().\n\nThe mem_cgroup_hierarchical_reclaim() polymath is split into a soft\nlimit reclaim function, which still does hierarchy walking on its own,\nand a limit (shrinking) reclaim function, which relies on generic\nreclaim code to walk the hierarchy.\n\nSigned-off-by: Johannes Weiner \u003cjweiner@redhat.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nReviewed-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.com\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nCc: Greg Thelen \u003cgthelen@google.com\u003e\nCc: Michel Lespinasse \u003cwalken@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ab936cbcd02072a34b60d268f94440fd5cf1970b", "tree": "d37e3e3c54cc4cc691a428b6ceb71b4b40e4f42b", "parents": [ "28d82dc1c4edbc352129f97f4ca22624d1fe61de" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Thu Jan 12 17:17:44 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:04 2012 -0800" }, "message": "memcg: add mem_cgroup_replace_page_cache() to fix LRU issue\n\nCommit ef6a3c6311 (\"mm: add replace_page_cache_page() function\") added a\nfunction replace_page_cache_page(). This function replaces a page in the\nradix-tree with a new page. WHen doing this, memory cgroup needs to fix\nup the accounting information. memcg need to check PCG_USED bit etc.\n\nIn some(many?) cases, \u0027newpage\u0027 is on LRU before calling\nreplace_page_cache(). So, memcg\u0027s LRU accounting information should be\nfixed, too.\n\nThis patch adds mem_cgroup_replace_page_cache() and removes the old hooks.\n In that function, old pages will be unaccounted without touching\nres_counter and new page will be accounted to the memcg (of old page).\nWHen overwriting pc-\u003emem_cgroup of newpage, take zone-\u003elru_lock and avoid\nraces with LRU handling.\n\nBackground:\n replace_page_cache_page() is called by FUSE code in its splice() handling.\n Here, \u0027newpage\u0027 is replacing oldpage but this newpage is not a newly allocated\n page and may be on LRU. LRU mis-accounting will be critical for memory cgroup\n because rmdir() checks the whole LRU is empty and there is no account leak.\n If a page is on the other LRU than it should be, rmdir() will fail.\n\nThis bug was added in March 2011, but no bug report yet. I guess there\nare not many people who use memcg and FUSE at the same time with upstream\nkernels.\n\nThe result of this bug is that admin cannot destroy a memcg because of\naccount leak. So, no panic, no deadlock. And, even if an active cgroup\nexist, umount can succseed. So no problem at shutdown.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Miklos Szeredi \u003cmszeredi@suse.cz\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: \u003cstable@vger.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": "28d82dc1c4edbc352129f97f4ca22624d1fe61de", "tree": "a6fbd269d17134ff42597b4e02eba4345bf6d901", "parents": [ "2ccd4f4d4737b37e21dd92c8c584c23cd87740a2" ], "author": { "name": "Jason Baron", "email": "jbaron@redhat.com", "time": "Thu Jan 12 17:17:43 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:04 2012 -0800" }, "message": "epoll: limit paths\n\nThe current epoll code can be tickled to run basically indefinitely in\nboth loop detection path check (on ep_insert()), and in the wakeup paths.\nThe programs that tickle this behavior set up deeply linked networks of\nepoll file descriptors that cause the epoll algorithms to traverse them\nindefinitely. A couple of these sample programs have been previously\nposted in this thread: https://lkml.org/lkml/2011/2/25/297.\n\nTo fix the loop detection path check algorithms, I simply keep track of\nthe epoll nodes that have been already visited. Thus, the loop detection\nbecomes proportional to the number of epoll file descriptor and links.\nThis dramatically decreases the run-time of the loop check algorithm. In\none diabolical case I tried it reduced the run-time from 15 mintues (all\nin kernel time) to .3 seconds.\n\nFixing the wakeup paths could be done at wakeup time in a similar manner\nby keeping track of nodes that have already been visited, but the\ncomplexity is harder, since there can be multiple wakeups on different\ncpus...Thus, I\u0027ve opted to limit the number of possible wakeup paths when\nthe paths are created.\n\nThis is accomplished, by noting that the end file descriptor points that\nare found during the loop detection pass (from the newly added link), are\nactually the sources for wakeup events. I keep a list of these file\ndescriptors and limit the number and length of these paths that emanate\nfrom these \u0027source file descriptors\u0027. In the current implemetation I\nallow 1000 paths of length 1, 500 of length 2, 100 of length 3, 50 of\nlength 4 and 10 of length 5. Note that it is sufficient to check the\n\u0027source file descriptors\u0027 reachable from the newly added link, since no\nother \u0027source file descriptors\u0027 will have newly added links. This allows\nus to check only the wakeup paths that may have gotten too long, and not\nre-check all possible wakeup paths on the system.\n\nIn terms of the path limit selection, I think its first worth noting that\nthe most common case for epoll, is probably the model where you have 1\nepoll file descriptor that is monitoring n number of \u0027source file\ndescriptors\u0027. In this case, each \u0027source file descriptor\u0027 has a 1 path of\nlength 1. Thus, I believe that the limits I\u0027m proposing are quite\nreasonable and in fact may be too generous. Thus, I\u0027m hoping that the\nproposed limits will not prevent any workloads that currently work to\nfail.\n\nIn terms of locking, I have extended the use of the \u0027epmutex\u0027 to all\nepoll_ctl add and remove operations. Currently its only used in a subset\nof the add paths. I need to hold the epmutex, so that we can correctly\ntraverse a coherent graph, to check the number of paths. I believe that\nthis additional locking is probably ok, since its in the setup/teardown\npaths, and doesn\u0027t affect the running paths, but it certainly is going to\nadd some extra overhead. Also, worth noting is that the epmuex was\nrecently added to the ep_ctl add operations in the initial path loop\ndetection code using the argument that it was not on a critical path.\n\nAnother thing to note here, is the length of epoll chains that is allowed.\nCurrently, eventpoll.c defines:\n\n/* Maximum number of nesting allowed inside epoll sets */\n#define EP_MAX_NESTS 4\n\nThis basically means that I am limited to a graph depth of 5 (EP_MAX_NESTS\n+ 1). However, this limit is currently only enforced during the loop\ncheck detection code, and only when the epoll file descriptors are added\nin a certain order. Thus, this limit is currently easily bypassed. The\nnewly added check for wakeup paths, stricly limits the wakeup paths to a\nlength of 5, regardless of the order in which ep\u0027s are linked together.\nThus, a side-effect of the new code is a more consistent enforcement of\nthe graph depth.\n\nThus far, I\u0027ve tested this, using the sample programs previously\nmentioned, which now either return quickly or return -EINVAL. I\u0027ve also\ntesting using the piptest.c epoll tester, which showed no difference in\nperformance. I\u0027ve also created a number of different epoll networks and\ntested that they behave as expectded.\n\nI believe this solves the original diabolical test cases, while still\npreserving the sane epoll nesting.\n\nSigned-off-by: Jason Baron \u003cjbaron@redhat.com\u003e\nCc: Nelson Elhage \u003cnelhage@ksplice.com\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "43570fd2f47ba518145e9289f54cde3dba4c8b25", "tree": "67aa61c8b972f4b3af66cd89082222e77e06a4cb", "parents": [ "0d259cf8190b9c446eefd5225ffcc3941e76a432" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Thu Jan 12 17:17:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:03 2012 -0800" }, "message": "mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL\n\nWhile implementing cmpxchg_double() on s390 I realized that we don\u0027t set\nCONFIG_CMPXCHG_LOCAL despite the fact that we have support for it.\n\nHowever setting that option will increase the size of struct page by\neight bytes on 64 bit, which we certainly do not want. Also, it doesn\u0027t\nmake sense that a present cpu feature should increase the size of struct\npage.\n\nBesides that it looks like the dependency to CMPXCHG_LOCAL is wrong and\nthat it should depend on CMPXCHG_DOUBLE instead.\n\nThis patch:\n\nIf an architecture supports CMPXCHG_LOCAL this shouldn\u0027t result\nautomatically in larger struct pages if the SLUB allocator is used.\nInstead introduce a new config option \"HAVE_ALIGNED_STRUCT_PAGE\" which\ncan be selected if a double word aligned struct page is required. Also\nupdate x86 Kconfig so that it should work as before.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nAcked-by: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Pekka Enberg \u003cpenberg@kernel.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0d259cf8190b9c446eefd5225ffcc3941e76a432", "tree": "6a0b92845f506c1f03fad5acdedd46d90b5f852c", "parents": [ "ff2d8b19a3a62559afba1c53360c8577a7697714" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jan 12 17:17:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:03 2012 -0800" }, "message": "include/linux/linkage.h: remove unused ATTRIB_NORET macro\n\nThe uses have been renamed so delete the unused macro.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ff2d8b19a3a62559afba1c53360c8577a7697714", "tree": "20811c0e7c368cb216a436dd274695d9fc0577ef", "parents": [ "9402c95f34a66e81eba473a2f7267bbae5a1dee2" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jan 12 17:17:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:03 2012 -0800" }, "message": "treewide: convert uses of ATTRIB_NORETURN to __noreturn\n\nUse the more commonly used __noreturn instead of ATTRIB_NORETURN.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9402c95f34a66e81eba473a2f7267bbae5a1dee2", "tree": "c46628e702d625a737fedbd9de88138a94c93d1f", "parents": [ "80bf007f20b16272f210e0803f739f5606cff59d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jan 12 17:17:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:03 2012 -0800" }, "message": "treewide: remove useless NORET_TYPE macro and uses\n\nIt\u0027s a very old and now unused prototype marking so just delete it.\n\nNeaten panic pointer argument style to keep checkpatch quiet.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@gmail.com\u003e\nCc: Hans-Christian Egtvedt \u003cegtvedt@samfundet.no\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "80bf007f20b16272f210e0803f739f5606cff59d", "tree": "1d88fc99ec70e05a5452cf9ef54363f964a28da0", "parents": [ "4da47859956cebdc4c58c38a931e21847458d744" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jan 12 17:17:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:02 2012 -0800" }, "message": "include/linux/linkage.h: remove unused NORET_AND macro\n\nThe only use in kernel.h is gone so remove the macro.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4da47859956cebdc4c58c38a931e21847458d744", "tree": "3c588d141a5df4b4b7349e2476f0e711d7329886", "parents": [ "efeb156e7275c5b6c6e0f96aceb3c6abf98fc392" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Jan 12 17:17:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:13:02 2012 -0800" }, "message": "kernel.h: neaten panic prototype\n\nUse __printf macro.\nConvert NORET_AND to ATTRIB_NORET.\nUse the normal kernel style for pointer arguments.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ddecf0f4db44ef94847a62d6ecf74456b4dcc66f", "tree": "48c49b70f83d713c7e3f594e067ee726bb70777e", "parents": [ "72092cc45378176ba700034c91b7af2db524df26" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Jan 06 06:31:44 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 20:05:28 2012 -0800" }, "message": "net_sched: sfq: add optional RED on top of SFQ\n\nAdds an optional Random Early Detection on each SFQ flow queue.\n\nTraditional SFQ limits count of packets, while RED permits to also\ncontrol number of bytes per flow, and adds ECN capability as well.\n\n1) We dont handle the idle time management in this RED implementation,\nsince each \u0027new flow\u0027 begins with a null qavg. We really want to address\nbacklogged flows.\n\n2) if headdrop is selected, we try to ecn mark first packet instead of\ncurrently enqueued packet. This gives faster feedback for tcp flows\ncompared to traditional RED [ marking the last packet in queue ]\n\nExample of use :\n\ntc qdisc add dev $DEV parent 1:1 handle 10: est 1sec 4sec sfq \\\n\tlimit 3000 headdrop flows 512 divisor 16384 \\\n\tredflowlimit 100000 min 8000 max 60000 probability 0.20 ecn\n\nqdisc sfq 10: parent 1:1 limit 3000p quantum 1514b depth 127 headdrop\nflows 512/16384 divisor 16384\n ewma 6 min 8000b max 60000b probability 0.2 ecn\n prob_mark 0 prob_mark_head 4876 prob_drop 6131\n forced_mark 0 forced_mark_head 0 forced_drop 0\n Sent 1175211782 bytes 777537 pkt (dropped 6131, overlimits 11007\nrequeues 0)\n rate 99483Kbit 8219pps backlog 689392b 456p requeues 0\n\nIn this test, with 64 netperf TCP_STREAM sessions, 50% using ECN enabled\nflows, we can see number of packets CE marked is smaller than number of\ndrops (for non ECN flows)\n\nIf same test is run, without RED, we can check backlog is much bigger.\n\nqdisc sfq 10: parent 1:1 limit 3000p quantum 1514b depth 127 headdrop\nflows 512/16384 divisor 16384\n Sent 1148683617 bytes 795006 pkt (dropped 0, overlimits 0 requeues 0)\n rate 98429Kbit 8521pps backlog 1221290b 841p requeues 0\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCC: Dave Taht \u003cdave.taht@gmail.com\u003e\nTested-by: Dave Taht \u003cdave.taht@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb8a54a78e974e1af3e17fa38bb74d3747c5c1bd", "tree": "d3642783d7470c26815b7d3c14ea5d5949d7dcdb", "parents": [ "1398eee08222a038fa5f017900f387e81f6e3ff4" ], "author": { "name": "Timur Tabi", "email": "timur@freescale.com", "time": "Thu Jan 12 15:23:04 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 15:23:04 2012 -0800" }, "message": "phylib: introduce mdiobus_alloc_size()\n\nIntroduce function mdiobus_alloc_size() as an alternative to mdiobus_alloc().\nMost callers of mdiobus_alloc() also allocate a private data structure, and\nthen manually point bus-\u003epriv to this object. mdiobus_alloc_size()\ncombines the two operations into one, which simplifies memory management.\n\nThe original mdiobus_alloc() now just calls mdiobus_alloc_size(0).\n\nSigned-off-by: Timur Tabi \u003ctimur@freescale.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "72db395ffadb1d33233fd123c2bf87ba0198c6c1", "tree": "797832ee187297bb01cbad849b614c0caaac39ed", "parents": [ "a6e02554c1036f8c62080ecf4702703427c651a4" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:28 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:28 2012 +1030" }, "message": "module_param: check that bool parameters really are bool.\n\nmodule_param(bool) used to counter-intuitively take an int. In\nfddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy\ntrick.\n\nThis tightens the check (you\u0027ll get a warning about incompatible\nreturn type) but still allows it. Next kernel version, we\u0027ll remove\nit.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "90ab5ee94171b3e28de6bb42ee30b527014e0be7", "tree": "fcf89889f6e881f2b231d3d20287c08174ce4b54", "parents": [ "476bc0015bf09dad39d36a8b19f76f0c181d1ec9" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:20 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:20 2012 +1030" }, "message": "module_param: make bool parameters really bool (drivers \u0026 misc)\n\nmodule_param(bool) used to counter-intuitively take an int. In\nfddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy\ntrick.\n\nIt\u0027s time to remove the int/unsigned int option. For this version\nit\u0027ll simply give a warning, but it\u0027ll break next kernel version.\n\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "2329abfa344a9a824bc4c71f2415528777265510", "tree": "7779fadc6ceba76071e3f5db0ec6a1dee41a0dfd", "parents": [ "6d6a55ec0877393f467067d44b9a2a8c2e4a82d2" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:18 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:18 2012 +1030" }, "message": "module_param: make bool parameters really bool (core code)\n\nmodule_param(bool) used to counter-intuitively take an int. In\nfddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy\ntrick.\n\nIt\u0027s time to remove the int/unsigned int option. For this version\nit\u0027ll simply give a warning, but it\u0027ll break next kernel version.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "69116f279a9eaf4c540934269342d9149538fc79", "tree": "eb335b97a99fb25ce548dd06f053a81e3c56016f", "parents": [ "bafeafeab94b8d3019aac15c2df2ce47b08a6363" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:17 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:17 2012 +1030" }, "message": "module_param: avoid bool abuse, add bint for special cases.\n\nFor historical reasons, we allow module_param(bool) to take an int (or\nan unsigned int). That\u0027s going away.\n\nA few drivers really want an int: they set it to -1 and a parameter\nwill set it to 0 or 1. This sucks: reading them from sysfs will give\n\u0027Y\u0027 for both -1 and 1, but if we change it to an int, then the users\nmight be broken (if they did \"param\" instead of \"param\u003d1\").\n\nUse a new \u0027bint\u0027 parser for them.\n\n(ntfs has a different problem: it needs an int for debug_msgs because\nit\u0027s also exposed via sysctl.)\n\nCc: Steve Glendinning \u003csteve.glendinning@smsc.com\u003e\nCc: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nCc: Hoang-Nam Nguyen \u003chnguyen@de.ibm.com\u003e\nCc: Christoph Raisch \u003craisch@de.ibm.com\u003e\nCc: Roland Dreier \u003croland@kernel.org\u003e\nCc: Sean Hefty \u003csean.hefty@intel.com\u003e\nCc: Hal Rosenstock \u003chal.rosenstock@gmail.com\u003e\nCc: linux390@de.ibm.com\nCc: Anton Altaparmakov \u003canton@tuxera.com\u003e\nCc: Jaroslav Kysela \u003cperex@perex.cz\u003e\nCc: Takashi Iwai \u003ctiwai@suse.de\u003e\nCc: lm-sensors@lm-sensors.org\nCc: linux-rdma@vger.kernel.org\nCc: linux-s390@vger.kernel.org\nCc: linux-ntfs-dev@lists.sourceforge.net\nCc: alsa-devel@alsa-project.org\nAcked-by: Takashi Iwai \u003ctiwai@suse.de\u003e (For the sound part)\nAcked-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e (For the hwmon driver)\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "bafeafeab94b8d3019aac15c2df2ce47b08a6363", "tree": "c121e82aee4f0969cf90dfb2dbad46d06a669696", "parents": [ "e49ce14150c64b29a8dd211df785576fa19a9858" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:16 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:16 2012 +1030" }, "message": "module_param: check type correctness for module_param_array\n\nmodule_param_array(), unlike its non-array cousins, didn\u0027t check the type\nof the variable. Fixing this found two bugs.\n\nCc: Luca Risolia \u003cluca.risolia@studio.unibo.it\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@infradead.org\u003e\nCc: Eric Piel \u003ceric.piel@tremplin-utc.net\u003e\nCc: linux-media@vger.kernel.org\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "bd77c04772da38fca510c81f78e51f727123b919", "tree": "8554b40191d3d5adebbd2461d26450c0ed7295d4", "parents": [ "48fd11880b5ef04270be8a87d9a9a9ee2fdae338" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Jan 13 09:32:14 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jan 13 09:32:14 2012 +1030" }, "message": "module: struct module_ref should contains long fields\n\nmodule_ref contains two \"unsigned int\" fields.\n\nThats now too small, since some machines can open more than 2^32 files.\n\nCheck commit 518de9b39e8 (fs: allow for more than 2^31 files) for\nreference.\n\nWe can add an aligned(2 * sizeof(unsigned long)) attribute to force\nalloc_percpu() allocating module_ref areas in single cache lines.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCC: Tejun Heo \u003ctj@kernel.org\u003e\nCC: Robin Holt \u003cholt@sgi.com\u003e\nCC: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "6733e54b669c600eb8e451939ad55130db664fed", "tree": "2a8c24c856fa3f5d7d58a3eb39da943ca1c57e65", "parents": [ "bcf8a3dfcb274cf6654a19e12e244f3af8c0d355", "451d0f599934fd97faf54a5d7954b518e66192cb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 12:39:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 12:39:21 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:\n FUSE: Notifying the kernel of deletion.\n fuse: support ioctl on directories\n fuse: Use kcalloc instead of kzalloc to allocate array\n fuse: llseek optimize SEEK_CUR and SEEK_SET\n" }, { "commit": "bcf8a3dfcb274cf6654a19e12e244f3af8c0d355", "tree": "f1d0e0f36c0575a9202750aff65ba17ce91bc437", "parents": [ "61bd5e5683244a564ecfe31c73575ee0bc708ccc", "b6c96c0214138186f495e3ee73737c6fc5e4efa2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 12:37:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 12:37:27 2012 -0800" }, "message": "Merge tag \u0027to-linus\u0027 of git://github.com/rustyrussell/linux\n\n* tag \u0027to-linus\u0027 of git://github.com/rustyrussell/linux: (24 commits)\n lguest: Make sure interrupt is allocated ok by lguest_setup_irq\n lguest: move the lguest tool to the tools directory\n lguest: switch segment-voodoo-numbers to readable symbols\n virtio: balloon: Add freeze, restore handlers to support S4\n virtio: balloon: Move vq initialization into separate function\n virtio: net: Add freeze, restore handlers to support S4\n virtio: net: Move vq and vq buf removal into separate function\n virtio: net: Move vq initialization into separate function\n virtio: blk: Add freeze, restore handlers to support S4\n virtio: blk: Move vq initialization to separate function\n virtio: console: Disable callbacks for virtqueues at start of S4 freeze\n virtio: console: Add freeze and restore handlers to support S4\n virtio: console: Move vq and vq buf removal into separate functions\n virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff\n virtio: pci: switch to new PM API\n virtio_blk: fix config handler race\n virtio: add debugging if driver doesn\u0027t kick.\n virtio: expose added descriptors immediately.\n virtio: avoid modulus operation.\n virtio: support unlocked queue kick\n ...\n" }, { "commit": "069c9f142822d552ec885572945d8bce9eff0519", "tree": "f73eedfc7142af588d97cb4008127693f411f298", "parents": [ "a4924c71aa43d4f8a3f342b1f71788349472e684" ], "author": { "name": "Girish K S", "email": "girish.shivananjappa@linaro.org", "time": "Fri Jan 06 09:56:39 2012 +0530" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Thu Jan 12 15:17:16 2012 -0500" }, "message": "mmc: host: Adds support for eMMC 4.5 HS200 mode\n\nThis patch adds support for the HS200 mode on the host side.\nAlso enables the tuning feature required when the HS200 mode\nis selected.\n\nSigned-off-by: Girish K S \u003cgirish.shivananjappa@linaro.org\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "a4924c71aa43d4f8a3f342b1f71788349472e684", "tree": "19de11b280fca6718e5e766feaa53a43a9a6cb58", "parents": [ "ee5d19b20a711dca3848450979e3cd20b6b795cc" ], "author": { "name": "Girish K S", "email": "girish.shivananjappa@linaro.org", "time": "Wed Jan 11 14:04:52 2012 -0500" }, "committer": { "name": "Chris Ball", "email": "cjb@laptop.org", "time": "Thu Jan 12 15:17:15 2012 -0500" }, "message": "mmc: core: HS200 mode support for eMMC 4.5\n\nThis patch adds the support of the HS200 bus speed for eMMC 4.5 devices.\nThe eMMC 4.5 devices have support for 200MHz bus speed. The function\nprototype of the tuning function is modified to handle the tuning\ncommand number which is different in sd and mmc case.\n\nSigned-off-by: Girish K S \u003cgirish.shivananjappa@linaro.org\u003e\nSigned-off-by: Philip Rakity \u003cprakity@marvell.com\u003e\nSigned-off-by: Chris Ball \u003ccjb@laptop.org\u003e\n" }, { "commit": "46f72b349290d2bd7aecea38f02609d814332df6", "tree": "4d9adf3578e3cc526c6756b1e5165a65ba285648", "parents": [ "d46cfba5363a163851dc768f717f34185527a472" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Tue Jan 10 09:04:37 2012 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Jan 12 11:00:28 2012 -0800" }, "message": "vfs: export symbol d_find_any_alias()\n\nCeph needs this.\n\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "a429638cac1e5c656818a45aaff78df7b743004e", "tree": "0465e0d7a431bff97a3dd5a1f91d9b30c69ae0d8", "parents": [ "5cf9a4e69c1ff0ccdd1d2b7404f95c0531355274", "9e4ce164ee3a1d07580f017069c25d180b0aa785" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 08:00:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 08:00:30 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)\n ASoC: twl6040 - Add method to query optimum PDM_DL1 gain\n ALSA: hda - Fix the lost power-setup of seconary pins after PM resume\n ALSA: usb-audio: add Yamaha MOX6/MOX8 support\n ALSA: virtuoso: add S/PDIF input support for all Xonars\n ALSA: ice1724 - Support for ooAoo SQ210a\n ALSA: ice1724 - Allow card info based on model only\n ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations\n ALSA: hdspm - Provide unique driver id based on card serial\n ASoC: Dynamically allocate the rtd device for a non-empty release()\n ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC\n ALSA: hda - Fix the detection of \"Loopback Mixing\" control for VIA codecs\n ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs\n ALSA: hda - Use auto-parser for HP laptops with cx20459 codec\n ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()\n ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()\n ALSA: hda/cirrus - support for iMac12,2 model\n ASoC: cx20442: add bias control over a platform provided regulator\n ALSA: usb-audio - Avoid flood of frame-active debug messages\n ALSA: snd-usb-us122l: Delete calls to preempt_disable\n mfd: Put WM8994 into cache only mode when suspending\n ...\n\nFix up trivial conflicts in:\n - arch/arm/mach-s3c64xx/mach-crag6410.c:\n\trenamed speyside_wm8962 to tobermory, added littlemill right\n\tnext to it\n - drivers/base/regmap/{regcache.c,regmap.c}:\n\tduplicate diff that had already come in with other changes in\n\tthe regmap tree\n" }, { "commit": "fd83240a60ecc59849420df3393e9e6d35c77683", "tree": "d85ae1c6459d5d5c01db1617011db403929578b4", "parents": [ "0b4156eb27214e81f7012458bb15d1e038db9a00" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Thu Jan 12 09:17:30 2012 +0100" }, "committer": { "name": "Jens Axboe", "email": "axboe@kernel.dk", "time": "Thu Jan 12 09:19:54 2012 +0100" }, "message": "blockdev: convert some macros to static inlines\n\nWe prefer to program in C rather than preprocessor and it fixes this\nwarning when CONFIG_BLK_DEV_INTEGRITY is not set:\n\ndrivers/md/dm-table.c: In function \u0027dm_table_set_integrity\u0027:\ndrivers/md/dm-table.c:1285:3: warning: statement with no effect [-Wunused-value]\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Jens Axboe \u003caxboe@kernel.dk\u003e\n" } ], "next": "4c4d285ad5665bfbd983b95fde8d7a477d24a361" }