* Re: linux-next: xfs tree build failure
From: Stephen Rothwell @ 2009-09-02 2:00 UTC (permalink / raw)
To: Felix Blyakher
Cc: Christoph Hellwig, David Chinner, xfs-masters, linux-next,
linux-kernel, Alex Elder
In-Reply-To: <F0C21C0B-E90E-44DF-B094-CC5F1DA7EDCE@sgi.com>
[-- Attachment #1: Type: text/plain, Size: 297 bytes --]
Hi Felix, Christoph,
On Tue, 1 Sep 2009 20:54:07 -0500 Felix Blyakher <felixb@sgi.com> wrote:
>
> The fix is now in official xfs tree as well.
Thanks, I will pick it up tomorrow.
--
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: xfs tree build failure
From: Felix Blyakher @ 2009-09-02 1:54 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Stephen Rothwell, David Chinner, xfs-masters, linux-next,
linux-kernel, Alex Elder
In-Reply-To: <20090902012844.GA15549@lst.de>
On Sep 1, 2009, at 8:28 PM, Christoph Hellwig wrote:
> On Wed, Sep 02, 2009 at 11:25:09AM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>>
>> fs/xfs/xfs_ialloc.c:63: error: static declaration of
>> 'xfs_inobt_lookup' follows non-static declaration
>> fs/xfs/xfs_ialloc.h:155: note: previous declaration of
>> 'xfs_inobt_lookup' was here
>>
>> Caused by commit 2187550525d7bcb8c87689e4eca41b1955bf9ac3 ("xfs:
>> rationalize xfs_inobt_lookup*").
>
> I've sent a fix to the list about an hour ago:
I've reviewed it and picked it up right away.
Thanks, Christoph.
> Subject: [PATCH] xfs: un-static xfs_inobt_lookup
> From: Christoph Hellwig <hch@lst.de>
>
> xfs_inobt_lookup is also used in xfs_itable.c, remove the STATIC
> modifier
> from it's declaration to fix non-debug builds.
>
> This was already fixed in my git tree vs the version last posted to
> the
> list.
>
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> Index: xfs/fs/xfs/xfs_ialloc.c
> ===================================================================
> --- xfs.orig/fs/xfs/xfs_ialloc.c 2009-09-01 20:47:28.515468366 -0300
> +++ xfs/fs/xfs/xfs_ialloc.c 2009-09-01 20:47:33.867913011 -0300
> @@ -59,7 +59,7 @@ xfs_ialloc_cluster_alignment(
> /*
> * Lookup a record by ino in the btree given by cur.
> */
> -STATIC int /* error */
> +int /* error */
> xfs_inobt_lookup(
> struct xfs_btree_cur *cur, /* btree cursor */
> xfs_agino_t ino, /* starting inode of chunk */
>>
>> I have used the version of the xfs tree from next-20090901 for today.
Argh! It was broken just for couple of hours.
The fix is now in official xfs tree as well.
Thanks,
Felix
>>
>> --
>> Cheers,
>> Stephen Rothwell sfr@canb.auug.org.au
>> http://www.canb.auug.org.au/~sfr/
>
>
> ---end quoted text---
^ permalink raw reply
* Re: linux-next: xfs tree build failure
From: Christoph Hellwig @ 2009-09-02 1:28 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Chinner, xfs-masters, linux-next, linux-kernel,
Christoph Hellwig, Felix Blyakher, Alex Elder
In-Reply-To: <20090902112509.739ce995.sfr@canb.auug.org.au>
On Wed, Sep 02, 2009 at 11:25:09AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> fs/xfs/xfs_ialloc.c:63: error: static declaration of 'xfs_inobt_lookup' follows non-static declaration
> fs/xfs/xfs_ialloc.h:155: note: previous declaration of 'xfs_inobt_lookup' was here
>
> Caused by commit 2187550525d7bcb8c87689e4eca41b1955bf9ac3 ("xfs:
> rationalize xfs_inobt_lookup*").
I've sent a fix to the list about an hour ago:
Subject: [PATCH] xfs: un-static xfs_inobt_lookup
From: Christoph Hellwig <hch@lst.de>
xfs_inobt_lookup is also used in xfs_itable.c, remove the STATIC modifier
from it's declaration to fix non-debug builds.
This was already fixed in my git tree vs the version last posted to the
list.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: xfs/fs/xfs/xfs_ialloc.c
===================================================================
--- xfs.orig/fs/xfs/xfs_ialloc.c 2009-09-01 20:47:28.515468366 -0300
+++ xfs/fs/xfs/xfs_ialloc.c 2009-09-01 20:47:33.867913011 -0300
@@ -59,7 +59,7 @@ xfs_ialloc_cluster_alignment(
/*
* Lookup a record by ino in the btree given by cur.
*/
-STATIC int /* error */
+int /* error */
xfs_inobt_lookup(
struct xfs_btree_cur *cur, /* btree cursor */
xfs_agino_t ino, /* starting inode of chunk */
>
> I have used the version of the xfs tree from next-20090901 for today.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
---end quoted text---
^ permalink raw reply
* linux-next: xfs tree build failure
From: Stephen Rothwell @ 2009-09-02 1:25 UTC (permalink / raw)
To: David Chinner, xfs-masters
Cc: linux-next, linux-kernel, Christoph Hellwig, Felix Blyakher,
Alex Elder
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
Hi all,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
fs/xfs/xfs_ialloc.c:63: error: static declaration of 'xfs_inobt_lookup' follows non-static declaration
fs/xfs/xfs_ialloc.h:155: note: previous declaration of 'xfs_inobt_lookup' was here
Caused by commit 2187550525d7bcb8c87689e4eca41b1955bf9ac3 ("xfs:
rationalize xfs_inobt_lookup*").
I have used the version of the xfs tree from next-20090901 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
* linux-next: Tree for September 1
From: Stephen Rothwell @ 2009-09-01 10:03 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7792 bytes --]
Hi all,
Changes since 20090831:
The pxa tree lost its conflict.
The xfs tree lost its conflict.
The pci tree gained a conflict against the powerpc tree.
The i2c tree lost its build failure.
The acpi tree gained a build failure so I used the version from
next-20090831.
The block tree gained a build failure so I used the version from
next-20090831 (also the device-mapper tree which depend on the block
tree).
The dwmw2-iommu tree lost its build failure.
----------------------------------------------------------------------------
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 141 trees (counting Linus' and 21 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/tty.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 ide-curent/master
Merging dwmw2/master
Merging arm/devel
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
Merging parisc/next
Merging powerpc/next
CONFLICT (content): Merge conflict in kernel/gcov/Kconfig
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
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
CONFLICT (content): Merge conflict in net/sunrpc/cache.c
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/powerpc/kernel/pci_64.c
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
CONFLICT (content): Merge conflict in scripts/extract-ikconfig
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
$ git reset --hard HEAD^
Merging refs/next/20090831/acpi
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging mmc/next
Merging input/next
CONFLICT (content): Merge conflict in drivers/base/platform.c
Merging lsm/for-next
Merging block/for-next
$ git reset --hard HEAD^
Merging refs/next/20090831/block
Merging quilt/device-mapper
$ git reset --hard HEAD^
Merging refs/next/20090831/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
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in firmware/Makefile
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
CONFLICT (content): Merge conflict in drivers/char/agp/uninorth-agp.c
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
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/include/asm/socket.h
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
Merging oprofile/for-next
CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
CONFLICT (content): Merge conflict in include/linux/topology.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/class.c
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/tty
CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h
Merging quilt/usb
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: linux-next: block tree build failure
From: Stephen Rothwell @ 2009-09-01 8:38 UTC (permalink / raw)
To: Jens Axboe; +Cc: Alasdair G Kergon, linux-next, linux-kernel
In-Reply-To: <20090901081324.GS12579@kernel.dk>
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
Hi Jens,
On Tue, 1 Sep 2009 10:13:25 +0200 Jens Axboe <jens.axboe@oracle.com> wrote:
>
> This is resolved now.
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: block tree build failure
From: Jens Axboe @ 2009-09-01 8:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Alasdair G Kergon, linux-next, linux-kernel
In-Reply-To: <20090901053807.GJ12579@kernel.dk>
On Tue, Sep 01 2009, Jens Axboe wrote:
> On Tue, Sep 01 2009, Stephen Rothwell wrote:
> > Hi Alasdair,
> >
> > On Tue, 1 Sep 2009 14:59:49 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > I have used the version of the block tree from next-20090831 for today.
> >
> > Which means that I have had to use yesterday's version of the
> > device-mapper tree as well (since it is based on the block tree).
>
> Ah darn, sorry about that. I'll get that updated in about an hours time
> and do a full compile.
This is resolved now.
--
Jens Axboe
^ permalink raw reply
* Re: linux-next: block tree build failure
From: Jens Axboe @ 2009-09-01 5:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Alasdair G Kergon, linux-next, linux-kernel
In-Reply-To: <20090901153038.807f5586.sfr@canb.auug.org.au>
On Tue, Sep 01 2009, Stephen Rothwell wrote:
> Hi Alasdair,
>
> On Tue, 1 Sep 2009 14:59:49 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > I have used the version of the block tree from next-20090831 for today.
>
> Which means that I have had to use yesterday's version of the
> device-mapper tree as well (since it is based on the block tree).
Ah darn, sorry about that. I'll get that updated in about an hours time
and do a full compile.
--
Jens Axboe
^ permalink raw reply
* Re: linux-next: block tree build failure
From: Stephen Rothwell @ 2009-09-01 5:30 UTC (permalink / raw)
To: Alasdair G Kergon; +Cc: linux-next, linux-kernel, Jens Axboe
In-Reply-To: <20090901145949.58610c23.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 417 bytes --]
Hi Alasdair,
On Tue, 1 Sep 2009 14:59:49 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I have used the version of the block tree from next-20090831 for today.
Which means that I have had to use yesterday's version of the
device-mapper tree as well (since it is based on the block tree).
--
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: block tree build failure
From: Stephen Rothwell @ 2009-09-01 4:59 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]
Hi Jens,
Today's linux-next build (x86_64 allmodconfig) failed like this:
fs/ubifs/budget.c: In function 'shrink_liability':
fs/ubifs/budget.c:74: warning: passing argument 1 of 'generic_sync_sb_inodes' from incompatible pointer type
include/linux/fs.h:2085: note: expected 'struct writeback_control *' but argument is of type 'struct super_block *'
fs/ubifs/budget.c:74: error: too many arguments to function 'generic_sync_sb_inodes'
fs/ubifs/budget.c:86: warning: passing argument 1 of 'generic_sync_sb_inodes' from incompatible pointer type
include/linux/fs.h:2085: note: expected 'struct writeback_control *' but argument is of type 'struct super_block *'
fs/ubifs/budget.c:86: error: too many arguments to function 'generic_sync_sb_inodes'
Caused by commit 2fa24dd6ef3c67be20fde192f67fe519ea8a4b91 ("writeback:
switch to per-bdi threads for flushing data").
I have used the version of the block tree from next-20090831 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
* linux-next: acpi tree build failure
From: Stephen Rothwell @ 2009-09-01 2:57 UTC (permalink / raw)
To: Len Brown; +Cc: linux-next, linux-kernel, Zhang Rui
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
Hi Len,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/acpi/als.c: In function 'acpi_als_get_mappings':
drivers/acpi/als.c:173: error: expected ')' before 'PREFIX'
drivers/acpi/als.c: In function 'acpi_als_add':
drivers/acpi/als.c:347: error: expected ')' before 'PREFIX'
I have used the version of the acpi tree from next-20090831 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
* linux-next: manual merge of the pci tree with the powerpc tree
From: Stephen Rothwell @ 2009-09-01 2:05 UTC (permalink / raw)
To: Jesse Barnes
Cc: linux-next, linux-kernel, Mike Mason, Richard Lary, Grant Likely,
Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev
Hi Jesse,
Today's linux-next merge of the pci tree got a conflict in
arch/powerpc/kernel/pci_64.c between commit
fbe65447197789a3ccccc27755956f6a4c445089 ("powerpc/pci: move pci_64.c
device tree scanning code into pci-common.c") from the powerpc tree and
commit ced66a36d35607c60d18bb531527acd2083c0523 ("PCI/powerpc: support
PCIe fundamental reset") from the pci tree.
The former moved the code that is modified by the latter into another
file. I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 72c31bc..7311fdf 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -139,6 +139,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
dev->dev.bus = &pci_bus_type;
dev->devfn = devfn;
dev->multifunction = 0; /* maybe a lie? */
+ dev->needs_freset = 0; /* pcie fundamental reset required */
dev->vendor = get_int_prop(node, "vendor-id", 0xffff);
dev->device = get_int_prop(node, "device-id", 0xffff);
^ permalink raw reply related
* [PATCH] linux-next drm_cache.c: fix compilation error
From: Fenghua Yu @ 2009-08-31 19:28 UTC (permalink / raw)
To: Stephen Rothwell, Dave Airlie; +Cc: Tony luck, linux-ia64, lkml, linux-next
In-Reply-To: <20090804221119.GA21544@linux-os.sc.intel.com>
When compiling drm_cache.c on ia64, gcc reports undefined
drm_clflush_ipi_handler() error. The problem is because drm_cache_ipi_handler is
a typo.
One straightforward fix is changing drm_cache_ipi_handler to
drm_clflush_ipi_handler.
But since drm_clflush_ipi_handler() does nothing on non-x86 platforms and ipi
handling is costly, it would be better to just do nothing on non-x86 platforms
and remove drm_clflush_ipi_handler() for those platforms.
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
---
The issue was introduced by commit c9c97b8c75019814d8c007059bc827bb475be917
in linux-next.
drm_cache.c | 7 -------
1 files changed, 7 deletions(-)
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 3a5575e..8054a5c 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -62,10 +62,6 @@ drm_clflush_ipi_handler(void *null)
{
wbinvd();
}
-#elif !defined(__powerpc__)
-static void drm_cache_ipi_handler(void *dummy)
-{
-}
#endif
void
drm_clflush_pages(struct page *pages[], unsigned long num_pages)
@@ -94,9 +90,6 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
(unsigned long)page_virtual + PAGE_SIZE);
kunmap_atomic(page_virtual, KM_USER0);
}
-#else
- if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
- printk(KERN_ERR "Timed out waiting for drm cache flush\n");
#endif
}
EXPORT_SYMBOL(drm_clflush_pages);
^ permalink raw reply related
* Re: linux-next: i2c tree build failure
From: Stephen Rothwell @ 2009-08-31 12:21 UTC (permalink / raw)
To: Jean Delvare; +Cc: linux-next, linux-kernel, Greg KH
In-Reply-To: <20090831141546.6c52c7fb@hyperion.delvare>
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
Hi Jean,
On Mon, 31 Aug 2009 14:15:46 +0200 Jean Delvare <khali@linux-fr.org> wrote:
>
> I've made sure my patch has the same name as Greg's, to make it easier
> for you to spot duplicates.
Thanks.
> > Just readd the patch :-)
>
> OK, done. Hopefully the next merge window is coming soon now anyway, and
> then the trouble with this specific patch will be solved.
Indeed - and I can get more sleep :-)
--
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: i2c tree build failure
From: Jean Delvare @ 2009-08-31 12:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Greg KH
In-Reply-To: <20090831215905.caadce2f.sfr@canb.auug.org.au>
On Mon, 31 Aug 2009 21:59:05 +1000, Stephen Rothwell wrote:
> On Mon, 31 Aug 2009 13:16:47 +0200 Jean Delvare <khali@linux-fr.org> wrote:
> > I am also surprised that I would have to tell you. What is the purpose
> > of the NEXT_BASE tag if you do not check for dependencies automatically?
>
> I use the tag to choose the base when I import the quilt series into git.
> So far I have not needed to automate the ordering of the imports.
>
> > Anyway, if you say git can deal with duplicate patches OK, then I think
> > I'll simply re-add the patch on my end. But I do not have a strong
> > opinion on this either, so if you prefer clean dependencies and
> > ordering without duplicate patches, it is just as easy for me to leave
> > the redundant patch out and restore the NEXT_BASE tag.
>
> I prefer less dependencies (so you could put the patch back in), however,
> that means if Greg changes the patch, then we will have two slightly
> different versions to merge. I can cope with that as well.
I've made sure my patch has the same name as Greg's, to make it easier
for you to spot duplicates.
> Just readd the patch :-)
OK, done. Hopefully the next merge window is coming soon now anyway, and
then the trouble with this specific patch will be solved.
--
Jean Delvare
^ permalink raw reply
* Re: linux-next: i2c tree build failure
From: Stephen Rothwell @ 2009-08-31 11:59 UTC (permalink / raw)
To: Jean Delvare; +Cc: linux-next, linux-kernel, Greg KH
In-Reply-To: <20090831131647.3f609ad4@hyperion.delvare>
[-- Attachment #1: Type: text/plain, Size: 1672 bytes --]
Hi Jean,
On Mon, 31 Aug 2009 13:16:47 +0200 Jean Delvare <khali@linux-fr.org> wrote:
>
> OK, thanks for the clarification. I did not notice Greg had split some
> of his trees that way. Makes sense.
>
> > It you decide to leave that patch out and
> > change the dependency, please let me know as I will then have to merge
> > your tree after Greg's (it is currently earlier.
>
> Regardless of what I do, I think it would make sense to merge
> driver-core before driver subsystem trees. I would insert if before pci.
I merge driver-core near the end because it often has API changes in it
and Linus suggested that the pain of API changes should be with the
changer.
> I am also surprised that I would have to tell you. What is the purpose
> of the NEXT_BASE tag if you do not check for dependencies automatically?
I use the tag to choose the base when I import the quilt series into git.
So far I have not needed to automate the ordering of the imports.
> Anyway, if you say git can deal with duplicate patches OK, then I think
> I'll simply re-add the patch on my end. But I do not have a strong
> opinion on this either, so if you prefer clean dependencies and
> ordering without duplicate patches, it is just as easy for me to leave
> the redundant patch out and restore the NEXT_BASE tag.
I prefer less dependencies (so you could put the patch back in), however,
that means if Greg changes the patch, then we will have two slightly
different versions to merge. I can cope with that as well.
Just readd the patch :-)
--
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: i2c tree build failure
From: Jean Delvare @ 2009-08-31 11:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Greg KH
In-Reply-To: <20090831210335.f382d7ff.sfr@canb.auug.org.au>
Hi Stephen,
On Mon, 31 Aug 2009 21:03:35 +1000, Stephen Rothwell wrote:
> On Mon, 31 Aug 2009 12:04:49 +0200 Jean Delvare <khali@linux-fr.org> wrote:
> >
> > These are caused by the fact that I moved the patch adding
> > class_compat_create_link() and friends out of the NEXT_PATCHES section.
> > I did so because Greg KH (Cc'd) added this patch to his driver-core
> > patch set, which I thought was part of linux-next. I simply didn't want
> > to apply the same patch twice.
>
> It doesn't really matter if the same patch appears twice - git usually
> copes quite well. Also I can tell and I (usually) don't bother
> commenting on it.
>
> > To clarify the dependency, I added the following to my series.conf:
> >
> > # NEXT_BASE driver-core.current
> >
> > but apparently it didn't work as intended.
> >
> > Greg, please clarify whether the patch in question
> > (driver-core-add-support-for-compatibility-classes.patch) is pushed to
> > linux-next or not.
> >
> > Stephen, if my dependency tag is not correct, please tell me how to fix
> > it.
>
> It was fine, except that Greg has that patch in the driver-core series
> (not driver-core.current).
OK, thanks for the clarification. I did not notice Greg had split some
of his trees that way. Makes sense.
> It you decide to leave that patch out and
> change the dependency, please let me know as I will then have to merge
> your tree after Greg's (it is currently earlier.
Regardless of what I do, I think it would make sense to merge
driver-core before driver subsystem trees. I would insert if before pci.
I am also surprised that I would have to tell you. What is the purpose
of the NEXT_BASE tag if you do not check for dependencies automatically?
Anyway, if you say git can deal with duplicate patches OK, then I think
I'll simply re-add the patch on my end. But I do not have a strong
opinion on this either, so if you prefer clean dependencies and
ordering without duplicate patches, it is just as easy for me to leave
the redundant patch out and restore the NEXT_BASE tag.
Thanks,
--
Jean Delvare
^ permalink raw reply
* Re: linux-next: i2c tree build failure
From: Stephen Rothwell @ 2009-08-31 11:03 UTC (permalink / raw)
To: Jean Delvare; +Cc: linux-next, linux-kernel, Greg KH
In-Reply-To: <20090831120449.3f64aa74@hyperion.delvare>
[-- Attachment #1: Type: text/plain, Size: 1346 bytes --]
Hi Jean,
On Mon, 31 Aug 2009 12:04:49 +0200 Jean Delvare <khali@linux-fr.org> wrote:
>
> These are caused by the fact that I moved the patch adding
> class_compat_create_link() and friends out of the NEXT_PATCHES section.
> I did so because Greg KH (Cc'd) added this patch to his driver-core
> patch set, which I thought was part of linux-next. I simply didn't want
> to apply the same patch twice.
It doesn't really matter if the same patch appears twice - git usually
copes quite well. Also I can tell and I (usually) don't bother
commenting on it.
> To clarify the dependency, I added the following to my series.conf:
>
> # NEXT_BASE driver-core.current
>
> but apparently it didn't work as intended.
>
> Greg, please clarify whether the patch in question
> (driver-core-add-support-for-compatibility-classes.patch) is pushed to
> linux-next or not.
>
> Stephen, if my dependency tag is not correct, please tell me how to fix
> it.
It was fine, except that Greg has that patch in the driver-core series
(not driver-core.current). It you decide to leave that patch out and
change the dependency, please let me know as I will then have to merge
your tree after Greg's (it is currently earlier.
--
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: i2c tree build failure
From: Jean Delvare @ 2009-08-31 10:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Greg KH
In-Reply-To: <20090831111935.5059565b.sfr@canb.auug.org.au>
Hi Stephen,
On Mon, 31 Aug 2009 11:19:35 +1000, Stephen Rothwell wrote:
> Hi Jean,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> drivers/i2c/i2c-core.c:234: warning: initialization from incompatible pointer type
> drivers/i2c/i2c-core.c:537: warning: initialization from incompatible pointer type
> drivers/i2c/i2c-core.c: In function 'i2c_register_adapter':
> drivers/i2c/i2c-core.c:603: error: implicit declaration of function 'class_compat_create_link'
> drivers/i2c/i2c-core.c: In function 'i2c_del_adapter':
> drivers/i2c/i2c-core.c:789: error: implicit declaration of function 'class_compat_remove_link'
> drivers/i2c/i2c-core.c: In function 'i2c_init':
> drivers/i2c/i2c-core.c:999: error: implicit declaration of function 'class_compat_register'
> drivers/i2c/i2c-core.c:999: warning: assignment makes pointer from integer without a cast
> drivers/i2c/i2c-core.c:1012: error: implicit declaration of function 'class_compat_unregister'
>
> I have used the i2c tree from next-20090828 for today.
These are caused by the fact that I moved the patch adding
class_compat_create_link() and friends out of the NEXT_PATCHES section.
I did so because Greg KH (Cc'd) added this patch to his driver-core
patch set, which I thought was part of linux-next. I simply didn't want
to apply the same patch twice.
To clarify the dependency, I added the following to my series.conf:
# NEXT_BASE driver-core.current
but apparently it didn't work as intended.
Greg, please clarify whether the patch in question
(driver-core-add-support-for-compatibility-classes.patch) is pushed to
linux-next or not.
Stephen, if my dependency tag is not correct, please tell me how to fix
it.
Thanks, and sorry for the trouble.
--
Jean Delvare
^ permalink raw reply
* linux-next: Tree for August 31
From: Stephen Rothwell @ 2009-08-31 8:39 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7548 bytes --]
Hi all,
Changes since 20090828:
The pxa tree lost its conflict.
The i2c tree gained a build failure so I used the version from
next-20090828.
The sound tree lost its build failure.
The drm tree gained a conflict against the net tree.
The dwmw2-iommu tree gained a build failure for which I applied a patch.
The sfi tree lost its conflicts.
----------------------------------------------------------------------------
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 141 trees (counting Linus' and 21 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/tty.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 ide-curent/master
Merging dwmw2/master
Merging arm/devel
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
Merging parisc/next
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
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
CONFLICT (content): Merge conflict in net/sunrpc/cache.c
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_sync.h
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
$ git reset --hard HEAD^
Merging refs/next/20090828/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
CONFLICT (content): Merge conflict in scripts/extract-ikconfig
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 net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging mmc/next
Merging input/next
CONFLICT (content): Merge conflict in drivers/base/platform.c
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
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in firmware/Makefile
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
CONFLICT (content): Merge conflict in drivers/char/agp/uninorth-agp.c
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Applying: intel-iommu: include linux/dmi.h to use dmi_ routines
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/include/asm/socket.h
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
Merging oprofile/for-next
CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
CONFLICT (content): Merge conflict in include/linux/topology.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/class.c
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/tty
CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h
Merging quilt/usb
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: [PATCH 0/9] drivers/net/s2io.c: Cleanups
From: David Miller @ 2009-08-31 5:35 UTC (permalink / raw)
To: Sreenivasa.Honnur
Cc: joe, netdev, Anil.Murthy, Sivakumar.Subramani, santosh.rastapur,
Ramkrishna.Vepa, akpm, linux-next
In-Reply-To: <78C9135A3D2ECE4B8162EBDCE82CAD7705A1DF76@nekter>
From: "Sreenivasa Honnur" <Sreenivasa.Honnur@neterion.com>
Date: Mon, 31 Aug 2009 01:21:36 -0400
> Joe,
> Patches look fine, I reviewed and tested these patches on latest
> davem-net-next-2.6 sources.
>
> Acked-by: Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
Great, all patches applied to net-next-2.6, thanks everyone.
^ permalink raw reply
* linux-next: dwmw2-iommu tree build failure
From: Stephen Rothwell @ 2009-08-31 5:24 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, linux-kernel, Len Brown
Hi David,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/pci/intel-iommu.c: In function 'iommu_prepare_identity_map':
drivers/pci/intel-iommu.c:1979: error: implicit declaration of function 'dmi_get_system_info'
Caused by commit 2ff729f5445cc47d1910386c36e53fc6b1c5e47a ("intel-iommu:
Cope with yet another BIOS screwup causing crashes") from the dwmw2-iommu
tree interacting with commit 2e15511d37cded52140573b72c3b5b085fdb7f80
("ACPI: linux/acpi.h should not include linux/dmi.h") from he acpi tree.
This file needs to include linux/dmi.h directly ... I applied the
following patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 31 Aug 2009 15:20:33 +1000
Subject: [PATCH] intel-iommu: include linux/dmi.h to use dmi_ routines
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/pci/intel-iommu.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index d36fa80..2ec5899 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -37,6 +37,7 @@
#include <linux/iommu.h>
#include <linux/intel-iommu.h>
#include <linux/sysdev.h>
+#include <linux/dmi.h>
#include <asm/cacheflush.h>
#include <asm/iommu.h>
#include "pci.h"
--
1.6.3.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply related
* RE: [PATCH 0/9] drivers/net/s2io.c: Cleanups
From: Sreenivasa Honnur @ 2009-08-31 5:21 UTC (permalink / raw)
To: Joe Perches, David Miller
Cc: netdev, Anil Murthy, Sivakumar Subramani, Rastapur Santosh,
Ramkrishna Vepa, akpm, linux-next
In-Reply-To: <1251326878.13026.52.camel@Joe-Laptop.home>
Joe,
Patches look fine, I reviewed and tested these patches on latest
davem-net-next-2.6 sources.
Acked-by: Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
Regs
srini
-----Original Message-----
From: Joe Perches [mailto:joe@perches.com]
Sent: Thursday, August 27, 2009 4:18 AM
To: David Miller
Cc: netdev@vger.kernel.org; Anil Murthy; Sreenivasa Honnur; Sivakumar
Subramani; Rastapur Santosh; Ramkrishna Vepa; akpm@linux-foundation.org;
linux-next@vger.kernel.org
Subject: Re: [PATCH 0/9] drivers/net/s2io.c: Cleanups
On Wed, 2009-08-26 at 15:33 -0700, David Miller wrote:
> From: Joe Perches <joe@perches.com>
> Date: Mon, 24 Aug 2009 20:29:39 -0700
> > Just a few cleanups, compiled, untested. No hardware.
> > s2io.c: Use const for strings
> > s2io.c: Shorten code line length by using intermediate pointers
> > s2io.c: Use calculated size in kmallocs
> > s2io.c: use kzalloc
> > s2io.c: Make more conforming to normal kernel style
> > s2io.c: convert printks to pr_<level>
> > s2io.c: fix spelling explaination
> > s2io.c: Standardize statistics accessors
> > s2io.c: Convert skipped nic->config.tx_cfg[i]. to tx_cfg->
>
> Since this is a pretty serious set of cleanups, I'd like to let the
> S2IO driver folks have some time to look at this and at least have a
> chance to ACK/NACK them.
No worries. That's fine. It's only cleanups.
I haven't heard from them though and they haven't submitted or signed a
patch for s2io in over a year.
Hey! Neterion people! Is anybody home?
^ permalink raw reply
* Re: linux-next: manual merge of the drm tree with the net tree
From: David Miller @ 2009-08-31 4:29 UTC (permalink / raw)
To: sfr; +Cc: airlied, linux-next, linux-kernel, ben, divy
In-Reply-To: <20090831142105.7c05ae77.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 31 Aug 2009 14:21:05 +1000
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> firmware/Makefile between commit 2e8c07c35b3ffee7689406be61fd1448ee45d3cd
> ("cxgb3: use request_firmware() for the EDC registers setup") from the
> net tree and commit ece2be7993cc5e269cbf0cad6442b401a2c31915 ("drm/mga:
> Use request_firmware() to load microcode") from the drm tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
This looks fine, please carry the fix until we all merge this stuff
in during the merge window :-)
^ permalink raw reply
* linux-next: manual merge of the drm tree with the net tree
From: Stephen Rothwell @ 2009-08-31 4:21 UTC (permalink / raw)
To: Dave Airlie
Cc: linux-next, linux-kernel, Ben Hutchings, Divy Le Ray,
David S. Miller
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
firmware/Makefile between commit 2e8c07c35b3ffee7689406be61fd1448ee45d3cd
("cxgb3: use request_firmware() for the EDC registers setup") from the
net tree and commit ece2be7993cc5e269cbf0cad6442b401a2c31915 ("drm/mga:
Use request_firmware() to load microcode") from the drm 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 firmware/Makefile
index 878329c,d166a7f..0000000
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@@ -42,10 -41,23 +42,26 @@@ fw-shipped-$(CONFIG_CASSINI) += sun/cas
fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
cxgb3/t3c_psram-1.1.0.bin \
- cxgb3/t3fw-7.4.0.bin
+ cxgb3/t3fw-7.4.0.bin \
+ cxgb3/ael2005_opt_edc.bin \
+ cxgb3/ael2005_twx_edc.bin \
+ cxgb3/ael2020_twx_edc.bin
+ fw-shipped-$(CONFIG_DRM_MGA) += matrox/g200_warp.fw matrox/g400_warp.fw
+ fw-shipped-$(CONFIG_DRM_R128) += r128/r128_cce.bin
+ fw-shipped-$(CONFIG_DRM_RADEON) += radeon/R100_cp.bin radeon/R200_cp.bin \
+ radeon/R300_cp.bin radeon/R420_cp.bin \
+ radeon/RS690_cp.bin radeon/RS600_cp.bin \
+ radeon/R520_cp.bin \
+ radeon/R600_pfp.bin radeon/R600_me.bin \
+ radeon/RV610_pfp.bin radeon/RV610_me.bin \
+ radeon/RV630_pfp.bin radeon/RV630_me.bin \
+ radeon/RV620_pfp.bin radeon/RV620_me.bin \
+ radeon/RV635_pfp.bin radeon/RV635_me.bin \
+ radeon/RV670_pfp.bin radeon/RV670_me.bin \
+ radeon/RS780_pfp.bin radeon/RS780_me.bin \
+ radeon/RV770_pfp.bin radeon/RV770_me.bin \
+ radeon/RV730_pfp.bin radeon/RV730_me.bin \
+ radeon/RV710_pfp.bin radeon/RV710_me.bin
fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
^ 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