* Re: [PATCH linux-next] treewide: remove unnecessary semicolons
From: Jiri Kosina @ 2009-08-13 9:57 UTC (permalink / raw)
To: Joe Perches
Cc: linux-next, linux-kernel, David Miller, Alan Cox, Andrew Morton
In-Reply-To: <1248472866.3498.79.camel@Joe-Laptop.home>
On Fri, 24 Jul 2009, Joe Perches wrote:
> Previous discussion at: http://lkml.org/lkml/2009/6/28/288
> Signed-off-by: Joe Perches <joe@perches.com>
Thanks. I have one more request if you don't mind -- please take out the
drivers/staging part and push that one individually to Greg. I'll then
merge the remaining bits through trivial tree.
The code in staging tree is supposed to be changing rapidly, so we'll be
getting conflicts very often.
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply
* linux-next: Tree for August 13
From: Stephen Rothwell @ 2009-08-13 10:05 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8642 bytes --]
Hi all,
News:
The git tree is now hosted at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git and the
patches are now at http://www.kernel.org/pub/linux/kernel/v2.6/next/ .
There are symlinks from the old locations (so they will continue to work).
Changes since 20090812:
This tree fails to build for powerpc allyesconfig (due to a TOC overflow
problem in the final link).
The v4l-dvb tree got its conflicts back (it looks like the davinci
patches were removed and then readded).
The kvm tree gained a build failure so I used the version from
next-20090812.
The percup tree lost 2 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) 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 140 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
CONFLICT (content): Merge conflict in MAINTAINERS
Merging davinci/for-next
Merging pxa/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
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/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
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
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
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
$ git reset --hard HEAD^
Merging refs/next/20090812/kvm
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in arch/microblaze/include/asm/socket.h
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
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
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.c
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
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
Applying: drbd: fix for removal of blk_queue_stack_limits
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
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: [PATCH linux-next] treewide: remove unnecessary semicolons
From: Joe Perches @ 2009-08-13 10:21 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, David Miller, Alan Cox, Andrew Morton
In-Reply-To: <alpine.LNX.2.00.0908131155510.25797@wotan.suse.de>
On Thu, 2009-08-13 at 11:57 +0200, Jiri Kosina wrote:
> On Fri, 24 Jul 2009, Joe Perches wrote:
>
> > Previous discussion at: http://lkml.org/lkml/2009/6/28/288
> > Signed-off-by: Joe Perches <joe@perches.com>
>
> Thanks. I have one more request if you don't mind -- please take out the
> drivers/staging part and push that one individually to Greg. I'll then
> merge the remaining bits through trivial tree.
>
> The code in staging tree is supposed to be changing rapidly, so we'll be
> getting conflicts very often.
I could do that or you could "git apply --exclude=drivers/staging/"
Which do you prefer?
^ permalink raw reply
* Re: [PATCH] USB: isp1362: fix build warnings on 64-bit systems
From: Greg KH @ 2009-08-13 23:44 UTC (permalink / raw)
To: Mike Frysinger
Cc: Greg Kroah-Hartman, linux-next, linux-kernel, Lothar Wassmann,
Stephen Rothwell
In-Reply-To: <1250046053-3097-1-git-send-email-vapier@gentoo.org>
On Tue, Aug 11, 2009 at 11:00:53PM -0400, Mike Frysinger wrote:
> A bunch of places assumed pointers were 32-bits in size (bit checking and
> debug output), but none of these affected runtime functionality.
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This patch doesn't apply to my tree, what did you make it against?
thanks,
greg k-h
^ permalink raw reply
* Re: [PATCH] USB: isp1362: fix build warnings on 64-bit systems
From: Mike Frysinger @ 2009-08-14 0:34 UTC (permalink / raw)
To: Greg KH
Cc: Greg Kroah-Hartman, linux-next, linux-kernel, Lothar Wassmann,
Stephen Rothwell
In-Reply-To: <20090813234410.GB4406@kroah.com>
On Thu, Aug 13, 2009 at 19:44, Greg KH wrote:
> On Tue, Aug 11, 2009 at 11:00:53PM -0400, Mike Frysinger wrote:
>> A bunch of places assumed pointers were 32-bits in size (bit checking and
>> debug output), but none of these affected runtime functionality.
>>
>> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>
> This patch doesn't apply to my tree, what did you make it against?
it was reported against next, so i used that
-mike
^ permalink raw reply
* linux-next: manual merge of the net tree with the net-current tree
From: Stephen Rothwell @ 2009-08-14 2:40 UTC (permalink / raw)
To: David Miller
Cc: linux-next, linux-kernel, Dhananjay Phadke, Amit Kumar Salecha
Hi David,
Today's linux-next merge of the net tree got a conflict in
drivers/net/netxen/netxen_nic_main.c between commits
e424fa9d6a0add1a9b812b07e3607daaa5b9e53d ("netxen: remove netxen
workqueue") and 232e7d68d50c9ac3a55d716e5ae215ecd1e043b9 ("netxen: free
napi resources during detach") from the net-current tree and commits
6598b169b856793f8f9b80a3f3c5a48f5eaf40e3 ("netxen: enable ip addr
hashing"), f17443f4b01659a5c44d5fc6f5c502c39c293959 ("netxen: refactor
net_device setup code") and 7042cd8f148345bfca6c336f009c96a416674f5e
("netxen: support for ethtool set ringparam") from the net tree.
I fixed it up (I hope) (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/netxen/netxen_nic_main.c
index 28f270f,98271f9..0000000
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@@ -905,19 -923,15 +935,17 @@@ netxen_nic_attach(struct netxen_adapte
struct nx_host_rds_ring *rds_ring;
struct nx_host_tx_ring *tx_ring;
+ if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC)
+ return 0;
+
err = netxen_init_firmware(adapter);
- if (err != 0) {
- printk(KERN_ERR "Failed to init firmware\n");
- return -EIO;
- }
+ if (err)
+ return err;
+
+ err = netxen_napi_add(adapter, netdev);
+ if (err)
+ return err;
- if (adapter->fw_major < 4)
- adapter->max_rds_rings = 3;
- else
- adapter->max_rds_rings = 2;
-
err = netxen_alloc_sw_resources(adapter);
if (err) {
printk(KERN_ERR "%s: Error in setting sw resources\n",
@@@ -981,6 -1000,95 +1015,91 @@@ netxen_nic_detach(struct netxen_adapte
adapter->is_up = 0;
}
+ int
+ netxen_nic_reset_context(struct netxen_adapter *adapter)
+ {
+ int err = 0;
+ struct net_device *netdev = adapter->netdev;
+
+ if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
+
+ if (netif_running(netdev))
+ netxen_nic_down(adapter, netdev);
+
+ netxen_nic_detach(adapter);
+
+ err = netxen_nic_attach(adapter);
+ if (err)
+ goto done;
+
+ if (netif_running(netdev))
+ err = netxen_nic_up(adapter, netdev);
+ }
+ done:
+ return err;
+ }
+
+ static int
+ netxen_setup_netdev(struct netxen_adapter *adapter,
+ struct net_device *netdev)
+ {
+ int err = 0;
+ struct pci_dev *pdev = adapter->pdev;
+
+ adapter->rx_csum = 1;
+ adapter->mc_enabled = 0;
+ if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
+ adapter->max_mc_count = 38;
+ else
+ adapter->max_mc_count = 16;
+
+ netdev->netdev_ops = &netxen_netdev_ops;
+ netdev->watchdog_timeo = 2*HZ;
+
+ netxen_nic_change_mtu(netdev, netdev->mtu);
+
+ SET_ETHTOOL_OPS(netdev, &netxen_nic_ethtool_ops);
+
+ netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
+ netdev->features |= (NETIF_F_GRO);
+ netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
+
+ if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+ netdev->features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
+ netdev->vlan_features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
+ }
+
+ if (adapter->pci_using_dac) {
+ netdev->features |= NETIF_F_HIGHDMA;
+ netdev->vlan_features |= NETIF_F_HIGHDMA;
+ }
+
+ if (adapter->capabilities & NX_FW_CAPABILITY_FVLANTX)
+ netdev->features |= (NETIF_F_HW_VLAN_TX);
+
+ netdev->irq = adapter->msix_entries[0].vector;
+
- err = netxen_napi_add(adapter, netdev);
- if (err)
- return err;
-
+ init_timer(&adapter->watchdog_timer);
+ adapter->watchdog_timer.function = &netxen_watchdog;
+ adapter->watchdog_timer.data = (unsigned long)adapter;
+ INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task);
+ INIT_WORK(&adapter->tx_timeout_task, netxen_reset_task);
+
+ if (netxen_read_mac_addr(adapter))
+ dev_warn(&pdev->dev, "failed to read mac addr\n");
+
+ netif_carrier_off(netdev);
+ netif_stop_queue(netdev);
+
+ err = register_netdev(netdev);
+ if (err) {
+ dev_err(&pdev->dev, "failed to register net device\n");
+ return err;
+ }
+
+ return 0;
+ }
+
static int __devinit
netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
@@@ -1189,17 -1245,13 +1256,15 @@@ static void __devexit netxen_nic_remove
unregister_netdev(netdev);
+ cancel_work_sync(&adapter->watchdog_task);
+ cancel_work_sync(&adapter->tx_timeout_task);
+
- if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
- netxen_nic_detach(adapter);
- }
+ netxen_nic_detach(adapter);
if (adapter->portnum == 0)
- netxen_free_adapter_offload(adapter);
+ netxen_free_dummy_dma(adapter);
netxen_teardown_intr(adapter);
- netxen_free_sds_rings(&adapter->recv_ctx);
netxen_cleanup_pci_map(adapter);
@@@ -1225,11 -1277,7 +1290,10 @@@ netxen_nic_suspend(struct pci_dev *pdev
if (netif_running(netdev))
netxen_nic_down(adapter, netdev);
+ cancel_work_sync(&adapter->watchdog_task);
+ cancel_work_sync(&adapter->tx_timeout_task);
+
- if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC)
- netxen_nic_detach(adapter);
+ netxen_nic_detach(adapter);
pci_save_state(pdev);
@@@ -1686,11 -1746,15 +1779,14 @@@ void netxen_watchdog_task(struct work_s
static void netxen_tx_timeout(struct net_device *netdev)
{
- struct netxen_adapter *adapter = (struct netxen_adapter *)
- netdev_priv(netdev);
+ struct netxen_adapter *adapter = netdev_priv(netdev);
+
+ dev_err(&netdev->dev, "transmit timeout, resetting.\n");
+
- SCHEDULE_WORK(&adapter->tx_timeout_task);
+ schedule_work(&adapter->tx_timeout_task);
}
- static void netxen_tx_timeout_task(struct work_struct *work)
+ static void netxen_reset_task(struct work_struct *work)
{
struct netxen_adapter *adapter =
container_of(work, struct netxen_adapter, tx_timeout_task);
@@@ -1844,6 -2025,14 +2057,11 @@@ static int __init netxen_init_module(vo
{
printk(KERN_INFO "%s\n", netxen_nic_driver_string);
- if ((netxen_workq = create_singlethread_workqueue("netxen")) == NULL)
- return -ENOMEM;
-
+ #ifdef CONFIG_INET
+ register_netdevice_notifier(&netxen_netdev_cb);
+ register_inetaddr_notifier(&netxen_inetaddr_cb);
+ #endif
+
return pci_register_driver(&netxen_driver);
}
@@@ -1852,6 -2041,12 +2070,11 @@@ module_init(netxen_init_module)
static void __exit netxen_exit_module(void)
{
pci_unregister_driver(&netxen_driver);
+
+ #ifdef CONFIG_INET
+ unregister_inetaddr_notifier(&netxen_inetaddr_cb);
+ unregister_netdevice_notifier(&netxen_netdev_cb);
+ #endif
- destroy_workqueue(netxen_workq);
}
module_exit(netxen_exit_module);
^ permalink raw reply
* Re: linux-next: manual merge of the net tree with the net-current tree
From: David Miller @ 2009-08-14 2:50 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-kernel, dhananjay, amit
In-Reply-To: <20090814124040.534dd43c.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 14 Aug 2009 12:40:40 +1000
> Hi David,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/netxen/netxen_nic_main.c between commits
> e424fa9d6a0add1a9b812b07e3607daaa5b9e53d ("netxen: remove netxen
> workqueue") and 232e7d68d50c9ac3a55d716e5ae215ecd1e043b9 ("netxen: free
> napi resources during detach") from the net-current tree and commits
> 6598b169b856793f8f9b80a3f3c5a48f5eaf40e3 ("netxen: enable ip addr
> hashing"), f17443f4b01659a5c44d5fc6f5c502c39c293959 ("netxen: refactor
> net_device setup code") and 7042cd8f148345bfca6c336f009c96a416674f5e
> ("netxen: support for ethtool set ringparam") from the net tree.
>
> I fixed it up (I hope) (see below) and can carry the fix as necessary.
Thanks for the note Stephen.
I'll do a merge of net-2.6 into net-next-2.6 to resolve this
and get it out of your hair.
^ permalink raw reply
* Re: linux-next: manual merge of the net tree with the net-current tree
From: Stephen Rothwell @ 2009-08-14 4:19 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, linux-kernel, dhananjay, amit
In-Reply-To: <20090813.195042.203385912.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
Hi Dave,
On Thu, 13 Aug 2009 19:50:42 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I'll do a merge of net-2.6 into net-next-2.6 to resolve this
> and get it out of your hair.
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 net tree with the net-current tree
From: Dhananjay Phadke @ 2009-08-14 5:27 UTC (permalink / raw)
To: David Miller, sfr@canb.auug.org.au
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Amit Salecha
In-Reply-To: <20090813.195042.203385912.davem@davemloft.net>
Well yeah, I had already confessed in the introductory mail.
http://article.gmane.org/gmane.linux.network/135134
I have verified my own cherry-picked version of net-next driver,
will do that again once Dave fixes the tree.
Thanks,
Dhananjay
> -----Original Message-----
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Thursday, August 13, 2009 19:51
> To: sfr@canb.auug.org.au
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org;
> Dhananjay Phadke; Amit Salecha
> Subject: Re: linux-next: manual merge of the net tree with
> the net-current tree
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 14 Aug 2009 12:40:40 +1000
>
> > Hi David,
> >
> > Today's linux-next merge of the net tree got a conflict in
> > drivers/net/netxen/netxen_nic_main.c between commits
> > e424fa9d6a0add1a9b812b07e3607daaa5b9e53d ("netxen: remove netxen
> > workqueue") and 232e7d68d50c9ac3a55d716e5ae215ecd1e043b9
> ("netxen: free
> > napi resources during detach") from the net-current tree and commits
> > 6598b169b856793f8f9b80a3f3c5a48f5eaf40e3 ("netxen: enable ip addr
> > hashing"), f17443f4b01659a5c44d5fc6f5c502c39c293959
> ("netxen: refactor
> > net_device setup code") and 7042cd8f148345bfca6c336f009c96a416674f5e
> > ("netxen: support for ethtool set ringparam") from the net tree.
> >
> > I fixed it up (I hope) (see below) and can carry the fix as
> necessary.
>
> Thanks for the note Stephen.
>
> I'll do a merge of net-2.6 into net-next-2.6 to resolve this
> and get it out of your hair.
>
> No virus found in this incoming message.
> Checked by AVG - www.avg.com
> Version: 8.5.392 / Virus Database: 270.13.54/2300 - Release
> Date: 08/13/09 18:16:00
>
^ permalink raw reply
* linux-next: Tree for August 14
From: Stephen Rothwell @ 2009-08-14 7:57 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8479 bytes --]
Hi all,
News:
The git tree is now hosted at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git and the
patches are now at http://www.kernel.org/pub/linux/kernel/v2.6/next/ .
There are symlinks from the old locations (so they will continue to work).
Changes since 20090813:
This tree fails to build for powerpc allyesconfig (due to a TOC overflow
problem in the final link).
The kvm tree lost its build failure.
The net tree lost its conflict, but gained another against the
net-current 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) 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 140 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
CONFLICT (content): Merge conflict in MAINTAINERS
Merging davinci/for-next
Merging pxa/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
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/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
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
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
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/netxen/netxen_nic_main.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
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
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.c
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
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
Applying: drbd: fix for removal of blk_queue_stack_limits
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
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
* linux-next: ground rules
From: Stephen Rothwell @ 2009-08-14 8:02 UTC (permalink / raw)
To: linux-next; +Cc: Andrew Morton, Linus
[-- Attachment #1: Type: text/plain, Size: 1793 bytes --]
[This email has been bcc'd to all the current contributors to
linux-next. No response is required unless you have some issue with the
following.]
Thanks for being a participant of linux-next. I have been asked by my
employer to send you this e-mail summarizing these "ground rules" for the
project:
The linux-next integration testing is not a judgment of your code. The
purpose of linux-next is for integration testing and to lower the impact
of conflicts between subsystems in the next merge window.
You need to ensure that the patches/commits in your tree/series have been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* [PATCH] next-20090813 DX SEP driver build breaks with CONFIG_PCI=n
From: Kamalesh Babulal @ 2009-08-14 10:22 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, LKML, Stephen Rothwell, mark.a.allyn
In-Reply-To: <20090813200559.6bf4f5d9.sfr@canb.auug.org.au>
Hi Greg,
next-20090813 randconfig build breaks Discretix SEP driver when
configured with CONFIG_PCI=n.
drivers/staging/sep/sep_driver.c: In function 'sep_probe':
drivers/staging/sep/sep_driver.c:2548: error: implicit declaration of function 'pci_dev_get'
This patch adds the dependency on PCI for the DX SEP driver.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
drivers/staging/sep/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/sep/Kconfig b/drivers/staging/sep/Kconfig
index 6ef59f8..0a9c39c 100644
--- a/drivers/staging/sep/Kconfig
+++ b/drivers/staging/sep/Kconfig
@@ -1,7 +1,7 @@
config DX_SEP
tristate "Discretix SEP driver"
# depends on MRST
- depends on RAR_REGISTER
+ depends on RAR_REGISTER && PCI
default y
help
Discretix SEP driver
Kamalesh
^ permalink raw reply related
* Re: linux-next: ground rules
From: John W. Linville @ 2009-08-14 12:07 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Andrew Morton, Linus
In-Reply-To: <20090814180246.9ac3e78e.sfr@canb.auug.org.au>
On Fri, Aug 14, 2009 at 06:02:46PM +1000, Stephen Rothwell wrote:
> [This email has been bcc'd to all the current contributors to
> linux-next. No response is required unless you have some issue with the
> following.]
>
> Thanks for being a participant of linux-next. I have been asked by my
> employer to send you this e-mail summarizing these "ground rules" for the
> project:
>
> The linux-next integration testing is not a judgment of your code. The
> purpose of linux-next is for integration testing and to lower the impact
> of conflicts between subsystems in the next merge window.
>
> You need to ensure that the patches/commits in your tree/series have been:
> * submitted under GPL v2 (or later) and include the Contributor's
> Signed-off-by,
> * posted to the relevant mailing list,
> * reviewed by you (or another maintainer of your subsystem tree),
> * successfully unit tested, and
> * destined for the current or next Linux merge window.
>
> Basically, this should be just what you would send to Linus (or ask him
> to fetch). It is allowed to be rebased if you deem it necessary.
ACK (if that helps!)
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply
* Re: linux-next: ground rules
From: James Bottomley @ 2009-08-14 13:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Andrew Morton, Linus
In-Reply-To: <20090814180246.9ac3e78e.sfr@canb.auug.org.au>
On Fri, 2009-08-14 at 18:02 +1000, Stephen Rothwell wrote:
> [This email has been bcc'd to all the current contributors to
> linux-next. No response is required unless you have some issue with the
> following.]
>
> Thanks for being a participant of linux-next. I have been asked by my
> employer to send you this e-mail summarizing these "ground rules" for the
> project:
>
> The linux-next integration testing is not a judgment of your code. The
> purpose of linux-next is for integration testing and to lower the impact
> of conflicts between subsystems in the next merge window.
>
> You need to ensure that the patches/commits in your tree/series have been:
> * submitted under GPL v2 (or later) and include the Contributor's
> Signed-off-by,
> * posted to the relevant mailing list,
> * reviewed by you (or another maintainer of your subsystem tree),
> * successfully unit tested, and
The rest are fine, but this one isn't feasible for a driver tree ... I
don't have all the hardware, and people will insist on fixing
theoretical bugs in drivers we can't test on.
A lot of time, bugs turn up in this code only after it has been on
release for several months and the small pool of HW owners actually gets
around to testing it.
Additionally, I have to carry patches on trust for HW I'm never likely
to see outside someones multi-million dollar lab.
> * destined for the current or next Linux merge window.
James
^ permalink raw reply
* Re: linux-next: ground rules
From: Stephen Rothwell @ 2009-08-14 15:16 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-next, Andrew Morton, Linus
In-Reply-To: <1250258173.4021.3.camel@mulgrave.site>
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
Hi James,
On Fri, 14 Aug 2009 08:56:13 -0500 James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
>
> On Fri, 2009-08-14 at 18:02 +1000, Stephen Rothwell wrote:
> >
> > * successfully unit tested, and
>
> The rest are fine, but this one isn't feasible for a driver tree ... I
> don't have all the hardware, and people will insist on fixing
> theoretical bugs in drivers we can't test on.
>
> A lot of time, bugs turn up in this code only after it has been on
> release for several months and the small pool of HW owners actually gets
> around to testing it.
>
> Additionally, I have to carry patches on trust for HW I'm never likely
> to see outside someones multi-million dollar lab.
OK, in the context of linux-next, "successfully unit tested" to me means
that it doesn't break on "reasonable" builds (i.e. x86(_64) allmodconfig
or something similar) and probably won't break if someone tries to use
it. Clearly, you are correct, you can't test everything. I guess I just
want to be able to be justifiably annoyed if my builds break for
something obvious (which does happen from time to time :-().
--
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: ground rules
From: James Bottomley @ 2009-08-14 15:19 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Andrew Morton, Linus
In-Reply-To: <20090815011617.bed3494e.sfr@canb.auug.org.au>
On Sat, 2009-08-15 at 01:16 +1000, Stephen Rothwell wrote:
> Hi James,
>
> On Fri, 14 Aug 2009 08:56:13 -0500 James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> >
> > On Fri, 2009-08-14 at 18:02 +1000, Stephen Rothwell wrote:
> > >
> > > * successfully unit tested, and
> >
> > The rest are fine, but this one isn't feasible for a driver tree ... I
> > don't have all the hardware, and people will insist on fixing
> > theoretical bugs in drivers we can't test on.
> >
> > A lot of time, bugs turn up in this code only after it has been on
> > release for several months and the small pool of HW owners actually gets
> > around to testing it.
> >
> > Additionally, I have to carry patches on trust for HW I'm never likely
> > to see outside someones multi-million dollar lab.
>
> OK, in the context of linux-next, "successfully unit tested" to me means
> that it doesn't break on "reasonable" builds (i.e. x86(_64) allmodconfig
> or something similar) and probably won't break if someone tries to use
> it. Clearly, you are correct, you can't test everything. I guess I just
> want to be able to be justifiably annoyed if my builds break for
> something obvious (which does happen from time to time :-().
OK, so I can do compile tested for almost everything except s390
drivers ...
James
^ permalink raw reply
* mm/ipw2200 regression (was: Re: linux-next: Tree for August 6)
From: Bartlomiej Zolnierkiewicz @ 2009-08-15 16:56 UTC (permalink / raw)
To: linux-mm; +Cc: Stephen Rothwell, linux-next, LKML, Rafael J. Wysocki
In-Reply-To: <200908071515.45169.bzolnier@gmail.com>
On Friday 07 August 2009 15:15:45 Bartlomiej Zolnierkiewicz wrote:
> On Thursday 06 August 2009 22:50:50 Bartlomiej Zolnierkiewicz wrote:
> > On Thursday 06 August 2009 11:22:09 Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Changes since 20090805:
> >
> > At the moment -next is completely unusable for anything other than
> > detecting merge conflicts.. Running -next was never a completely
> > smooth experience but for a past year it was more-or-less doable.
> > However the last two months have been an absolute horror and I've
> > been hitting issues way faster than I was able to trace/report
> > them properly..
> >
> > Right now I still have following *outstanding* issues (on just *one*
> > machine/distribution):
> >
> > - Random (after some long hours) order:6 mode:0x8020 page allocation
> > failure (when ipw2200 driver reloads firmware on firmware error).
> >
> > [ I had first thought that it was caused by SLQB (which got enabled
> > as default somewhere along the way) but it also happens with SLUB
> > and I have good reasons to believe that is caused by heavy mm
> > changes first seen in next-20090618 (I've been testing next-20090617
> > for many days and it never happened there), the last confirmed
> > release with the problem is next-20090728. ]
>
> If anyone is interested in the full log of the problem:
>
> ipw2200: Firmware error detected. Restarting.
> ipw2200/0: page allocation failure. order:6, mode:0x8020
> Pid: 1004, comm: ipw2200/0 Not tainted 2.6.31-rc4-next-20090728-04869-gdae50fe-dirty #51
The bug managed to slip into Linus' tree..
ipw2200: Firmware error detected. Restarting.
ipw2200/0: page allocation failure. order:6, mode:0x8020
Pid: 945, comm: ipw2200/0 Not tainted 2.6.31-rc6-dirty #69
Call Trace:
[<c039505f>] ? printk+0xf/0x18
[<c016abc7>] __alloc_pages_nodemask+0x400/0x442
[<c01068b5>] dma_generic_alloc_coherent+0x53/0xc2
[<c0106862>] ? dma_generic_alloc_coherent+0x0/0xc2
[<e12c409b>] ipw_load_firmware+0x8f/0x4fb [ipw2200]
[<c01029bc>] ? restore_all_notrace+0x0/0x18
[<e12c0def>] ? ipw_stop_nic+0x2b/0x5d [ipw2200]
[<e12c88bd>] ipw_load+0x8b2/0xf94 [ipw2200]
[<e12cc727>] ipw_up+0xe1/0x5c6 [ipw2200]
[<e12ca7a3>] ? ipw_down+0x1f7/0x1ff [ipw2200]
[<e12ccc3e>] ipw_adapter_restart+0x32/0x46 [ipw2200]
[<e12ccc73>] ipw_bg_adapter_restart+0x21/0x2c [ipw2200]
[<c0139694>] worker_thread+0x15e/0x240
[<c0139652>] ? worker_thread+0x11c/0x240
[<e12ccc52>] ? ipw_bg_adapter_restart+0x0/0x2c [ipw2200]
[<c013ca65>] ? autoremove_wake_function+0x0/0x2f
[<c0139536>] ? worker_thread+0x0/0x240
[<c013c828>] kthread+0x6b/0x70
[<c013c7bd>] ? kthread+0x0/0x70
[<c01034ab>] kernel_thread_helper+0x7/0x10
Mem-Info:
DMA per-cpu:
CPU 0: hi: 0, btch: 1 usd: 0
Normal per-cpu:
CPU 0: hi: 186, btch: 31 usd: 80
Active_anon:25319 active_file:23485 inactive_anon:25576
inactive_file:23530 unevictable:2 dirty:1464 writeback:200 unstable:0
free:11175 slab:6927 mapped:7760 pagetables:930 bounce:0
DMA free:2052kB min:84kB low:104kB high:124kB active_anon:0kB inactive_anon:92kB active_file:1608kB inactive_file:1604kB unevictable:0kB present:15788kB pages_scanned:0 all_unreclaimable? no
lowmem_reserve[]: 0 489 489
Normal free:42648kB min:2788kB low:3484kB high:4180kB active_anon:101276kB inactive_anon:102212kB active_file:92332kB inactive_file:92516kB unevictable:8kB present:501392kB pages_scanned:0 all_unreclaimable? no
lowmem_reserve[]: 0 0 0
DMA: 3*4kB 7*8kB 2*16kB 1*32kB 0*64kB 1*128kB 1*256kB 1*512kB 1*1024kB 0*2048kB 0*4096kB = 2052kB
Normal: 1038*4kB 2148*8kB 1200*16kB 56*32kB 1*64kB 0*128kB 1*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 42648kB
52333 total pagecache pages
4675 pages in swap cache
Swap cache stats: add 27030, delete 22355, find 3967/5275
Free swap = 956380kB
Total swap = 1020116kB
131056 pages RAM
4225 pages reserved
53608 pages shared
86334 pages non-shared
ipw2200: Unable to load firmware: -12
ipw2200: Unable to load firmware: -12
ipw2200: Failed to up device
^ permalink raw reply
* Re: mm/ipw2200 regression (was: Re: linux-next: Tree for August 6)
From: Stephen Rothwell @ 2009-08-16 7:31 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-mm, linux-next, LKML, Rafael J. Wysocki
In-Reply-To: <200908151856.48596.bzolnier@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
Hi Bart,
On Sat, 15 Aug 2009 18:56:48 +0200 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote:
>
> The bug managed to slip into Linus' tree..
>
> ipw2200: Firmware error detected. Restarting.
> ipw2200/0: page allocation failure. order:6, mode:0x8020
> Pid: 945, comm: ipw2200/0 Not tainted 2.6.31-rc6-dirty #69
^^^^^
So, this is rc6 plus what? (just in case it is relevant).
--
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: mm/ipw2200 regression (was: Re: linux-next: Tree for August 6)
From: Bartlomiej Zolnierkiewicz @ 2009-08-16 10:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-mm, linux-next, LKML, Rafael J. Wysocki,
akpm@linux-foundation.org
In-Reply-To: <20090816173101.6e47b702.sfr@canb.auug.org.au>
Hi,
On Sunday 16 August 2009 09:31:01 Stephen Rothwell wrote:
> Hi Bart,
>
> On Sat, 15 Aug 2009 18:56:48 +0200 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote:
> >
> > The bug managed to slip into Linus' tree..
> >
> > ipw2200: Firmware error detected. Restarting.
> > ipw2200/0: page allocation failure. order:6, mode:0x8020
> > Pid: 945, comm: ipw2200/0 Not tainted 2.6.31-rc6-dirty #69
> ^^^^^
> So, this is rc6 plus what? (just in case it is relevant).
In this case plus upcoming staging/rt{286,287,307}0 patches (irrelevant,
they are not used on this machine and the problem happened many times
with vanilla -next kernels in the past)..
After going through mm commits in Linus' tree I think that the bug came
the other way around, from akpm's tree to Linus' tree and then to -next
(page allocator changes seem to match "the suspect's profile")..
^ permalink raw reply
* linux-next: manual merge of the tip tree with the tree
From: Stephen Rothwell @ 2009-08-17 6:50 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Neil Horman, Jason Baron,
Frederic Weisbecker
Hi all,
Today's linux-next merge of the tip tree got a conflict in
kernel/trace/trace.h between commit
9ec04da7489d2c9ae01ea6e9b5fa313ccf3d35fb ("net: skb ftracer - Add actual
ftrace code to kernel (v3)") from the net tree and commit
64c12e0444fcc6b75eb49144ba46d43dbdc6bc8f ("tracing: Add individual
syscalls tracepoint id support") from the tip tree.
Just overlapping additions/removals. I fixed it up (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/trace/trace.h
index 8a6281b,300ef78..0000000
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@@ -336,12 -317,6 +334,8 @@@ extern void __ftrace_bad_type(void)
TRACE_KMEM_ALLOC); \
IF_ASSIGN(var, ent, struct kmemtrace_free_entry, \
TRACE_KMEM_FREE); \
- IF_ASSIGN(var, ent, struct syscall_trace_enter, \
- TRACE_SYSCALL_ENTER); \
- IF_ASSIGN(var, ent, struct syscall_trace_exit, \
- TRACE_SYSCALL_EXIT); \
+ IF_ASSIGN(var, ent, struct trace_skb_event, \
+ TRACE_SKB_SOURCE); \
__ftrace_bad_type(); \
} while (0)
^ permalink raw reply
* linux-next: manual merge of the sfi tree with the acpi tree
From: Stephen Rothwell @ 2009-08-17 8:06 UTC (permalink / raw)
To: sfi-devel; +Cc: linux-next, linux-kernel, Len Brown
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
Hi all,
Today's linux-next merge of the sfi tree got a conflict in
drivers/acpi/tables.c between commit
44043a4299724bb386ac7915a57a18b176e9df07 ("ACPI: check acpi_disabled in
acpi_table_parse()") from the acpi tree and commit
55ec50ee899aa3199c126bb4b740abb9a4ab51df ("ACPI: check acpi_disabled in
acpi_table_parse() and acpi_table_parse_entries()") from the sfi tree.
I used the sfi tree version.
--
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 sfi tree with the acpi tree
From: Stephen Rothwell @ 2009-08-17 8:06 UTC (permalink / raw)
To: sfi-devel; +Cc: linux-next, linux-kernel, Feng Tang, Len Brown
[-- Attachment #1: Type: text/plain, Size: 742 bytes --]
Hi all,
Today's linux-next merge of the sfi tree got a conflict in
arch/x86/include/asm/io_apic.h arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic/io_apic.c between commit
f488a00f3759327c687e17858c07a1b0ea811cf0 ("ACPI, x86: remove ACPI
dependency on some IO-APIC routines") from the acpi tree and commit
2a98e7573b83bac1a79292a428090ee352626216 ("ACPI, x86: expose some IO-APIC
routines when CONFIG_ACPI=n") from the sfi tree.
The latter seems to be a superset of the former (with one name change
uniq_ioapic_id -> io_apic_unique_id). I fixed it up (using the sfi
trees' versions) and can carry the fix as 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
* linux-next: tree build failure
From: Stephen Rothwell @ 2009-08-17 8:39 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: linux-next, linux-kernel
Hi Rafael,
Today's linux-next build (powerpc allyesconfig) failed like this:
drivers/base/power/runtime.c:948: error: __ksymtab_pm_runtime_disable causes a section type conflict
Caused by commit d9d4cc5169ca18df9ff5afd31c6e6b715ecb454a ("PM: Introduce
core framework for run-time PM of I/O devices (rev. 17)") from the
suspend tree. This commit EXPORTs pm_runtime_disable which is an inline
function that calls __pm_runtime_disable (which is probably what was
meant to be EXPORTed).
I wish we could get these type of errors to fail on x86 as well ...
I have applied the following patch for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Aug 2009 18:34:28 +1000
Subject: [PATCH] suspend: EXPORT the correct function.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/base/power/runtime.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 28a3f91..38556f6 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -945,7 +945,7 @@ void __pm_runtime_disable(struct device *dev, bool check_resume)
out:
spin_unlock_irq(&dev->power.lock);
}
-EXPORT_SYMBOL_GPL(pm_runtime_disable);
+EXPORT_SYMBOL_GPL(__pm_runtime_disable);
/**
* pm_runtime_enable - Enable run-time PM of a device.
--
1.6.3.3
^ permalink raw reply related
* linux-next: suspend tree build failure
From: Stephen Rothwell @ 2009-08-17 8:40 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: linux-next, linux-kernel
[Sorry if some get this twice, I fixed up the subject.]
Hi Rafael,
Today's linux-next build (powerpc allyesconfig) failed like this:
drivers/base/power/runtime.c:948: error: __ksymtab_pm_runtime_disable causes a section type conflict
Caused by commit d9d4cc5169ca18df9ff5afd31c6e6b715ecb454a ("PM: Introduce
core framework for run-time PM of I/O devices (rev. 17)") from the
suspend tree. This commit EXPORTs pm_runtime_disable which is an inline
function that calls __pm_runtime_disable (which is probably what was
meant to be EXPORTed).
I wish we could get these type of errors to fail on x86 as well ...
I have applied the following patch for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Aug 2009 18:34:28 +1000
Subject: [PATCH] suspend: EXPORT the correct function.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/base/power/runtime.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 28a3f91..38556f6 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -945,7 +945,7 @@ void __pm_runtime_disable(struct device *dev, bool check_resume)
out:
spin_unlock_irq(&dev->power.lock);
}
-EXPORT_SYMBOL_GPL(pm_runtime_disable);
+EXPORT_SYMBOL_GPL(__pm_runtime_disable);
/**
* pm_runtime_enable - Enable run-time PM of a device.
--
1.6.3.3
^ permalink raw reply related
* linux-next: Tree for August 17
From: Stephen Rothwell @ 2009-08-17 8:54 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8981 bytes --]
Hi all,
News:
The git tree is now hosted at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git and the
patches are now at http://www.kernel.org/pub/linux/kernel/v2.6/next/ .
There are symlinks from the old locations (so they will continue to work).
Changes since 20090814:
This tree fails to build for powerpc allyesconfig (due to a TOC overflow
problem in the final link).
The arm tree lost its conflict.
The net tree lost its conflict.
The suspend tree gained a build failure for which I applied a patch.
The tip tree gained a conflict against the net tree.
The sfi tree gained conflicts against the acpi 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) 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 140 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
CONFLICT (content): Merge conflict in MAINTAINERS
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/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
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
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
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
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
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
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.c
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
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
Applying: drbd: fix for removal of blk_queue_stack_limits
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
CONFLICT (content): Merge conflict in kernel/trace/trace.h
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
CONFLICT (content): Merge conflict in arch/x86/include/asm/io_apic.h
CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/boot.c
CONFLICT (content): Merge conflict in arch/x86/kernel/apic/io_apic.c
CONFLICT (content): Merge conflict in drivers/acpi/internal.h
CONFLICT (content): Merge conflict in drivers/acpi/tables.c
CONFLICT (content): Merge conflict in include/linux/acpi.h
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
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
Applying: suspend: EXPORT the correct function.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 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