)]}' { "log": [ { "commit": "deb74f5ca1f22f9e1c5da93143a250dbb96535af", "tree": "ee9eb01e5433ea50f3414a469521a4c1cfaccb7a", "parents": [ "dd775ae2549217d3ae09363e3edb305d0fa19928", "615399c84d1b8d8d8752629e5e5ab4e5044d6918" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 08:53:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 02 08:53:24 2012 -0700" }, "message": "Merge tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux\n\nPull cpumask cleanups from Rusty Russell:\n \"(Somehow forgot to send this out; it\u0027s been sitting in linux-next, and\n if you don\u0027t want it, it can sit there another cycle)\"\n\nI\u0027m a sucker for things that actually delete lines of code.\n\nFix up trivial conflict in arch/arm/kernel/kprobes.c, where Rusty fixed\na user of \u0026cpu_online_map to be cpu_online_mask, but that code got\ndeleted by commit b21d55e98ac2 (\"ARM: 7332/1: extract out code patch\nfunction from kprobes\").\n\n* tag \u0027for-linus\u0027 of git://github.com/rustyrussell/linux:\n cpumask: remove old cpu_*_map.\n documentation: remove references to cpu_*_map.\n drivers/cpufreq/db8500-cpufreq: remove references to cpu_*_map.\n remove references to cpu_*_map in arch/\n" }, { "commit": "fa2a4519cb6ad94224eb56a1341fff570fd44ea1", "tree": "02f7d676a805bd1961dfb3c86a7ea40965207365", "parents": [ "923f79743c76583ed4684e2c80c8da51a7268af3", "bde4d8b205bc3ccdf7f5a841bfbfa9896b44b1ce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 18:40:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 18:40:33 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\nPull Sam Ravnborg\u0027s sparc32 build fixes from David Miller.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc32: fix fallout from system.h removal\n" }, { "commit": "bde4d8b205bc3ccdf7f5a841bfbfa9896b44b1ce", "tree": "04f98c044d3a4c31cf2c102b616e60094d858889", "parents": [ "623ff7739e7c00fa3d55dbfd42a492a68298fd7a" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Fri Mar 30 15:53:50 2012 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 30 18:16:58 2012 -0700" }, "message": "sparc32: fix fallout from system.h removal\n\nBuild failures for the typical configs I use\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "923f79743c76583ed4684e2c80c8da51a7268af3", "tree": "e523a04c6b4cdddf70cf4adec25fa4fbbdbc5f5a", "parents": [ "a7697b945e6e5025f184d6762e7285f1c498411d", "7f3bd6c9cb8e9fa2b57bfa860cd3e734a28f48ed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 18:15:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 30 18:15:43 2012 -0700" }, "message": "Merge branch \u0027kbuild\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\nPull kbuild changes from Michal Marek:\n - Unification of cmd_uimage among archs that use it\n - make headers_check tries harder before reporting a missing\n \u003clinux/types.h\u003e include\n - kbuild portability fix for shells that do not support echo -e\n - make clean descends into samples/\n - setlocalversion grep fix\n - modpost typo fix\n - dtc warnings fix\n\n* \u0027kbuild\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n setlocalversion: Use \"grep -q\" instead of piping output to \"read dummy\"\n modpost: fix ALL_INIT_DATA_SECTIONS\n Kbuild: centralize MKIMAGE and cmd_uimage definitions\n headers_check: recursively search for linux/types.h inclusion\n scripts/Kbuild.include: Fix portability problem of \"echo -e\"\n scripts: dtc: fix compile warnings\n kbuild: clean up samples directory\n kbuild: disable -Wmissing-field-initializers for W\u003d1\n" }, { "commit": "8befc9f23c695395de011ced289c611fada22f35", "tree": "33bf26e5a1c011e20de30697c34543705dc68ae9", "parents": [ "7f55ba9c4ca9e365637e8ddee1884aea47cb20c6" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 29 22:40:52 2012 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 29 22:40:52 2012 -0700" }, "message": "sparc: Fix even more fallout from system.h split.\n\njump_label.c needs asm/cacheflush.h to get flushi().\nkgdb_64.c needs asm/cacheflush.h to get flushw_all().\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7f55ba9c4ca9e365637e8ddee1884aea47cb20c6", "tree": "b01f7701a9cb9970924077fad55feb406690523e", "parents": [ "4bde23f8751f388867766b0a62ed1ef8b7e01561" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Thu Mar 29 22:39:57 2012 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 29 22:39:57 2012 -0700" }, "message": "sparc: fix fallout from system.h split\n\nFixes this build error:\n\nkernel/signal.c: In function \u0027ptrace_stop\u0027:\nkernel/signal.c:1860:3: error: implicit declaration of function \u0027synchronize_user_stack\u0027 [-Werror\u003dimplicit-function-declaration]\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a591afc01d9e48affbacb365558a31e53c85af45", "tree": "9bb91f4eb94ec69fc4706c4944788ec5f3586063", "parents": [ "820d41cf0cd0e94a5661e093821e2e5c6b36a9d8", "31796ac4e8f0e88f5c10f1ad6dab8f19bebe44a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:12:23 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 18:12:23 2012 -0700" }, "message": "Merge branch \u0027x86-x32-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x32 support for x86-64 from Ingo Molnar:\n \"This tree introduces the X32 binary format and execution mode for x86:\n 32-bit data space binaries using 64-bit instructions and 64-bit kernel\n syscalls.\n\n This allows applications whose working set fits into a 32 bits address\n space to make use of 64-bit instructions while using a 32-bit address\n space with shorter pointers, more compressed data structures, etc.\"\n\nFix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c}\n\n* \u0027x86-x32-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)\n x32: Fix alignment fail in struct compat_siginfo\n x32: Fix stupid ia32/x32 inversion in the siginfo format\n x32: Add ptrace for x32\n x32: Switch to a 64-bit clock_t\n x32: Provide separate is_ia32_task() and is_x32_task() predicates\n x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls\n x86/x32: Fix the binutils auto-detect\n x32: Warn and disable rather than error if binutils too old\n x32: Only clear TIF_X32 flag once\n x32: Make sure TS_COMPAT is cleared for x32 tasks\n fs: Remove missed -\u003efds_bits from cessation use of fd_set structs internally\n fs: Fix close_on_exec pointer in alloc_fdtable\n x32: Drop non-__vdso weak symbols from the x32 VDSO\n x32: Fix coding style violations in the x32 VDSO code\n x32: Add x32 VDSO support\n x32: Allow x32 to be configured\n x32: If configured, add x32 system calls to system call tables\n x32: Handle process creation\n x32: Signal-related system calls\n x86: Add #ifdef CONFIG_COMPAT to \u003casm/sys_ia32.h\u003e\n ...\n" }, { "commit": "50483c3268918ee51a56d1baa39b9149d2d0d521", "tree": "2fb9c927c319628ebddfd118c10df3e626bdd1c4", "parents": [ "7fda0412c5f7afdd1a5ff518f98dee5157266d8a", "1631fcea8399da5e80a80084b3b8c5bfd99d21e7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 14:49:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 14:49:45 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\nPull arch/tile (really asm-generic) update from Chris Metcalf:\n \"These are a couple of asm-generic changes that apply to tile.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n compat: use sys_sendfile64() implementation for sendfile syscall\n [PATCH v3] ipc: provide generic compat versions of IPC syscalls\n" }, { "commit": "0b5f9c005def154f9c21f9be0223b65b50d54368", "tree": "bbee9b3e549acc5886d1022c2aad46d5abfdd22e", "parents": [ "b5174fa3a7f4f8f150bfa3b917c92608953dfa0f" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Mar 29 15:38:30 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Mar 29 15:38:30 2012 +1030" }, "message": "remove references to cpu_*_map in arch/\n\nThis has been obsolescent for a while; time for the final push.\n\nIn adjacent context, replaced old cpus_* with cpumask_*.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e (arch/sparc)\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e (arch/tile)\nCc: user-mode-linux-devel@lists.sourceforge.net\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: linux-arm-kernel@lists.infradead.org\nCc: Richard Kuo \u003crkuo@codeaurora.org\u003e\nCc: linux-hexagon@vger.kernel.org\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: linux-mips@linux-mips.org\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nCc: sparclinux@vger.kernel.org\n" }, { "commit": "0195c00244dc2e9f522475868fa278c473ba7339", "tree": "f97ca98ae64ede2c33ad3de05ed7bbfa4f4495ed", "parents": [ "f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5", "141124c02059eee9dbc5c86ea797b1ca888e77f7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 28 15:58:21 2012 -0700" }, "message": "Merge tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system\n\nPull \"Disintegrate and delete asm/system.h\" from David Howells:\n \"Here are a bunch of patches to disintegrate asm/system.h into a set of\n separate bits to relieve the problem of circular inclusion\n dependencies.\n\n I\u0027ve built all the working defconfigs from all the arches that I can\n and made sure that they don\u0027t break.\n\n The reason for these patches is that I recently encountered a circular\n dependency problem that came about when I produced some patches to\n optimise get_order() by rewriting it to use ilog2().\n\n This uses bitops - and on the SH arch asm/bitops.h drags in\n asm-generic/get_order.h by a circuituous route involving asm/system.h.\n\n The main difficulty seems to be asm/system.h. It holds a number of\n low level bits with no/few dependencies that are commonly used (eg.\n memory barriers) and a number of bits with more dependencies that\n aren\u0027t used in many places (eg. switch_to()).\n\n These patches break asm/system.h up into the following core pieces:\n\n (1) asm/barrier.h\n\n Move memory barriers here. This already done for MIPS and Alpha.\n\n (2) asm/switch_to.h\n\n Move switch_to() and related stuff here.\n\n (3) asm/exec.h\n\n Move arch_align_stack() here. Other process execution related bits\n could perhaps go here from asm/processor.h.\n\n (4) asm/cmpxchg.h\n\n Move xchg() and cmpxchg() here as they\u0027re full word atomic ops and\n frequently used by atomic_xchg() and atomic_cmpxchg().\n\n (5) asm/bug.h\n\n Move die() and related bits.\n\n (6) asm/auxvec.h\n\n Move AT_VECTOR_SIZE_ARCH here.\n\n Other arch headers are created as needed on a per-arch basis.\"\n\nFixed up some conflicts from other header file cleanups and moving code\naround that has happened in the meantime, so David\u0027s testing is somewhat\nweakened by that. We\u0027ll find out anything that got broken and fix it..\n\n* tag \u0027split-asm_system_h-for-linus-20120328\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)\n Delete all instances of asm/system.h\n Remove all #inclusions of asm/system.h\n Add #includes needed to permit the removal of asm/system.h\n Move all declarations of free_initmem() to linux/mm.h\n Disintegrate asm/system.h for OpenRISC\n Split arch_align_stack() out from asm-generic/system.h\n Split the switch_to() wrapper out of asm-generic/system.h\n Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h\n Create asm-generic/barrier.h\n Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h\n Disintegrate asm/system.h for Xtensa\n Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]\n Disintegrate asm/system.h for Tile\n Disintegrate asm/system.h for Sparc\n Disintegrate asm/system.h for SH\n Disintegrate asm/system.h for Score\n Disintegrate asm/system.h for S390\n Disintegrate asm/system.h for PowerPC\n Disintegrate asm/system.h for PA-RISC\n Disintegrate asm/system.h for MN10300\n ...\n" }, { "commit": "141124c02059eee9dbc5c86ea797b1ca888e77f7", "tree": "ee5feb86df07f0f0de1350dd569767ec31537869", "parents": [ "9ffc93f203c18a70623f21950f1dd473c9ec48cd" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Delete all instances of asm/system.h\n\nDelete all instances of asm/system.h as they should be redundant by this\npoint.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\n" }, { "commit": "49a7f04a4b9d45cd794741ce3d5d66524b37bdd0", "tree": "74f7df3f508691bd73597119a537f810cf43d2ef", "parents": [ "705f4502bb9592ad0e8fb1cd2ba5ae4ce955ff8b" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Move all declarations of free_initmem() to linux/mm.h\n\nMove all declarations of free_initmem() to linux/mm.h so that there\u0027s only one\nand it\u0027s used by everything.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\ncc: linux-c6x-dev@linux-c6x.org\ncc: microblaze-uclinux@itee.uq.edu.au\ncc: linux-sh@vger.kernel.org\ncc: sparclinux@vger.kernel.org\ncc: x86@kernel.org\ncc: linux-mm@kvack.org\n" }, { "commit": "d550bbd40c0e10aefa05103dadbe0ae42e683707", "tree": "c1f32662f605f2b87c73901fbf66d12b2ca69b04", "parents": [ "e839ca528718e68cad32a307dc9aabf01ef3eb05" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 28 18:30:03 2012 +0100" }, "message": "Disintegrate asm/system.h for Sparc\n\nDisintegrate asm/system.h for Sparc.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\ncc: sparclinux@vger.kernel.org\n" }, { "commit": "cb52d8970eee65bf2c47d9a91bd4f58b17f595f4", "tree": "43521ba99805f293e09a284901cb5435afeab789", "parents": [ "1d9a47315042606b4217691bcea36cfa6ccbde66" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Mar 26 19:06:30 2012 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Mar 28 11:33:24 2012 +1100" }, "message": "powerpc+sparc/vio: Modernize driver registration\n\nThis makes vio_register_driver() get the module owner \u0026 name at compile\ntime like PCI drivers do, and adds a name pointer directly in struct\nvio_driver to avoid having to explicitly initialize the embedded\nstruct device.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e33936451484b06b61b259172fa3761a7d1cd4dc", "tree": "acdbb021fc7f3ba4c13adbd70059f7a7c70c9803", "parents": [ "f75a8df3bd6466e29a4e40b86b2cfc96fe06d328" ], "author": { "name": "Stephen Warren", "email": "swarren@wwwdotorg.org", "time": "Fri Mar 16 15:03:55 2012 -0600" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Mon Mar 26 15:49:20 2012 +0200" }, "message": "Kbuild: centralize MKIMAGE and cmd_uimage definitions\n\nAll ARCHs have the same definition of MKIMAGE. Move it to Makefile.lib\nto avoid duplication.\n\nAll ARCHs have similar definitions of cmd_uimage. Place a sufficiently\nparameterized version in Makefile.lib to avoid duplication.\n\nSigned-off-by: Stephen Warren \u003cswarren@wwwdotorg.org\u003e\nAcked-by: Nicolas Pitre \u003cnico@linaro.org\u003e\nTested-by: Mike Frysinger \u003cvapier@gentoo.org\u003e [Blackfin]\nTested-by: Michal Simek \u003cmonstr@monstr.eu\u003e [Microblaze]\nTested-by: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e [unicore32]\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "ed2d265d1266736bd294332d7f649003943ae36e", "tree": "860e5b7bb72933e4a9abacdc2f2d75a0e6254e32", "parents": [ "f1d38e423a697b7aa06e12d3ca4753bcc1aa3531", "6c03438edeb5c359af35f060ea016ca65671c269" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 24 10:08:39 2012 -0700" }, "message": "Merge tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull \u003clinux/bug.h\u003e cleanup from Paul Gortmaker:\n \"The changes shown here are to unify linux\u0027s BUG support under the one\n \u003clinux/bug.h\u003e file. Due to historical reasons, we have some BUG code\n in bug.h and some in kernel.h -- i.e. the support for BUILD_BUG in\n linux/kernel.h predates the addition of linux/bug.h, but old code in\n kernel.h wasn\u0027t moved to bug.h at that time. As a band-aid, kernel.h\n was including \u003casm/bug.h\u003e to pseudo link them.\n\n This has caused confusion[1] and general yuck/WTF[2] reactions. Here\n is an example that violates the principle of least surprise:\n\n CC lib/string.o\n lib/string.c: In function \u0027strlcat\u0027:\n lib/string.c:225:2: error: implicit declaration of function \u0027BUILD_BUG_ON\u0027\n make[2]: *** [lib/string.o] Error 1\n $\n $ grep linux/bug.h lib/string.c\n #include \u003clinux/bug.h\u003e\n $\n\n We\u0027ve included \u003clinux/bug.h\u003e for the BUG infrastructure and yet we\n still get a compile fail! [We\u0027ve not kernel.h for BUILD_BUG_ON.] Ugh -\n very confusing for someone who is new to kernel development.\n\n With the above in mind, the goals of this changeset are:\n\n 1) find and fix any include/*.h files that were relying on the\n implicit presence of BUG code.\n 2) find and fix any C files that were consuming kernel.h and hence\n relying on implicitly getting some/all BUG code.\n 3) Move the BUG related code living in kernel.h to \u003clinux/bug.h\u003e\n 4) remove the asm/bug.h from kernel.h to finally break the chain.\n\n During development, the order was more like 3-4, build-test, 1-2. But\n to ensure that git history for bisect doesn\u0027t get needless build\n failures introduced, the commits have been reorderd to fix the problem\n areas in advance.\n\n\t[1] https://lkml.org/lkml/2012/1/3/90\n\t[2] https://lkml.org/lkml/2012/1/17/414\"\n\nFix up conflicts (new radeon file, reiserfs header cleanups) as per Paul\nand linux-next.\n\n* tag \u0027bug-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n kernel.h: doesn\u0027t explicitly use bug.h, so don\u0027t include it.\n bug: consolidate BUILD_BUG_ON with other bug code\n BUG: headers with BUG/BUG_ON etc. need linux/bug.h\n bug.h: add include of it to various implicit C users\n lib: fix implicit users of kernel.h for TAINT_WARN\n spinlock: macroize assert_spin_locked to avoid bug.h dependency\n x86: relocate get/set debugreg fcns to include/asm/debugreg.\n" }, { "commit": "8e3ade251bc7c0a4f0777df4dd34343a03efadba", "tree": "6c0b78731e3d6609057951d07660efbd90992ad0", "parents": [ "e317234975cb7463b8ca21a93bb6862d9dcf113f", "e075f59152890ffd7e3d704afc997dd686c8a781" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:59:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:59:10 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge second batch of patches from Andrew Morton:\n - various misc things\n - core kernel changes to prctl, exit, exec, init, etc.\n - kernel/watchdog.c updates\n - get_maintainer\n - MAINTAINERS\n - the backlight driver queue\n - core bitops code cleanups\n - the led driver queue\n - some core prio_tree work\n - checkpatch udpates\n - largeish crc32 update\n - a new poll() feature for the v4l guys\n - the rtc driver queue\n - fatfs\n - ptrace\n - signals\n - kmod/usermodehelper updates\n - coredump\n - procfs updates\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (141 commits)\n seq_file: add seq_set_overflow(), seq_overflow()\n proc-ns: use d_set_d_op() API to set dentry ops in proc_ns_instantiate().\n procfs: speed up /proc/pid/stat, statm\n procfs: add num_to_str() to speed up /proc/stat\n proc: speed up /proc/stat handling\n fs/proc/kcore.c: make get_sparsemem_vmemmap_info() static\n coredump: add VM_NODUMP, MADV_NODUMP, MADV_CLEAR_NODUMP\n coredump: remove VM_ALWAYSDUMP flag\n kmod: make __request_module() killable\n kmod: introduce call_modprobe() helper\n usermodehelper: ____call_usermodehelper() doesn\u0027t need do_exit()\n usermodehelper: kill umh_wait, renumber UMH_* constants\n usermodehelper: implement UMH_KILLABLE\n usermodehelper: introduce umh_complete(sub_info)\n usermodehelper: use UMH_WAIT_PROC consistently\n signal: zap_pid_ns_processes: s/SEND_SIG_NOINFO/SEND_SIG_FORCED/\n signal: oom_kill_task: use SEND_SIG_FORCED instead of force_sig()\n signal: cosmetic, s/from_ancestor_ns/force/ in prepare_signal() paths\n signal: give SEND_SIG_FORCED more power to beat SIGNAL_UNKILLABLE\n Hexagon: use set_current_blocked() and block_sigmask()\n ...\n" }, { "commit": "d314d74c695f967e10598467a326f41c78ed1e20", "tree": "71fabe9cf1f2b99f16f7f9cc3f809955038a2d0c", "parents": [ "b502bd1152472dc1b98c60434f23c23b280c7b94" ], "author": { "name": "Cong Wang", "email": "xiyou.wangcong@gmail.com", "time": "Fri Mar 23 15:01:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 16:58:31 2012 -0700" }, "message": "nmi watchdog: do not use cpp symbol in Kconfig\n\nARCH_HAS_NMI_WATCHDOG is a macro defined by arch, but config\nHARDLOCKUP_DETECTOR depends on it. This is wrong, ARCH_HAS_NMI_WATCHDOG\nhas to be a Kconfig config, and arch\u0027s need it should select it\nexplicitly.\n\nSigned-off-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nAcked-by: Don Zickus \u003cdzickus@redhat.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "475c77edf826333aa61625f49d6a2bec26ecb5a6", "tree": "8e1c6c319e347cd3c649fdb0b3ab45971c6b19e7", "parents": [ "934e18b5cb4531cc6e81865bf54115cfd21d1ac6", "1488d5158dcd612fcdaf6b642451b026ee8bbcbb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 14:02:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 23 14:02:12 2012 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci\n\nPull PCI changes (including maintainer change) from Jesse Barnes:\n \"This pull has some good cleanups from Bjorn and Yinghai, as well as\n some more code from Yinghai to better handle resource re-allocation\n when enabled.\n\n There\u0027s also a new initcall_debug feature from Arjan which will print\n out quirk timing information to help identify slow quirks for fixing\n or refinement (Yinghai sent in a few patches to do just that once the\n new debug code landed).\n\n Beyond that, I\u0027m handing off PCI maintainership to Bjorn Helgaas.\n He\u0027s been a core PCI and Linux contributor for some time now, and has\n kindly volunteered to take over. I just don\u0027t feel I have the time\n for PCI review and work that it deserves lately (I\u0027ve taken on some\n other projects), and haven\u0027t been as responsive lately as I\u0027d like, so\n I approached Bjorn asking if he\u0027d like to manage things. He\u0027s going\n to give it a try, and I\u0027m confident he\u0027ll do at least as well as I\n have in keeping the tree managed, patches flowing, and keeping things\n stable.\"\n\nFix up some fairly trivial conflicts due to other cleanups (mips device\nresource fixup cleanups clashing with list handling cleanup, ppc iseries\nremoval clashing with pci_probe_only cleanup etc)\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (112 commits)\n PCI: Bjorn gets PCI hotplug too\n PCI: hand PCI maintenance over to Bjorn Helgaas\n unicore32/PCI: move \u003casm-generic/pci-bridge.h\u003e include to asm/pci.h\n sparc/PCI: convert devtree and arch-probed bus addresses to resource\n powerpc/PCI: allow reallocation on PA Semi\n powerpc/PCI: convert devtree bus addresses to resource\n powerpc/PCI: compute I/O space bus-to-resource offset consistently\n arm/PCI: don\u0027t export pci_flags\n PCI: fix bridge I/O window bus-to-resource conversion\n x86/PCI: add spinlock held check to \u0027pcibios_fwaddrmap_lookup()\u0027\n PCI / PCIe: Introduce command line option to disable ARI\n PCI: make acpihp use __pci_remove_bus_device instead\n PCI: export __pci_remove_bus_device\n PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge\n PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device\n PCI: print out PCI device info along with duration\n PCI: Move \"pci reassigndev resource alignment\" out of quirks.c\n PCI: Use class for quirk for usb host controller fixup\n PCI: Use class for quirk for ti816x class fixup\n PCI: Use class for quirk for intel e100 interrupt fixup\n ...\n" }, { "commit": "ce24d8a14207c2036df86d2bd3d14b4393eb51e3", "tree": "41644b88fc0b226c7fcf1c935ac262a07e94aac1", "parents": [ "d12f7c4a2f5d5c03ace0543d8cc70966c54d0692" ], "author": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Wed Mar 21 16:33:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:55 2012 -0700" }, "message": "sparc: use block_sigmask()\n\nUse the new helper function introduced in commit 5e6292c0f28f (\"signal:\nadd block_sigmask() for adding sigmask to current-\u003eblocked\") which\ncentralises the code for updating current-\u003eblocked after successfully\ndelivering a signal and reduces the amount of duplicate code across\narchitectures. In the past some architectures got this code wrong, so\nusing this helper function should stop that from happening again.\n\nAcked-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c207f3a43194e108dda43dc9a1ce507335cff6b9", "tree": "55880f8301e8546b1908f69947d0d41aaa044814", "parents": [ "c7c66c0cb0c77b1a8edf09bca57d922312d58030", "e7cc3aca0f6a36b018934264ee20bee45dc13e29" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:27:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:27:19 2012 -0700" }, "message": "Merge tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull irq_domain support for all architectures from Grant Likely:\n \"Generialize powerpc\u0027s irq_host as irq_domain\n\n This branch takes the PowerPC irq_host infrastructure (reverse mapping\n from Linux IRQ numbers to hardware irq numbering), generalizes it,\n renames it to irq_domain, and makes it available to all architectures.\n\n Originally the plan has been to create an all-new irq_domain\n implementation which addresses some of the powerpc shortcomings such\n as not handling 1:1 mappings well, but doing that proved to be far\n more difficult and invasive than generalizing the working code and\n refactoring it in-place. So, this branch rips out the \u0027new\u0027\n irq_domain and replaces it with the modified powerpc version (in a\n fully bisectable way of course). It converts all users over to the\n new API and makes irq_domain selectable on any architecture.\n\n No architecture is forced to enable irq_domain, but the infrastructure\n is required for doing OpenFirmware style irq translations. It will\n even work on SPARC even though SPARC has it\u0027s own mechanism for\n translating irqs at boot time. MIPS, microblaze, embedded x86 and c6x\n are converted too.\n\n The resulting irq_domain code is probably still too verbose and can be\n optimized more, but that can be done incrementally and is a task for\n follow-on patches.\"\n\n* tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6: (31 commits)\n dt: fix twl4030 for non-dt compile on x86\n mfd: twl-core: Add IRQ_DOMAIN dependency\n devicetree: Add empty of_platform_populate() for !CONFIG_OF_ADDRESS (sparc)\n irq_domain: Centralize definition of irq_dispose_mapping()\n irq_domain/mips: Allow irq_domain on MIPS\n irq_domain/x86: Convert x86 (embedded) to use common irq_domain\n ppc-6xx: fix build failure in flipper-pic.c and hlwd-pic.c\n irq_domain/microblaze: Convert microblaze to use irq_domains\n irq_domain/powerpc: Replace custom xlate functions with library functions\n irq_domain/powerpc: constify irq_domain_ops\n irq_domain/c6x: Use library of xlate functions\n irq_domain/c6x: constify irq_domain structures\n irq_domain/c6x: Convert c6x to use generic irq_domain support.\n irq_domain: constify irq_domain_ops\n irq_domain: Create common xlate functions that device drivers can use\n irq_domain: Remove irq_domain_add_simple()\n irq_domain: Remove \u0027new\u0027 irq_domain in favour of the ppc one\n mfd: twl-core.c: Fix the number of interrupts managed by twl4030\n of/address: add empty static inlines for !CONFIG_OF\n irq_domain: Add support for base irq and hwirq in legacy mappings\n ...\n" }, { "commit": "9f3938346a5c1fa504647670edb5fea5756cfb00", "tree": "7cf6d24d6b076c8db8571494984924cac03703a2", "parents": [ "69a7aebcf019ab3ff5764525ad6858fbe23bb86d", "317b6e128247f75976b0fc2b9fd8d2c20ef13b3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 09:40:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 09:40:26 2012 -0700" }, "message": "Merge branch \u0027kmap_atomic\u0027 of git://github.com/congwang/linux\n\nPull kmap_atomic cleanup from Cong Wang.\n\nIt\u0027s been in -next for a long time, and it gets rid of the (no longer\nused) second argument to k[un]map_atomic().\n\nFix up a few trivial conflicts in various drivers, and do an \"evil\nmerge\" to catch some new uses that have come in since Cong\u0027s tree.\n\n* \u0027kmap_atomic\u0027 of git://github.com/congwang/linux: (59 commits)\n feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal\n highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]\n drbd: remove the second argument of k[un]map_atomic()\n zcache: remove the second argument of k[un]map_atomic()\n gma500: remove the second argument of k[un]map_atomic()\n dm: remove the second argument of k[un]map_atomic()\n tomoyo: remove the second argument of k[un]map_atomic()\n sunrpc: remove the second argument of k[un]map_atomic()\n rds: remove the second argument of k[un]map_atomic()\n net: remove the second argument of k[un]map_atomic()\n mm: remove the second argument of k[un]map_atomic()\n lib: remove the second argument of k[un]map_atomic()\n power: remove the second argument of k[un]map_atomic()\n kdb: remove the second argument of k[un]map_atomic()\n udf: remove the second argument of k[un]map_atomic()\n ubifs: remove the second argument of k[un]map_atomic()\n squashfs: remove the second argument of k[un]map_atomic()\n reiserfs: remove the second argument of k[un]map_atomic()\n ocfs2: remove the second argument of k[un]map_atomic()\n ntfs: remove the second argument of k[un]map_atomic()\n ...\n" }, { "commit": "3b59bf081622b6446db77ad06c93fe23677bc533", "tree": "3f4bb5a27c90cc86994a1f6d3c53fbf9208003cb", "parents": [ "e45836fafe157df137a837093037f741ad8f4c90", "bbdb32cb5b73597386913d052165423b9d736145" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking merge from David Miller:\n \"1) Move ixgbe driver over to purely page based buffering on receive.\n From Alexander Duyck.\n\n 2) Add receive packet steering support to e1000e, from Bruce Allan.\n\n 3) Convert TCP MD5 support over to RCU, from Eric Dumazet.\n\n 4) Reduce cpu usage in handling out-of-order TCP packets on modern\n systems, also from Eric Dumazet.\n\n 5) Support the IP{,V6}_UNICAST_IF socket options, making the wine\n folks happy, from Erich Hoover.\n\n 6) Support VLAN trunking from guests in hyperv driver, from Haiyang\n Zhang.\n\n 7) Support byte-queue-limtis in r8169, from Igor Maravic.\n\n 8) Outline code intended for IP_RECVTOS in IP_PKTOPTIONS existed but\n was never properly implemented, Jiri Benc fixed that.\n\n 9) 64-bit statistics support in r8169 and 8139too, from Junchang Wang.\n\n 10) Support kernel side dump filtering by ctmark in netfilter\n ctnetlink, from Pablo Neira Ayuso.\n\n 11) Support byte-queue-limits in gianfar driver, from Paul Gortmaker.\n\n 12) Add new peek socket options to assist with socket migration, from\n Pavel Emelyanov.\n\n 13) Add sch_plug packet scheduler whose queue is controlled by\n userland daemons using explicit freeze and release commands. From\n Shriram Rajagopalan.\n\n 14) Fix FCOE checksum offload handling on transmit, from Yi Zou.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1846 commits)\n Fix pppol2tp getsockname()\n Remove printk from rds_sendmsg\n ipv6: fix incorrent ipv6 ipsec packet fragment\n cpsw: Hook up default ndo_change_mtu.\n net: qmi_wwan: fix build error due to cdc-wdm dependecy\n netdev: driver: ethernet: Add TI CPSW driver\n netdev: driver: ethernet: add cpsw address lookup engine support\n phy: add am79c874 PHY support\n mlx4_core: fix race on comm channel\n bonding: send igmp report for its master\n fs_enet: Add MPC5125 FEC support and PHY interface selection\n net: bpf_jit: fix BPF_S_LDX_B_MSH compilation\n net: update the usage of CHECKSUM_UNNECESSARY\n fcoe: use CHECKSUM_UNNECESSARY instead of CHECKSUM_PARTIAL on tx\n net: do not do gso for CHECKSUM_UNNECESSARY in netif_needs_gso\n ixgbe: Fix issues with SR-IOV loopback when flow control is disabled\n net/hyperv: Fix the code handling tx busy\n ixgbe: fix namespace issues when FCoE/DCB is not enabled\n rtlwifi: Remove unused ETH_ADDR_LEN defines\n igbvf: Use ETH_ALEN\n ...\n\nFix up fairly trivial conflicts in drivers/isdn/gigaset/interface.c and\ndrivers/net/usb/{Kconfig,qmi_wwan.c} as per David.\n" }, { "commit": "a031589bc04086250d0a4d89dd277a70d74ed8fa", "tree": "8e5be9945ffc950952d86b970c92af8738a9fe45", "parents": [ "c0f209468e8b6c81b28f6417e7d88c99171d20b6" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Fri Mar 16 17:48:24 2012 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Mar 20 10:42:01 2012 -0700" }, "message": "sparc/PCI: convert devtree and arch-probed bus addresses to resource\n\nNormal PCI enumeration via PCI config space uses __pci_read_base(), where\nthe PCI core applies any bus-to-resource offset. But sparc sometimes\nreads PCI config space itself, and sometimes it gets addresses from the\ndevice tree.\n\nIn ac1edcc579b6, I converted sparc to use the PCI core bus-to-resource\nconversion, but I missed these sparc-specific paths. I don\u0027t have a way\nto test it, but I think sparc is broken between that commit and this one.\n\nThis patch replaces the sparc-specific pci_resource_adjust() with the\ngeneric pcibios_bus_to_resource() in the following paths:\n\n pci_cfg_fake_ranges() (addresses read from PCI config)\n apb_fake_ranges() (addresses computed based on PCI config)\n of_scan_pci_bridge() (addresses from OF \"ranges\" property)\n\nN.B.: Resources of non-P2P bridge devices are set in pci_parse_of_addrs()\nand, as far as I can see, never converted to CPU addresses. I do not\nunderstand why these would be treated differently than bridge windows.\n\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCC: sparclinux@vger.kernel.org\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "2ba68940c893c8f0bfc8573c041254251bb6aeab", "tree": "fa83ebb01d32abd98123fa28f9f6f0b3eaeee25d", "parents": [ "9c2b957db1772ebf942ae7a9346b14eba6c8ca66", "600e145882802d6ccbfe2c4aea243d97caeb91a9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:31:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:31:44 2012 -0700" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler changes for v3.4 from Ingo Molnar\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)\n printk: Make it compile with !CONFIG_PRINTK\n sched/x86: Fix overflow in cyc2ns_offset\n sched: Fix nohz load accounting -- again!\n sched: Update yield() docs\n printk/sched: Introduce special printk_sched() for those awkward moments\n sched/nohz: Correctly initialize \u0027next_balance\u0027 in \u0027nohz\u0027 idle balancer\n sched: Cleanup cpu_active madness\n sched: Fix load-balance wreckage\n sched: Clean up parameter passing of proc_sched_autogroup_set_nice()\n sched: Ditch per cgroup task lists for load-balancing\n sched: Rename load-balancing fields\n sched: Move load-balancing arguments into helper struct\n sched/rt: Do not submit new work when PI-blocked\n sched/rt: Prevent idle task boosting\n sched/wait: Add __wake_up_all_locked() API\n sched/rt: Document scheduler related skip-resched-check sites\n sched/rt: Use schedule_preempt_disabled()\n sched/rt: Add schedule_preempt_disabled()\n sched/rt: Do not throttle when PI boosting\n sched/rt: Keep period timer ticking when rt throttling is active\n ...\n" }, { "commit": "9c2b957db1772ebf942ae7a9346b14eba6c8ca66", "tree": "0dbb83e57260ea7fc0dc421f214d5f1b26262005", "parents": [ "0bbfcaff9b2a69c71a95e6902253487ab30cb498", "bea95c152dee1791dd02cbc708afbb115bb00f9a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:29:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:29:15 2012 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf events changes for v3.4 from Ingo Molnar:\n\n - New \"hardware based branch profiling\" feature both on the kernel and\n the tooling side, on CPUs that support it. (modern x86 Intel CPUs\n with the \u0027LBR\u0027 hardware feature currently.)\n\n This new feature is basically a sophisticated \u0027magnifying glass\u0027 for\n branch execution - something that is pretty difficult to extract from\n regular, function histogram centric profiles.\n\n The simplest mode is activated via \u0027perf record -b\u0027, and the result\n looks like this in perf report:\n\n\t$ perf record -b any_call,u -e cycles:u branchy\n\n\t$ perf report -b --sort\u003dsymbol\n\t 52.34% [.] main [.] f1\n\t 24.04% [.] f1 [.] f3\n\t 23.60% [.] f1 [.] f2\n\t 0.01% [k] _IO_new_file_xsputn [k] _IO_file_overflow\n\t 0.01% [k] _IO_vfprintf_internal [k] _IO_new_file_xsputn\n\t 0.01% [k] _IO_vfprintf_internal [k] strchrnul\n\t 0.01% [k] __printf [k] _IO_vfprintf_internal\n\t 0.01% [k] main [k] __printf\n\n This output shows from/to branch columns and shows the highest\n percentage (from,to) jump combinations - i.e. the most likely taken\n branches in the system. \"branches\" can also include function calls\n and any other synchronous and asynchronous transitions of the\n instruction pointer that are not \u0027next instruction\u0027 - such as system\n calls, traps, interrupts, etc.\n\n This feature comes with (hopefully intuitive) flat ascii and TUI\n support in perf report.\n\n - Various \u0027perf annotate\u0027 visual improvements for us assembly junkies.\n It will now recognize function calls in the TUI and by hitting enter\n you can follow the call (recursively) and back, amongst other\n improvements.\n\n - Multiple threads/processes recording support in perf record, perf\n stat, perf top - which is activated via a comma-list of PIDs:\n\n\tperf top -p 21483,21485\n\tperf stat -p 21483,21485 -ddd\n\tperf record -p 21483,21485\n\n - Support for per UID views, via the --uid paramter to perf top, perf\n report, etc. For example \u0027perf top --uid mingo\u0027 will only show the\n tasks that I am running, excluding other users, root, etc.\n\n - Jump label restructurings and improvements - this includes the\n factoring out of the (hopefully much clearer) include/linux/static_key.h\n generic facility:\n\n\tstruct static_key key \u003d STATIC_KEY_INIT_FALSE;\n\n\t...\n\n\tif (static_key_false(\u0026key))\n\t do unlikely code\n\telse\n\t do likely code\n\n\t...\n\tstatic_key_slow_inc();\n\t...\n\tstatic_key_slow_inc();\n\t...\n\n The static_key_false() branch will be generated into the code with as\n little impact to the likely code path as possible. the\n static_key_slow_*() APIs flip the branch via live kernel code patching.\n\n This facility can now be used more widely within the kernel to\n micro-optimize hot branches whose likelihood matches the static-key\n usage and fast/slow cost patterns.\n\n - SW function tracer improvements: perf support and filtering support.\n\n - Various hardenings of the perf.data ABI, to make older perf.data\u0027s\n smoother on newer tool versions, to make new features integrate more\n smoothly, to support cross-endian recording/analyzing workflows\n better, etc.\n\n - Restructuring of the kprobes code, the splitting out of \u0027optprobes\u0027,\n and a corner case bugfix.\n\n - Allow the tracing of kernel console output (printk).\n\n - Improvements/fixes to user-space RDPMC support, allowing user-space\n self-profiling code to extract PMU counts without performing any\n system calls, while playing nice with the kernel side.\n\n - \u0027perf bench\u0027 improvements\n\n - ... and lots of internal restructurings, cleanups and fixes that made\n these features possible. And, as usual this list is incomplete as\n there were also lots of other improvements\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (120 commits)\n perf report: Fix annotate double quit issue in branch view mode\n perf report: Remove duplicate annotate choice in branch view mode\n perf/x86: Prettify pmu config literals\n perf report: Enable TUI in branch view mode\n perf report: Auto-detect branch stack sampling mode\n perf record: Add HEADER_BRANCH_STACK tag\n perf record: Provide default branch stack sampling mode option\n perf tools: Make perf able to read files from older ABIs\n perf tools: Fix ABI compatibility bug in print_event_desc()\n perf tools: Enable reading of perf.data files from different ABI rev\n perf: Add ABI reference sizes\n perf report: Add support for taken branch sampling\n perf record: Add support for sampling taken branch\n perf tools: Add code to support PERF_SAMPLE_BRANCH_STACK\n x86/kprobes: Split out optprobe related code to kprobes-opt.c\n x86/kprobes: Fix a bug which can modify kernel code permanently\n x86/kprobes: Fix instruction recovery on optimized path\n perf: Add callback to flush branch_stack on context switch\n perf: Disable PERF_SAMPLE_BRANCH_* when not supported\n perf/x86: Add LBR software filter support for Intel CPUs\n ...\n" }, { "commit": "a24401bcf4a67c8fe17e649e74eeb09b08b79ef5", "tree": "c4b1be87e0a63057e85ae82076d54c437313b1f8", "parents": [ "589973a7042f5a91a5b8bf78a32c97ae073e2c72" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Sat Nov 26 10:53:39 2011 +0800" }, "committer": { "name": "Cong Wang", "email": "xiyou.wangcong@gmail.com", "time": "Tue Mar 20 21:48:30 2012 +0800" }, "message": "highmem: kill all __kmap_atomic()\n[swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\n" }, { "commit": "4da0bd736552e6377b407b3c3d3ae518ebbdd269", "tree": "f0da9f843b8033565c3ca4103fccb17a60688326", "parents": [ "81a430ac1b88b0702c57d2513e247317e810e04d", "c16fa4f2ad19908a47c63d8fa436a1178438c7e7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 18 23:29:41 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 18 23:29:41 2012 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "48b25c43e6eebb6c0edf72935e8720385beca76b", "tree": "d1c774a79ef5a8373b093479c3dabe9bf16aec07", "parents": [ "fde7d9049e55ab85a390be7f415d74c9f62dd0f9" ], "author": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Thu Mar 15 13:13:38 2012 -0400" }, "committer": { "name": "Chris Metcalf", "email": "cmetcalf@tilera.com", "time": "Thu Mar 15 13:13:38 2012 -0400" }, "message": "[PATCH v3] ipc: provide generic compat versions of IPC syscalls\n\nWhen using the \"compat\" APIs, architectures will generally want to\nbe able to make direct syscalls to msgsnd(), shmctl(), etc., and\nin the kernel we would want them to be handled directly by\ncompat_sys_xxx() functions, as is true for other compat syscalls.\n\nHowever, for historical reasons, several of the existing compat IPC\nsyscalls do not do this. semctl() expects a pointer to the fourth\nargument, instead of the fourth argument itself. msgsnd(), msgrcv()\nand shmat() expect arguments in different order.\n\nThis change adds an ARCH_WANT_OLD_COMPAT_IPC config option that can be\nset to preserve this behavior for ports that use it (x86, sparc, powerpc,\ns390, and mips). No actual semantics are changed for those architectures,\nand there is only a minimal amount of code refactoring in ipc/compat.c.\n\nNewer architectures like tile (and perhaps future architectures such\nas arm64 and unicore64) should not select this option, and thus can\navoid having any IPC-specific code at all in their architecture-specific\ncompat layer. In the same vein, if this option is not selected, IPC_64\nmode is assumed, since that\u0027s what the \u003casm-generic\u003e headers expect.\n\nThe workaround code in \"tile\" for msgsnd() and msgrcv() is removed\nwith this change; it also fixes the bug that shmat() and semctl() were\nnot being properly handled.\n\nReviewed-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\n" }, { "commit": "e0adb9902fb338a9fe634c3c2a3e474075c733ba", "tree": "3a8ad1f18a11f848ba016a99ee564216271049e8", "parents": [ "69539ab1006f6c55cc5243fa82341bb6e59c07ed" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 13 18:19:51 2012 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 13 18:19:51 2012 -0700" }, "message": "sparc32: Add -Av8 to assembler command line.\n\nNewer version of binutils are more strict about specifying the\ncorrect options to enable certain classes of instructions.\n\nThe sparc32 build is done for v7 in order to support sun4c systems\nwhich lack hardware integer multiply and divide instructions.\n\nSo we have to pass -Av8 when building the assembler routines that\nuse these instructions and get patched into the kernel when we find\nout that we have a v8 capable cpu.\n\nReported-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2481c5fa6db0237e4f0168f88913178b2b495b7c", "tree": "4d0e8e9616c8e83ca2a72abbc3ac94621adc49be", "parents": [ "3e702ff6d1ea12dcf1c798ecb61e7f3a1579df42" ], "author": { "name": "Stephane Eranian", "email": "eranian@google.com", "time": "Thu Feb 09 23:20:59 2012 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Mar 05 14:55:42 2012 +0100" }, "message": "perf: Disable PERF_SAMPLE_BRANCH_* when not supported\n\nPERF_SAMPLE_BRANCH_* is disabled for:\n\n - SW events (sw counters, tracepoints)\n - HW breakpoints\n - ALL but Intel x86 architecture\n - AMD64 processors\n\nSigned-off-by: Stephane Eranian \u003ceranian@google.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/1328826068-11713-10-git-send-email-eranian@google.com\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "187f1882b5b0748b3c4c22274663fdb372ac0452", "tree": "36283f258cf65f03599a045d48bb05d0ec27f3f9", "parents": [ "50af5ead3b44ccf8bd2b4d2a50c1b610f557c480" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Nov 23 20:12:59 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun Mar 04 17:54:34 2012 -0500" }, "message": "BUG: headers with BUG/BUG_ON etc. need linux/bug.h\n\nIf a header file is making use of BUG, BUG_ON, BUILD_BUG_ON, or any\nother BUG variant in a static inline (i.e. not in a #define) then\nthat header really should be including \u003clinux/bug.h\u003e and not just\nexpecting it to be implicitly present.\n\nWe can make this change risk-free, since if the files using these\nheaders didn\u0027t have exposure to linux/bug.h already, they would have\nbeen causing compile failures/warnings.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "ba74c1448f127649046615ec017bded7b2a76f29", "tree": "33eceaf0c4b35aca095e3e1a678bdbab23006650", "parents": [ "bd2f55361f18347e890d52ff9cfd8895455ec11b" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Mar 21 13:32:17 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Mar 01 10:28:04 2012 +0100" }, "message": "sched/rt: Document scheduler related skip-resched-check sites\n\nCreate a distinction between scheduler related preempt_enable_no_resched()\ncalls and the nearly one hundred other places in the kernel that do not\nwant to reschedule, for one reason or another.\n\nThis distinction matters for -rt, where the scheduler and the non-scheduler\npreempt models (and checks) are different. For upstream it\u0027s purely\ndocumentational.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLink: http://lkml.kernel.org/n/tip-gs88fvx2mdv5psnzxnv575ke@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "bd2f55361f18347e890d52ff9cfd8895455ec11b", "tree": "5725e83f96934da2c2d741255db929df34f153eb", "parents": [ "c5491ea779793f977d282754db478157cc409d82" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Mar 21 12:33:18 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Mar 01 10:28:03 2012 +0100" }, "message": "sched/rt: Use schedule_preempt_disabled()\n\nCoccinelle based conversion.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/n/tip-24swm5zut3h9c4a6s46x8rws@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d593f25ff263b1a7752b7380f8b7d57809206c40", "tree": "5bb7355eba575cf3d28a928fdf44f435e4e6912a", "parents": [ "abd2363f6a5f1030b935e0bdc15cf917313b3b10" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Feb 24 08:24:17 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sun Feb 26 16:48:06 2012 -0700" }, "message": "irq_domain: Centralize definition of irq_dispose_mapping()\n\nSeveral architectures define their own empty irq_dispose_mapping(). Since\nthe irq_domain code is centralized now, there is little need to do so. This\npatch removes them and creates a new empty copy when !CONFIG_IRQ_DOMAIN is\nselected.\n\nThe patch also means that IRQ_DOMAIN becomes selectable on all architectures.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Rob Herring \u003crob.herring@calxeda.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jonas Bonn \u003cjonas@southpole.se\u003e\nCc: sparclinux@vger.kernel.org\nCc: linux@lists.openrisc.net\n" }, { "commit": "3bdc0eba0b8b47797f4a76e377dd8360f317450f", "tree": "da6bd907f599402bc8db0a2484997fd4d3e06f7b", "parents": [ "0184039a4b6727d6efd545919c773ef141090ae7" ], "author": { "name": "Ben Greear", "email": "greearb@candelatech.com", "time": "Sat Feb 11 15:39:30 2012 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Feb 24 01:37:35 2012 -0800" }, "message": "net: Add framework to allow sending packets with customized CRC.\n\nThis is useful for testing RX handling of frames with bad\nCRCs.\n\nRequires driver support to actually put the packet on the\nwire properly.\n\nSigned-off-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "c5905afb0ee6550b42c49213da1c22d67316c194", "tree": "253fdb322e6e5b257ffda3b9b66bce90a473a6f7", "parents": [ "1cfa60dc7d7c7cc774a44eee47ff135a644a1f31" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 24 08:31:31 2012 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Feb 24 10:05:59 2012 +0100" }, "message": "static keys: Introduce \u0027struct static_key\u0027, static_key_true()/false() and static_key_slow_[inc|dec]()\n\nSo here\u0027s a boot tested patch on top of Jason\u0027s series that does\nall the cleanups I talked about and turns jump labels into a\nmore intuitive to use facility. It should also address the\nvarious misconceptions and confusions that surround jump labels.\n\nTypical usage scenarios:\n\n #include \u003clinux/static_key.h\u003e\n\n struct static_key key \u003d STATIC_KEY_INIT_TRUE;\n\n if (static_key_false(\u0026key))\n do unlikely code\n else\n do likely code\n\nOr:\n\n if (static_key_true(\u0026key))\n do likely code\n else\n do unlikely code\n\nThe static key is modified via:\n\n static_key_slow_inc(\u0026key);\n ...\n static_key_slow_dec(\u0026key);\n\nThe \u0027slow\u0027 prefix makes it abundantly clear that this is an\nexpensive operation.\n\nI\u0027ve updated all in-kernel code to use this everywhere. Note\nthat I (intentionally) have not pushed through the rename\nblindly through to the lowest levels: the actual jump-label\npatching arch facility should be named like that, so we want to\ndecouple jump labels from the static-key facility a bit.\n\nOn non-jump-label enabled architectures static keys default to\nlikely()/unlikely() branches.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: Jason Baron \u003cjbaron@redhat.com\u003e\nAcked-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: a.p.zijlstra@chello.nl\nCc: mathieu.desnoyers@efficios.com\nCc: davem@davemloft.net\nCc: ddaney.cavm@gmail.com\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/r/20120222085809.GA26397@elte.hu\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "fb127cb9de791d62fb393d6e65fa9869bddd2460", "tree": "5cb45ac2fd5139cfc9165fead210a3ad2bb3b2a5", "parents": [ "4ba2aef3157f483fd67ac2616f14dbc32a3f751d" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Thu Feb 23 20:19:04 2012 -0700" }, "committer": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Thu Feb 23 20:19:04 2012 -0700" }, "message": "PCI: collapse pcibios_resource_to_bus\n\nEverybody uses the generic pcibios_resource_to_bus() supplied by the core\nnow, so remove the ARCH_HAS_GENERIC_PCI_OFFSETS used during conversion.\n\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\n" }, { "commit": "ac1edcc579b6554211221ee5eeac7dfc15a6da17", "tree": "fff5aa13f8f046d0cc5564e8da013491993f8758", "parents": [ "7fa6a50eb3625638d5c8fec6187d3da9d1733dca" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Thu Feb 23 20:19:04 2012 -0700" }, "committer": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Thu Feb 23 20:19:04 2012 -0700" }, "message": "sparc/PCI: get rid of device resource fixups\n\nTell the PCI core about host bridge address translation so it can take\ncare of bus-to-resource conversion for us.\n\nN.B. Leon apparently never uses initial BAR values, so it didn\u0027t matter\nthat we never fixed up the I/O resources from bus address to CPU addresses.\n\nOther sparc uses pci_of_scan_bus(), which sets device resources directly\nto CPU addresses, not bus addresses, so it didn\u0027t need pcibios_fixup_bus()\neither. But by telling the core about the offsets, we can nuke\npcibios_resource_to_bus().\n\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCC: sparclinux@vger.kernel.org\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\n" }, { "commit": "ef64a54f6e558155b4f149bb10666b9e914b6c54", "tree": "bd7adba8d802aff2aaec0f5f2a9e2ba5431cafcc", "parents": [ "da5ef6e51b327b41180b5d1000c06e8d3595a936" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Feb 21 07:31:34 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 21 15:03:48 2012 -0500" }, "message": "sock: Introduce the SO_PEEK_OFF sock option\n\nThis one specifies where to start MSG_PEEK-ing queue data from. When\nset to negative value means that MSG_PEEK works as ususally -- peeks\nfrom the head of the queue always.\n\nWhen some bytes are peeked from queue and the peeking offset is non\nnegative it is moved forward so that the next peek will return next\nportion of data.\n\nWhen non-peeking recvmsg occurs and the peeking offset is non negative\nis is moved backward so that the next peek will still peek the proper\ndata (i.e. the one that would have been picked if there were no non\npeeking recv in between).\n\nThe offset is set using per-proto opteration to let the protocol handle\nthe locking issues and to check whether the peeking offset feature is\nsupported by the protocol the socket belongs to.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8c4c7a9a0fd4217a044b33f91f1e5b2987cbfa04", "tree": "d944092ac4db61b0444746f36254cc390d9c115b", "parents": [ "81620bb7acee40dda4dbfdd061cd22c373529372" ], "author": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue Feb 07 21:09:02 2012 -0800" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@zytor.com", "time": "Tue Feb 14 12:01:30 2012 -0800" }, "message": "sparc: Use generic posix_types.h\n\nChange the sparc architecture to use \u003casm-generic/posix_types.h\u003e.\n\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nLink: http://lkml.kernel.org/r/1328677745-20121-19-git-send-email-hpa@zytor.com\n" }, { "commit": "c6df4b17c8539f737a6a2d7b797eac41e8e34cdc", "tree": "7b891178267aa9486fed1197419aac57d3036b5f", "parents": [ "86f8bedc9e1a8ddb4f1d9ff1f0c1229cc0797d6d" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Thu Feb 02 00:17:54 2012 +0200" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Feb 02 10:34:23 2012 +1100" }, "message": "lib: Fix multiple definitions of clz_tab\n\nBoth sparc 32-bit\u0027s software divide assembler and MPILIB provide\nclz_tab[] with identical contents.\n\nBreak it out into a seperate object file and select it when\nSPARC32 or MPILIB is set.\n\nReported-by: Al Viro \u003cviro@ZenIV.linux.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "c75d5c5d82146636560ad5b91f3544ae60fc1c57", "tree": "2ceb03ac95dd3f7889a2d45d72f9342e52fa7583", "parents": [ "2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1", "e51e07e0ac7e3ff847d640f41b7527db04d4a4e7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 17:00:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 26 17:00:38 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc32: forced setting of mode of sun4m per-cpu timers\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": "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": "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": "7b67e751479d50b7f84d1a3cc5216eed5e534b66", "tree": "a1a6746857cf65f04dde739fe271bf4143d55eaf", "parents": [ "9f13a1fd452f11c18004ba2422a6384b424ec8a9", "76ccc297018d25d55b789bbd508861ef1e2cdb0c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 18:50:26 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 11 18:50:26 2012 -0800" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits)\n x86/PCI: Expand the x86_msi_ops to have a restore MSIs.\n PCI: Increase resource array mask bit size in pcim_iomap_regions()\n PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES\n PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)\n PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB\n x86/PCI: amd: factor out MMCONFIG discovery\n PCI: Enable ATS at the device state restore\n PCI: msi: fix imbalanced refcount of msi irq sysfs objects\n PCI: kconfig: English typo in pci/pcie/Kconfig\n PCI/PM/Runtime: make PCI traces quieter\n PCI: remove pci_create_bus()\n xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources\n x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()\n x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()\n x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan\n sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources\n sparc/PCI: convert to pci_create_root_bus()\n sh/PCI: convert to pci_scan_root_bus() for correct root bus resources\n powerpc/PCI: convert to pci_create_root_bus()\n powerpc/PCI: split PHB part out of pcibios_map_io_space()\n ...\n\nFix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due\nto the same patches being applied in other branches.\n" }, { "commit": "e343a895a9f342f239c5e3c5ffc6c0b1707e6244", "tree": "46c81c6ae375b1f14e209b13c8ac020842807ece", "parents": [ "06792c4dde2ad143928cc95c1ba218c6269c494b", "193a667fba76b3df482cbf865228e26ee246e889" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 18:04:27 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 18:04:27 2012 -0800" }, "message": "Merge tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost\n\nlib: use generic pci_iomap on all architectures\n\nMany architectures don\u0027t want to pull in iomap.c,\nso they ended up duplicating pci_iomap from that file.\nThat function isn\u0027t trivial, and we are going to modify it\nhttps://lkml.org/lkml/2011/11/14/183\nso the duplication hurts.\n\nThis reduces the scope of the problem significantly,\nby moving pci_iomap to a separate file and\nreferencing that from all architectures.\n\n* tag \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:\n alpha: drop pci_iomap/pci_iounmap from pci-noop.c\n mn10300: switch to GENERIC_PCI_IOMAP\n mn10300: add missing __iomap markers\n frv: switch to GENERIC_PCI_IOMAP\n tile: switch to GENERIC_PCI_IOMAP\n tile: don\u0027t panic on iomap\n sparc: switch to GENERIC_PCI_IOMAP\n sh: switch to GENERIC_PCI_IOMAP\n powerpc: switch to GENERIC_PCI_IOMAP\n parisc: switch to GENERIC_PCI_IOMAP\n mips: switch to GENERIC_PCI_IOMAP\n microblaze: switch to GENERIC_PCI_IOMAP\n arm: switch to GENERIC_PCI_IOMAP\n alpha: switch to GENERIC_PCI_IOMAP\n lib: add GENERIC_PCI_IOMAP\n lib: move GENERIC_IOMAP to lib/Kconfig\n\nFix up trivial conflicts due to changes nearby in arch/{m68k,score}/Kconfig\n" }, { "commit": "f350b1778f1b7713ef54fbc7e079e09e2fe098b9", "tree": "8f14a0c2d4ebbc4aab33b14facff2e321f15938d", "parents": [ "9b467e6ebebbe75288aeb7e816ffbb5d35d6eaa3" ], "author": { "name": "Matt Fleming", "email": "matt.fleming@intel.com", "time": "Tue Jan 10 15:11:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:54 2012 -0800" }, "message": "sparc: make SA_NOMASK a synonym of SA_NODEFER\n\nUnlike other architectures, sparc currently has no SA_NODEFER definition\nbut only the older SA_NOMASK. Since SA_NOMASK is the historical name for\nSA_NODEFER, add SA_NODEFER and copy what other architectures do by making\nSA_NOMASK a synonym for SA_NODEFER.\n\nSigned-off-by: Matt Fleming \u003cmatt.fleming@intel.com\u003e\nAcked-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e51e07e0ac7e3ff847d640f41b7527db04d4a4e7", "tree": "1cd232b43e4b80f5e8881d802949a02a29b4ceda", "parents": [ "7b3480f8b701170c046e1ed362946f5f0d005e13" ], "author": { "name": "Tkhai Kirill", "email": "tkhai@yandex.ru", "time": "Tue Jan 10 13:17:03 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 10 16:28:24 2012 -0800" }, "message": "sparc32: forced setting of mode of sun4m per-cpu timers\n\nSUN4M per-cpu timers have two modes of work. These are timer mode and\ncounter mode. Kernel doesn\u0027t write anything to the register, which is\nconnected with mode choice.\nSo, the mode is chosen by bootloader. This patch forces to use timer\nmode from the kernel and to be independent of bootloader.\n\nI had this problem with OpenBIOS. Timers don\u0027t tick and kernel fails on\nQEMU, when it\u0027s compiled with SMP support. The patch fixes problem.\n\nSigned-off-by: Tkhai Kirill \u003ctkhai@yandex.ru\u003e\nAcked-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "37cfc3f67db9f2d907f6bfcfae590cdbbef623e8", "tree": "b573983938838dd76b40a7b53b3744472041720f", "parents": [ "38e5781bbf8e82c1635ea845e0d07b2228a5ac7a", "6e4d177dc07b1c4d8e6ef061fe5ffcc7e7646546" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:47:06 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:47:06 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:\n sparc32: remove unused file: include/asm/pgtsun4.h\n sparc32: fix PAGE_SIZE definition\n sparc32: enable different preemptions models\n sparc32: support atomic64_t\n apbuart: fix section mismatch warning\n sparc32: drop useless preprocessor conditional in atomic_32.h\n sparc32: drop unused atomic24 support\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "tree": "c6e875adc12b481b916e847e8f80b8881a0fb02c", "parents": [ "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "c233523b3d392e530033a7587d7970dc62a02361" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n PM / Freezer: fix return value of freezable_schedule_timeout_killable()\n PM / shmobile: Allow the A4R domain to be turned off at run time\n PM / input / touchscreen: Make st1232 use device PM QoS constraints\n PM / QoS: Introduce dev_pm_qos_add_ancestor_request()\n PM / shmobile: Remove the stay_on flag from SH7372\u0027s PM domains\n PM / shmobile: Don\u0027t include SH7372\u0027s INTCS in syscore suspend/resume\n PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n ARM: S3C64XX: Implement basic power domain support\n PM / shmobile: Use common always on power domain governor\n ...\n\nFix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused\nXBT_FORCE_SLEEP bit\n" }, { "commit": "972b2c719990f91eb3b2310d44ef8a2d38955a14", "tree": "b25a250ec5bec4b7b6355d214642d8b57c5cab32", "parents": [ "02550d61f49266930e674286379d3601006b2893", "c3aa077648e147783a7a53b409578234647db853" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)\n reiserfs: Properly display mount options in /proc/mounts\n vfs: prevent remount read-only if pending removes\n vfs: count unlinked inodes\n vfs: protect remounting superblock read-only\n vfs: keep list of mounts for each superblock\n vfs: switch -\u003eshow_options() to struct dentry *\n vfs: switch -\u003eshow_path() to struct dentry *\n vfs: switch -\u003eshow_devname() to struct dentry *\n vfs: switch -\u003eshow_stats to struct dentry *\n switch security_path_chmod() to struct path *\n vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n vfs: trim includes a bit\n switch mnt_namespace -\u003eroot to struct mount\n vfs: take /proc/*/mounts and friends to fs/proc_namespace.c\n vfs: opencode mntget() mnt_set_mountpoint()\n vfs: spread struct mount - remaining argument of next_mnt()\n vfs: move fsnotify junk to struct mount\n vfs: move mnt_devname\n vfs: move mnt_list to struct mount\n vfs: switch pnode.h macros to struct mount *\n ...\n" }, { "commit": "7affca3537d74365128e477b40c529d6f2fe86c8", "tree": "20be92bd240029182fc89c2c4f25401b7715dcae", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b", "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)\n arm: fix up some samsung merge sysdev conversion problems\n firmware: Fix an oops on reading fw_priv-\u003efw in sysfs loading file\n Drivers:hv: Fix a bug in vmbus_driver_unregister()\n driver core: remove __must_check from device_create_file\n debugfs: add missing #ifdef HAS_IOMEM\n arm: time.h: remove device.h #include\n driver-core: remove sysdev.h usage.\n clockevents: remove sysdev.h\n arm: convert sysdev_class to a regular subsystem\n arm: leds: convert sysdev_class to a regular subsystem\n kobject: remove kset_find_obj_hinted()\n m86k: gpio - convert sysdev_class to a regular subsystem\n mips: txx9_sram - convert sysdev_class to a regular subsystem\n mips: 7segled - convert sysdev_class to a regular subsystem\n sh: dma - convert sysdev_class to a regular subsystem\n sh: intc - convert sysdev_class to a regular subsystem\n power: suspend - convert sysdev_class to a regular subsystem\n power: qe_ic - convert sysdev_class to a regular subsystem\n power: cmm - convert sysdev_class to a regular subsystem\n s390: time - convert sysdev_class to a regular subsystem\n ...\n\nFix up conflicts with \u0027struct sysdev\u0027 removal from various platform\ndrivers that got changed:\n - arch/arm/mach-exynos/cpu.c\n - arch/arm/mach-exynos/irq-eint.c\n - arch/arm/mach-s3c64xx/common.c\n - arch/arm/mach-s3c64xx/cpu.c\n - arch/arm/mach-s5p64x0/cpu.c\n - arch/arm/mach-s5pv210/common.c\n - arch/arm/plat-samsung/include/plat/cpu.h\n - arch/powerpc/kernel/sysfs.c\nand fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h\n" }, { "commit": "e4e88f31bcb5f05f24b9ae518d4ecb44e1a7774d", "tree": "9eef6998f5bbd1a2c999011d9e0151f00c6e7297", "parents": [ "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)\n powerpc: fix compile error with 85xx/p1010rdb.c\n powerpc: fix compile error with 85xx/p1023_rds.c\n powerpc/fsl: add MSI support for the Freescale hypervisor\n arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree\n powerpc/fsl: Add support for Integrated Flash Controller\n powerpc/fsl: update compatiable on fsl 16550 uart nodes\n powerpc/85xx: fix PCI and localbus properties in p1022ds.dts\n powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig\n powerpc/fsl: Update defconfigs to enable some standard FSL HW features\n powerpc: Add TBI PHY node to first MDIO bus\n sbc834x: put full compat string in board match check\n powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address\n powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit\n offb: Fix setting of the pseudo-palette for \u003e8bpp\n offb: Add palette hack for qemu \"standard vga\" framebuffer\n offb: Fix bug in calculating requested vram size\n powerpc/boot: Change the WARN to INFO for boot wrapper overlap message\n powerpc/44x: Fix build error on currituck platform\n powerpc/boot: Change the load address for the wrapper to fit the kernel\n powerpc/44x: Enable CRASH_DUMP for 440x\n ...\n\nFix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to\nthe additional sparse-checking code for cputime_t.\n" }, { "commit": "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "tree": "c017a1b4a70b8447c71b01d8b320e071546b5c9d", "parents": [ "edf7c8148ec40c0fd27c0ef3f688defcc65e3913", "9f42f126154786e6e76df513004800c8c633f020" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:22:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:22:09 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1958 commits)\n net: pack skb_shared_info more efficiently\n net_sched: red: split red_parms into parms and vars\n net_sched: sfq: extend limits\n cnic: Improve error recovery on bnx2x devices\n cnic: Re-init dev-\u003estats_addr after chip reset\n net_sched: Bug in netem reordering\n bna: fix sparse warnings/errors\n bna: make ethtool_ops and strings const\n xgmac: cleanups\n net: make ethtool_ops const\n vmxnet3\" make ethtool ops const\n xen-netback: make ops structs const\n virtio_net: Pass gfp flags when allocating rx buffers.\n ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call\n netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call\n igb: reset PHY after recovering from PHY power down\n igb: add basic runtime PM support\n igb: Add support for byte queue limits.\n e1000: cleanup CE4100 MDIO registers access\n e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove\n ...\n" }, { "commit": "2b591616ada6cf499a4e83bf453761e40dc53059", "tree": "a2bb55b55351710f7ea1a138410c8c2ad27b38b3", "parents": [ "1a300107b5a49e3b7da080ae4827a9ee17c49a25" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Fri Oct 28 16:27:58 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jan 06 12:11:11 2012 -0800" }, "message": "sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources\n\nConvert from pci_scan_bus_parented() to pci_scan_root_bus() and remove root\nbus resource fixups. This fixes the problem of \"early\" and \"header\" quirks\nseeing incorrect root bus resources.\n\npci_scan_root_bus() also includes the pci_bus_add_devices() so we don\u0027t\nneed to do that separately.\n\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "1a300107b5a49e3b7da080ae4827a9ee17c49a25", "tree": "86952156aec5378df93cc59fb54481189af39f1a", "parents": [ "6f17dd1ba96bb857fc1e8ab0357a6a0a09935baf" ], "author": { "name": "Bjorn Helgaas", "email": "bhelgaas@google.com", "time": "Fri Oct 28 16:27:53 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jan 06 12:11:11 2012 -0800" }, "message": "sparc/PCI: convert to pci_create_root_bus()\n\nConvert from pci_create_bus() to pci_create_root_bus(). This way the root\nbus resources are correct immediately. This patch doesn\u0027t fix a problem\nbecause sparc fixed the resources before scanning the bus, but it makes\nsparc more consistent with other architectures.\n\nv2: fix build error (from sfr)\n\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "ba232a1fe4d4bca18efc8966e08dbf85abf11519", "tree": "dc792e000bf22850fa4e2a2ae04f643c0858120f", "parents": [ "79c8be8384d8b41ff67b5fda03c7ace3c3af1550" ], "author": { "name": "Myron Stowe", "email": "mstowe@redhat.com", "time": "Fri Oct 28 15:48:10 2011 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jan 06 12:10:39 2012 -0800" }, "message": "PCI: SPARC: convert pcibios_set_master() to a non-inlined function\n\nThis patch converts SPARC\u0027s architecture-specific\n\u0027pcibios_set_master()\u0027 routine to a non-inlined function. This will\nallow follow on patches to create a generic \u0027pcibios_set_master()\u0027\nfunction using the \u0027__weak\u0027 attribute which can be used by all\narchitectures as a default which, if necessary, can then be over-\nridden by architecture-specific code.\n\nConverting \u0027pci_bios_set_master()\u0027 to a non-inlined function will\nallow SPARC\u0027s \u0027pcibios_set_master()\u0027 implementation to remain\narchitecture-specific after the generic version is introduced and\nthus, not change current behavior.\n\nNo functional change.\n\nSigned-off-by: Myron Stowe \u003cmyron.stowe@redhat.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df", "tree": "d851c923f85566572112d4c0f884cff388a3cc05", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 into Linux 3.2\n\nThis resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,\nand it fixes the build error in the arch/x86/kernel/microcode_core.c\nfile, that the merge did not catch.\n\nThe microcode_core.c patch was provided by Stephen Rothwell\n\u003csfr@canb.auug.org.au\u003e who was invaluable in the merge issues involved\nwith the large sysdev removal process in the driver-core tree.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "423d091dfe58d3109d84c408810a7cfa82f6f184", "tree": "43c4385d1dc7219582f924d42db1f3e203a577bd", "parents": [ "1483b3823542c9721eddf09a077af1e02ac96b50", "919b83452b2e7c1dbced0456015508b4b9585db3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (64 commits)\n cpu: Export cpu_up()\n rcu: Apply ACCESS_ONCE() to rcu_boost() return value\n Revert \"rcu: Permit rt_mutex_unlock() with irqs disabled\"\n docs: Additional LWN links to RCU API\n rcu: Augment rcu_batch_end tracing for idle and callback state\n rcu: Add rcutorture tests for srcu_read_lock_raw()\n rcu: Make rcutorture test for hotpluggability before offlining CPUs\n driver-core/cpu: Expose hotpluggability to the rest of the kernel\n rcu: Remove redundant rcu_cpu_stall_suppress declaration\n rcu: Adaptive dyntick-idle preparation\n rcu: Keep invoking callbacks if CPU otherwise idle\n rcu: Irq nesting is always 0 on rcu_enter_idle_common\n rcu: Don\u0027t check irq nesting from rcu idle entry/exit\n rcu: Permit dyntick-idle with callbacks pending\n rcu: Document same-context read-side constraints\n rcu: Identify dyntick-idle CPUs on first force_quiescent_state() pass\n rcu: Remove dynticks false positives and RCU failures\n rcu: Reduce latency of rcu_prepare_for_idle()\n rcu: Eliminate RCU_FAST_NO_HZ grace-period hang\n rcu: Avoid needlessly IPIing CPUs at GP end\n ...\n" }, { "commit": "4a2164a7dbf0d3b6a1c2ef6f20c0d54350491a12", "tree": "1ef38a6a3b39f7e539fff848975a5672acc21f44", "parents": [ "15f043a65f655eb8a3aeb831a85da66de520c80f", "45aa0663cc408617b79a2b53f0a5f50e94688a48" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:54:53 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:54:53 2012 -0800" }, "message": "Merge branch \u0027core-memblock-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-memblock-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (52 commits)\n memblock: Reimplement memblock allocation using reverse free area iterator\n memblock: Kill early_node_map[]\n score: Use HAVE_MEMBLOCK_NODE_MAP\n s390: Use HAVE_MEMBLOCK_NODE_MAP\n mips: Use HAVE_MEMBLOCK_NODE_MAP\n ia64: Use HAVE_MEMBLOCK_NODE_MAP\n SuperH: Use HAVE_MEMBLOCK_NODE_MAP\n sparc: Use HAVE_MEMBLOCK_NODE_MAP\n powerpc: Use HAVE_MEMBLOCK_NODE_MAP\n memblock: Implement memblock_add_node()\n memblock: s/memblock_analyze()/memblock_allow_resize()/ and update users\n memblock: Track total size of regions automatically\n powerpc: Cleanup memblock usage\n memblock: Reimplement memblock_enforce_memory_limit() using __memblock_remove()\n memblock: Make memblock functions handle overflowing range @size\n memblock: Reimplement __memblock_remove() using memblock_isolate_range()\n memblock: Separate out memblock_isolate_range() from memblock_set_node()\n memblock: Kill memblock_init()\n memblock: Kill sentinel entries at the end of static region arrays\n memblock: Add __memblock_dump_all()\n ...\n" }, { "commit": "0583fcc96bb117763c0fa74c123573c0112dec65", "tree": "5d8a62e922c34e6e6bc0836b40f5b59f69266766", "parents": [ "1bc94226d5c642b78cf6b2e3e843ef24eb740df0" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 17:04:15 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:17 2012 -0500" }, "message": "consolidate umode_t declarations\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "6e4d177dc07b1c4d8e6ef061fe5ffcc7e7646546", "tree": "765291075b2b334df16cf120fbc37259a2bcd342", "parents": [ "a4b4f4371b94552973109f6b9ebe6af7a9efa0bd" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Fri Dec 30 13:32:16 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 13:29:18 2011 -0500" }, "message": "sparc32: remove unused file: include/asm/pgtsun4.h\n\nsun4 is no longer supported and this file is unused.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61", "tree": "d6e9edb2087fa4a97b2cc3d585a0189672a14cf4", "parents": [ "8ade06c616b34b4237c0ed77d1ff0ce04ad7d056", "89307babf966165171547f105e2253dec261cfa5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 13:04:14 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 13:04:14 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "a4b4f4371b94552973109f6b9ebe6af7a9efa0bd", "tree": "1a5404b34c2e547ab6a9f8aa7a940d5b9c54e163", "parents": [ "b2a1fa30b54ed616e0ae6f521bcd3fad750f5184" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Thu Dec 29 15:04:38 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 29 14:58:31 2011 -0800" }, "message": "sparc32: fix PAGE_SIZE definition\n\nUse _AC() in definition of PAGE_SIZE so the same definition\ncan be used in C and assembler.\nAlso use PAGE_SIZE in definition of THREAD_SIZE.\n\nThis commit kill the following comment:\n\n \"I have my suspicions... -DaveM\"\n\nI did not find any clue what this referred to anyway.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b2a1fa30b54ed616e0ae6f521bcd3fad750f5184", "tree": "d1832a72a8014e6e2fc54f343895da4eca4cb5de", "parents": [ "aea1181b0bd0a09c54546399768f359d1e198e45" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Thu Dec 29 14:54:49 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 29 14:58:31 2011 -0800" }, "message": "sparc32: enable different preemptions models\n\nWhile chasing following warning from kconfig I noticed that the\nkconfig preemption model symbols were all dependent on sparc64.\n\nwarning: (PREEMPT \u0026\u0026 DEBUG_ATOMIC_SLEEP) selects PREEMPT_COUNT which has unmet direct dependencies (SPARC64)\n\n\u003eFrom arch/sparc/Kconfig:\n\n if SPARC64\n source \"kernel/Kconfig.preempt\"\n endif\n\nBut looking a bit closer I see nothing obvious why\nsparc32 should not support the various preemption models.\nDrop the \"if SPARC64\" conditional to enable selection of\npreemption model on sparc32 too.\n\nBuild-tested - but not run-time tested all three models.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aea1181b0bd0a09c54546399768f359d1e198e45", "tree": "1cd2b545f2ea4b6d52b5e593a9da5c115598d1d6", "parents": [ "ab17da5cb9d4aaf9f04c706761d3a8024897bedd" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Tue Dec 27 21:46:53 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 27 16:33:13 2011 -0500" }, "message": "sparc32: support atomic64_t\n\nThere is no-one that really require atomic64_t support on sparc32.\nBut several drivers fails to build without proper atomic64 support.\nAnd for an allyesconfig build for sparc32 this is annoying.\n\nInclude the generic atomic64_t support for sparc32.\nThis has a text footprint cost:\n\n$size vmlinux (before atomic64_t support)\n text data bss dec hex filename\n3578860 134260 108781 3821901 3a514d vmlinux\n\n$size vmlinux (after atomic64_t support)\n text data bss dec hex filename\n3579892 130684 108781 3819357 3a475d vmlinux\n\ntext increase (3579892 - 3578860) \u003d 1032 bytes\n\ndata decreases - but I fail to explain why!\nI have rebuild twice to check my numbers.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e1a8b69afd63f26f8e7be39e3bc78c4894cdb9fd", "tree": "e5a0d19e61ce90e300aac33415cdaeceaf75a09e", "parents": [ "348738afe530cc3a7306bbd3d1ccd322f9638f32" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Mon Dec 26 21:05:27 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 27 14:11:40 2011 -0500" }, "message": "sparc32: drop useless preprocessor conditional in atomic_32.h\n\narch/sparc/include/asm/atomic_32.h is not exported to userspace.\nSo there is no need to protect code using __KERNEL__.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "348738afe530cc3a7306bbd3d1ccd322f9638f32", "tree": "7ae88b2743aa8d1c0b5633b43877bd6aeecfe0c8", "parents": [ "371de6e4e0042adf4f9b54c414154f57414ddd37" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Mon Dec 26 20:57:22 2011 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 27 14:11:40 2011 -0500" }, "message": "sparc32: drop unused atomic24 support\n\natomic24 support was used to semaphores in the past - but is no longer used.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7ba68c4a072c9aa8f04b8cf7838b6cd2f48d918", "tree": "cd8f8029111fc52d06060691fb0325ba2e798e94", "parents": [ "8d274ab7d3d6f23e2bc0e433c8d53acbe60a9773", "90363ddf0a1a4dccfbb8d0c10b8f488bc7fa69f8" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Dec 25 23:42:20 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Dec 25 23:42:20 2011 +0100" }, "message": "Merge branch \u0027pm-sleep\u0027 into pm-for-linus\n\n* pm-sleep: (51 commits)\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n PM / Sleep: Recommend [un]lock_system_sleep() over using pm_mutex directly\n PM / Sleep: Replace mutex_[un]lock(\u0026pm_mutex) with [un]lock_system_sleep()\n PM / Sleep: Make [un]lock_system_sleep() generic\n PM / Sleep: Use the freezer_count() functions in [un]lock_system_sleep() APIs\n PM / Freezer: Remove the \"userspace only\" constraint from freezer[_do_not]_count()\n PM / Hibernate: Replace unintuitive \u0027if\u0027 condition in kernel/power/user.c with \u0027else\u0027\n Freezer / sunrpc / NFS: don\u0027t allow TASK_KILLABLE sleeps to block the freezer\n PM / Sleep: Unify diagnostic messages from device suspend/resume\n ACPI / PM: Do not save/restore NVS on Asus K54C/K54HR\n PM / Hibernate: Remove deprecated hibernation test modes\n PM / Hibernate: Thaw processes in SNAPSHOT_CREATE_IMAGE ioctl test path\n ...\n\nConflicts:\n\tkernel/kmod.c\n" }, { "commit": "abb434cb0539fb355c1c921f8fd761efbbac3462", "tree": "24a7d99ec161f8fd4dc9ff03c9c4cc93be883ce6", "parents": [ "2494654d4890316e7340fb8b3458daad0474a1b9", "6350323ad8def2ac00d77cdee3b79c9b9fba75c4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 23 17:13:56 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 23 17:13:56 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tnet/bluetooth/l2cap_core.c\n\nJust two overlapping changes, one added an initialization of\na local variable, and another change added a new local variable.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7cc8583372a21d98a23b703ad96cab03180b5030", "tree": "15c342c336b72e431ce96f1b4d27930b9f58ebe2", "parents": [ "b3b1b70e62a603f473619dbebc3b3d23f535e6f8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 22 13:23:59 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 22 13:46:53 2011 -0800" }, "message": "sparc64: Fix MSIQ HV call ordering in pci_sun4v_msiq_build_irq().\n\nThis silently was working for many years and stopped working on\nNiagara-T3 machines.\n\nWe need to set the MSIQ to VALID before we can set it\u0027s state to IDLE.\n\nOn Niagara-T3, setting the state to IDLE first was causing HV_EINVAL\nerrors. The hypervisor documentation says, rather ambiguously, that\nthe MSIQ must be \"initialized\" before one can set the state.\n\nI previously understood this to mean merely that a successful setconf()\noperation has been performed on the MSIQ, which we have done at this\npoint. But it seems to also mean that it has been set VALID too.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8a25a2fd126c621f44f3aeaef80d51f00fc11639", "tree": "41694ab1a9c82a7a02d9cd33c929fd039c98c815", "parents": [ "cb0c05c5fae12eeb7c85c205578df277bd706155" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Wed Dec 21 14:29:42 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 21 14:29:42 2011 -0800" }, "message": "cpu: convert \u0027cpu\u0027 and \u0027machinecheck\u0027 sysdev_class to a regular subsystem\n\nThis moves the \u0027cpu sysdev_class\u0027 over to a regular \u0027cpu\u0027 subsystem\nand converts the devices to regular devices. The sysdev drivers are\nimplemented as subsystem interfaces now.\n\nAfter all sysdev classes are ported to regular driver core entities, the\nsysdev implementation will be entirely removed from the kernel.\n\nUserspace relies on events and generic sysfs subsystem infrastructure\nfrom sysdev devices, which are made available with this conversion.\n\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\nCc: Arnd Bergmann \u003carnd@arndb.de\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: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Borislav Petkov \u003cbp@amd64.org\u003e\nCc: Tigran Aivazian \u003ctigran@aivazian.fsnet.co.uk\u003e\nCc: Len Brown \u003clenb@kernel.org\u003e\nCc: Zhang Rui \u003crui.zhang@intel.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: \"Srivatsa S. Bhat\" \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "b00f4dc5ff022cb9cbaffd376d9454d7fa1e496f", "tree": "40f1b232e2f1e8ac365317a14fdcbcb331722b46", "parents": [ "1eac8111e0763853266a171ce11214da3a347a0a", "b9e26dfdad5a4f9cbdaacafac6998614cc9c41bc" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Dec 21 21:59:45 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Dec 21 21:59:45 2011 +0100" }, "message": "Merge branch \u0027master\u0027 into pm-sleep\n\n* master: (848 commits)\n SELinux: Fix RCU deref check warning in sel_netport_insert()\n binary_sysctl(): fix memory leak\n mm/vmalloc.c: remove static declaration of va from __get_vm_area_node\n ipmi_watchdog: restore settings when BMC reset\n oom: fix integer overflow of points in oom_badness\n memcg: keep root group unchanged if creation fails\n nilfs2: potential integer overflow in nilfs_ioctl_clean_segments()\n nilfs2: unbreak compat ioctl\n cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask\n evm: prevent racing during tfm allocation\n evm: key must be set once during initialization\n mmc: vub300: fix type of firmware_rom_wait_states module parameter\n Revert \"mmc: enable runtime PM by default\"\n mmc: sdhci: remove \"state\" argument from sdhci_suspend_host\n x86, dumpstack: Fix code bytes breakage due to missing KERN_CONT\n IB/qib: Correct sense on freectxts increment and decrement\n RDMA/cma: Verify private data length\n cgroups: fix a css_set not found bug in cgroup_attach_proc\n oprofile: Fix uninitialized memory access when writing to writing to oprofilefs\n Revert \"xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel\"\n ...\n\nConflicts:\n\tkernel/cgroup_freezer.c\n" }, { "commit": "45aa0663cc408617b79a2b53f0a5f50e94688a48", "tree": "0a53931c317c3c72a3555bd2fbb70a881ee870f2", "parents": [ "511585a28e5b5fd1cac61e601e42efc4c5dd64b5", "7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 20 12:14:26 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 20 12:14:26 2011 +0100" }, "message": "Merge branch \u0027memblock-kill-early_node_map\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/memblock\n" }, { "commit": "b1f44e13a525d2ffb7d5afe2273b7169d6f2222e", "tree": "ba282dbd218ad8cf2e51e5325fecd43a4554c9d7", "parents": [ "dbf2b92d54e73e4a2524b90d29bd498ecc4aa593" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 14 10:05:22 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 14 10:57:28 2011 -0800" }, "message": "sparc32: Be less strict in matching %lo part of relocation.\n\nThe \"(insn \u0026 0x01800000) !\u003d 0x01800000\" test matches \u0027restore\u0027\nbut that is a legitimate place to see the %lo() part of a 32-bit\nsymbol relocation, particularly in tail calls.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nTested-by: Sergei Trofimovich \u003cslyfox@gentoo.org\u003e\n" }, { "commit": "070712c6cd8a02e57506ebf52d7c6056d7535b42", "tree": "497ff94a4b0174c24e148a0607673d71f3fe9297", "parents": [ "8935e13457341841a6a02b8c8f65799f18cf4804" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Dec 12 13:54:35 2011 +0000" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Dec 12 13:54:35 2011 +0000" }, "message": "UAPI: Don\u0027t include linux/compat.h in sparc\u0027s asm/siginfo.h\n\nDon\u0027t include linux/compat.h in sparc\u0027s asm/siginfo.h as it leads to a circular\ndependency:\n\n\tasm/siginfo.h -\u003e linux/compat.h -\u003e asm/siginfo.h\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\ncc: David S. Miller \u003cdavem@davemloft.net\u003e\ncc: sparclinux@vger.kernel.org\n" }, { "commit": "1268fbc746ea1cd279886a740dcbad4ba5232225", "tree": "dc0ff36b4114992a3f67479e25132f5e99f36b9e", "parents": [ "b58bdccaa8d908e0f71dae396468a0d3f7bb3125" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Nov 17 18:48:14 2011 +0100" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sun Dec 11 10:31:57 2011 -0800" }, "message": "nohz: Remove tick_nohz_idle_enter_norcu() / tick_nohz_idle_exit_norcu()\n\nThose two APIs were provided to optimize the calls of\ntick_nohz_idle_enter() and rcu_idle_enter() into a single\nirq disabled section. This way no interrupt happening in-between would\nneedlessly process any RCU job.\n\nNow we are talking about an optimization for which benefits\nhave yet to be measured. Let\u0027s start simple and completely decouple\nidle rcu and dyntick idle logics to simplify.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "29f043a2caea2860db36fbeda0c17f79bf0cffbe", "tree": "c776a156e1a3d3dcee8d6082e6b731f17c94914f", "parents": [ "99745b6a83414006f5c1e83efaebb423b41b67ef" ], "author": { "name": "Paul E. McKenney", "email": "paul.mckenney@linaro.org", "time": "Thu Nov 10 15:56:46 2011 -0800" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sun Dec 11 10:31:49 2011 -0800" }, "message": "sparc: Make SPARC use the new is_idle_task() API\n\nChange from direct comparison of -\u003epid with zero to is_idle_task().\n\nSigned-off-by: Paul E. McKenney \u003cpaul.mckenney@linaro.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\n" }, { "commit": "2bbb6817c0ac1b5f2a68d720f364f98eeb1ac4fd", "tree": "05bb5ba54671a8eaeca4fe4406a75e820317e473", "parents": [ "280f06774afedf849f0b34248ed6aff57d0f6908" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sat Oct 08 16:01:00 2011 +0200" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sun Dec 11 10:31:36 2011 -0800" }, "message": "nohz: Allow rcu extended quiescent state handling seperately from tick stop\n\nIt is assumed that rcu won\u0027t be used once we switch to tickless\nmode and until we restart the tick. However this is not always\ntrue, as in x86-64 where we dereference the idle notifiers after\nthe tick is stopped.\n\nTo prepare for fixing this, add two new APIs:\ntick_nohz_idle_enter_norcu() and tick_nohz_idle_exit_norcu().\n\nIf no use of RCU is made in the idle loop between\ntick_nohz_enter_idle() and tick_nohz_exit_idle() calls, the arch\nmust instead call the new *_norcu() version such that the arch doesn\u0027t\nneed to call rcu_idle_enter() and rcu_idle_exit().\n\nOtherwise the arch must call tick_nohz_enter_idle() and\ntick_nohz_exit_idle() and also call explicitly:\n\n- rcu_idle_enter() after its last use of RCU before the CPU is put\nto sleep.\n- rcu_idle_exit() before the first use of RCU after the CPU is woken\nup.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "280f06774afedf849f0b34248ed6aff57d0f6908", "tree": "62ef683226d0569c0e6c3ba34ab2e6d85b2e047f", "parents": [ "867f236bd12f5091df6dc7cc75f94d7fd982d78a" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Oct 07 18:22:06 2011 +0200" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sun Dec 11 10:31:35 2011 -0800" }, "message": "nohz: Separate out irq exit and idle loop dyntick logic\n\nThe tick_nohz_stop_sched_tick() function, which tries to delay\nthe next timer tick as long as possible, can be called from two\nplaces:\n\n- From the idle loop to start the dytick idle mode\n- From interrupt exit if we have interrupted the dyntick\nidle mode, so that we reprogram the next tick event in\ncase the irq changed some internal state that requires this\naction.\n\nThere are only few minor differences between both that\nare handled by that function, driven by the ts-\u003einidle\ncpu variable and the inidle parameter. The whole guarantees\nthat we only update the dyntick mode on irq exit if we actually\ninterrupted the dyntick idle mode, and that we enter in RCU extended\nquiescent state from idle loop entry only.\n\nSplit this function into:\n\n- tick_nohz_idle_enter(), which sets ts-\u003einidle to 1, enters\ndynticks idle mode unconditionally if it can, and enters into RCU\nextended quiescent state.\n\n- tick_nohz_irq_exit() which only updates the dynticks idle mode\nwhen ts-\u003einidle is set (ie: if tick_nohz_idle_enter() has been called).\n\nTo maintain symmetry, tick_nohz_restart_sched_tick() has been renamed\ninto tick_nohz_idle_exit().\n\nThis simplifies the code and micro-optimize the irq exit path (no need\nfor local_irq_save there). This also prepares for the split between\ndynticks and rcu extended quiescent state logics. We\u0027ll need this split to\nfurther fix illegal uses of RCU in extended quiescent states in the idle\nloop.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\n" }, { "commit": "0ee332c1451869963626bf9cac88f165a90990e1", "tree": "a40e6c9c6cfe39ecbca37a08019be3c9e56a4a9b", "parents": [ "a2bf79e7dcc97b4e9654f273453f9264f49e41ff" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:09 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:09 2011 -0800" }, "message": "memblock: Kill early_node_map[]\n\nNow all ARCH_POPULATES_NODE_MAP archs select HAVE_MEBLOCK_NODE_MAP -\nthere\u0027s no user of early_node_map[] left. Kill early_node_map[] and\nreplace ARCH_POPULATES_NODE_MAP with HAVE_MEMBLOCK_NODE_MAP. Also,\nrelocate for_each_mem_pfn_range() and helper from mm.h to memblock.h\nas page_alloc.c would no longer host an alternative implementation.\n\nThis change is ultimately one to one mapping and shouldn\u0027t cause any\nobservable difference; however, after the recent changes, there are\nsome functions which now would fit memblock.c better than page_alloc.c\nand dependency on HAVE_MEMBLOCK_NODE_MAP instead of HAVE_MEMBLOCK\ndoesn\u0027t make much sense on some of them. Further cleanups for\nfunctions inside HAVE_MEMBLOCK_NODE_MAP in mm.h would be nice.\n\n-v2: Fix compile bug introduced by mis-spelling\n CONFIG_HAVE_MEMBLOCK_NODE_MAP to CONFIG_MEMBLOCK_HAVE_NODE_MAP in\n mmzone.h. Reported by Stephen Rothwell.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Chen Liqin \u003cliqin.chen@sunplusct.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\n" }, { "commit": "2a4814df545a0645aff6fc04e5106877cc576945", "tree": "87c3f223590e548f01043d7008ab72bc13ac71b8", "parents": [ "1d7cfe18ec2eb2d0480a9b29465af66b61291202" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:08 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:08 2011 -0800" }, "message": "sparc: Use HAVE_MEMBLOCK_NODE_MAP\n\nsparc doesn\u0027t access early_node_map[] directly and enabling\nHAVE_MEMBLOCK_NODE_MAP is trivial - replacing add_active_range() calls\nwith memblock_set_node() and selecting HAVE_MEMBLOCK_NODE_MAP is\nenough.\n\n-v2: Use select in Kconfig instead as suggested by Sam Ravnborg.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: sparclinux@vger.kernel.org\n" }, { "commit": "1aadc0560f46530f8a0f11055285b876a8a31770", "tree": "9d57dbe134894d4f8d20cfd246ac9457af65b271", "parents": [ "1440c4e2c918532f39131c3330fe2226e16be7b6" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:08 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:08 2011 -0800" }, "message": "memblock: s/memblock_analyze()/memblock_allow_resize()/ and update users\n\nThe only function of memblock_analyze() is now allowing resize of\nmemblock region arrays. Rename it to memblock_allow_resize() and\nupdate its users.\n\n* The following users remain the same other than renaming.\n\n arm/mm/init.c::arm_memblock_init()\n microblaze/kernel/prom.c::early_init_devtree()\n powerpc/kernel/prom.c::early_init_devtree()\n openrisc/kernel/prom.c::early_init_devtree()\n sh/mm/init.c::paging_init()\n sparc/mm/init_64.c::paging_init()\n unicore32/mm/init.c::uc32_memblock_init()\n\n* In the following users, analyze was used to update total size which\n is no longer necessary.\n\n powerpc/kernel/machine_kexec.c::reserve_crashkernel()\n powerpc/kernel/prom.c::early_init_devtree()\n powerpc/mm/init_32.c::MMU_init()\n powerpc/mm/tlb_nohash.c::__early_init_mmu() \n powerpc/platforms/ps3/mm.c::ps3_mm_add_memory()\n powerpc/platforms/embedded6xx/wii.c::wii_memory_fixups()\n sh/kernel/machine_kexec.c::reserve_crashkernel()\n\n* x86/kernel/e820.c::memblock_x86_fill() was directly setting\n memblock_can_resize before populating memblock and calling analyze\n afterwards. Call memblock_allow_resize() before start populating.\n\nmemblock_can_resize is now static inside memblock.c.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\n" }, { "commit": "fe091c208a40299fba40e62292a610fb91e44b4e", "tree": "72bf673f05a736cbf3555a4dcf428b95840fc9f7", "parents": [ "c5a1cb284b791fcc3c70962331a682452afaf6cd" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:07 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:07 2011 -0800" }, "message": "memblock: Kill memblock_init()\n\nmemblock_init() initializes arrays for regions and memblock itself;\nhowever, all these can be done with struct initializers and\nmemblock_init() can be removed. This patch kills memblock_init() and\ninitializes memblock with struct initializer.\n\nThe only difference is that the first dummy entries don\u0027t have .nid\nset to MAX_NUMNODES initially. This doesn\u0027t cause any behavior\ndifference.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\n" }, { "commit": "1c16d242aa441c11ccaeaa63b49712555b8bfaeb", "tree": "ff8332060f3d800abbabbfe63a942e0ef6d93d33", "parents": [ "d4bbf7e7759afc172e2bfbc5c416324590049cdd" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:06 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Dec 08 10:22:06 2011 -0800" }, "message": "memblock: Fix include breakages caused by 24aa07882b\n\n24aa07882b (memblock, x86: Replace memblock_x86_reserve/free_range()\nwith generic ones) removed arch/x86/include/asm/memblock.h and dropped\nits inclusion from include/linux/memblock.h which breaks other\narchitectures which depended on the generic memblock.h pulling in the\narch specific one.\n\nHowever, the proper fix isn\u0027t adding back the asm inclusion. memblock\ndoesn\u0027t have any arch dependent part and doesn\u0027t need arch specific\nheader file and asm/memblock.h files are either practically empty or\ncontain mostly unrelated arch specific stuff.\n\n* In microblaze, sh, powerpc, sparc and openrisc, asm/memblock.h is\n either empty or just contains unused MEMBLOCK_DBG() macro. Remove\n them.\n\n* In arm and unicore32, asm/memblock.h contains arch specific stuff.\n Include it directly from its users. It might be a good idea to\n rename the header file to avoid confusion.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\n" }, { "commit": "f0a4cf31017ac8179a2fe295c1bd8e821d7674f4", "tree": "1a640c00647cc7eb90d9849033071270f39f81d7", "parents": [ "e5fd47bfab2df0c2184cc0bf4245d8e1bb7724fb" ], "author": { "name": "Thomas Meyer", "email": "thomas@m3y3r.de", "time": "Thu Nov 17 12:43:40 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 04 10:46:56 2011 -0800" }, "message": "sparc: Use kmemdup rather than duplicating its implementation\n\nThe semantic patch that makes this change is available\nin scripts/coccinelle/api/memdup.cocci.\n\nSigned-off-by: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a21a2fd4036f9a572415a7543896a1163c211ee5", "tree": "e668585f82aee3abb56b011c78cdb7a5f46099da", "parents": [ "43db595e8b5d78ce5ad2feab719814a76e3ad2e5" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Nov 24 21:10:12 2011 +0200" }, "committer": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Sun Dec 04 15:59:49 2011 +0200" }, "message": "sparc: switch to GENERIC_PCI_IOMAP\n\nsparc copied pci_iomap from generic code, probably to avoid\npulling the rest of iomap.c in. Since that\u0027s in\na separate file now, we can reuse the common implementation.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\n" }, { "commit": "42b2aa86c6670347a2a07e6d7af0e0ecc8fdbff9", "tree": "6f8fb2a1efb3e84bf281658befe06dc6a7fb026b", "parents": [ "a13b032776379fa6e2bfccf798969ca51e5fb052" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Nov 28 20:31:00 2011 -0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Dec 02 14:57:31 2011 +0100" }, "message": "treewide: Fix typos in various parts of the kernel, and fix some comments.\n\nThe below patch fixes some typos in various parts of the kernel, as well as fixes some comments.\nPlease let me know if I missed anything, and I will try to get it changed and resent.\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "d4bbf7e7759afc172e2bfbc5c416324590049cdd", "tree": "7eab5ee5481cd3dcf1162329fec827177640018a", "parents": [ "a150439c4a97db379f0ed6faa46fbbb6e7bf3cb2", "401d0069cb344f401bc9d264c31db55876ff78c0" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 28 09:46:22 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 28 09:46:22 2011 -0800" }, "message": "Merge branch \u0027master\u0027 into x86/memblock\n\nConflicts \u0026 resolutions:\n\n* arch/x86/xen/setup.c\n\n\tdc91c728fd \"xen: allow extra memory to be in multiple regions\"\n\t24aa07882b \"memblock, x86: Replace memblock_x86_reserve/free...\"\n\n\tconflicted on xen_add_extra_mem() updates. The resolution is\n\ttrivial as the latter just want to replace\n\tmemblock_x86_reserve_range() with memblock_reserve().\n\n* drivers/pci/intel-iommu.c\n\n\t166e9278a3f \"x86/ia64: intel-iommu: move to drivers/iommu/\"\n\t5dfe8660a3d \"bootmem: Replace work_with_active_regions() with...\"\n\n\tconflicted as the former moved the file under drivers/iommu/.\n\tResolved by applying the chnages from the latter on the moved\n\tfile.\n\n* mm/Kconfig\n\n\t6661672053a \"memblock: add NO_BOOTMEM config symbol\"\n\tc378ddd53f9 \"memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option\"\n\n\tconflicted trivially. Both added config options. Just\n\tletting both add their own options resolves the conflict.\n\n* mm/memblock.c\n\n\td1f0ece6cdc \"mm/memblock.c: small function definition fixes\"\n\ted7b56a799c \"memblock: Remove memblock_memory_can_coalesce()\"\n\n\tconfliected. The former updates function removed by the\n\tlatter. Resolution is trivial.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "fa8cbaaf5a68f62db3f9a8444ecbb940b47984cb", "tree": "ef8c31c149c7f1fb6c504e7556dab3e56212c539", "parents": [ "3ce21cdfe93efffa4ffba9cf3ca2576d3d60d6dc" ], "author": { "name": "Dan McGee", "email": "dpmcgee@gmail.com", "time": "Mon Oct 17 13:05:23 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Mon Nov 28 11:42:09 2011 +1100" }, "message": "powerpc+sparc64/mm: Remove hack in mmap randomize layout\n\nSince commit 8a0a9bd4db63bc45e301, this comment in mmap_rnd() does not\nhold true as the value returned by get_random_int() will in fact be\n\ndifferent every single call. Remove the comment and simplify the code\nback to its original desired form.\n\nThis reverts commit a5adc91a4b44b5d1 which is no longer necessary and\nalso fixes the sparc code that copied this same adjustment.\n\nSigned-off-by: Dan McGee \u003cdpmcgee@gmail.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "d88e4cb67197d007fb778d62fe17360e970d5bfa", "tree": "5307877c29d7d9f8be6699164039db26e50be457", "parents": [ "a3201227f803ad7fd43180c5195dbe5a2bf998aa" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 21 12:32:25 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Nov 21 12:32:25 2011 -0800" }, "message": "freezer: remove now unused TIF_FREEZE\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: linux-arch@vger.kernel.org\n" }, { "commit": "efd0bf97deeddd9ba53daabfc470a1399c6b0b2d", "tree": "eec56da5fbc796bac7c67f1990a18f5e0a304059", "parents": [ "f8a15af093b19b86d56933c8757cee298d0f32a8", "6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 13:50:33 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 13:50:33 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nThe forcedeth changes had a conflict with the conversion over\nto atomic u64 statistics in net-next.\n\nThe libertas cfg.c code had a conflict with the bss reference\ncounting fix by John Linville in net-next.\n\nConflicts:\n\tdrivers/net/ethernet/nvidia/forcedeth.c\n\tdrivers/net/wireless/libertas/cfg.c\n" }, { "commit": "0b64120cceb86e93cb1bda0dc055f13016646907", "tree": "5dcd3444fc219e5b9774734d846b655e0776575b", "parents": [ "3e37fd3153ac95088a74f5e7c569f7567e9f993a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 17 22:44:58 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 17 22:44:58 2011 -0800" }, "message": "sparc64: Patch sun4v code sequences properly on module load.\n\nSome of the sun4v code patching occurs in inline functions visible\nto, and usable by, modules.\n\nTherefore we have to patch them up during module load.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3e37fd3153ac95088a74f5e7c569f7567e9f993a", "tree": "60a7f2334034a0294929f645373062620a67145d", "parents": [ "e88d2468718b0789b4c33da2f7e1cef2a1eee279" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 17 18:17:59 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 17 18:17:59 2011 -0800" }, "message": "sparc: Kill custom io_remap_pfn_range().\n\nTo handle the large physical addresses, just make a simple wrapper\naround remap_pfn_range() like MIPS does.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e11c259f745889b55bc5596ca78271f2f5cf08d2", "tree": "5025f0bf9093e84d0643beb9097249c176dbbea7", "parents": [ "8d26784cf0d04c1238e906efdd5de76439cb0a1e", "b4487c2d0edaf1332d7a9f11b5661044955ef5e2" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Nov 17 13:11:43 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Nov 17 13:11:43 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tinclude/net/bluetooth/bluetooth.h\n" }, { "commit": "e88d2468718b0789b4c33da2f7e1cef2a1eee279", "tree": "beb5a9eff292f1faa05eb9b96b7f1bd7815da131", "parents": [ "1d299bc7732c34d85bd43ac1a8745f5a2fed2078" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 15 12:57:00 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 15 12:57:00 2011 -0800" }, "message": "sparc: Stash orig_i0 into %g6 instead of %g2\n\nAs per the comments added by this commit, %g2 turns out to not be a\nusable place to save away orig_i0 for syscall restart handling.\n\nIn fact all of %g2, %g3, %g4, and %g5 are assumed to be saved across\na system call by various bits of code in glibc.\n\n%g1 can\u0027t be used because that holds the syscall number, which would\nneed to be saved and restored for syscall restart handling too, and\nthat would only compound our problems :-)\n\nThis leaves us with %g6 and %g7 which are for \"system use\". %g7 is\nused as the \"thread register\" by glibc, but %g6 is used as a compiler\nand assembler temporary scratch register. And in no instance is %g6\nused to hold a value across a system call.\n\nTherefore %g6 is safe for storing away orig_i0, at least for now.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "1d299bc7732c34d85bd43ac1a8745f5a2fed2078" }