* Re: FW: next-20090724: null pointer dereference from ibm_find_acpi_device
From: Thomas Meyer @ 2009-07-30 16:55 UTC (permalink / raw)
To: Lin Ming; +Cc: Moore, Robert, Len Brown, linux-next
In-Reply-To: <1248685437.3166.28.camel@minggr.sh.intel.com>
Am Montag, den 27.07.2009, 17:03 +0800 schrieb Lin Ming:
> Hi, Thomas
>
> Would you please try below patch?
Yes. The patch below makes the NULL pointer dereference go away. Is the
hardware_id.string accessibly thru sysfs?
>
> info->hardware_id.string[sizeof(info->hardware_id.length) - 1] = '\0' is
> not needed anymore because acpi_get_object_info already handles it.
>
> /* Allocate a buffer for the HID */
>
> hid =
> ACPI_ALLOCATE_ZEROED(sizeof(struct acpica_device_id) +
> (acpi_size) length);
>
> And it would cause null pointer deference if info->hardware_id.string is
> NULL.
>
> So delete it.
>
> diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
> index a9d926b..e7be66d 100644
> --- a/drivers/pci/hotplug/acpiphp_ibm.c
> +++ b/drivers/pci/hotplug/acpiphp_ibm.c
> @@ -406,7 +406,6 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
> __func__, status);
> return retval;
> }
> - info->hardware_id.string[sizeof(info->hardware_id.length) - 1] = '\0';
>
> if (info->current_status && (info->valid & ACPI_VALID_HID) &&
> (!strcmp(info->hardware_id.string, IBM_HARDWARE_ID1) ||
>
>
> On Mon, 2009-07-27 at 13:09 +0800, Moore, Robert wrote:
> > Lin Ming,
> >
> > Can you take a look at this?
> >
> > Thanks
> > Bob
> >
> >
> > -----Original Message-----
> > From: Thomas Meyer [mailto:thomas@m3y3r.de]
> > Sent: Sunday, July 26, 2009 3:15 AM
> > To: Moore, Robert; Brown, Len; linux-next@vger.kernel.org
> > Subject: next-20090724: null pointer dereference from ibm_find_acpi_device
> >
> > Hi.
> >
> > Probably caused by commit fbe8cddd2d85979d273d7937a2b8a47498694d91.
> >
> > See attached screenshot.
> >
>
^ permalink raw reply
* Loan Application
From: jmc @ 2009-07-30 18:49 UTC (permalink / raw)
To: info
we lend at 0.3%,contact us via email jmcloaninvestment@gala.net with your details.
^ permalink raw reply
* Re: [PATCH] next-20090730 lguest build breaks with pfn_pmd()
From: Rusty Russell @ 2009-07-30 23:19 UTC (permalink / raw)
To: Kamalesh Babulal
Cc: sfr-3FnU+UHB4dNDw9hX6IcOSA, lguest-mnsaURCQ41sdnm+yROfE0A,
linux-next-u79uwXL29TY76Z2rM5mHXA, LKML
In-Reply-To: <20090730120533.GB4955-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
On Thu, 30 Jul 2009 09:35:33 pm Kamalesh Babulal wrote:
> Hi Rusty,
>
> next-20090729 allmodconfig build breaks at
>
> drivers/lguest/page_tables.c: In function 'setup_pagetables':
> drivers/lguest/page_tables.c:987: error: incompatible type for argument 2 of 'pfn_pmd'
> drivers/lguest/page_tables.c:994: error: expected ';' before ')' token
> drivers/lguest/page_tables.c:994: error: expected statement before ')' token
> make[2]: *** [drivers/lguest/page_tables.o] Error 1
>
> build failure is introduced by commit e07dd6220a4bf81a2549e7e37523a2557547d9d7
> I have tested the patch for the build failure only.
>
> Signed-off-by: Kamalesh Babulal <kamalesh-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
Thanks, applied!
Rusty.
^ permalink raw reply
* Re: OProfile for linux-next
From: Stephen Rothwell @ 2009-07-30 23:25 UTC (permalink / raw)
To: Robert Richter; +Cc: Ingo Molnar, linux-next, LKML
In-Reply-To: <20090730120738.GA24694@erda.amd.com>
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
Hi Robert,
On Thu, 30 Jul 2009 14:07:38 +0200 Robert Richter <robert.richter@amd.com> wrote:
>
> please add following tree to linux-next:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git for-next
>
> This is the oprofile master branch containing all changes for the next
> merge window.
Added from today.
> The general way of sending oprofile to linux-next is via tip. So, this
> will be a temporary solution until Ingo will be back.
I added it after the tip tree, so if it hangs around for a few days after
Ingo has integrated it, it should not be a problem.
What I tell everyone: all patches/commits in the tree/series must
have been:
posted to a relevant mailing list
reviewed
unit tested
destined for the next merge window (or the current release)
*before* they are included. The linux-next tree is for integration
testing and to lower the impact of conflicts between subsystems in the
next merge window.
Basically, this should be just what you would send to Linus or in this
case, Ingo, (or ask him to fetch). It is allowed to be rebased if you
deem it necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: scsi-rc-fixes tree build failure
From: Stephen Rothwell @ 2009-07-30 23:31 UTC (permalink / raw)
To: James Bottomley
Cc: linux-next, linux-kernel, Tom Peng, Jack Wang, Lindar Liu,
Kevin Ao, linux-scsi
In-Reply-To: <1248965603.3880.64.camel@mulgrave.site>
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
Hi James,
On Thu, 30 Jul 2009 09:53:23 -0500 James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
>
> This fixes it on my ppc64 box, so I'll fold it into the original patch
> and put it back into the tree.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm tree with Linus' tree
From: Stephen Rothwell @ 2009-07-31 0:33 UTC (permalink / raw)
To: Russell King
Cc: linux-next, linux-kernel, Hartley Sweeten, Ryan Mallon,
Joe Perches, Andrew Morton
Hi Russell,
Today's linux-next merge of the arm tree got a conflict in MAINTAINERS
between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS:
coalesce name and email address lines") from Linus' tree and commit
d19d36672ee379f26b79df985a9a2e5afb3f1df1 ("[ARM] 5599/1: MAINTAINERS:
update for EP93XX ARM") from the arm tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc MAINTAINERS
index 79471ba,1be6a0c..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -535,12 -604,18 +535,15 @@@ W: http://maxim.org.za/at91_26.htm
S: Maintained
ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
- M: Lennert Buytenhek <kernel@wantstofly.org>
-P: Hartley Sweeten
-M: hsweeten@visionengravers.com
-P: Ryan Mallon
-M: ryan@bluewatersys.com
++M: Hartley Sweeten <hsweeten@visionengravers.com>
++M: Ryan Mallon <ryan@bluewatersys.com>
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
S: Maintained
+ F: arch/arm/mach-ep93xx/
+ F: arch/arm/mach-ep93xx/include/mach/
ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
-P: Lennert Buytenhek
-M: kernel@wantstofly.org
+M: Lennert Buytenhek <kernel@wantstofly.org>
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
S: Maintained
^ permalink raw reply
* RE: linux-next: manual merge of the arm tree with Linus' tree
From: H Hartley Sweeten @ 2009-07-31 0:41 UTC (permalink / raw)
To: Stephen Rothwell, Russell King
Cc: linux-next, linux-kernel, Ryan Mallon, Joe Perches, Andrew Morton
In-Reply-To: <20090731103354.5e7fdd42.sfr@canb.auug.org.au>
On Thursday, July 30, 2009 5:34 PM, Stephen Rothwell wrote:
> Hi Russell,
>
> Today's linux-next merge of the arm tree got a conflict in MAINTAINERS
> between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS:
> coalesce name and email address lines") from Linus' tree and commit
> d19d36672ee379f26b79df985a9a2e5afb3f1df1 ("[ARM] 5599/1: MAINTAINERS:
> update for EP93XX ARM") from the arm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Russell,
Stephen's fix below is fine with me. If needed I will resubmit this patch.
Regards,
Hartley
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc MAINTAINERS
> index 79471ba,1be6a0c..0000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -535,12 -604,18 +535,15 @@@ W: http://maxim.org.za/at91_26.htm
> S: Maintained
>
> ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
> - M: Lennert Buytenhek <kernel@wantstofly.org>
> -P: Hartley Sweeten
> -M: hsweeten@visionengravers.com
> -P: Ryan Mallon
> -M: ryan@bluewatersys.com
> ++M: Hartley Sweeten <hsweeten@visionengravers.com>
> ++M: Ryan Mallon <ryan@bluewatersys.com>
> L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
> S: Maintained
> + F: arch/arm/mach-ep93xx/
> + F: arch/arm/mach-ep93xx/include/mach/
>
> ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
> -P: Lennert Buytenhek
> -M: kernel@wantstofly.org
> +M: Lennert Buytenhek <kernel@wantstofly.org>
> L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
> S: Maintained
^ permalink raw reply
* Re: linux-next: kmemleak tree build failure
From: Stephen Rothwell @ 2009-07-31 2:00 UTC (permalink / raw)
To: Catalin Marinas; +Cc: linux-next, linux-kernel
In-Reply-To: <1248944337.3376.5.camel@pc1117.cambridge.arm.com>
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
Hi Catalin,
On Thu, 30 Jul 2009 09:58:57 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> Yes, it's missing this (I was only testing it with slub which has
> kmemleak.h included in its header file).
>
> I updated the kmemleak branch now. Thanks.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the edac-amd tree with the rr tree
From: Stephen Rothwell @ 2009-07-31 2:01 UTC (permalink / raw)
To: Borislav Petkov
Cc: Borislav Petkov, linux-next, linux-kernel, Rusty Russell,
Andreas Herrmann
In-Reply-To: <20090730110938.GA16659@aftab>
[-- Attachment #1: Type: text/plain, Size: 626 bytes --]
Hi Boris,
On Thu, 30 Jul 2009 13:09:39 +0200 Borislav Petkov <borislav.petkov@amd.com> wrote:
>
> I rediffed the topology bits against
> cpumask:remove-topology_core_siblings-and-topology_thread_siblings-core.
> patch from Rusty's tree so we should be good to go.
Thanks.
> Also, I'm carrying couple of patches that should go through the x86 tree
> and depending on when they go in, I'll drop them from mine. Just wanted
> to give you heads up here in case you start getting merge conflicts :).
OK
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the trivial tree with the tree
From: Stephen Rothwell @ 2009-07-31 4:39 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Joe Perches, Andrew Morton,
Markus Heidelberg
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
MAINTAINERS between commit 24725d1ecf26ba05d74c1cc3ae7467b61a900421
("MAINTAINERS: Update KERNEL JANITORS") from Linus' tree and commit
70301b8cc8a23d57d3e6120c012c86569285efcb ("trivial: update the Kernel
Janitors' web-page URL") from the trivial tree.
Just context differences. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc MAINTAINERS
index fa86fd5,354cc16..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2912,13 -3374,16 +2912,13 @@@ F: Makefil
F: scripts/Makefile.*
KERNEL JANITORS
-P: Several
L: kernel-janitors@vger.kernel.org
- W: http://www.kerneljanitors.org/
+ W: http://janitor.kernelnewbies.org/
-S: Maintained
+S: Odd fixes
KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
-P: J. Bruce Fields
-M: bfields@fieldses.org
-P: Neil Brown
-M: neilb@suse.de
+M: "J. Bruce Fields" <bfields@fieldses.org>
+M: Neil Brown <neilb@suse.de>
L: linux-nfs@vger.kernel.org
W: http://nfs.sourceforge.net/
S: Supported
^ permalink raw reply
* Re: linux-next: manual merge of the reiserfs-bkl tree with Linus' tree
From: Frederic Weisbecker @ 2009-07-31 5:05 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jens Axboe
In-Reply-To: <20090713115114.a871ea68.sfr@canb.auug.org.au>
On Mon, Jul 13, 2009 at 11:51:14AM +1000, Stephen Rothwell wrote:
> Hi Frédéric,
>
> Today's linux-next merge of the reiserfs-bkl tree got a conflict in
> fs/reiserfs/journal.c between commit
> 8aa7e847d834ed937a9ad37a0f2ad5b8584c1ab0 ("Fix congestion_wait()
> sync/async vs read/write confusion") from Linus' tree and commit
> e533d8da923c77ed58940309c401584bffda75e0 ("reiserfs: kill-the-BKL") from
> the reiserfs-bkl tree.
>
> Just context changes. I fixed it up as best I could (see below) and can
> carry the fix for a while.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc fs/reiserfs/journal.c
> index 9062220,86c1ff4..0000000
> --- a/fs/reiserfs/journal.c
> +++ b/fs/reiserfs/journal.c
> @@@ -996,8 -984,13 +984,13 @@@ static int reiserfs_async_progress_wait
> {
> DEFINE_WAIT(wait);
> struct reiserfs_journal *j = SB_JOURNAL(s);
> - if (atomic_read(&j->j_async_throttle))
> +
> + if (atomic_read(&j->j_async_throttle)) {
> + reiserfs_write_unlock(s);
> - congestion_wait(WRITE, HZ / 10);
> + congestion_wait(BLK_RW_ASYNC, HZ / 10);
> + reiserfs_write_lock(s);
> + }
> +
> return 0;
> }
>
Sorry to answer that late. That's the right fix, thanks Stephen!
I've pushed the latest update/rebase of the reiserfs/kill-bkl tree
there:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git \
reiserfs/kill-bkl
I've changed the branch name because the previous one had a fixed rc version
inside. This new branch will keep beeing the most up to date.
Could you please drop the old branch and integrate this new one?
Thanks a lot,
Frederic.
^ permalink raw reply
* Re: linux-next: manual merge of the reiserfs-bkl tree with Linus' tree
From: Stephen Rothwell @ 2009-07-31 5:50 UTC (permalink / raw)
To: Frederic Weisbecker; +Cc: linux-next, linux-kernel, Jens Axboe
In-Reply-To: <20090731050505.GA6115@nowhere>
[-- Attachment #1: Type: text/plain, Size: 675 bytes --]
Hi Frederic,
On Fri, 31 Jul 2009 07:05:07 +0200 Frederic Weisbecker <fweisbec@gmail.com> wrote:
>
> I've pushed the latest update/rebase of the reiserfs/kill-bkl tree
> there:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git \
> reiserfs/kill-bkl
Thanks.
> I've changed the branch name because the previous one had a fixed rc version
> inside. This new branch will keep beeing the most up to date.
> Could you please drop the old branch and integrate this new one?
OK, I will fetch the new branch starting on Monday.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: Tree for July 31
From: Stephen Rothwell @ 2009-07-31 8:09 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8513 bytes --]
Hi all,
Changes since 20090730:
New tree: oprofile
Undropped tree: kmemleak
This tree fails to build for powerpc allyesconfig (final link problem).
The scsi-rc-fixes tree lost its build failure.
The arm tree gained a conflict against Linus' tree.
The i2c tree lost its conflict.
The trivial tree gained a conflict against Linus' tree.
The edac-amd tree lost its conflict.
The kmemleak tree lost its build failure.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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) 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 136 trees (counting Linus' and 19 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 Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in MAINTAINERS
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl-rc6
CONFLICT (content): Merge conflict in fs/reiserfs/journal.c
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-dm646x-evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm644x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm646x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm355.h
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm644x.h
CONFLICT (content): Merge conflict in drivers/media/dvb/b2c2/flexcop-fe-tuner.c
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-3945.h
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-tx.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl3945-base.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/lguest/boot.c
CONFLICT (content): Merge conflict in drivers/lguest/page_tables.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_pci.c
Merging mmc/next
Merging input/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
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging edac-amd/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Applying: drbd: fix for removal of blk_queue_stack_limits
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/oprofile/oprofile_stats.c
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
Merging oprofile/for-next
CONFLICT (content): Merge conflict in drivers/oprofile/oprofile_stats.c
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging quilt/driver-core
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/m66592-udc.c
CONFLICT (content): Merge conflict in drivers/usb/host/r8a66597-hcd.c
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree.
$ git rm -f drivers/staging/epl/VirtualEthernetLinux.c
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: Boot failure on x86_64 (OOPS set_cpu_sibling_map() )
From: Sachin Sant @ 2009-07-31 10:41 UTC (permalink / raw)
To: Borislav Petkov; +Cc: Stephen Rothwell, linux-next, LKML, Ingo Molnar
In-Reply-To: <20090730135623.GB16659@aftab>
Borislav Petkov wrote:
> I can't trigger it here, please send me your .config. In the meantime,
> you could try the following:
>
> --
> diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
> index 3ede593..5fd57fe 100644
> --- a/arch/x86/kernel/smpboot.c
> +++ b/arch/x86/kernel/smpboot.c
> @@ -1070,6 +1070,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
> for_each_possible_cpu(i) {
> zalloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
> zalloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
> + zalloc_cpumask_var(&per_cpu(cpu_node_map, i), GFP_KERNEL);
> zalloc_cpumask_var(&cpu_data(i).llc_shared_map, GFP_KERNEL);
> }
> set_cpu_sibling_map(0);
>
Thanks for the patch Borislav. With this patch i can boot next on my x86_64 box.
Regards
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
^ permalink raw reply
* Re: [PATCH] next-20090730 lguest build breaks with pfn_pmd()
From: Randy Dunlap @ 2009-07-31 18:03 UTC (permalink / raw)
To: Kamalesh Babulal; +Cc: rusty, linux-next, LKML, lguest, sfr
In-Reply-To: <20090730120533.GB4955@linux.vnet.ibm.com>
On Thu, 30 Jul 2009 17:35:33 +0530 Kamalesh Babulal wrote:
> Hi Rusty,
>
> next-20090729 allmodconfig build breaks at
>
> drivers/lguest/page_tables.c: In function 'setup_pagetables':
> drivers/lguest/page_tables.c:987: error: incompatible type for argument 2 of 'pfn_pmd'
> drivers/lguest/page_tables.c:994: error: expected ';' before ')' token
> drivers/lguest/page_tables.c:994: error: expected statement before ')' token
> make[2]: *** [drivers/lguest/page_tables.o] Error 1
>
> build failure is introduced by commit e07dd6220a4bf81a2549e7e37523a2557547d9d7
> I have tested the patch for the build failure only.
>
> Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> --
> drivers/lguest/page_tables.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
> index 8c86446..c610b82 100644
> --- a/drivers/lguest/page_tables.c
> +++ b/drivers/lguest/page_tables.c
> @@ -984,14 +984,14 @@ static unsigned long setup_pagetables(struct lguest *lg,
> for (i = j = 0; i < mapped_pages && j < PTRS_PER_PMD;
> i += PTRS_PER_PTE, j++) {
> pmd = pfn_pmd(((unsigned long)&linear[i] - mem_base)/PAGE_SIZE,
> - _PAGE_PRESENT | _PAGE_RW | _PAGE_USER);
> + __pgrot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER));
s/__pgrot/__pgprot/
>
> if (copy_to_user(&pmds[j], &pmd, sizeof(pmd)) != 0)
> return -EFAULT;
> }
>
> /* One PGD entry, pointing to that PMD page. */
> - pgd = __pgd(((unsigned long)pmds - mem_base) | _PAGE_PRESENT));
> + pgd = __pgd(((unsigned long)pmds - mem_base) | _PAGE_PRESENT);
> /* Copy it in as the first PGD entry (ie. addresses 0-1G). */
> if (copy_to_user(&pgdir[0], &pgd, sizeof(pgd)) != 0)
> return -EFAULT;
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply
* [PATCH -next] media/zr364xx: fix build errors
From: Randy Dunlap @ 2009-07-31 22:47 UTC (permalink / raw)
To: Stephen Rothwell, linux-media, akpm
Cc: lkml, linux-next, Antoine Jacquet, Mauro Carvalho Chehab
In-Reply-To: <20090731180943.8f30c49d.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix build errors in zr364xx by adding selects:
zr364xx.c:(.text+0x195ed7): undefined reference to `videobuf_streamon'
zr364xx.c:(.text+0x196030): undefined reference to `videobuf_dqbuf'
zr364xx.c:(.text+0x1960c4): undefined reference to `videobuf_qbuf'
zr364xx.c:(.text+0x196123): undefined reference to `videobuf_querybuf'
zr364xx.c:(.text+0x196182): undefined reference to `videobuf_reqbufs'
zr364xx.c:(.text+0x196224): undefined reference to `videobuf_queue_is_busy'
zr364xx.c:(.text+0x196390): undefined reference to `videobuf_vmalloc_free'
zr364xx.c:(.text+0x196571): undefined reference to `videobuf_iolock'
zr364xx.c:(.text+0x196678): undefined reference to `videobuf_mmap_mapper'
zr364xx.c:(.text+0x196760): undefined reference to `videobuf_poll_stream'
zr364xx.c:(.text+0x19689a): undefined reference to `videobuf_read_one'
zr364xx.c:(.text+0x1969ec): undefined reference to `videobuf_mmap_free'
zr364xx.c:(.text+0x197862): undefined reference to `videobuf_queue_vmalloc_init'
zr364xx.c:(.text+0x197a28): undefined reference to `videobuf_streamoff'
zr364xx.c:(.text+0x198203): undefined reference to `videobuf_to_vmalloc'
zr364xx.c:(.text+0x198603): undefined reference to `videobuf_streamoff'
drivers/built-in.o: In function `free_buffer':
zr364xx.c:(.text+0x19930c): undefined reference to `videobuf_vmalloc_free'
drivers/built-in.o: In function `zr364xx_open':
zr364xx.c:(.text+0x19a7de): undefined reference to `videobuf_queue_vmalloc_init'
drivers/built-in.o: In function `read_pipe_completion':
zr364xx.c:(.text+0x19b17f): undefined reference to `videobuf_to_vmalloc'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/media/video/Kconfig | 2 ++
1 file changed, 2 insertions(+)
--- linux-next-20090729.orig/drivers/media/video/Kconfig
+++ linux-next-20090729/drivers/media/video/Kconfig
@@ -991,6 +991,8 @@ source "drivers/media/video/pwc/Kconfig"
config USB_ZR364XX
tristate "USB ZR364XX Camera support"
depends on VIDEO_V4L2
+ select VIDEOBUF_GEN
+ select VIDEOBUF_VMALLOC
---help---
Say Y here if you want to connect this type of camera to your
computer's USB port.
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply
* tty tree change for linux-next
From: Greg KH @ 2009-08-01 4:39 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
Hi Stephen,
I've now merged Alan's tty tree into my patch trees, and I'd like to ask
for linux-next to pick them up.
They are contained within the same directory as my other trees (staging,
usb, driver-core), and conviently named "tty.current" and "tty", and can
be found at:
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
As you can see by the nameing in the above directory, the usb and
staging trees changed names by virtue of putting the tty tree ahead of
them. Your scripts might need adjusting for this.
If there are any problems with the trees, please let me know.
thanks,
greg k-h
^ permalink raw reply
* Re: tty tree change for linux-next
From: Stephen Rothwell @ 2009-08-01 6:41 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, LKML
In-Reply-To: <20090801043905.GA12779@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 855 bytes --]
Hi Greg,
On Fri, 31 Jul 2009 21:39:05 -0700 Greg KH <greg@kroah.com> wrote:
>
> I've now merged Alan's tty tree into my patch trees, and I'd like to ask
> for linux-next to pick them up.
>
> They are contained within the same directory as my other trees (staging,
> usb, driver-core), and conviently named "tty.current" and "tty", and can
> be found at:
> http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
> As you can see by the nameing in the above directory, the usb and
> staging trees changed names by virtue of putting the tty tree ahead of
> them. Your scripts might need adjusting for this.
OK, I have added/updated these.
> If there are any problems with the trees, please let me know.
Will do.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: tty tree change for linux-next
From: Stephen Rothwell @ 2009-08-01 7:22 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, LKML
In-Reply-To: <20090801164104.5e9b2f17.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1039 bytes --]
Hi Greg,
On Sat, 1 Aug 2009 16:41:04 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 31 Jul 2009 21:39:05 -0700 Greg KH <greg@kroah.com> wrote:
> >
> > If there are any problems with the trees, please let me know.
>
> Will do.
Just a small (but important) thing. All the tty series patches look like this:
<summary>
From: <author>
<message>
.
.
When I import these, they will all look like they are authored by you and
use the file name as the one line summary :-( . "Git quilt-import"
expects more mail-like patches like:
From: <author>
Subject: <summary>
..
So if there is some easy transform you could do on these, it would be
good. (There is only one patch that has "Subject:" at the start of the
<summary>.) (Subject: followed by From: is ok as well, so 'prepend
"Subject: " to first line and remove following blank line' would probably
get you very close.)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: tty tree change for linux-next
From: Greg KH @ 2009-08-01 17:18 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20090801172245.1d3e8b31.sfr@canb.auug.org.au>
On Sat, Aug 01, 2009 at 05:22:45PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> On Sat, 1 Aug 2009 16:41:04 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Fri, 31 Jul 2009 21:39:05 -0700 Greg KH <greg@kroah.com> wrote:
> > >
> > > If there are any problems with the trees, please let me know.
> >
> > Will do.
>
> Just a small (but important) thing. All the tty series patches look like this:
>
> <summary>
>
> From: <author>
>
> <message>
> .
> .
>
>
> When I import these, they will all look like they are authored by you and
> use the file name as the one line summary :-( . "Git quilt-import"
> expects more mail-like patches like:
>
> From: <author>
> Subject: <summary>
>
> ..
>
> So if there is some easy transform you could do on these, it would be
> good. (There is only one patch that has "Subject:" at the start of the
> <summary>.) (Subject: followed by From: is ok as well, so 'prepend
> "Subject: " to first line and remove following blank line' would probably
> get you very close.)
Ok, that's not good at all, I just took the patches straight from Alan.
I'll edit them up this weekend to work better (i.e. in the format that
all of my other patches are in, pseudo-mbox headers, which both quilt
and git seem to like.)
Thanks for letting me know,
greg k-h
^ permalink raw reply
* Re: tty tree change for linux-next
From: Stephen Rothwell @ 2009-08-01 23:16 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, LKML
In-Reply-To: <20090801171815.GA15259@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 450 bytes --]
Hi Greg,
On Sat, 1 Aug 2009 10:18:15 -0700 Greg KH <greg@kroah.com> wrote:
>
> Ok, that's not good at all, I just took the patches straight from Alan.
> I'll edit them up this weekend to work better (i.e. in the format that
> all of my other patches are in, pseudo-mbox headers, which both quilt
> and git seem to like.)
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: tree build failure
From: Stephen Rothwell @ 2009-08-03 0:35 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-next, linux-kernel, Andre Noll
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
Hi Neil,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
ERROR: ".md_integrity_add_rdev" [drivers/md/multipath.ko] undefined!
Caused by commit 66f4f3f41f5c334f399e920b2aaad9b82514acda ("md: Push down
data integrity code to personalities") from the md-current and md trees.
Looks like md_integrity_add_rdev needs an EXPORT_SYMBOL.
I have used the version of the md-current and md trees from next-20090731
for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: tree build failure
From: NeilBrown @ 2009-08-03 1:01 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Andre Noll
In-Reply-To: <20090803103550.9b28900a.sfr@canb.auug.org.au>
On Mon, August 3, 2009 10:35 am, Stephen Rothwell wrote:
> Hi Neil,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> ERROR: ".md_integrity_add_rdev" [drivers/md/multipath.ko] undefined!
>
> Caused by commit 66f4f3f41f5c334f399e920b2aaad9b82514acda ("md: Push down
> data integrity code to personalities") from the md-current and md trees.
> Looks like md_integrity_add_rdev needs an EXPORT_SYMBOL.
Yes, of course...
Thanks!
Fixed.
NeilBrown
>
> I have used the version of the md-current and md trees from next-20090731
> for today.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
^ permalink raw reply
* linux-next: manual merge of the pxa tree with Linus' tree
From: Stephen Rothwell @ 2009-08-03 1:03 UTC (permalink / raw)
To: Eric Miao
Cc: linux-next, linux-kernel, Marek Vasut, Joe Perches, Andrew Morton
Hi Eric,
Today's linux-next merge of the pxa tree got a conflict in MAINTAINERS
between commit 8b58be884a9fd650abb7f7adf3f885fb9cecd79d ("MAINTAINERS:
coalesce name and email address lines") from Linus' tree and commit
4ad9febe53347962225169c5bde2ec030e46ab1d ("Palm Tungsten|C initial
support") from the pxa 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 MAINTAINERS
index 1677158,642cd9a..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -705,12 -803,15 +705,12 @@@ W: http://wiki.openmoko.org/wiki/Neo_Fr
S: Supported
ARM/TOSA MACHINE SUPPORT
-P: Dmitry Eremin-Solenikov
-M: dbaryshkov@gmail.com
-P: Dirk Opfer
-M: dirk@opfer-online.de
+M: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+M: Dirk Opfer <dirk@opfer-online.de>
S: Maintained
- ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
+ ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
-P: Marek Vasut
-M: marek.vasut@gmail.com
+M: Marek Vasut <marek.vasut@gmail.com>
W: http://hackndev.com
S: Maintained
^ permalink raw reply
* Re: FW: next-20090724: null pointer dereference from ibm_find_acpi_device
From: Lin Ming @ 2009-08-03 1:17 UTC (permalink / raw)
To: Thomas Meyer; +Cc: Moore, Robert, Brown, Len, linux-next@vger.kernel.org
In-Reply-To: <1248972952.23004.0.camel@localhost>
On Fri, 2009-07-31 at 00:55 +0800, Thomas Meyer wrote:
> Am Montag, den 27.07.2009, 17:03 +0800 schrieb Lin Ming:
> > Hi, Thomas
> >
> > Would you please try below patch?
>
> Yes. The patch below makes the NULL pointer dereference go away. Is the
> hardware_id.string accessibly thru sysfs?
It's shown thru sysfs if it's not NULL.
See acpi_device_setup_files.
static int acpi_device_setup_files(struct acpi_device *dev)
{
....
if (dev->flags.hardware_id) {
result = device_create_file(&dev->dev, &dev_attr_hid);
if (result)
goto end;
}
....
}
Lin Ming
>
> >
> > info->hardware_id.string[sizeof(info->hardware_id.length) - 1] = '\0' is
> > not needed anymore because acpi_get_object_info already handles it.
> >
> > /* Allocate a buffer for the HID */
> >
> > hid =
> > ACPI_ALLOCATE_ZEROED(sizeof(struct acpica_device_id) +
> > (acpi_size) length);
> >
> > And it would cause null pointer deference if info->hardware_id.string is
> > NULL.
> >
> > So delete it.
> >
> > diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
> > index a9d926b..e7be66d 100644
> > --- a/drivers/pci/hotplug/acpiphp_ibm.c
> > +++ b/drivers/pci/hotplug/acpiphp_ibm.c
> > @@ -406,7 +406,6 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
> > __func__, status);
> > return retval;
> > }
> > - info->hardware_id.string[sizeof(info->hardware_id.length) - 1] = '\0';
> >
> > if (info->current_status && (info->valid & ACPI_VALID_HID) &&
> > (!strcmp(info->hardware_id.string, IBM_HARDWARE_ID1) ||
> >
> >
> > On Mon, 2009-07-27 at 13:09 +0800, Moore, Robert wrote:
> > > Lin Ming,
> > >
> > > Can you take a look at this?
> > >
> > > Thanks
> > > Bob
> > >
> > >
> > > -----Original Message-----
> > > From: Thomas Meyer [mailto:thomas@m3y3r.de]
> > > Sent: Sunday, July 26, 2009 3:15 AM
> > > To: Moore, Robert; Brown, Len; linux-next@vger.kernel.org
> > > Subject: next-20090724: null pointer dereference from ibm_find_acpi_device
> > >
> > > Hi.
> > >
> > > Probably caused by commit fbe8cddd2d85979d273d7937a2b8a47498694d91.
> > >
> > > See attached screenshot.
> > >
> >
>
^ 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