* Re: linux-next: Tree for Mar 7 (kvm)
From: Avi Kivity @ 2012-03-08 11:53 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, kvm
In-Reply-To: <4F57E791.6070205@xenotime.net>
On 03/08/2012 12:56 AM, Randy Dunlap wrote:
> On 03/06/2012 11:10 PM, Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Changes since 20120306:
> >
> > The kvm tree lost its build failure.
>
>
> I'm getting this build error on X86_32 (i386):
>
> arch/x86/kvm/x86.c:1042: Error: no instruction mnemonic suffix given and no register operands; can't size instruction
>
>
Patch to follow.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply
* Re: linux-next: manual merge of the akpm tree with Linus' tree
From: Xiao Guangrong @ 2012-03-08 9:59 UTC (permalink / raw)
To: Andrew Morton; +Cc: Stephen Rothwell, linux-next, linux-kernel, Linus
In-Reply-To: <20120307235012.847af577.akpm@linux-foundation.org>
On 03/08/2012 03:50 PM, Andrew Morton wrote:
> Doh. The author reviewed that for me too!
>
> I'll drop it - please rework, retest and resend?
>
Andrew, the patch has been reworked.
Subject: [PATCH] hugetlb: drop prev_vma in hugetlb_get_unmapped_area_topdown()
After the call find_vma_prev(mm, addr, &prev_vma), the following condition
is always true:
!prev_vma || (addr >= prev_vma->vm_end)
it can happily drop prev_vma and use find_vma() instead of find_vma_prev().
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
---
arch/x86/mm/hugetlbpage.c | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
index 8ecbb4b..0c1701b 100644
--- a/arch/x86/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
@@ -308,7 +308,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
{
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
- struct vm_area_struct *vma, *prev_vma;
+ struct vm_area_struct *vma;
unsigned long base = mm->mmap_base, addr = addr0;
unsigned long largest_hole = mm->cached_hole_size;
int first_time = 1;
@@ -337,22 +337,14 @@ try_again:
if (!vma)
return addr;
- /*
- * new region fits between prev_vma->vm_end and
- * vma->vm_start, use it:
- */
- prev_vma = vma->vm_prev;
- if (addr + len <= vma->vm_start &&
- (!prev_vma || (addr >= prev_vma->vm_end))) {
+ if (addr + len <= vma->vm_start) {
/* remember the address as a hint for next time */
mm->cached_hole_size = largest_hole;
return (mm->free_area_cache = addr);
- } else {
+ } else if (mm->free_area_cache == vma->vm_end) {
/* pull free_area_cache down to the first hole */
- if (mm->free_area_cache == vma->vm_end) {
- mm->free_area_cache = vma->vm_start;
- mm->cached_hole_size = largest_hole;
- }
+ mm->free_area_cache = vma->vm_start;
+ mm->cached_hole_size = largest_hole;
}
/* remember the largest hole we saw so far */
--
1.7.7.6
^ permalink raw reply related
* From Mrs Maite Mashabane
From: Maite Nkoana-Mashabane @ 2012-03-08 9:26 UTC (permalink / raw)
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: MY NAME IS MAITE NKANA-MASHABANE.doc --]
[-- Type: application/msword, Size: 23040 bytes --]
^ permalink raw reply
* for-next inclusion request: dma-buf buffer sharing framework
From: Sumit Semwal @ 2012-03-08 8:58 UTC (permalink / raw)
To: sfr; +Cc: linux-kernel, linux-next, linux-media, linaro-mm-sig,
DRI mailing list
Hi Stephen,
May I request you to please add the dma-buf buffer sharing framework
tree to linux-next?
It is hosted here
git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
branch: for-next
--
Thanks and nest regards,
Sumit Semwal.
^ permalink raw reply
* Re: linux-next: manual merge of the akpm tree with Linus' tree
From: Xiao Guangrong @ 2012-03-08 7:50 UTC (permalink / raw)
To: Andrew Morton; +Cc: Stephen Rothwell, linux-next, linux-kernel, Linus
In-Reply-To: <20120307235012.847af577.akpm@linux-foundation.org>
On 03/08/2012 03:50 PM, Andrew Morton wrote:
> On Thu, 8 Mar 2012 18:41:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>> Hi Andrew,
>>
>> On Wed, 7 Mar 2012 23:32:20 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>>>
>>> Actually they're different. I reworked the earlier patch as below.
>>
>> OK. But some comments.
>>
>>> diff -puN arch/x86/mm/hugetlbpage.c~hugetlb-drop-prev_vma-in-hugetlb_get_unmapped_area_topdown arch/x86/mm/hugetlbpage.c
>>> --- a/arch/x86/mm/hugetlbpage.c~hugetlb-drop-prev_vma-in-hugetlb_get_unmapped_area_topdown
>>> +++ a/arch/x86/mm/hugetlbpage.c
>>> @@ -308,7 +308,7 @@ static unsigned long hugetlb_get_unmappe
>>> {
>>> struct hstate *h = hstate_file(file);
>>> struct mm_struct *mm = current->mm;
>>> - struct vm_area_struct *vma, *prev_vma;
>>> + struct vm_area_struct *vma;
>>
>> You still remove prev_vma ...
>>
>>> unsigned long base = mm->mmap_base, addr = addr0;
>>> unsigned long largest_hole = mm->cached_hole_size;
>>> int first_time = 1;
>>> @@ -334,25 +334,16 @@ try_again:
>>> * i.e. return with success:
>>> */
>>> vma = find_vma(mm, addr);
>>> - if (!vma)
>>> - return addr;
>>> -
>>> - /*
>>> - * new region fits between prev_vma->vm_end and
>>> - * vma->vm_start, use it:
>>> - */
>>> - prev_vma = vma->vm_prev;
>>> - if (addr + len <= vma->vm_start &&
>>> - (!prev_vma || (addr >= prev_vma->vm_end))) {
>>> + if (vma)
>>> + prev_vma = vma->vm_prev;
>>
>> But then assign to it ...
>>
>>> + if (!vma || addr + len <= vma->vm_start) {
>>> /* remember the address as a hint for next time */
>>> mm->cached_hole_size = largest_hole;
>>> return (mm->free_area_cache = addr);
>>> - } else {
>>> + } else if (mm->free_area_cache == vma->vm_end) {
>>> /* pull free_area_cache down to the first hole */
>>> - if (mm->free_area_cache == vma->vm_end) {
>>> - mm->free_area_cache = vma->vm_start;
>>> - mm->cached_hole_size = largest_hole;
>>> - }
>>> + mm->free_area_cache = vma->vm_start;
>>> + mm->cached_hole_size = largest_hole;
>>> }
>>>
>>> /* remember the largest hole we saw so far */
>>
>> But it never gets used.
>
> Doh. The author reviewed that for me too!
>
> I'll drop it - please rework, retest and resend?
I am sorry, i will repost it!
^ permalink raw reply
* Re: linux-next: manual merge of the akpm tree with Linus' tree
From: Andrew Morton @ 2012-03-08 7:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Linus, Xiao Guangrong
In-Reply-To: <20120308184105.5b03ec90bcddf90562181277@canb.auug.org.au>
On Thu, 8 Mar 2012 18:41:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> On Wed, 7 Mar 2012 23:32:20 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > Actually they're different. I reworked the earlier patch as below.
>
> OK. But some comments.
>
> > diff -puN arch/x86/mm/hugetlbpage.c~hugetlb-drop-prev_vma-in-hugetlb_get_unmapped_area_topdown arch/x86/mm/hugetlbpage.c
> > --- a/arch/x86/mm/hugetlbpage.c~hugetlb-drop-prev_vma-in-hugetlb_get_unmapped_area_topdown
> > +++ a/arch/x86/mm/hugetlbpage.c
> > @@ -308,7 +308,7 @@ static unsigned long hugetlb_get_unmappe
> > {
> > struct hstate *h = hstate_file(file);
> > struct mm_struct *mm = current->mm;
> > - struct vm_area_struct *vma, *prev_vma;
> > + struct vm_area_struct *vma;
>
> You still remove prev_vma ...
>
> > unsigned long base = mm->mmap_base, addr = addr0;
> > unsigned long largest_hole = mm->cached_hole_size;
> > int first_time = 1;
> > @@ -334,25 +334,16 @@ try_again:
> > * i.e. return with success:
> > */
> > vma = find_vma(mm, addr);
> > - if (!vma)
> > - return addr;
> > -
> > - /*
> > - * new region fits between prev_vma->vm_end and
> > - * vma->vm_start, use it:
> > - */
> > - prev_vma = vma->vm_prev;
> > - if (addr + len <= vma->vm_start &&
> > - (!prev_vma || (addr >= prev_vma->vm_end))) {
> > + if (vma)
> > + prev_vma = vma->vm_prev;
>
> But then assign to it ...
>
> > + if (!vma || addr + len <= vma->vm_start) {
> > /* remember the address as a hint for next time */
> > mm->cached_hole_size = largest_hole;
> > return (mm->free_area_cache = addr);
> > - } else {
> > + } else if (mm->free_area_cache == vma->vm_end) {
> > /* pull free_area_cache down to the first hole */
> > - if (mm->free_area_cache == vma->vm_end) {
> > - mm->free_area_cache = vma->vm_start;
> > - mm->cached_hole_size = largest_hole;
> > - }
> > + mm->free_area_cache = vma->vm_start;
> > + mm->cached_hole_size = largest_hole;
> > }
> >
> > /* remember the largest hole we saw so far */
>
> But it never gets used.
Doh. The author reviewed that for me too!
I'll drop it - please rework, retest and resend?
^ permalink raw reply
* Re: linux-next: manual merge of the akpm tree with Linus' tree
From: Stephen Rothwell @ 2012-03-08 7:41 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Linus
In-Reply-To: <20120307233220.5a76aa3c.akpm@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 2073 bytes --]
Hi Andrew,
On Wed, 7 Mar 2012 23:32:20 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> Actually they're different. I reworked the earlier patch as below.
OK. But some comments.
> diff -puN arch/x86/mm/hugetlbpage.c~hugetlb-drop-prev_vma-in-hugetlb_get_unmapped_area_topdown arch/x86/mm/hugetlbpage.c
> --- a/arch/x86/mm/hugetlbpage.c~hugetlb-drop-prev_vma-in-hugetlb_get_unmapped_area_topdown
> +++ a/arch/x86/mm/hugetlbpage.c
> @@ -308,7 +308,7 @@ static unsigned long hugetlb_get_unmappe
> {
> struct hstate *h = hstate_file(file);
> struct mm_struct *mm = current->mm;
> - struct vm_area_struct *vma, *prev_vma;
> + struct vm_area_struct *vma;
You still remove prev_vma ...
> unsigned long base = mm->mmap_base, addr = addr0;
> unsigned long largest_hole = mm->cached_hole_size;
> int first_time = 1;
> @@ -334,25 +334,16 @@ try_again:
> * i.e. return with success:
> */
> vma = find_vma(mm, addr);
> - if (!vma)
> - return addr;
> -
> - /*
> - * new region fits between prev_vma->vm_end and
> - * vma->vm_start, use it:
> - */
> - prev_vma = vma->vm_prev;
> - if (addr + len <= vma->vm_start &&
> - (!prev_vma || (addr >= prev_vma->vm_end))) {
> + if (vma)
> + prev_vma = vma->vm_prev;
But then assign to it ...
> + if (!vma || addr + len <= vma->vm_start) {
> /* remember the address as a hint for next time */
> mm->cached_hole_size = largest_hole;
> return (mm->free_area_cache = addr);
> - } else {
> + } else if (mm->free_area_cache == vma->vm_end) {
> /* pull free_area_cache down to the first hole */
> - if (mm->free_area_cache == vma->vm_end) {
> - mm->free_area_cache = vma->vm_start;
> - mm->cached_hole_size = largest_hole;
> - }
> + mm->free_area_cache = vma->vm_start;
> + mm->cached_hole_size = largest_hole;
> }
>
> /* remember the largest hole we saw so far */
But it never gets used.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the akpm tree with Linus' tree
From: Andrew Morton @ 2012-03-08 7:32 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Linus
In-Reply-To: <20120308175307.b295b1013728a5666fe4571a@canb.auug.org.au>
On Thu, 8 Mar 2012 17:53:07 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> arch/x86/mm/hugetlbpage.c between commit 097d59106a8e ("vm: avoid using
> find_vma_prev() unnecessarily") from Linus' tree and commit "hugetlb:
> drop prev_vma in hugetlb_get_unmapped_area_topdown()" from the akpm tree.
>
> I think the latter is a superset of the former, so I just dropped the
> changes from the former.
Actually they're different. I reworked the earlier patch as below.
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Subject: hugetlb: drop prev_vma in hugetlb_get_unmapped_area_topdown()
After the call find_vma_prev(mm, addr, &prev_vma), the following condition
is always true:
!prev_vma || (addr >= prev_vma->vm_end)
it can happily drop prev_vma and use find_vma() instead of find_vma_prev().
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Hillf Danton <dhillf@gmail.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/x86/mm/hugetlbpage.c | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff -puN arch/x86/mm/hugetlbpage.c~hugetlb-drop-prev_vma-in-hugetlb_get_unmapped_area_topdown arch/x86/mm/hugetlbpage.c
--- a/arch/x86/mm/hugetlbpage.c~hugetlb-drop-prev_vma-in-hugetlb_get_unmapped_area_topdown
+++ a/arch/x86/mm/hugetlbpage.c
@@ -308,7 +308,7 @@ static unsigned long hugetlb_get_unmappe
{
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
- struct vm_area_struct *vma, *prev_vma;
+ struct vm_area_struct *vma;
unsigned long base = mm->mmap_base, addr = addr0;
unsigned long largest_hole = mm->cached_hole_size;
int first_time = 1;
@@ -334,25 +334,16 @@ try_again:
* i.e. return with success:
*/
vma = find_vma(mm, addr);
- if (!vma)
- return addr;
-
- /*
- * new region fits between prev_vma->vm_end and
- * vma->vm_start, use it:
- */
- prev_vma = vma->vm_prev;
- if (addr + len <= vma->vm_start &&
- (!prev_vma || (addr >= prev_vma->vm_end))) {
+ if (vma)
+ prev_vma = vma->vm_prev;
+ if (!vma || addr + len <= vma->vm_start) {
/* remember the address as a hint for next time */
mm->cached_hole_size = largest_hole;
return (mm->free_area_cache = addr);
- } else {
+ } else if (mm->free_area_cache == vma->vm_end) {
/* pull free_area_cache down to the first hole */
- if (mm->free_area_cache == vma->vm_end) {
- mm->free_area_cache = vma->vm_start;
- mm->cached_hole_size = largest_hole;
- }
+ mm->free_area_cache = vma->vm_start;
+ mm->cached_hole_size = largest_hole;
}
/* remember the largest hole we saw so far */
_
^ permalink raw reply
* linux-next: Tree for Mar 8
From: Stephen Rothwell @ 2012-03-08 7:24 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 47815 bytes --]
Hi all,
Changes since 20120307:
The powerpc tree gained a conflict against the arm tree.
The pci tree still has its build failure for which I applied a patch.
The cpufreq tree gained a conflict against the cpufreq-current tree.
The tip tree gained a build failure for which I disabled a staging driver.
The arm-soc tree gained conflicts against the omap-dss2 and Linus' trees.
The akpm tree lost some patches that turned up elsewhere and gained
conflicts against the tip and Linus' trees.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 185 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (4f262ac Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm)
Merging fixes/master (88ebdda Merge tag 'for-3.3' of git://openrisc.net/jonas/linux)
Merging kbuild-current/rc-fixes (42f1c01 coccicheck: change handling of C={1,2} when M= is set)
Merging arm-current/fixes (a0feb6d ARM: 7358/1: perf: add PMU hotplug notifier)
Merging m68k-current/for-linus (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation)
Merging powerpc-merge/merge (c2ea377 Merge remote-tracking branch 'origin/master' into merge)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (e51e07e sparc32: forced setting of mode of sun4m per-cpu timers)
Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576)
Merging net/master (d47775c Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless)
Merging sound-current/for-linus (526af6e ALSA: hda/realtek - Apply the coef-setup only to ALC269VB)
Merging pci-current/for-linus (a97f4f5 x86/PCI: do not tie MSI MS-7253 use_crs quirk to BIOS version)
Merging wireless/master (182ada1 iwlwifi: fix wowlan suspend)
Merging driver-core.current/driver-core-linus (192cfd5 Linux 3.3-rc6)
Merging tty.current/tty-linus (f21c6d4 tty/powerpc: early udbg consoles can't be modules)
Merging usb.current/usb-linus (7191940 Revert "powerpc/usb: fix issue of CPU halt when missing USB PHY clock")
Merging staging.current/staging-linus (6b21d18 Linux 3.3-rc5)
Merging char-misc.current/char-misc-linus (b01543d Linux 3.3-rc4)
Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes)
Merging input-current/for-linus (19d57d3 Input: wacom - fix 3rd-gen Bamboo MT when 4+ fingers are in use)
Merging md-current/for-linus (7a90484 md/raid10: fix assembling of arrays with replacement devices.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (f8f54e1 crypto: mv_cesa - fix final callback not ignoring input data)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging devicetree-current/devicetree/merge (2261cc6 dt: add empty of_find_compatible_node function)
Merging spi-current/spi/merge (c88db23 spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver)
Merging gpio-current/gpio/merge (7e3a70f gpio: Add missing spin_lock_init in gpio-ml-ioh driver)
Merging arm/for-next (0e7f451 Merge branch 'acorn' into for-next)
Merging arm-perf/for-next/perf (cdd2a5b Merge branches 'perf/updates' and 'perf/fixes' into for-next/perf)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (5c2c667 Merge branch 'next/soc-exynos5250-arch' into for-next)
Merging tegra/for-next (1233655 Merge branch 'for-3.4/cleanup-and-fixes' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (e651fe5 Blackfin: wire up new process_vm syscalls)
Merging c6x/for-linux-next (4cd7c0a C6X: fix KSTK_EIP and KSTK_ESP macros)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging ia64/next (15839b4 [IA64] Fix a couple of warnings for EXPORT_SYMBOL)
Merging m68k/for-next (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation)
Merging m68knommu/for-next (ae909ea m68knommu: factor more common ColdFire cpu reset code)
Merging microblaze/next (8597559 Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6)
Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next)
Merging openrisc/for-upstream (fa8d9d7 OpenRISC: Remove memory_start/end prototypes)
Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
Merging powerpc/next (2d4b971 powerpc/pmac: Use string library in nvram code)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging 4xx/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
Merging s390/features (451eb06 [S390] Ensure that vmcore_info pointer is never accessed directly)
Merging sparc-next/master (e9b57cc sparc: Use vsprintf extention %pf with builtin_return_address)
Merging tile/master (0c90547 arch/tile: use new generic {enable,disable}_percpu_irq() routines)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (83eb26a ceph: ensure prealloc_blob is in place when removing xattr)
Merging cifs/master (d575146 CIFS: Do not kmalloc under the flocks spinlock)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (e703c20 ext3: fix start and len arguments handling in ext3_trim_fs())
Merging ext4/dev (9ee4930 ext4: format flag in dx_probe())
Merging fuse/for-next (4273b79 fuse: O_DIRECT support for files)
Merging gfs2/master (58884c4 GFS2: make sure rgrps are up to date in func gfs2_blk2rgrpd)
Merging logfs/master (55062d0 x86: fix typo in recent find_vma_prev purge)
Merging nfs/linux-next (cf470c3 NFSv4: Don't free the nfs4_lock_state until after the release_lockowner)
Merging nfsd/nfsd-next (508dc6e nfsd41: free_session/free_client must be called under the client_lock)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (3d4a1c8 Squashfs: fix i_blocks calculation with extended regular files)
Merging v9fs/for-next (208f3c2 net/9p: handle flushed Tclunk/Tremove)
Merging ubifs/linux-next (c43be10 UBIFS: do not use inc_link when i_nlink is zero)
Merging xfs/for-next (4b217ed quota: make Q_XQUOTASYNC a noop)
CONFLICT (content): Merge conflict in fs/xfs/xfs_trans_dquot.c
Merging vfs/for-next (9161999 fs: initial qnx6fs addition)
Merging pci/linux-next (63ab387 x86/PCI: add spinlock held check to 'pcibios_fwaddrmap_lookup()')
CONFLICT (content): Merge conflict in arch/mips/pci/pci.c
Applying: powerpc/PCI: fix up for mismatch between resource_size_t and pointer size
Merging hid/for-next (7c923df Merge branch 'multitouch' into for-next)
Merging quilt/i2c (c3632e0 i2c-i801: Use usleep_range to wait for command completion)
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging i2c-embedded/i2c-embedded/for-next (bbceeee i2c-eg20t: Remove write-only variables)
Merging quilt/jdelvare-hwmon (064628b hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (b77a6b8 hwmon: (zl6100) Add support for ZL9101M and ZL9117M)
Merging quilt/kernel-doc (7e7b32a Update quilt tree location for Documentation/ patches.)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
Merging v4l-dvb/master (df0877b Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (17c0999 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (3f1581f sata_fsl: add support for interrupt coalsecing feature)
Merging infiniband/for-next (8f52938 Merge branches 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next)
Merging acpi/next (71ad90e ACPICA: Fix regression in FADT revision checks)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (02c68b7 Merge branch 'master' into for-next)
Merging ubi/linux-next (a29852b UBI: fix error handling in ubi_scan())
Merging dlm/next (60f98d1 dlm: add recovery callbacks)
Merging scsi/master (cd8df93 [SCSI] qla4xxx: Update driver version to 5.02.00-k15)
Merging target-updates/for-next (c0974f8 target: Allow target_submit_tmr interrupt context + pass ABORT_TASK tag)
Merging target-merge/for-next-merge (c0974f8 target: Allow target_submit_tmr interrupt context + pass ABORT_TASK tag)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (57872c2 Merge branches 'devel' and 'fixes' into all)
CONFLICT (content): Merge conflict in include/scsi/libsas.h
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_init.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_expander.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_discover.c
CONFLICT (content): Merge conflict in drivers/scsi/isci/registers.h
CONFLICT (content): Merge conflict in drivers/scsi/isci/init.c
Merging slave-dma/next (6d0d7e2 dma: imx-sdma: Print a message when firmare fails to be requested)
CONFLICT (content): Merge conflict in drivers/mmc/host/atmel-mci.c
Merging dmaengine/next (d07a74a dmaengine: fix missing 'cnt' in ?: in dmatest)
Merging net-next/master (b4fb05e tcp: md5: correct a RCU lockdep splat)
Merging wireless-next/master (41b58f1 rtl8187: Add AD-HOC support)
Merging bluetooth/master (f64b993 Bluetooth: Fix coding style in all .h files)
Merging mtd/master (3c3e51d Merge ../linux-2.6 to bring in 3.3-rc fixes already merged)
Merging l2-mtd/master (309756e mtd : change the location of the ONFI detected log)
CONFLICT (content): Merge conflict in drivers/mtd/chips/cfi_cmdset_0002.c
Merging crypto/master (8940426 crypto: twofish-x86_64/i586 - set alignmask to zero)
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/fuse.c
Merging sound/for-next (0acf2f8 Merge branch 'topic/hda' into for-next)
CONFLICT (content): Merge conflict in sound/soc/mxs/mxs-pcm.h
CONFLICT (content): Merge conflict in sound/soc/imx/imx-pcm-dma-mx2.c
Merging sound-asoc/for-next (1a8feca Merge branch 'for-3.4' into asoc-next)
Merging cpufreq/next (fd0ef7a [CPUFREQ] CPUfreq ondemand: update sampling rate without waiting for next sampling)
CONFLICT (content): Merge conflict in drivers/cpufreq/Kconfig.arm
Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.)
CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
Merging input/next (104a5f3 Input: max8925_onkey - avoid accessing input device too early)
Merging input-mt/for-next (7491f3d bcm5974: Add pointer and buttonpad properties)
Merging block/for-next (7622d14 Merge branch 'for-3.4/drivers' into for-next)
Merging quilt/device-mapper (8aad5b7 Commit unwritten data every second to prevent too much building up. In future we might make the commit interval tunable.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
CONFLICT (content): Merge conflict in drivers/pcmcia/soc_common.c
Merging battery/master (913272b Merge git://git.infradead.org/users/cbou/battery-urgent)
Merging mmc/mmc-next (b985f9c mmc: omap_hsmmc: Don't expect MMC1 to always have vmmc supply)
CONFLICT (content): Merge conflict in include/linux/mmc/host.h
CONFLICT (content): Merge conflict in drivers/mmc/host/atmel-mci.c
Merging kgdb/kgdb-next (0e997a4 KDB: Fix usability issues relating to the 'enter' key.)
Merging slab/for-next (96438bc Merge branch 'slub/cleanups' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (61f3dfb md: don't set md arrays to readonly on shutdown.)
Merging mfd/for-next (2f5f89b mfd: Fix pm8606 build failure)
CONFLICT (content): Merge conflict in drivers/mfd/ab8500-core.c
Merging drm/drm-next (81ffbbe drm/radeon: fix deferred page-flip detection logic on Avivo-based ASICs)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
Merging fbdev/fbdev-next (33ad391 MAINTAINERS: add entry for exynos mipi display drivers)
Merging viafb/viafb-next (91dc1be viafb: LCD bpp cleanup)
Merging omap_dss2/for-next (4614679 OMAPDSS: APPLY: print warning if wait_pending_extra_info_updates fails)
Merging regulator/for-next (829c7fa Merge branch 'regulator-drivers', tag 'for-linus' into regulator-next)
Merging security/next (f67dabb KEYS: testing wrong bit for KEY_FLAG_REVOKED)
Merging selinux/master (a9ab18a selinux: include flow.h where used rather than get it indirectly)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/linux-next (d6b7074 watchdog: pnx4008: don't use __raw_-accessors)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (b1ad1ef Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next)
Merging osd/linux-next (0aa436b exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (4f3612b Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c")
CONFLICT (content): Merge conflict in drivers/watchdog/pnx4008_wdt.c
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (ed819e3 Merge branch 'pm-qos')
Merging apm/for-next (b4a133d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
CONFLICT (modify/delete): arch/powerpc/platforms/iseries/Kconfig deleted in HEAD and modified in devicetree/devicetree/next. Version devicetree/devicetree/next of arch/powerpc/platforms/iseries/Kconfig left in tree.
$ git rm -f arch/powerpc/platforms/iseries/Kconfig
Merging spi/spi/next (14af60b spi/pl022: Add high priority message pump support)
Merging tip/auto-latest (ce6deb9 Merge branch 'x86/x32' into auto-latest)
CONFLICT (content): Merge conflict in include/net/sock.h
CONFLICT (modify/delete): arch/m68k/kernel/process_no.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/m68k/kernel/process_no.c left in tree.
CONFLICT (modify/delete): arch/m68k/kernel/process_mm.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/m68k/kernel/process_mm.c left in tree.
$ git rm -f arch/m68k/kernel/process_no.c arch/m68k/kernel/process_mm.c
Applying: sched/rt: Use schedule_preempt_disabled() in m68k
Applying: staging: disable the sep driver due to breakage
Merging rcu/rcu/next (1cc8596 rcu: Stop spurious warnings from synchronize_sched_expedited)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (f0b42ab uprobes/core: handle breakpoint and signal step exception.)
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (add/add): Merge conflict in kernel/events/uprobes.c
CONFLICT (content): Merge conflict in kernel/events/Makefile
CONFLICT (add/add): Merge conflict in include/linux/uprobes.h
CONFLICT (content): Merge conflict in fs/signalfd.c
CONFLICT (content): Merge conflict in fs/eventpoll.c
CONFLICT (add/add): Merge conflict in arch/x86/kernel/uprobes.c
CONFLICT (add/add): Merge conflict in arch/x86/include/asm/uprobes.h
Merging cgroup/for-next (3ce3230 cgroup: Walk task list under tasklist_lock in cgroup_enable_task_cg_list)
CONFLICT (content): Merge conflict in block/blk-cgroup.c
Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3)
Merging kvm/linux-next (6613bf8 Fix kvm_vcpu_compatible for non-x86)
Merging oprofile/for-next (b9e7f8e Merge branches 'oprofile/urgent' and 'oprofile/core' into oprofile/master)
CONFLICT (content): Merge conflict in tools/perf/util/header.c
Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
Merging xen-two/linux-next (eb76442 Merge branch 'stable/for-linus-3.4' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_return() definition)
Merging workqueues/for-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e75732 sysctl: Don't call sysctl_follow_link unless we are a link.)
CONFLICT (content): Merge conflict in fs/proc/proc_sysctl.c
Merging regmap/for-next (52c6221 Merge remote-tracking branches 'regmap/topic/bulk', 'regmap/topic/devm', 'regmap/topic/patch' and 'regmap/topic/sync' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (f6e8a1d w1_bq27000: Only one thread can access the bq27000 at a time.)
CONFLICT (content): Merge conflict in include/linux/pci.h
CONFLICT (content): Merge conflict in drivers/base/cpu.c
Merging tty/tty-next (6623d64 tty: keyboard.c: add uaccess.h to fix a build problem on sparc32)
Merging usb/usb-next (30e9eb1 usb/gadget/pch_udc: Fix compile error)
CONFLICT (content): Merge conflict in drivers/usb/host/ehci-fsl.h
Merging staging/staging-next (97d5cb0 staging/mei: don't use read buffer for writing)
Merging char-misc/char-misc-next (b222258 misc: bmp085: Use unsigned long to store jiffies)
Merging tmem/linux-next (b05b561 Merge branch 'devel/frontswap.v13' into linux-next)
Applying: mm: frontswap: update for security_vm_enough_memory API change
Merging writeback/writeback-for-next (977b7e3 writeback: fix dereferencing NULL bdi->dev on trace_writeback_queue)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (a6c3b33 Merge branch 'pinctrl-tegra-for-next-diet' into for-next)
Merging moduleh/for-sfr (60f35e3 Merge branch 'module-3.4' into for-sfr-Mar6)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/dwc3-omap.c
Merging vhost/linux-next (1e05b62 sh: use the the PCI channels's io_map_base)
Merging kmap_atomic/kmap_atomic (23a000f feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
CONFLICT (content): Merge conflict in drivers/staging/zcache/zcache-main.c
CONFLICT (content): Merge conflict in drivers/scsi/storvsc_drv.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/e1000e/netdev.c
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/)
CONFLICT (content): Merge conflict in include/linux/virtio_ids.h
Merging irqdomain/irqdomain/next (e7cc3ac dt: fix twl4030 for non-dt compile on x86)
CONFLICT (content): Merge conflict in arch/powerpc/sysdev/mpic.c
CONFLICT (content): Merge conflict in arch/c6x/Kconfig
CONFLICT (content): Merge conflict in arch/arm/common/gic.c
Merging gpio/gpio/next (e4e449e gpiolib: Add comments explaining the _cansleep() WARN_ON()s)
CONFLICT (content): Merge conflict in include/linux/mfd/tps65910.h
Merging arm-soc/for-next (5026c75 Merge branch 'next/fixes-non-critical' into for-next)
CONFLICT (modify/delete): arch/arm/plat-mxc/audmux-v1.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of arch/arm/plat-mxc/audmux-v1.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/pxa27x.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/pxa25x.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap1/board-palmz71.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap1/board-palmtt.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap1/board-osk.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap1/board-nokia770.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap1/board-ams-delta.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx3.c
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
$ git rm -f arch/arm/plat-mxc/audmux-v1.c
Merging kvmtool/master (402e975 kvm tools: Bring mptables back in case if no firmware used)
Merging dma-mapping/dma-mapping-next (6cc2bf1 common: DMA-mapping: add NON-CONSISTENT attribute)
Merging ktest/for-next (be405f9 ktest: Add INGORE_ERRORS to ignore warnings in boot up)
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: geos: platform driver for Geos and Geos2 single-board computers
CONFLICT (content): Merge conflict in arch/x86/platform/geode/Makefile
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Applying: platform-drivers-x86: convert drivers/platform/x86/* to use module_platform_driver()
Applying: drivers/platform/x86/sony-laptop.c: fix scancodes
Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
Applying: drivers/platform/x86/acer-wmi.c: no wifi rfkill on Lenovo machines
Applying: x86, olpc: add debugfs interface for EC commands
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix
Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
Applying: x86-change-percpu_read_stable-to-this_cpu_read_stable-fix
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: drivers/media/video/uvc/uvc_driver.c: use linux/atomic.h
Applying: Hexagon: use set_current_blocked() and block_sigmask()
Applying: drivers/idle/intel_idle.c: fix confusing code identation
Applying: tile: use set_current_blocked() and block_sigmask()
Applying: hrtimers: Special-case zero length sleeps
Applying: hpet: factor timer allocate from open
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: headers_check: recursively search for linux/types.h inclusion
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: MIPS: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: drivers/thermal/thermal_sys.c: fix build warning
Applying: thermal_sys: remove unnecessary line continuations
Applying: thermal_sys: remove obfuscating used-once macros
Applying: thermal_sys: kernel style cleanups
Applying: thermal_sys: convert printks to pr_<level>
Applying: thermal: add support for thermal sensor present on SPEAr13xx machines
Applying: thermal-add-support-for-thermal-sensor-present-on-spear13xx-machines-fix
Applying: thermal-add-support-for-thermal-sensor-present-on-spear13xx-machines-fix-fix
Applying: thermal/spear_thermal: Add compilation dependency on PLAT_SPEAR
Applying: thermal/spear_thermal: replace readl/writel with lighter _relaxed variants
Applying: thermal: spear13xx: checking for NULL instead of IS_ERR()
Applying: unicore32: use block_sigmask()
Applying: net/netfilter/nfnetlink_acct.c: use linux/atomic.h
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: xtensa: don't reimplement force_sigsegv()
Applying: xtensa: no need to reset handler if SA_ONESHOT
Applying: xtensa: don't mask signals if we fail to setup signal stack
Applying: xtensa: use set_current_blocked() and block_sigmask()
Applying: slab: introduce kmalloc_array()
Applying: sparc: use block_sigmask()
Applying: mm, oom: avoid looping when chosen thread detaches its mm
Applying: mm, oom: fold oom_kill_task() into oom_kill_process()
Applying: mm, oom: do not emit oom killer warning if chosen thread is already exiting
Applying: mm, oom: introduce independent oom killer ratelimit state
Applying: mm: add rss counters consistency check
Applying: mm/vmscan.c: cleanup with s/reclaim_mode/isolate_mode/
Applying: mm: make get_mm_counter static-inline
Applying: mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()
Applying: mm: make swapin readahead skip over holes
Applying: make-swapin-readahead-skip-over-holes-fix
Applying: vmscan: reclaim at order 0 when compaction is enabled
Applying: vmscan: kswapd carefully call compaction
Applying: vmscan-kswapd-carefully-call-compaction-fix
Applying: vmscan: only defer compaction for failed order and higher
Applying: compact_pgdat: workaround lockdep warning in kswapd
Applying: mm: compaction: make compact_control order signed
Applying: mm-compaction-make-compact_control-order-signed-fix
Applying: hugetlbfs: fix hugetlb_get_unmapped_area()
Applying: hugetlb: drop prev_vma in hugetlb_get_unmapped_area_topdown()
CONFLICT (content): Merge conflict in arch/x86/mm/hugetlbpage.c
Applying: hugetlb: try to search again if it is really needed
Applying: hugetlb-try-to-search-again-if-it-is-really-needed-fix
Applying: mm: do not reset cached_hole_size when vma is unmapped
Applying: mm: search from free_area_cache for the bigger size
Applying: pagemap: avoid splitting thp when reading /proc/pid/pagemap
Applying: thp: optimize away unnecessary page table locking
Applying: fix mremap bug of failing to split thp
Applying: thp-optimize-away-unnecessary-page-table-locking-fix-checkpatch-fixes
Applying: pagemap: export KPF_THP
Applying: pagemap: document KPF_THP and make page-types aware of it
Applying: pagemap: introduce data structure for pagemap entry
Applying: mm: replace PAGE_MIGRATION with IS_ENABLED(CONFIG_MIGRATION)
Applying: mm: vmscan: forcibly scan highmem if there are too many buffer_heads pinning highmem
Applying: mm: move buffer_heads_over_limit check up
Applying: mm-vmscan-forcibly-scan-highmem-if-there-are-too-many-buffer_heads-pinning-highmem-fix-fix
Applying: mm: hugetlb: defer freeing pages when gathering surplus pages
Applying: rmap: anon_vma_prepare: Reduce code duplication by calling anon_vma_chain_link
Applying: vmscan: handle isolated pages with lru lock released
Applying: thp: documentation: 'transparent_hugepage=' can also be specified on cmdline
Applying: mm: hugetlb: bail out unmapping after serving reference page
Applying: mm: hugetlb: cleanup duplicated code in unmapping vm range
Applying: procfs: mark thread stack correctly in proc/<pid>/maps
Applying: mm, oom: force oom kill on sysrq+f
Applying: tmpfs: security xattr setting on inode creation
Applying: thp: allow a hwpoisoned head page to be put back to LRU
Applying: mm: fix move/migrate_pages() race on task struct
Applying: mm-fix-move-migrate_pages-race-on-task-struct-checkpatch-fixes
Applying: mm: drain percpu lru add/rotate page-vectors on cpu hot-unplug
Applying: bootmem/sparsemem: remove limit constraint in alloc_bootmem_section
Applying: bootmem-sparsemem-remove-limit-constraint-in-alloc_bootmem_section-fix
Applying: ksm: clean up page_trans_compound_anon_split()
Applying: ksm: cleanup: introduce ksm_check_mm()
Applying: ksm-cleanup-introduce-ksm_check_mm-fix
Applying: hugetlbfs: avoid taking i_mutex from hugetlbfs_read()
Applying: mm: don't set __GFP_WRITE on ramfs/sysfs writes
Applying: mm: use global_dirty_limit in throttle_vm_writeout()
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: memcg: replace MEM_CONT by MEM_RES_CTLR
Applying: memcg: replace mem and mem_cont stragglers
Applying: memcg: lru_size instead of MEM_CGROUP_ZSTAT
Applying: memcg: enum lru_list lru
Applying: memcg: remove redundant returns
Applying: memcg: remove unnecessary thp check in page stat accounting
Applying: idr: make idr_get_next() good for rcu_read_lock()
Applying: cgroup: revert ss_id_lock to spinlock
Applying: memcg: let css_get_next() rely upon rcu_read_lock()
Applying: memcg: remove PCG_CACHE page_cgroup flag
Applying: memcg-remove-pcg_cache-page_cgroup-flag-checkpatch-fixes
Applying: memcg: remove PCG_CACHE page_cgroup flag fix
Applying: memcg: kill dead prev_priority stubs
Applying: memcg: remove EXPORT_SYMBOL(mem_cgroup_update_page_stat)
Applying: memcg: simplify move_account() check
Applying: memcg-simplify-move_account-check-fix
Applying: memcg: remove PCG_MOVE_LOCK flag from page_cgroup
Applying: memcg: use new logic for page stat accounting
Applying: memcg-use-new-logic-for-page-stat-accounting-fix
Applying: memcg: fix deadlock by avoiding stat lock when anon
Applying: memcg: remove PCG_FILE_MAPPED
Applying: memcg-remove-pcg_file_mapped-fix
Applying: memcg: remove PCG_FILE_MAPPED fix cosmetic fix
Applying: memcg: remove PCG_CACHE page_cgroup flag fix2
Applying: memcg: fix performance of mem_cgroup_begin_update_page_stat()
Applying: memcg-fix-performance-of-mem_cgroup_begin_update_page_stat-fix
Applying: mm/memcontrol.c: s/stealed/stolen/
Applying: mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event()
Applying: mm/memcontrol.c: remove unnecessary 'break' in mem_cgroup_read()
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: sh: no need to reset handler if SA_ONESHOT
Applying: sh: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: alpha: use set_current_blocked() and block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: C6X: use set_current_blocked() and block_sigmask()
Applying: cpuidle: add a sysfs entry to disable specific C state for debug purpose.
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
Applying: um: don't restore current->blocked on error
Applying: um: use set_current_blocked() and block_sigmask()
Applying: magic.h: move some FS magic numbers into magic.h
Applying: nmi watchdog: do not use cpp symbol in Kconfig
Applying: ceph, cifs, nfs, fuse: boolean and / or confusion
Applying: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: percpu: remove percpu_xxx() functions
Applying: percpu-remove-percpu_xxx-functions-fix
Applying: headers: include linux/types.h where appropriate
Applying: consolidate WARN_...ONCE() static variables
Applying: Remove remaining bits of io_remap_page_range()
Applying: prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision
Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix
Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix
Applying: kernel/exit.c: if init dies, log a signal which killed it, if any
Applying: kernel-exitc-if-init-dies-log-a-signal-which-killed-it-if-any-fix
Applying: powerpc/eeh: remove eeh_event_handler()->daemonize()
Applying: vfs: increment iversion when a file is truncated
Applying: brlocks/lglocks: cleanups
Applying: vfs: correctly set the dir i_mutex lockdep class
Applying: seq_file: fix mishandling of consecutive pread() invocations.
Applying: fs: symlink restrictions on sticky directories
Applying: fs-symlink-restrictions-on-sticky-directories-fix-2
Applying: fs: hardlink creation restrictions
Applying: fs-hardlink-creation-restrictions-fix
Applying: fs: hardlink creation restriction cleanup
Applying: get_maintainer: use a default "unknown" S: status/role
Applying: MAINTAINERS: fix REMOTEPROC F: typo
Applying: MAINTAINERS: Update MCA section
Applying: MAINTAINERS: update git urls for 2.6 deletions
Applying: MAINTAINERS: add status to ALPHA architecture
Applying: MAINTAINERS: Add "S: Maintained" to clkdev and clk sections
Applying: backlight: convert backlight i2c drivers to module_i2c_driver
Applying: backlight: convert backlight spi drivers to module_spi_driver
Applying: drivers/video/backlight/wm831x_bl.c: use devm_ functions
Applying: drivers/video/backlight: use devm_ functions
Applying: drivers/video/backlight/adp5520_bl.c: use devm_ functions
Applying: backlight: new backlight driver for LP855x devices
Applying: backlight: lp855x_bl: Add missing mutex_unlock in lp855x_read_byte error path
Applying: backlight/lp855x_bl.c: check platform data in lp855x_probe()
Applying: backlight/lp855x_bl.c: small cleanups
Applying: lp855x-bl: remove unnecessary platform data
Applying: lp855x-bl: remove unnecessary headers
Applying: backlight: add driver for Bachmann's ot200
Applying: backlight-add-driver-for-bachmanns-ot200-fix
Applying: backlight: add support for Pandora backlight
Applying: backlight-add-support-for-pandora-backlight-v2
Applying: backlight: convert platform_lcd to dev_pm_ops
Applying: backlight: fix ot200_bl build
Applying: bitops: rename for_each_set_bit_cont() in favor of analogous list.h function
Applying: bitops: remove for_each_set_bit_cont()
Applying: regmap: cope with bitops API change (for_each_set_bit_cont)
Applying: bitops: introduce for_each_clear_bit()
Applying: mtd: use for_each_clear_bit()
Applying: s390/char: use for_each_clear_bit()
Applying: uwb: use for_each_clear_bit()
Applying: x86: use for_each_clear_bit_from()
Applying: drivers/leds/leds-lp5521.c: fix typo
Applying: drivers/leds/leds-tca6507.c: cleanup error handling in tca6507_probe()
Applying: drivers/leds/leds-tca6507.c: remove obsolete cleanup for clientdata
Applying: drivers/leds/leds-lp5521.c: add 'name' in the lp5521_led_config
Applying: drivers/leds/leds-lp5521.c: add 'update_config' in the lp5521_platform_data
Applying: drivers/leds/leds-lp5521.c: support led pattern data
Applying: leds-lp5521-support-led-pattern-data-checkpatch-fixes
Applying: drivers/leds/leds-lp5521.c: redefinition of register bits
Applying: drivers/leds/leds-lp5521.c: ret may be uninitialized
Applying: drivers/leds/leds-lp5523.c: constify some data
Applying: drivers/leds: add driver for PCA9633 I2C chip
Applying: drivers-leds-add-driver-for-pca9663-i2c-chip-fix
Applying: drivers-leds-add-driver-for-pca9663-i2c-chip-fix-2
Applying: drivers/leds/leds-pca9633.c: fix kcalloc parameters swapped
Applying: drivers/leds/leds-gpio.c: use linux/gpio.h rather than asm/gpio.h
Applying: leds-lm3530: set the max_brightness to 127
Applying: leds-lm3530: replace i2c_client with led_classdev
Applying: leds-lm3530-replace-i2c_client-with-led_classdev-fix
Applying: leds-lm3530: support pwm input mode
Applying: leds-lm3530: remove LM3530_ALS_ZONE_REG code
Applying: leds-lm3530: replace pltfm with pdata
Applying: drivers/leds/leds-pca9633.c: remove unused 'adapter' variable
Applying: drivers/leds/leds-lm3530.c: move the code setting gen_config to one place
Applying: drivers-leds-leds-lm3530c-move-the-code-setting-gen_config-to-one-place-fix
Applying: string: memchr_inv speed improvements
Applying: prio_tree: remove unnecessary code in prio_tree_replace
Applying: prio_tree: cleanup prio_tree_left()/prio_tree_right()
Applying: prio_tree: simplify prio_tree_expand()
Applying: prio_tree: introduce prio_set_parent()
Applying: include/ and checkpatch: prefer __scanf to __attribute__((format(scanf,...)
Applying: checkpatch: add some --strict coding style checks
Applying: checkpatch-add-some-strict-coding-style-checks-v3
Applying: checkpatch.pl: be silent when -q and --ignore is given
Applying: checkpatch: catch [ ... ] usage when not at the beginning of definition
Applying: checkpatch: allow simple character constants in #defines
Applying: checkpatch: handle string concatenation in simple #defines
Applying: checkpatch: high precedence operators do not require additional parentheses in #defines
Applying: checkpatch: add [] to type extensions
Applying: checkpatch: add --strict tests for braces, comments and casts
Applying: checkpatch: add --strict test for strings split across multiple lines
Applying: crc32: remove two instances of trailing whitespaces
Applying: crc32: move long comment about crc32 fundamentals to Documentation/
Applying: crc32-move-long-comment-about-crc32-fundamentals-to-documentation-fix
Applying: crc32: simplify unit test code
Applying: crc32: miscellaneous cleanups
Applying: crc32: fix mixing of endian-specific types
Applying: crc32: make CRC_*_BITS definition correspond to actual bit counts
Applying: crc32: add slice-by-8 algorithm to existing code
Applying: crc32: optimize loop counter for x86
Applying: crc32: add note about this patchset to crc32.c
Applying: crc32: bolt on crc32c
Applying: crc32: Don't reference unnecessary crc32 tables in single-bit mode
Applying: crypto: crc32c should use library implementation
Applying: crc32: add self-test code for crc32c
Applying: crc32: select an algorithm via Kconfig
Applying: epoll: comment the funky #ifdef
Applying: epoll: remove unneeded variable in reverse_path_check()
Applying: init/do_mounts.c: create /root if it does not exist
Applying: rtc-spear: fix for balancing the enable_irq_wake in Power Mgmt
Applying: rtc/spear: fix for RTC_AIE_ON and RTC_AIE_OFF ioctl errors
Applying: rtc/rtc-spear: call platform_set_drvdata() before registering rtc device
Applying: rtc: convert rtc spi drivers to module_spi_driver
Applying: rtc: convert rtc i2c drivers to module_i2c_driver
Applying: MIPS: add RTC support for loongson1B
Applying: drivers/rtc/rtc-twl.c: optimize IRQ bit access
Applying: drivers/rtc/rtc-twl.c: enable RTC irrespective of its prior state
Applying: drivers/rtc/rtc-twl.c: simplify RTC interrupt clearing
Applying: drivers/rtc/rtc-twl.c: return correct RTC event from ISR
Applying: drivers/rtc: remove IRQF_DISABLED
Applying: drivers/rtc/rtc-pm8xxx.c: make pm8xxx_rtc_pm_ops static
Applying: drivers/rtc/rtc-max8925.c: fix max8925_rtc_read_alarm() return value error
Applying: drivers/rtc/rtc-max8925.c: fix alarm->enabled mistake in max8925_rtc_read_alarm/max8925_rtc_set_alarm
Applying: rtc: driver for DA9052/53 PMIC v1
Applying: rtc-rtc-driver-for-da9052-53-pmic-v1-fix
Applying: rtc: ds1307: refactor chip_desc table
Applying: rtc: ds1307: simplify irq setup code
Applying: rtc: ds1307: comment and format cleanup
Applying: rtc: ds1307: generalise ram size and offset
Applying: rtc: fix rtc-ds1307 printk format warning
Applying: ptrace: the killed tracee should not enter the syscall
Applying: ptrace: don't send SIGTRAP on exec if SEIZED
Applying: ptrace: don't modify flags on PTRACE_SETOPTIONS failure
Applying: ptrace: simplify PTRACE_foo constants and PTRACE_SETOPTIONS code
Applying: ptrace: make PTRACE_SEIZE set ptrace options specified in 'data' parameter
Applying: ptrace: renumber PTRACE_EVENT_STOP so that future new options and events can match
Applying: ptrace: remove PTRACE_SEIZE_DEVEL bit
Applying: signal: give SEND_SIG_FORCED more power to beat SIGNAL_UNKILLABLE
Applying: signal: cosmetic, s/from_ancestor_ns/force/ in prepare_signal() paths
Applying: signal: oom_kill_task: use SEND_SIG_FORCED instead of force_sig()
Applying: signal: zap_pid_ns_processes: s/SEND_SIG_NOINFO/SEND_SIG_FORCED/
Applying: usermodehelper: use UMH_WAIT_PROC consistently
Applying: usermodehelper: introduce umh_complete(sub_info)
Applying: usermodehelper: implement UMH_KILLABLE
Applying: usermodehelper: kill umh_wait, renumber UMH_* constants
Applying: usermodehelper: ____call_usermodehelper() doesn't need do_exit()
Applying: kmod: introduce call_modprobe() helper
Applying: kmod: make __request_module() killable
Applying: kmod: avoid deadlock from recursive kmod call
Applying: kmod-avoid-deadlock-by-recursive-kmod-call-fix
Applying: fs/proc/kcore.c: make get_sparsemem_vmemmap_info() static
Applying: proc: speedup /proc/stat handling
Applying: procfs: add num_to_str() to speed up /proc/stat
Applying: procfs-add-num_to_str-to-speed-up-proc-stat-fix
Applying: procfs: avoid breaking the ABI in /proc/stat
Applying: procfs: speed up /proc/pid/stat, statm
Applying: procfs-speed-up-proc-pid-stat-statm-checkpatch-fixes
Applying: proc: clean up /proc/<pid>/environ handling
Applying: seq_file: add seq_set_overflow(), seq_overflow()
Applying: seq_file-add-seq_set_overflow-seq_overflow-fix
Applying: smp: introduce a generic on_each_cpu_mask() function
Applying: arm: move arm over to generic on_each_cpu_mask
Applying: tile: move tile to use generic on_each_cpu_mask
Applying: smp: add func to IPI cpus based on parameter func
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-fix
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update-fix
Applying: smp: add func to IPI cpus based on parameter func
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-v9-fix
Applying: slub: only IPI CPUs that have per cpu obj to flush
Applying: fs: only send IPI to invalidate LRU BH when needed
Applying: mm: only IPI CPUs to drain local pages if they exist
Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-update
Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-v9
Applying: lib/cpumask.c: remove __any_online_cpu()
Applying: arch/ia64: remove references to cpu_*_map
Applying: kexec: crash: don't save swapper_pg_dir for !CONFIG_MMU configurations
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipc: provide generic compat versions of IPC syscalls
Applying: ipmi: decrease the IPMI message transaction time in interrupt mode
Applying: ipmi: increase KCS timeouts
Applying: ipmi: use a tasklet for handling received messages
Applying: ipmi: fix message handling during panics
Applying: ipmi: simplify locking
Applying: ipmi: use locks on watchdog timeout set on reboot
Applying: sysctl: use bitmap library functions
Applying: pidns: add reboot_pid_ns() to handle the reboot syscall
Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-fix
Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-checkpatch-fixes
Applying: fs/proc/namespaces.c: prevent crash when ns_entries[] is empty
Applying: selftests: launch individual selftests from the main Makefile
Applying: selftests/Makefile: make `run_tests' depend on `all'
Applying: mm: move page-types.c from Documentation to tools/vm
Applying: mm: move slabinfo.c to tools/vm
Applying: mm: move hugepage test examples to tools/testing/selftests/vm
Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix
Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix-fix
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix-2
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: notify_change(): check that i_mutex is held
Merging akpm (e9f5028 notify_change(): check that i_mutex is held)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the akpm tree with Linus' tree
From: Stephen Rothwell @ 2012-03-08 6:53 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Linus
[-- Attachment #1: Type: text/plain, Size: 465 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/x86/mm/hugetlbpage.c between commit 097d59106a8e ("vm: avoid using
find_vma_prev() unnecessarily") from Linus' tree and commit "hugetlb:
drop prev_vma in hugetlb_get_unmapped_area_topdown()" from the akpm tree.
I think the latter is a superset of the former, so I just dropped the
changes from the former.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the akpm tree with the tip tree
From: Stephen Rothwell @ 2012-03-08 6:32 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Philip A. Prindeville, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 1174 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/x86/Kconfig between commit da4e3302949f ("x86/geode/net5501: Add
platform driver for Soekris Engineering net5501") from the tip tree and
commit "geos: platform driver for Geos and Geos2 single-board computers"
from the akpm tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/Kconfig
index 97a7a56,a985f6b..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2151,12 -2151,13 +2151,19 @@@ config ALI
Note: You have to set alix.force=1 for boards with Award BIOS.
+config NET5501
+ bool "Soekris Engineering net5501 System Support (LEDS, GPIO, etc)"
+ select GPIOLIB
+ ---help---
+ This option enables system support for the Soekris Engineering net5501.
+
+ config GEOS
+ bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)"
+ select GPIOLIB
+ depends on DMI
+ ---help---
+ This option enables system support for the Traverse Technologies GEOS.
+
endif # X86_32
config AMD_NB
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the akpm tree with the tip tree
From: Stephen Rothwell @ 2012-03-08 6:28 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Daniel Drake, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 488 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/x86/platform/olpc/olpc-xo15-sci.c between commit d1f42e314c9c
("x86/olpc/xo15/sci: Enable lid close wakeup control") from the tip tree
and commit "x86, olpc-xo15-sci: enable lid close wakeup control through
sysfs" from the akpm tree.
I assume that these were meant to be the same patch, so I dropped the one
from the akpm tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the tree
From: Stephen Rothwell @ 2012-03-08 6:17 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Tomi Valkeinen, Tony Lindgren
In-Reply-To: <20120308170303.c113c6c34b8a7ae95caeb592@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1435 bytes --]
Hi guys,
Sorry for the cut and paste mess ... :-(
On Thu, 8 Mar 2012 17:03:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap1/board-palmz71.c between commit ("") from the tree and commit ("") from the arm-soc tree.
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-omap1/board-palmz71.c between commit ddba6c7f7ec6 ("OMAP1:
> pass LCD config with omapfb_set_lcd_config()") from the omap_dss2 tree
> and commit 2e3ee9f45b3c ("ARM: OMAP1: Move most of plat/io.h into local
> iomap.h") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-omap1/board-palmz71.c
> index 9924c70,c1cd0f2..0000000
> --- a/arch/arm/mach-omap1/board-palmz71.c
> +++ b/arch/arm/mach-omap1/board-palmz71.c
> @@@ -27,9 -27,9 +27,10 @@@
> #include <linux/mtd/mtd.h>
> #include <linux/mtd/partitions.h>
> #include <linux/mtd/physmap.h>
> +#include <linux/omapfb.h>
> + #include <linux/spi/spi.h>
> + #include <linux/spi/ads7846.h>
>
> - #include <mach/hardware.h>
> #include <asm/mach-types.h>
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with Linus' tree
From: Stephen Rothwell @ 2012-03-08 6:07 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Pawel Moll, Will Deacon, Russell King
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-vexpress/Kconfig between commit 43a6955fa8c3 ("ARM: 7346/1:
errata: fix PL310 erratum #753970 workaround selection") from Linus' tree
and commit 8deed1786a64 ("ARM: vexpress: Add Device Tree support") from
the arm-soc tree.
The latter took the former into account, so I dropped the former for this
file.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the tree
From: Stephen Rothwell @ 2012-03-08 6:03 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Tomi Valkeinen, Tony Lindgren
[-- Attachment #1: Type: text/plain, Size: 1156 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap1/board-palmz71.c between commit ("") from the tree and commit ("") from the arm-soc tree.
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap1/board-palmz71.c between commit ddba6c7f7ec6 ("OMAP1:
pass LCD config with omapfb_set_lcd_config()") from the omap_dss2 tree
and commit 2e3ee9f45b3c ("ARM: OMAP1: Move most of plat/io.h into local
iomap.h") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap1/board-palmz71.c
index 9924c70,c1cd0f2..0000000
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@@ -27,9 -27,9 +27,10 @@@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
+#include <linux/omapfb.h>
+ #include <linux/spi/spi.h>
+ #include <linux/spi/ads7846.h>
- #include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
From: Stephen Rothwell @ 2012-03-08 6:00 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Tomi Valkeinen, Tony Lindgren
[-- Attachment #1: Type: text/plain, Size: 971 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap1/board-palmtt.c between commit ddba6c7f7ec6 ("OMAP1:
pass LCD config with omapfb_set_lcd_config()") from the omap_dss2 tree
and commit 2e3ee9f45b3c ("ARM: OMAP1: Move most of plat/io.h into local
iomap.h") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap1/board-palmtt.c
index b63350b,acd1f36..0000000
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@@ -24,9 -24,9 +24,10 @@@
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/leds.h>
+#include <linux/omapfb.h>
+ #include <linux/spi/spi.h>
+ #include <linux/spi/ads7846.h>
- #include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
From: Stephen Rothwell @ 2012-03-08 5:58 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Tomi Valkeinen, Tony Lindgren
[-- Attachment #1: Type: text/plain, Size: 859 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap1/board-osk.c between commit ddba6c7f7ec6 ("OMAP1: pass
LCD config with omapfb_set_lcd_config()") from the omap_dss2 tree and
commit 2e3ee9f45b3c ("ARM: OMAP1: Move most of plat/io.h into local
iomap.h") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap1/board-osk.c
index ef87465,e2d7ae4..0000000
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@@ -34,8 -34,6 +34,7 @@@
#include <linux/i2c.h>
#include <linux/leds.h>
#include <linux/smc91x.h>
+#include <linux/omapfb.h>
-
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
From: Stephen Rothwell @ 2012-03-08 5:55 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Tony Lindgren, Tomi Valkeinen
[-- Attachment #1: Type: text/plain, Size: 865 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap1/board-nokia770.c between commit 58e0d6ab02eb ("OMAP:
N770: remove HWA742 platform data") from the omap_dss2 tree and commit
2e3ee9f45b3c ("ARM: OMAP1: Move most of plat/io.h into local iomap.h")
from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap1/board-nokia770.c
index 9b6332a,abdbdb0..0000000
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@@ -30,7 -29,7 +29,6 @@@
#include <plat/usb.h>
#include <plat/board.h>
#include <plat/keypad.h>
- #include "common.h"
-#include <plat/hwa742.h>
#include <plat/lcd_mipid.h>
#include <plat/mmc.h>
#include <plat/clock.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the powerpc tree with the arm tree
From: Benjamin Herrenschmidt @ 2012-03-08 5:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michael Neuling, Paul Mackerras, linuxppc-dev, Russell King,
linux-next, linux-kernel, Rob Herring
In-Reply-To: <20120308145131.fad50bbc79c36f0b0b12d101@canb.auug.org.au>
On Thu, 2012-03-08 at 14:51 +1100, Stephen Rothwell wrote:
> Hi Mikey,
>
> On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling <mikey@neuling.org> wrote:
> >
> > Surely we only need SPARSE_IRQ now and not MAY_HAVE_SPARSE_IRQ.
> >
> > In fact, keeping MAY_HAVE_SPARSE_IRQ seems to make SPARSE_IRQ user
> > selectable, which we don't want anymore since ad5b7f1350c2.
>
> Yes, indeed. I will fix up the merge resolution for tomorrow.
This is my fault. Grant's patch had a collision and I manually fixed it
up. While doing that, I put back MAY_HAVE_SPARSE_IRQ which the patch
originally took out.
Cheers,
Ben.
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
From: Stephen Rothwell @ 2012-03-08 5:51 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Tomi Valkeinen, Janusz Krzysztofik,
Tony Lindgren
[-- Attachment #1: Type: text/plain, Size: 3913 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap1/board-ams-delta.c between commit ddba6c7f7ec6
("OMAP1: pass LCD config with omapfb_set_lcd_config()") from the
omap_dss2 tree and commits 5ca6180fa6d7 ("ARM: OMAP1: ams-delta:
supersede custom led device by leds-gpio") and 2e3ee9f45b3c ("ARM: OMAP1:
Move most of plat/io.h into local iomap.h") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap1/board-ams-delta.c
index e0e8245,c847597..0000000
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@@ -20,7 -21,7 +21,8 @@@
#include <linux/platform_device.h>
#include <linux/serial_8250.h>
#include <linux/export.h>
+#include <linux/omapfb.h>
+ #include <linux/io.h>
#include <media/soc_camera.h>
@@@ -170,6 -162,117 +163,113 @@@ static struct omap_usb_config ams_delta
.pins[0] = 2,
};
-static struct omap_board_config_kernel ams_delta_config[] __initdata = {
- { OMAP_TAG_LCD, &ams_delta_lcd_config },
-};
-
+ #define LATCH1_GPIO_BASE 232
+ #define LATCH1_NGPIO 8
+
+ static struct resource latch1_resources[] __initconst = {
+ [0] = {
+ .name = "dat",
+ .start = LATCH1_PHYS,
+ .end = LATCH1_PHYS + (LATCH1_NGPIO - 1) / 8,
+ .flags = IORESOURCE_MEM,
+ },
+ };
+
+ static struct bgpio_pdata latch1_pdata __initconst = {
+ .base = LATCH1_GPIO_BASE,
+ .ngpio = LATCH1_NGPIO,
+ };
+
+ static struct platform_device latch1_gpio_device = {
+ .name = "basic-mmio-gpio",
+ .id = 0,
+ .resource = latch1_resources,
+ .num_resources = ARRAY_SIZE(latch1_resources),
+ .dev = {
+ .platform_data = &latch1_pdata,
+ },
+ };
+
+ static struct resource latch2_resources[] __initconst = {
+ [0] = {
+ .name = "dat",
+ .start = LATCH2_PHYS,
+ .end = LATCH2_PHYS + (AMS_DELTA_LATCH2_NGPIO - 1) / 8,
+ .flags = IORESOURCE_MEM,
+ },
+ };
+
+ static struct bgpio_pdata latch2_pdata __initconst = {
+ .base = AMS_DELTA_LATCH2_GPIO_BASE,
+ .ngpio = AMS_DELTA_LATCH2_NGPIO,
+ };
+
+ static struct platform_device latch2_gpio_device = {
+ .name = "basic-mmio-gpio",
+ .id = 1,
+ .resource = latch2_resources,
+ .num_resources = ARRAY_SIZE(latch2_resources),
+ .dev = {
+ .platform_data = &latch2_pdata,
+ },
+ };
+
+ static struct gpio latch_gpios[] __initconst = {
+ {
+ .gpio = LATCH1_GPIO_BASE + 6,
+ .flags = GPIOF_OUT_INIT_LOW,
+ .label = "dockit1",
+ },
+ {
+ .gpio = LATCH1_GPIO_BASE + 7,
+ .flags = GPIOF_OUT_INIT_LOW,
+ .label = "dockit2",
+ },
+ {
+ .gpio = AMS_DELTA_GPIO_PIN_SCARD_RSTIN,
+ .flags = GPIOF_OUT_INIT_LOW,
+ .label = "scard_rstin",
+ },
+ {
+ .gpio = AMS_DELTA_GPIO_PIN_SCARD_CMDVCC,
+ .flags = GPIOF_OUT_INIT_LOW,
+ .label = "scard_cmdvcc",
+ },
+ {
+ .gpio = AMS_DELTA_GPIO_PIN_MODEM_NRESET,
+ .flags = GPIOF_OUT_INIT_LOW,
+ .label = "modem_nreset",
+ },
+ {
+ .gpio = AMS_DELTA_GPIO_PIN_MODEM_CODEC,
+ .flags = GPIOF_OUT_INIT_LOW,
+ .label = "modem_codec",
+ },
+ {
+ .gpio = AMS_DELTA_LATCH2_GPIO_BASE + 14,
+ .flags = GPIOF_OUT_INIT_LOW,
+ .label = "hookflash1",
+ },
+ {
+ .gpio = AMS_DELTA_LATCH2_GPIO_BASE + 15,
+ .flags = GPIOF_OUT_INIT_LOW,
+ .label = "hookflash2",
+ },
+ };
+
+ void ams_delta_latch_write(int base, int ngpio, u16 mask, u16 value)
+ {
+ int bit = 0;
+ u16 bitpos = 1 << bit;
+
+ for (; bit < ngpio; bit++, bitpos = bitpos << 1) {
+ if (!(mask & bitpos))
+ continue;
+ gpio_set_value(base + bit, (value & bitpos) != 0);
+ }
+ }
+ EXPORT_SYMBOL(ams_delta_latch_write);
+
static struct resource ams_delta_nand_resources[] = {
[0] = {
.start = OMAP1_MPUIO_BASE,
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the tip tree
From: Stephen Rothwell @ 2012-03-08 4:21 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Greg KH, Alan Cox, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
Hi all,
After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/staging/sep/sep_driver.c:55:32: fatal error: linux/rar_register.h: No such file or directory
Caused by commit 33e9970add94 ("x86/mid: Kill off Moorestown").
Following previous instructions, I have disabled the staging tree driver
using this patch (pending a fix in the tip tree):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Mar 2012 15:15:44 +1100
Subject: [PATCH] staging: disable the sep driver due to breakage
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/staging/sep/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/sep/Kconfig b/drivers/staging/sep/Kconfig
index 92bf166..cd95ca2 100644
--- a/drivers/staging/sep/Kconfig
+++ b/drivers/staging/sep/Kconfig
@@ -1,6 +1,6 @@
config DX_SEP
tristate "Discretix SEP driver"
- depends on PCI
+ depends on PCI && BROKEN
help
Discretix SEP driver; used for the security processor subsystem
on bard the Intel Mobile Internet Device.
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* Re: linux-next: manual merge of the powerpc tree with the arm tree
From: Stephen Rothwell @ 2012-03-08 3:51 UTC (permalink / raw)
To: Michael Neuling
Cc: Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev,
Russell King, linux-next, linux-kernel, Rob Herring
In-Reply-To: <25744.1331174036@neuling.org>
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
Hi Mikey,
On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling <mikey@neuling.org> wrote:
>
> Surely we only need SPARSE_IRQ now and not MAY_HAVE_SPARSE_IRQ.
>
> In fact, keeping MAY_HAVE_SPARSE_IRQ seems to make SPARSE_IRQ user
> selectable, which we don't want anymore since ad5b7f1350c2.
Yes, indeed. I will fix up the merge resolution for tomorrow.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH v3] PM / QoS: Introduce new classes: DMA-Throughput and DVFS-Latency
From: mark gross @ 2012-03-08 3:47 UTC (permalink / raw)
To: MyungJoo Ham
Cc: Rafael J. Wysocki, Stephen Rothwell, Dave Jones, linux-pm,
linux-next@vger.kernel.org, Len Brown, Pavel Machek, Kevin Hilman,
Jean Pihet, markgross, kyungmin.park, myungjoo.ham, linux-kernel
In-Reply-To: <1331096521-26026-1-git-send-email-myungjoo.ham@samsung.com>
On Wed, Mar 07, 2012 at 02:02:01PM +0900, MyungJoo Ham wrote:
> 1. CPU_DMA_THROUGHPUT
>
> This might look simliar to CPU_DMA_LATENCY. However, there are H/W
> blocks that creates QoS requirement based on DMA throughput, not
> latency, while their (those QoS requester H/W blocks) services are
> short-term bursts that cannot be effectively responsed by DVFS
> mechanisms (CPUFreq and Devfreq).
>
> In the Exynos4412 systems that are being tested, such H/W blocks include
> MFC (multi-function codec)'s decoding and enconding features, TV-out
> (including HDMI), and Cameras. When the display is operated at 60Hz,
> each chunk of task should be done within 16ms and the workload on DMA is
> not well spread and fluctuates between frames; some frame requires more
> and some do not and within a frame, the workload also fluctuates
> heavily and the tasks within a frame are usually not parallelized; they
> are processed through specific H/W blocks, not CPU cores. They often
> have PPMU capabilities; however, they need to be polled very frequently
> in order to let DVFS mechanisms react properly. (less than 5ms).
>
> For such specific tasks, allowing them to request QoS requirements seems
> adequete because DVFS mechanisms (as long as the polling rate is 5ms or
> longer) cannot follow up with them. Besides, the device drivers know
> when to request and cancel QoS exactly.
>
> 2. DVFS_LATENCY
>
> Both CPUFreq and Devfreq have response latency to a sudden workload
> increase. With near-100% (e.g., 95%) up-threshold, the average response
> latency is approximately 1.5 x polling-rate.
>
> A specific polling rate (e.g., 100ms) may generally fit for its system;
> however, there could be exceptions for that. For example,
> - When a user input suddenly starts: typing, clicking, moving cursors, and
> such, the user might need the full performance immediately. However,
> we do not know whether the full performance is actually needed or not
> until we calculate the utilization; thus, we need to calculate it
> faster with user inputs or any similar events. Specifying QoS on CPU
> processing power or Memory bandwidth at every user input is an
> overkill because there are many cases where such speed-up isn't
> necessary.
> - When a device driver needs a faster performance response from DVFS
> mechanism. This could be addressed by simply putting QoS requests.
> However, such QoS requests may keep the system running fast
> unnecessary in some cases, especially if a) the device's resource
> usage bursts with some duration (e.g., 100ms-long bursts) and
> b) the driver doesn't know when such burst come. MMC/WiFi often had
> such behaviors although there are possibilities that part (b) might
> be addressed with further efforts.
>
> The cases shown above can be tackled with putting QoS requests on the
> response time or latency of DVFS mechanism, which is directly related to
> its polling interval (if the DVFS mechanism is polling based).
>
> Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>
> --
> Changes from v2
> - Rebased on the recent PM QoS patches, resolving the merge conflict.
>
> Changes from RFC(v1)
> - Added omitted part (registering new classes)
> ---
> include/linux/pm_qos.h | 4 ++++
> kernel/power/qos.c | 31 ++++++++++++++++++++++++++++++-
> 2 files changed, 34 insertions(+), 1 deletions(-)
>
> diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
> index c8a541e..0ee7caa 100644
> --- a/include/linux/pm_qos.h
> +++ b/include/linux/pm_qos.h
> @@ -14,6 +14,8 @@ enum {
> PM_QOS_CPU_DMA_LATENCY,
> PM_QOS_NETWORK_LATENCY,
> PM_QOS_NETWORK_THROUGHPUT,
> + PM_QOS_CPU_DMA_THROUGHPUT,
> + PM_QOS_DVFS_RESPONSE_LATENCY,
>
> /* insert new class ID */
> PM_QOS_NUM_CLASSES,
> @@ -24,6 +26,8 @@ enum {
> #define PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE (2000 * USEC_PER_SEC)
> #define PM_QOS_NETWORK_LAT_DEFAULT_VALUE (2000 * USEC_PER_SEC)
> #define PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE 0
> +#define PM_QOS_CPU_DMA_THROUGHPUT_DEFAULT_VALUE 0
> +#define PM_QOS_DVFS_LAT_DEFAULT_VALUE (2000 * USEC_PER_SEC)
> #define PM_QOS_DEV_LAT_DEFAULT_VALUE 0
>
> struct pm_qos_request {
> diff --git a/kernel/power/qos.c b/kernel/power/qos.c
> index d6d6dbd..3e122db 100644
> --- a/kernel/power/qos.c
> +++ b/kernel/power/qos.c
> @@ -101,11 +101,40 @@ static struct pm_qos_object network_throughput_pm_qos = {
> };
>
>
> +static BLOCKING_NOTIFIER_HEAD(cpu_dma_throughput_notifier);
> +static struct pm_qos_constraints cpu_dma_tput_constraints = {
> + .list = PLIST_HEAD_INIT(cpu_dma_tput_constraints.list),
> + .target_value = PM_QOS_CPU_DMA_THROUGHPUT_DEFAULT_VALUE,
> + .default_value = PM_QOS_CPU_DMA_THROUGHPUT_DEFAULT_VALUE,
> + .type = PM_QOS_MAX,
> + .notifiers = &cpu_dma_throughput_notifier,
> +};
> +static struct pm_qos_object cpu_dma_throughput_pm_qos = {
> + .constraints = &cpu_dma_tput_constraints,
> + .name = "cpu_dma_throughput",
> +};
> +
> +
> +static BLOCKING_NOTIFIER_HEAD(dvfs_lat_notifier);
> +static struct pm_qos_constraints dvfs_lat_constraints = {
> + .list = PLIST_HEAD_INIT(dvfs_lat_constraints.list),
> + .target_value = PM_QOS_DVFS_LAT_DEFAULT_VALUE,
> + .default_value = PM_QOS_DVFS_LAT_DEFAULT_VALUE,
> + .type = PM_QOS_MIN,
> + .notifiers = &dvfs_lat_notifier,
> +};
> +static struct pm_qos_object dvfs_lat_pm_qos = {
> + .constraints = &dvfs_lat_constraints,
> + .name = "dvfs_latency",
> +};
> +
> static struct pm_qos_object *pm_qos_array[] = {
> &null_pm_qos,
> &cpu_dma_pm_qos,
> &network_lat_pm_qos,
> - &network_throughput_pm_qos
> + &network_throughput_pm_qos,
> + &cpu_dma_throughput_pm_qos,
> + &dvfs_lat_pm_qos,
> };
>
> static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> --
> 1.7.4.1
>
The cpu_dma_throughput looks ok to me. I do however; wonder about the
dvfs_lat_pm_qos. Should that knob be exposed to user mode? Does that
matter so much? why can't dvfs_lat use the cpu_dma_lat?
BTW I'll be out of town for the next 10 days and probably will not get
to this email account until I get home.
--mark
^ permalink raw reply
* linux-next: manual merge of the cpufreq tree with the cpufreq-current tree
From: Stephen Rothwell @ 2012-03-08 2:39 UTC (permalink / raw)
Cc: linux-next, linux-kernel, Russell King, Dave Jones, Kevin Hilman,
"Heiko Stübner"
[-- Attachment #1: Type: text/plain, Size: 1712 bytes --]
Hi Dave,
Today's linux-next merge of the cpufreq tree got a conflict in
drivers/cpufreq/Kconfig.arm between commit b09db45c56c2 ("cpufreq: OMAP
driver depends CPUfreq tables") from the cpufreq-current tree and commit
34ee55075265 ("[CPUFREQ] Add S3C2416/S3C2450 cpufreq driver") from the
cpufreq tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/cpufreq/Kconfig.arm
index 82f1aa9,dc59abf..0000000
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@@ -2,11 -2,28 +2,33 @@@
# ARM CPU Frequency scaling drivers
#
+config ARM_OMAP2PLUS_CPUFREQ
+ bool "TI OMAP2+"
+ default ARCH_OMAP2PLUS
+ select CPU_FREQ_TABLE
+
+ config ARM_S3C2416_CPUFREQ
+ bool "S3C2416 CPU Frequency scaling support"
+ depends on CPU_S3C2416
+ help
+ This adds the CPUFreq driver for the Samsung S3C2416 and
+ S3C2450 SoC. The S3C2416 supports changing the rate of the
+ armdiv clock source and also entering a so called dynamic
+ voltage scaling mode in which it is possible to reduce the
+ core voltage of the cpu.
+
+ If in doubt, say N.
+
+ config ARM_S3C2416_CPUFREQ_VCORESCALE
+ bool "Allow voltage scaling for S3C2416 arm core (EXPERIMENTAL)"
+ depends on ARM_S3C2416_CPUFREQ && REGULATOR && EXPERIMENTAL
+ help
+ Enable CPU voltage scaling when entering the dvs mode.
+ It uses information gathered through existing hardware and
+ tests but not documented in any datasheet.
+
+ If in doubt, say N.
+
config ARM_S3C64XX_CPUFREQ
bool "Samsung S3C64XX"
depends on CPU_S3C6410
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the powerpc tree with the arm tree
From: Michael Neuling @ 2012-03-08 2:33 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev,
Russell King, linux-next, linux-kernel, Rob Herring
In-Reply-To: <20120308120422.e071cba36425eacbee1f8d98@canb.auug.org.au>
> Today's linux-next merge of the powerpc tree got a conflict in
> arch/powerpc/Kconfig between commit 2ed86b16eabe ("irq: make SPARSE_IRQ
> an optionally hidden option") from the arm tree and commit ad5b7f1350c2
> ("powerpc: Make SPARSE_IRQ required") from the powerpc tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --=20
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/powerpc/Kconfig
> index bf7dbc2,4eecaaa..0000000
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@@ -133,7 -133,8 +133,8 @@@ config PP
> select HAVE_REGS_AND_STACK_ACCESS_API
> select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64
> select HAVE_GENERIC_HARDIRQS
> - select HAVE_SPARSE_IRQ
> + select MAY_HAVE_SPARSE_IRQ
> + select SPARSE_IRQ
Surely we only need SPARSE_IRQ now and not MAY_HAVE_SPARSE_IRQ.
In fact, keeping MAY_HAVE_SPARSE_IRQ seems to make SPARSE_IRQ user
selectable, which we don't want anymore since ad5b7f1350c2.
Mikey
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox