* linux-next: failed to import the device-mapper quilt series
From: Stephen Rothwell @ 2011-10-24 19:10 UTC (permalink / raw)
To: Alasdair G Kergon; +Cc: linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
Hi Alasdair,
Importing the device-mapper tree today gave this error:
$ git am ../quilt/device-mapper/dm-add-persistent-data-library.patch
Applying: The persistent-data library offers a re-usable framework for the storage
error: drivers/md/persistent-data/dm-space-map-common.c: does not exist in index
Patch failed at 0001 The persistent-data library offers a re-usable framework for the storage
And indeed, this file does not exist even though this patch is trying to
patch it (not create it).
I will use the device-mapper tree from next-20111014 for today.
--
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
* Re: Bluetooth tree url change
From: Stephen Rothwell @ 2011-10-24 9:58 UTC (permalink / raw)
To: Gustavo Padovan; +Cc: linux-next
In-Reply-To: <20111020025727.GA3077@joana>
[-- Attachment #1: Type: text/plain, Size: 433 bytes --]
Hi Gustavo,
On Thu, 20 Oct 2011 00:57:27 -0200 Gustavo Padovan <padovan@profusion.mobi> wrote:
>
> The bluetooth-next tree now has a new url, I drop the "-2.6" suffix when I
> moved back to kernel.org
>
> git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next.git
OK, I have switched to this now.
--
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
* Re: currently missing kernel devel trees
From: Stephen Rothwell @ 2011-10-24 9:50 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111016211102.GA15720@infomag.iguana.be>
[-- Attachment #1: Type: text/plain, Size: 588 bytes --]
Hi Wim,
On Sun, 16 Oct 2011 23:11:02 +0200 Wim Van Sebroeck <wim@iguana.be> wrote:
>
> ...
> > watchdog
> ...
>
> Untill I have the time to do something new could you use the following tree and branch:
>
> git://www.linux-watchdog.org/linux-watchdog.git linux-next
>
> I started filling it with 5 patches allready, but still need to add some others in the next day.
OK, I have switched to using this. Please let me know if/when you switch
back to kernel.org.
--
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
* Re: currently missing kernel devel trees
From: Stephen Rothwell @ 2011-10-24 9:38 UTC (permalink / raw)
To: Mike Frysinger; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <CAMjpGUe+jgnpB4pPhSBV=zYgNSUTzWYa2_KmPuWhjZw_6zjLMw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 597 bytes --]
Hi Mike,
On Sat, 15 Oct 2011 13:57:11 -0400 Mike Frysinger <vapier.adi@gmail.com> wrote:
>
> On Thu, Oct 13, 2011 at 23:25, Mike Frysinger wrote:
> > On Thu, Oct 13, 2011 at 02:43, Stephen Rothwell wrote:
> >> blackfin
> >
> > i was waiting for hpa to get back to me so i could get my repo enabled
> > again on git.kernel.org ... but maybe that'll take until/post LKS ?
>
> ah, got my info today. this tree should be alive again for you to merge in.
Thanks, looks good.
--
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
* Re: linux-next: build failure after merge of the final tree (sparc, ptrace trees related)
From: Stephen Rothwell @ 2011-10-24 9:36 UTC (permalink / raw)
To: Oleg Nesterov; +Cc: David Miller, linux-next, linux-kernel, matt.fleming, tj
In-Reply-To: <20111014190950.GA10791@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
Hi Oleg,
On Fri, 14 Oct 2011 21:09:50 +0200 Oleg Nesterov <oleg@redhat.com> wrote:
>
> On 10/14, David Miller wrote:
> >
> > Now you guys are creating conflicts against those fixed up patches in
> > another non-sparc tree, and adding new kinds of build failures as
> > well.
> >
> > This doesn't work.
>
> Sorry David and Stephen.
>
> Stephen, could you please temporary remove ptrace from linux-next?
OK, I have removed it until you tell me otherwise.
--
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
* Re: currently missing kernel devel trees
From: Stephen Rothwell @ 2011-10-24 9:20 UTC (permalink / raw)
To: Phillip Lougher; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <CAB3woddd=1Ps8HR4SPAOQxoxCnGLFDrjRN6KPJUFkpzmACXf4w@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
Hi Phillip,
On Fri, 14 Oct 2011 02:03:18 +0100 Phillip Lougher <phillip.lougher@gmail.com> wrote:
>
> > squashfs
>
> git://gitorious.org/squashfs-linux-next/squashfs-linux-next.git master
I have swu=itched to that, thanks. Please let me know if/when you switch
back to kernel.org.
> I don't have anything queued up at the moment, though...
I get one commit today (presumably added since you sent this email).
--
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
* Updated target-pending.git branches for linux-next
From: Nicholas A. Bellinger @ 2011-10-24 6:05 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, target-devel, Christoph Hellwig
Hi Stephen,
The target-pending.git tree is now back on kernel.org, and as before
the following branch is used as 'for-next' updates to existing
drivers/target/ code:
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git for-next
I've also added another branch that is being used for new target modules
being merged in the next development cycle:
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git for-next-merge
If you would be so kind, please go ahead and add the second entry as well
into your linux-next daily builds.
Thank you,
--nab
^ permalink raw reply
* Bluetooth tree url change
From: Gustavo Padovan @ 2011-10-20 2:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
Hi Stephen,
The bluetooth-next tree now has a new url, I drop the "-2.6" suffix when I
moved back to kernel.org
git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next.git
Thanks for your work!
Gustavo
^ permalink raw reply
* Re: linux-next: import of rr series failed
From: Rusty Russell @ 2011-10-18 23:51 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
In-Reply-To: <20111014103638.accaae53bac0e74da3c787bd@canb.auug.org.au>
On Fri, 14 Oct 2011 10:36:38 +1100, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
Non-text part: multipart/signed
> Hi Rusty,
>
> Importing the rr series today I got this error:
>
> $ git am ../quilt/rr/virtio:dont_add_config_to_list_for_per_vq_vector.patch
> Patch format detection failed.
>
> I added a From line to the top using the address from the first SOB line.
Weird, don't know how that slipped through my checking script :(
Fixed up now, thanks.
Rusty.
^ permalink raw reply
* Re: [PATCH -next] infiniband: fix printk format in hw/nes_cm.c
From: Roland Dreier @ 2011-10-17 21:18 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Andrew Morton, Faisal Latif,
Linux RDMA, Sean Hefty, Hal Rosenstock
In-Reply-To: <4E976147.9030000@xenotime.net>
Thanks, rolled this into the offending commit.
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Wim Van Sebroeck @ 2011-10-16 21:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111013174358.b20fedb97c7b53db2ba82ff6@canb.auug.org.au>
Hi Stephen,
> With the mrege window approaching (sometime) I thought I would see how
> many of the 200 odd trees that are included in linux-next are actually
> currently inaccessible. The list below (of 63 trees) is a couple of days
> out of date. These are the trees that were hosted on git.kernel.org that
> have not popped up anywhere else (or, at least I have not been informed
> is they have) nor been resurrected on kernel.org.
>
> Some of these may be no longer useful (please tell me). Some may have no
> commits for v3.2. But I bet that at leaset some do.
>
...
> watchdog
...
Untill I have the time to do something new could you use the following tree and branch:
git://www.linux-watchdog.org/linux-watchdog.git linux-next
I started filling it with 5 patches allready, but still need to add some others in the next day.
Kind regards,
Wim.
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Mike Frysinger @ 2011-10-15 17:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <CAMjpGUcdTj2XBxMX9v7dY4ATPjCtU9xj+xXvj3D5Ma2gsMA8Ww@mail.gmail.com>
On Thu, Oct 13, 2011 at 23:25, Mike Frysinger wrote:
> On Thu, Oct 13, 2011 at 02:43, Stephen Rothwell wrote:
>> blackfin
>
> i was waiting for hpa to get back to me so i could get my repo enabled
> again on git.kernel.org ... but maybe that'll take until/post LKS ?
ah, got my info today. this tree should be alive again for you to merge in.
-mike
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (sparc, ptrace trees related)
From: Oleg Nesterov @ 2011-10-14 19:09 UTC (permalink / raw)
To: David Miller, Stephen Rothwell; +Cc: linux-next, linux-kernel, matt.fleming, tj
In-Reply-To: <20111014.035459.2238341687770152474.davem@davemloft.net>
On 10/14, David Miller wrote:
>
> Now you guys are creating conflicts against those fixed up patches in
> another non-sparc tree, and adding new kinds of build failures as
> well.
>
> This doesn't work.
Sorry David and Stephen.
Stephen, could you please temporary remove ptrace from linux-next?
I'll send you another email once I fix the conflicts, can't do this
right now.
Oleg.
^ permalink raw reply
* Re: linux-next: Tree for Oct 11 (ata/pata_of_platform.c)
From: Randy Dunlap @ 2011-10-14 17:58 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, linux-ide@vger.kernel.org, Anton Vorontsov
In-Reply-To: <4E94A920.40503@xenotime.net>
On 10/11/2011 01:37 PM, Randy Dunlap wrote:
> On 10/11/11 02:11, Stephen Rothwell wrote:
>> Hi all,
>>
>> The linux-next tree is now available from
>> git://github.com/sfrothwell/linux-next.git as a temporary measure while
>> the kernel.org servers are unavailable.
>>
>> It may also turn up on git.kernel.org (depending on the mirroring). The
>> patch set is still absent, however.
>>
>> Changes since 20111007:
>>
>> Removed tree: ide (at the maintainer's request)
>
>
> drivers/ata/pata_of_platform.c:55:13: error: 'NO_IRQ' undeclared (first use in this function)
[adding Author: Anton]
Build error still present in linux-next of 20111014.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (sparc, ptrace trees related)
From: Stephen Rothwell @ 2011-10-14 11:38 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, linux-kernel, matt.fleming, tj, oleg
In-Reply-To: <20111014.035459.2238341687770152474.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 1222 bytes --]
Hi Dave,
On Fri, 14 Oct 2011 03:54:59 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 14 Oct 2011 18:07:14 +1100
>
> > After merging the final tree, today's linux-next build (sparc64 defconfig)
> > failed like this:
> >
> > arch/sparc/kernel/signal_64.c: In function 'handle_signal':
> > arch/sparc/kernel/signal_64.c:482:11: error: unused variable 'blocked' [-Werror=unused-variable]
> >
> > Caused by my merge of commits faddf598f0ba ("sparc: Use
> > set_current_blocked()") form the sparc tree and 383fe35697e4 ("sparc: Use
> > set_current_blocked() and block_sigmask()") from the ptrace tree.
> >
> > I have added the following merge fix patch for today.
>
> Now you guys are creating conflicts against those fixed up patches in
> another non-sparc tree, and adding new kinds of build failures as
> well.
To be a little fair, this particular build failure was caused because
when I did the merge, I didn't notice that the "blocked" variables needed
to be removed. But otherwise, I defer to your knowledge.
--
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
* Re: linux-next: build failure after merge of the final tree (sparc, ptrace trees related)
From: Matt Fleming @ 2011-10-14 9:27 UTC (permalink / raw)
To: David Miller; +Cc: sfr, linux-next, linux-kernel, tj, oleg, linux-arch
In-Reply-To: <20111014.035459.2238341687770152474.davem@davemloft.net>
On Fri, 2011-10-14 at 03:54 -0400, David Miller wrote:
> Ptrace folks can we not operate like this? The only reason I found
> out about the set_current_blocked() transformations was by accident,
> because the original patch was posted to linux-kernel only so it never
> got queued up into sparc patchwork.
>
> Then once Oleg mentioned it to me, it didn't even compile so I fixed
> it up and put the fixed up copy into my tree. It also didn't
> transform the TS_RESTORE_SIGMASK cases in the sparc signal code, so I
> also added a patch to the sparc tree which took care of that.
>
> Now you guys are creating conflicts against those fixed up patches in
> another non-sparc tree, and adding new kinds of build failures as
> well.
>
> This doesn't work.
Sorry David, this is my fault.
The reason that these patches couldn't be taken through the arch trees
was because they were dependent on the non-arch patch that introduced
block_sigmask(). I figured it would make more sense to put all the
patches through Oleg's tree. It's now pretty clear I was wrong about
that.
In hindsight, what I should have done was got the first patch that
introduced block_sigmask() into 3.1, then waited till the next release
cycle and sent out all the arch patches to the arch maintainers. That
way the patches could have been pulled into the respective arch trees.
Guys, how did you want to sort this out? Should we get the first patch
into 3.1, then get all the arch maintainers to pick up their patches?
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (sparc, ptrace trees related)
From: David Miller @ 2011-10-14 7:54 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-kernel, matt.fleming, tj, oleg
In-Reply-To: <20111014180714.e11e15fd35dfaca839c6421e@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 14 Oct 2011 18:07:14 +1100
> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
>
> arch/sparc/kernel/signal_64.c: In function 'handle_signal':
> arch/sparc/kernel/signal_64.c:482:11: error: unused variable 'blocked' [-Werror=unused-variable]
>
> Caused by my merge of commits faddf598f0ba ("sparc: Use
> set_current_blocked()") form the sparc tree and 383fe35697e4 ("sparc: Use
> set_current_blocked() and block_sigmask()") from the ptrace tree.
>
> I have added the following merge fix patch for today.
They didn't build test the original version of the signal patches I
put into the sparc tree either, which is why I fixed them up and put
them into the sparc GIT tree.
Ptrace folks can we not operate like this? The only reason I found
out about the set_current_blocked() transformations was by accident,
because the original patch was posted to linux-kernel only so it never
got queued up into sparc patchwork.
Then once Oleg mentioned it to me, it didn't even compile so I fixed
it up and put the fixed up copy into my tree. It also didn't
transform the TS_RESTORE_SIGMASK cases in the sparc signal code, so I
also added a patch to the sparc tree which took care of that.
Now you guys are creating conflicts against those fixed up patches in
another non-sparc tree, and adding new kinds of build failures as
well.
This doesn't work.
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (security tree related)
From: Sakkinen, Jarkko @ 2011-10-14 7:25 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: James Morris, linux-next, linux-kernel, Casey Schaufler
In-Reply-To: <20111014180730.193ed2e210b913c5852e9e39@canb.auug.org.au>
On Fri, Oct 14, 2011 at 10:07 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi James,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> security/smack/smack_lsm.c: In function 'smack_bprm_set_creds':
> security/smack/smack_lsm.c:473:21: error: 'PER_CLEAR_ON_SETID' undeclared (first use in this function)
>
> Caused by commit 84088ba23929 ("Smack: domain transition protections
> (v3)"). PER_CLEAR_ON_SETID is defined in linux/personality.h which is not
> directly included by the above file.
>
> I have reverted that commit for today.
Oops. Sorry about that. Thanks for informing, I'll fix the issue ASAP.
/Jarkko
^ permalink raw reply
* linux-next: Tree for Oct 14
From: Stephen Rothwell @ 2011-10-14 7:17 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 40983 bytes --]
Hi all,
The linux-next tree remains available from
git://github.com/sfrothwell/linux-next.git .
It is also back on git.kernel.org. The patch is still absent, however.
This will be the last linux-next release before (probably) November
1st (and therefore presumably the merge window for v3.2).
Changes since 20111013:
Removed trees:
udf (at maintainer's request)
agp (at maintiner's request)
The arm-soc tree lost 3 conflicts.
The trivial tree gained a conflict against the mips tree.
The security tree gained a build failure for which I reverted a commit.
The gpio tree lost its build failure.
The ptrace tree gained conflicts against the sparc tree (which also
needed a merge fix patch).
The moduleh tree gained conflicts against the gpio tree.
The akpm tree gained a conflict against the udf tree.
----------------------------------------------------------------------------
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/v2.6/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 199 trees (counting Linus' and 27 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
Merging fixes/master
Merging kbuild-current/rc-fixes
Merging arm-current/fixes
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc/master
Merging scsi-rc-fixes/master
Merging net/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S
CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
Merging arm-soc/for-next
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-seaboard.h
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.h
CONFLICT (modify/delete): arch/arm/mach-nuc93x/Makefile.boot deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
CONFLICT (modify/delete): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
Merging at91/at91-next
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
Merging davinci/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
Merging linux-spec/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/Kconfig
Merging tegra/for-next
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging c6x/for-linux-next
Merging cris/for-next
Merging quilt/hexagon
Merging ia64/next
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc-next/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-wacom.c
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/acpi
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
Merging async_tx/next
Merging net-next/master
CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c
CONFLICT (modify/delete): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net-next/master. Version net-next/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Merging wireless/master
Applying: net: wireless: brcm80211: include module.h
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/smp.c
CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
Merging mtd/master
Merging l2-mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
CONFLICT (modify/delete): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/mips/Kconfig
CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
CONFLICT (content): Merge conflict in drivers/mmc/host/au1xmmc.c
CONFLICT (content): Merge conflict in drivers/mmc/core/sd.c
CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/irqs.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-mx31moboard.c
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/fbdev-next
CONFLICT (content): Merge conflict in drivers/video/Kconfig
Merging viafb/viafb-next
Merging omap_dss2/for-next
CONFLICT (modify/delete): drivers/video/omap/lcd_overo.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_overo.c left in tree.
CONFLICT (modify/delete): drivers/video/omap/lcd_ldp.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_ldp.c left in tree.
CONFLICT (modify/delete): drivers/video/omap/lcd_apollon.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_apollon.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-ldp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-h4.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-apollon.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-2430sdp.c
$ git rm -f drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
Merging regulator/for-next
Applying: regulator: using module related services requires module.h
Merging security/next
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging selinux/master
Merging lblnet/master
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging iommu/next
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in drivers/net/Kconfig
CONFLICT (content): Merge conflict in drivers/ide/Kconfig
CONFLICT (modify/delete): arch/arm/mach-nuc93x/time.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-nuc93x/time.c left in tree.
CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
$ git rm -f arch/arm/mach-nuc93x/time.c
Merging audit/for-next
Merging pm/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging edac-amd/for-next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/iommu/Makefile
Merging rcu/rcu/next
Merging kmemleak/kmemleak
Merging kvm/kvm-updates/3.2
Merging oprofile/for-next
Merging ptrace/ptrace
CONFLICT (content): Merge conflict in arch/sparc/kernel/signal_64.c
CONFLICT (content): Merge conflict in arch/sparc/kernel/signal_32.c
CONFLICT (content): Merge conflict in arch/sparc/kernel/signal32.c
Merging xen/upstream/xen
Merging xen-two/linux-next
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-pvhvm/linux-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
Merging driver-core/driver-core-next
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
Merging tty/tty-next
CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
CONFLICT (modify/delete): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/hv/Makefile
CONFLICT (content): Merge conflict in drivers/staging/et131x/et1310_tx.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c
CONFLICT (modify/delete): drivers/staging/brcm80211/brcmsmac/mac80211_if.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/brcm80211/brcmsmac/mac80211_if.c left in tree.
CONFLICT (modify/delete): drivers/staging/brcm80211/brcmfmac/dhd_linux.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/brcm80211/brcmfmac/dhd_linux.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in drivers/Kconfig
$ git rm -f drivers/staging/brcm80211/brcmfmac/dhd_linux.c drivers/staging/brcm80211/brcmsmac/mac80211_if.c drivers/staging/rtl8192e/r8192E_core.c
Merging bkl-config/config
Merging tmem/tmem
Merging writeback/writeback-for-next
Merging arm-dt/devicetree/arm-next
Merging hwspinlock/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/hwspinlock.c
Merging pinctrl/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-u300/core.c
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Kconfig
Merging moduleh/for-sfr
CONFLICT (content): Merge conflict in sound/soc/soc-io.c
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
CONFLICT (modify/delete): drivers/staging/iio/industrialio-ring.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/iio/industrialio-ring.c left in tree.
CONFLICT (modify/delete): drivers/staging/brcm80211/brcmfmac/dhd_sdio.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/brcm80211/brcmfmac/dhd_sdio.c left in tree.
CONFLICT (modify/delete): drivers/staging/brcm80211/brcmfmac/dhd_linux.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/brcm80211/brcmfmac/dhd_linux.c left in tree.
CONFLICT (modify/delete): drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c left in tree.
CONFLICT (modify/delete): drivers/staging/brcm80211/brcmfmac/bcmsdh.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/brcm80211/brcmfmac/bcmsdh.c left in tree.
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
CONFLICT (content): Merge conflict in drivers/gpio/gpio-pch.c
CONFLICT (content): Merge conflict in drivers/gpio/gpio-ml-ioh.c
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-wdt.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-wdt.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-usb.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-usb.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-ts.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-ts.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-rtc.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-rtc.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-pwm.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-pwm.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-nand.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-nand.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-ide.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-ide.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-asocdma.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-asocdma.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-samsung/dev-adc.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-samsung/dev-adc.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-s5p/dev-onenand.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-s5p/dev-onenand.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-s5p/dev-ehci.c deleted in HEAD and modified in moduleRecorded preimage for 'drivers/gpio/gpio-ml-ioh.c'
CONFLICT (modify/delete): arch/arm/plat-s3c24xx/devs.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of arch/arm/plat-s3c24xx/devs.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
$ git rm -f drivers/staging/iio/industrialio-ring.c
$ git rm -f drivers/staging/brcm80211/brcmfmac/bcmsdh.c drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c drivers/staging/brcm80211/brcmfmac/dhd_linux.c drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
$ git rm -f arch/arm/plat-s3c24xx/devs.c arch/arm/plat-s5p/dev-ehci.c arch/arm/plat-s5p/dev-onenand.c arch/arm/plat-samsung/dev-adc.c arch/arm/plat-samsung/dev-asocdma.c arch/arm/plat-samsung/dev-ide.c arch/arm/plat-samsung/dev-nand.c arch/arm/plat-samsung/dev-pwm.c arch/arm/plat-samsung/dev-rtc.c arch/arm/plat-samsung/dev-ts.c arch/arm/plat-samsung/dev-usb.c arch/arm/plat-samsung/dev-wdt.c
Applying: block/bsg-lib.c: change module.h -> export.h in power/common.c
Applying: mmc: using module_param requires the inclusion of moduleparam.h
Applying: NFC: use of module facilities requires the inclusion of module.h
Applying: arm: Add export.h to recently added files for EXPORT_SYMBOL
CONFLICT (modify/delete): arch/arm/plat-s5p/dev-tv.c deleted in HEAD and modified in arm: Add export.h to recently added files for EXPORT_SYMBOL. Version arm: Add export.h to recently added files for EXPORT_SYMBOL of arch/arm/plat-s5p/dev-tv.c left in tree.
$ git rm -f arch/arm/plat-s5p/dev-tv.c
Applying: arm: Add export.h to recently added files for EXPORT_SYMBOL
Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
Applying: PM QoS: include export.h in qos.c for EXPORT_SYMBOL
Applying: net: Add export.h to nfc/nci/core.c
Applying: scsi: Add export.h to drivers/scsi/libsas/sas_host_smp.c
Applying: drivers/md: change module.h -> export.h in persistent-data/dm-*
Applying: drivers/net: Add module.h to wireless/ath/ath6kl/sdio.c
Applying: drivers/net: wireless/ath/ath5k/debug.c does not need module.h
Applying: drivers/bcma: driver_chipcommon_pmu.c needs export.h for EXPORT_SYMBOL
Applying: drivers/base: change module.h -> export.h in power/common.c
Applying: drivers/base: Add export.h to regmap/regcache.c
Applying: pinctrl: EXPORT_SYMBOL needs export.h
Applying: ath6kl: THIS_MODULES needs export.h
Applying: ath6kl: module_param needs the inclusion of moduleparam.h
Applying: rtlwifi: use of module_param requires the inclusion of moduleparam.h
Applying: staging: Add export.h to recently added files for EXPORT_SYMBOL
Applying: x86: Add export.h to arch/x86/kernel/cpu/perf_event_intel.c
Applying: x86, nmi: include export.h for EXPORT_SYMBOL
Applying: net: wireless; brcm80211: add export.h
CONFLICT (content): Merge conflict in drivers/net/wireless/brcm80211/brcmutil/wifi.c
Applying: net: wireless; brcm80211: add export.h
Merging kvmtool/master
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master
$ git checkout akpm
Applying: include/linux/dmar.h: forward-declare struct acpi_dmar_header
Applying: drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug
Applying: drm: fix kconfig unmet dependency warning
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: hp_accel: Add a new PNP id
Applying: hp_accel: Add axis-mapping for HP ProBook / EliteBook
Applying: x86: fix mmap random address range
Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
Applying: vrtc: change its year offset from 1960 to 1972
Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
Applying: mrst: battery fixes
Applying: drivers/power/intel_mid_battery.c: fix build
Applying: x86,mrst: add mapping for bma023
Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
Applying: x86: tlb flush avoid superflous leave_mm()
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: audit: always follow va_copy() with va_end()
Applying: btrfs: don't dereference extent_mapping if NULL
Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
Applying: ia64, exec: remove redundant set_fs(USER_DS)
Applying: brlocks/lglocks: clean up code
Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
Applying: ipc/mqueue: cleanup definition names and locations
Applying: ipc/mqueue: switch back to using non-max values on create
Applying: ipc/mqueue: enforce hard limits
Applying: ipc/mqueue: update maximums for the mqueue subsystem
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
Applying: unicore32, exec: remove redundant set_fs(USER_DS)
Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
Applying: debugobjects: extend debugobjects to assert that an object is initialized
Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
Applying: ext4: use proper little-endian bitops
Applying: ocfs2: avoid unaligned access to dqc_bitmap
Applying: parisc, exec: remove redundant set_fs(USER_DS)
Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
Applying: scsi: fix a header to include linux/types.h
Applying: drivers/scsi/megaraid.c: fix sparse warnings
Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
Applying: drivers/scsi/sd.c: use ida_simple_get() and ida_simple_remove() in place of boilerplate code
Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
Applying: loop: prevent information leak after failed read
Applying: loop: cleanup set_status interface
Applying: loop-cleanup-set_status-interface-checkpatch-fixes
Applying: cciss: add half second delay to PCI PM reset code
Applying: cciss: auto engage SCSI mid layer at driver load time
Applying: slab: add taint flag outputting to debug paths.
Applying: slub: add taint flag outputting to debug paths
Applying: drivers/tty/serial/pch_uart.c: add console support
Applying: Cross Memory Attach
Applying: cross-memory-attach-update
Applying: cross-memory-attach-v4
Applying: mm: compaction: trivial clean up in acct_isolated()
Applying: mm: change isolate mode from #define to bitwise type
Applying: mm-change-isolate-mode-from-define-to-bitwise-type-fix
Applying: mm: compaction: make isolate_lru_page() filter-aware
Applying: mm-compaction-make-isolate_lru_page-filter-aware-fix
Applying: mm: zone_reclaim: make isolate_lru_page() filter-aware
Applying: mm-zone_reclaim-make-isolate_lru_page-filter-aware-fix
Applying: mm: migration: clean up unmap_and_move()
Applying: radix_tree: clean away saw_unset_tag leftovers
Applying: vmscan: add block plug for page reclaim
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
Applying: mm/page-writeback.c: document bdi_min_ratio
Applying: oom: avoid killing kthreads if they assume the oom killed thread's mm
Applying: oom: remove oom_disable_count
Applying: oom: fix race while temporarily setting current's oom_score_adj
Applying: tmpfs: add "tmpfs" to the Kconfig prompt to make it obvious.
Applying: mm: output a list of loaded modules when we hit bad_page()
Applying: mm: vmscan: drop nr_force_scan[] from get_scan_count
Applying: mm: distinguish between mlocked and pinned pages
Applying: mm: add comments to explain mm_struct fields
Applying: mm-add-comments-to-explain-mm_struct-fields-fix
Applying: mm: vmscan: do not writeback filesystem pages in direct reclaim
Applying: mm: vmscan: remove dead code related to lumpy reclaim waiting on pages under writeback
Applying: xfs: warn if direct reclaim tries to writeback pages
Applying: ext4: warn if direct reclaim tries to writeback pages
Applying: mm: vmscan: do not writeback filesystem pages in kswapd except in high priority
Applying: mm: vmscan: throttle reclaim if encountering too many dirty pages under writeback
Applying: mm-vmscan-throttle-reclaim-if-encountering-too-many-dirty-pages-under-writeback-update
Applying: mm: vmscan: immediately reclaim end-of-LRU dirty pages when writeback completes
Applying: vmscan: count pages into balanced for zone with good watermark
Applying: mm/debug-pagealloc.c: use plain __ratelimit() instead of printk_ratelimit()
Applying: lib/string.c: introduce memchr_inv()
Applying: lib-stringc-introduce-memchr_inv-fix-kernel-doc-for-memchr_inv
Applying: mm/debug-pagealloc.c: use memchr_inv
Applying: vmscan: fix initial shrinker size handling
Applying: vmscan: use atomic-long for shrinker batching
Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
Applying: mm: avoid null pointer access in vm_struct via /proc/vmallocinfo
Applying: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: memblock: add memblock_start_of_DRAM()
Applying: memblock: add NO_BOOTMEM config symbol
Applying: mremap: check for overflow using deltas
Applying: mremap: avoid sending one IPI per page
Applying: thp: mremap support and TLB optimization
Applying: thp-mremap-support-and-tlb-optimization-fix
Applying: thp-mremap-support-and-tlb-optimization-fix-fix
Applying: thp-mremap-support-and-tlb-optimization-fix-fix-fix
Applying: include/asm-generic/page.h: calculate virt_to_page and page_to_virt via predefined macro
Applying: mm: iov_iter: have iov_iter_advance() decrement nr_segs appropriately
Applying: mm: neaten warn_alloc_failed
Applying: mm-neaten-warn_alloc_failed-fix
Applying: debug-pagealloc: add support for highmem pages
Applying: debug-pagealloc-add-support-for-highmem-pages-fix
Applying: kswapd: avoid unnecessary rebalance after an unsuccessful balancing
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm/memblock.c: small function definition fixes
Applying: mm: compaction: compact unevictable pages
Applying: mm-compaction-compact-unevictable-pages-checkpatch-fixes
Applying: mm: compaction: accounting fix
Applying: kswapd: assign new_order and new_classzone_idx after wakeup in sleeping
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm/vmalloc.c: report more vmalloc failures
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: mm: thp: tail page refcounting fix
Applying: thp-tail-page-refcounting-fix-6
Applying: ksm: fix the comment of try_to_unmap_one()
Applying: mm-add-comment-explaining-task-state-setting-in-bdi_forker_thread-fix
Applying: vmscan: fix shrinker callback bug in fs/super.c
Applying: mm/mmap.c: eliminate the ret variable from mm_take_all_locks()
Applying: mm-mmapc-eliminate-the-ret-variable-from-mm_take_all_locks-fix
Applying: fs/buffer.c: add device information for error output in __find_get_block_slow()
Applying: HWPOISON: convert pr_debug()s to pr_info()s
Applying: mm: compaction: make compact_zone_order() static
Applying: mm: fix kunmap_high() comment
Applying: vmscan.c: fix invalid strict_strtoul() check in write_scan_unevictable_node()
Applying: mm: disable user interface to manually rescue unevictable pages
Applying: mm/memblock.c: quiet sparse noise
Applying: mm/thrash.c: quiet sparse noise
Applying: mm/mempolicy.c: quiet sparse noise
Applying: mm/huge_memory.c: quiet sparse noise
Applying: vmscan: add barrier to prevent evictable page in unevictable list
Applying: selinuxfs: remove custom hex_to_bin()
Applying: include/linux/security.h: fix security_inode_init_security() arg
Applying: hpet: factor timer allocate from open
Applying: alpha: wire up accept4 syscall
Applying: alpha: wire up sendmmsg syscall
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: fs/pipe.c: add ->statfs callback for pipefs
Applying: lib/Kconfig.debug: fix help message for DEFAULT_HUNG_TASK_TIMEOUT
Applying: hwmon: convert idr to ida and use ida_simple interface
Applying: drivers/hwmon/hwmon.c: convert idr to ida and use ida_simple_get()
Applying: lis3lv02d: avoid divide by zero due to unchecked
Applying: lis3: update maintainer information
Applying: lis3: add support for HP EliteBook 2730p
Applying: lis3: add support for HP EliteBook 8540w
Applying: hp_accel: add HP ProBook 655x
Applying: lis3: free regulators if probe() fails
Applying: lis3: use consistent naming of variables
Applying: lis3: change exported function to use passed parameter
Applying: lis3: remove the references to the global variable in core driver
Applying: lis3-remove-the-references-to-the-global-variable-in-core-driver-fix
Applying: lis3lv02d: make regulator API usage unconditional
Applying: driver/misc/fsa9480.c fix potential null-pointer dereference
Applying: stop_machine: make stop_machine safe and efficient to call early
Applying: stop_machine-make-stop_machine-safe-and-efficient-to-call-early-v3.
Applying: watchdog: move watchdog_*_all_cpus under CONFIG_SYSCTL
Applying: dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
Applying: dynamic_debug: remove num_enabled accounting
Applying: dynamic_debug: use a single printk() to emit messages
Applying: dynamic_debug: fix undefined reference to `__netdev_printk'
Applying: printk: add module parameter ignore_loglevel to control ignore_loglevel
Applying: printk: add ignore_loglevel as module parameter
Applying: printk: add console_suspend module parameter
Applying: printk: fix bounds checking for log_prefix
Applying: printk: remove bounds checking for log_prefix
Applying: treewide: use __printf not __attribute__((format(printf,...)))
CONFLICT (content): Merge conflict in fs/udf/udfdecl.h
Applying: treewide-use-__printf-not-__attribute__formatprintf-fix
Applying: treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes
Applying: fs/namei.c: remove unused getname_flags()
Applying: poll: add poll_requested_events() function
Applying: MAINTAINERS: add new entry for ideapad-laptop
Applying: video/backlight: remove obsolete cleanup for clientdata
Applying: backlight: fix broken regulator API usage in l4f00242t03
Applying: drivers/video/backlight/l4f00242t03.c: use gpio_request_one() to simplify error handling
Applying: backlight: rename corgibl_limit_intensity() to genericbl_limit_intensity()
Applying: leds: Renesas TPU LED driver
Applying: leds-renesas-tpu-led-driver-v2-fix
Applying: drivers/leds/led-triggers.c: fix memory leak
Applying: drivers/leds/leds-lm3530.c: remove obsolete cleanup for clientdata
Applying: drivers/leds/leds-renesas-tpu.c: update driver to use workqueue
Applying: drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data
Applying: drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
Applying: lib/kstrtox: common code between kstrto*() and simple_strto*() functions
Applying: lib/spinlock_debug.c: print owner on spinlock lockup
Applying: lib/bitmap.c: quiet sparse noise about address space
Applying: lib-bitmapc-quiet-sparse-noise-about-address-space-fix
Applying: lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
Applying: lib/idr.c: fix comment for ida_get_new_above()
Applying: llist: using in_nmi requires including hardirq.h
Applying: llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
Applying: kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
Applying: lib/crc: add slice by 8 algorithm to crc32.c
Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
Applying: epoll: fix spurious lockdep warnings
Applying: epoll: limit paths
Applying: binfmt_elf: fix PIE execution with randomization disabled
Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs
Applying: oprofilefs: handle zero-length writes
Applying: drivers/rtc/class.c: convert idr to ida and use ida_simple_get()
Applying: rtc: add initial support for mcp7941x parts
Applying: drivers/rtc/rtc-mc13xxx.c: move probe and remove callbacks to .init.text and .exit.text
Applying: minix: describe usage of different magic numbers
Applying: cgroups: more safe tasklist locking in cgroup_attach_proc
Applying: cgroups: don't attach task to subsystem if migration failed
Applying: cgroup/kmemleak: Annotate alloc_page() for cgroup allocations
Applying: cgroups: add res_counter_write_u64() API
Applying: cgroups: new resource counter inheritance API
Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
Applying: cgroups: new cancel_attach_task() subsystem callback
Applying: cgroups: ability to stop res charge propagation on bounded ancestor
Applying: cgroups: add res counter common ancestor searching
Applying: res_counter: allow charge failure pointer to be null
Applying: cgroups: pull up res counter charge failure interpretation to caller
Applying: cgroups: allow subsystems to cancel a fork
Applying: cgroups: add a task counter subsystem
Applying: memcg: rename mem variable to memcg
Applying: memcg: fix oom schedule_timeout()
Applying: memcg: replace ss->id_lock with a rwlock
Applying: memcg: do not expose uninitialized mem_cgroup_per_node to world
Applying: memcg: skip scanning active lists based on individual size
Applying: memcg-skip-scanning-active-lists-based-on-individual-size-fix
Applying: memcg: close race between charge and putback
Applying: memcg: Fix race condition in memcg_check_events() with this_cpu usage
Applying: cpusets: avoid looping when storing to mems_allowed if one node remains set
Applying: procfs: report EISDIR when reading sysctl dirs in proc
Applying: proc: fix races against execve() of /proc/PID/fd**
Applying: proc-fix-races-against-execve-of-proc-pid-fd-fix
Applying: proc: force dcache drop on unauthorized access
Applying: ipc-introduce-shm_rmid_forced-sysctl-testing
Applying: init: add root=PARTUUID=UUID/PARTNROFF=%d support
Applying: init-add-root=partuuid=uuid-partnroff=%d-support-fix
Applying: drivers/rapidio/rio-scan.c: use discovered bit to test if enumeration is complete
Applying: arch/powerpc/sysdev/fsl_rio.c: release rapidio port I/O region resource if port failed to initialize
Applying: RapidIO: add mport driver for Tsi721 bridge
Applying: RapidIO: Tsi721 driver - fixes for the initial release
Applying: RapidIO: fix potential null deref in rio_setup_device()
Applying: drivers/net/rionet.c: fix ethernet address macros for LE platforms
Applying: sysctl: add support for poll()
Applying: sysctl-add-support-for-poll-fix
Applying: sysctl: make CONFIG_SYSCTL_SYSCALL default to n
Applying: pps: default echo function
Applying: pps: new client driver using GPIO
Applying: pps-new-client-driver-using-gpio-fix
Applying: pps gpio client: add missing dependency
Applying: w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
Applying: drivers/power/ds2780_battery.c: create central point for calling w1 interface
Applying: drivers/power/ds2780_battery.c: add a nolock function to w1 interface
Applying: drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
Applying: drivers/w1/w1_int.c: multiple masters used same init_name
Applying: aio: allocate kiocbs in batches
Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()
Applying: dio: separate fields only used in the submission path from struct dio
Applying: dio-separate-fields-only-used-in-the-submission-path-from-struct-dio-checkpatch-fixes
Applying: dio: fix a wrong comment
Applying: dio: rearrange fields in dio/dio_submit to avoid holes
Applying: dio: use a slab cache for struct dio
Applying: dio: separate map_bh from dio
Applying: dio: inline the complete submission path
Applying: dio-inline-the-complete-submission-path-v2-checkpatch-fixes
Applying: dio: merge direct_io_walker() into __blockdev_direct_IO()
Applying: dio-merge-direct_io_walker-into-__blockdev_direct_io-checkpatch-fixes
Applying: dio: remove unnecessary dio argument from dio_pages_present()
Applying: dio: remove unused dio parameter from dio_bio_add_page()
Applying: vfs: cache request_queue in struct block_device
Applying: dio: optimize cache misses in the submission path
Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
Applying: dio: using prefetch requires including prefetch.h
Applying: ipc/mqueue: vlammoc requires vmalloc.h
Applying: cgroups: ERR_PTR needs err.h
Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone()
Merging akpm
[master ce05bd4] Revert "Smack: domain transition protections (v3)"
Applying: sparc: fix mismerge of signal*.c
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (security tree related)
From: Stephen Rothwell @ 2011-10-14 7:07 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, linux-kernel, Jarkko Sakkinen
[-- Attachment #1: Type: text/plain, Size: 616 bytes --]
Hi James,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
security/smack/smack_lsm.c: In function 'smack_bprm_set_creds':
security/smack/smack_lsm.c:473:21: error: 'PER_CLEAR_ON_SETID' undeclared (first use in this function)
Caused by commit 84088ba23929 ("Smack: domain transition protections
(v3)"). PER_CLEAR_ON_SETID is defined in linux/personality.h which is not
directly included by the above file.
I have reverted that commit for today.
--
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: build failure after merge of the final tree (sparc, ptrace trees related)
From: Stephen Rothwell @ 2011-10-14 7:07 UTC (permalink / raw)
To: David S. Miller
Cc: linux-next, linux-kernel, Matt Fleming, Tejun Heo, Oleg Nesterov
[-- Attachment #1: Type: text/plain, Size: 2312 bytes --]
Hi All,
After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:
arch/sparc/kernel/signal_64.c: In function 'handle_signal':
arch/sparc/kernel/signal_64.c:482:11: error: unused variable 'blocked' [-Werror=unused-variable]
Caused by my merge of commits faddf598f0ba ("sparc: Use
set_current_blocked()") form the sparc tree and 383fe35697e4 ("sparc: Use
set_current_blocked() and block_sigmask()") from the ptrace tree.
I have added the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 14 Oct 2011 17:58:53 +1100
Subject: [PATCH] sparc: fix mismerge of signal*.c
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/sparc/kernel/signal32.c | 1 -
arch/sparc/kernel/signal_32.c | 1 -
arch/sparc/kernel/signal_64.c | 1 -
3 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c
index 74a5dde..22b7c6a 100644
--- a/arch/sparc/kernel/signal32.c
+++ b/arch/sparc/kernel/signal32.c
@@ -776,7 +776,6 @@ static inline int handle_signal32(unsigned long signr, struct k_sigaction *ka,
siginfo_t *info,
sigset_t *oldset, struct pt_regs *regs)
{
- sigset_t blocked;
int err;
if (ka->sa.sa_flags & SA_SIGINFO)
diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
index 9e005b6..b3a2229 100644
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@ -465,7 +465,6 @@ static inline int
handle_signal(unsigned long signr, struct k_sigaction *ka,
siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)
{
- sigset_t blocked;
int err;
if (ka->sa.sa_flags & SA_SIGINFO)
diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c
index 26560e9..27332cd 100644
--- a/arch/sparc/kernel/signal_64.c
+++ b/arch/sparc/kernel/signal_64.c
@@ -479,7 +479,6 @@ static inline int handle_signal(unsigned long signr, struct k_sigaction *ka,
siginfo_t *info,
sigset_t *oldset, struct pt_regs *regs)
{
- sigset_t blocked;
int err;
err = setup_rt_frame(ka, regs, signr, oldset,
--
1.7.7
--
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 related
* linux-next: manual merge of the akpm with the ext3 tree
From: Stephen Rothwell @ 2011-10-14 6:34 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Joe Perches, Jan Kara
[-- Attachment #1: Type: text/plain, Size: 1386 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
fs/udf/udfdecl.h between various commits from the ext3 tree and commit
2ea9eff85131 ("treewide: use __printf not __attribute__((format
(printf,...)))") from the scsi-post-merge tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/udf/udfdecl.h
index f7273fb,4a33c72..0000000
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@@ -18,21 -16,6 +18,21 @@@
#define UDF_PREALLOCATE
#define UDF_DEFAULT_PREALLOC_BLOCKS 8
- __attribute__((format(printf, 3, 4)))
- extern void _udf_err(struct super_block *sb, const char *function,
++extern __printf(3, 4)
++void _udf_err(struct super_block *sb, const char *function,
+ const char *fmt, ...);
+#define udf_err(sb, fmt, ...) \
+ _udf_err(sb, __func__, fmt, ##__VA_ARGS__)
+
- __attribute__((format(printf, 3, 4)))
- extern void _udf_warn(struct super_block *sb, const char *function,
++extern __printf(3, 4)
++void _udf_warn(struct super_block *sb, const char *function,
+ const char *fmt, ...);
+#define udf_warn(sb, fmt, ...) \
+ _udf_warn(sb, __func__, fmt, ##__VA_ARGS__)
+
+#define udf_info(fmt, ...) \
+ pr_info("INFO " fmt, ##__VA_ARGS__)
+
#undef UDFFS_DEBUG
#ifdef UDFFS_DEBUG
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the gpio tree
From: Stephen Rothwell @ 2011-10-14 6:02 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Tomoya MORINAGA, Grant Likely
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/gpio/gpio-pch.c between commit 38eb18a6f92d ("gpio-pch: Support
interrupt function") from the gpio tree and commit d331aa9b3a0b
("drivers/gpio: Fix drivers who are implicit users of module.h") from the
moduleh tree.
Just context changes. I fxied it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpio/gpio-pch.c
index 46b5209,c9c4297..0000000
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@@ -17,17 -17,10 +17,18 @@@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/gpio.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+ #include <linux/module.h>
-#define PCH_GPIO_ALL_PINS 0xfff /* Mask for GPIO pins 0 to 11 */
-#define GPIO_NUM_PINS 12 /* Specifies number of GPIO PINS GPIO0-GPIO11 */
+#define PCH_EDGE_FALLING 0
+#define PCH_EDGE_RISING BIT(0)
+#define PCH_LEVEL_L BIT(1)
+#define PCH_LEVEL_H (BIT(0) | BIT(1))
+#define PCH_EDGE_BOTH BIT(2)
+#define PCH_IM_MASK (BIT(0) | BIT(1) | BIT(2))
+
+#define PCH_IRQ_BASE 24
struct pch_regs {
u32 ien;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the gpio tree
From: Stephen Rothwell @ 2011-10-14 6:02 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Tomoya MORINAGA, Grant Likely
[-- Attachment #1: Type: text/plain, Size: 1146 bytes --]
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/gpio/gpio-ml-ioh.c between commit 54be566317b6 ("gpio-ml-ioh:
Support interrupt function") from the gpio tree and commit d331aa9b3a0b
("drivers/gpio: Fix drivers who are implicit users of module.h") from the
moduleh tree.
Just context changes. I fxied it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpio/gpio-ml-ioh.c
index 274fd4d,16c7b5b..0000000
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@@ -18,18 -18,8 +18,19 @@@
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/gpio.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+ #include <linux/module.h>
+#define IOH_EDGE_FALLING 0
+#define IOH_EDGE_RISING BIT(0)
+#define IOH_LEVEL_L BIT(1)
+#define IOH_LEVEL_H (BIT(0) | BIT(1))
+#define IOH_EDGE_BOTH BIT(2)
+#define IOH_IM_MASK (BIT(0) | BIT(1) | BIT(2))
+
+#define IOH_IRQ_BASE 0
+
#define PCI_VENDOR_ID_ROHM 0x10DB
struct ioh_reg_comn {
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the ptrace tree with the sparc tree
From: Stephen Rothwell @ 2011-10-14 4:47 UTC (permalink / raw)
To: Tejun Heo, Oleg Nesterov
Cc: linux-next, linux-kernel, Matt Fleming, David Miller
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
Hi all,
Today's linux-next merge of the ptrace tree got conflicts in
arch/sparc/kernel/signal32.c, arch/sparc/kernel/signal_32.c and
arch/sparc/kernel/signal_64.c between commit faddf598f0ba ("sparc: Use
set_current_blocked()") from the sparc tree and commit 383fe35697e4
("sparc: Use set_current_blocked() and block_sigmask()") from the ptrace
tree.
I used ther version from the ptrace tree as these seem to go further (and
have a later Auther Date).
--
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
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