* Re: [PATCH -next] qdio: add missing export.h include
From: Paul Gortmaker @ 2011-09-27 22:17 UTC (permalink / raw)
To: Heiko Carstens; +Cc: linux-next, Frank Blaschka, Jan Glauber
In-Reply-To: <1316676108-5729-1-git-send-email-heiko.carstens@de.ibm.com>
On 11-09-22 03:21 AM, Heiko Carstens wrote:
> Fix compile breakage caused by splitting module.h:
>
> drivers/s390/cio/qdio_setup.c:31:1:
> warning: data definition has no type or storage class [enabled by default]
> drivers/s390/cio/qdio_setup.c:31:1:
> warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
Thanks, I've squashed this into what contained the other
s390 changes from you, which now touches the following:
arch/s390/crypto/sha_common.c | 1 +
arch/s390/mm/init.c | 1 +
drivers/s390/char/fs3270.c | 1 +
drivers/s390/char/sclp_cpi_sys.c | 1 +
drivers/s390/char/vmcp.c | 1 +
drivers/s390/char/vmur.c | 1 +
drivers/s390/cio/chp.c | 2 ++
drivers/s390/cio/qdio_debug.c | 2 ++
drivers/s390/cio/qdio_setup.c | 1 +
drivers/s390/kvm/kvm_virtio.c | 1 +
drivers/s390/scsi/zfcp_aux.c | 1 +
drivers/s390/scsi/zfcp_ccw.c | 1 +
drivers/s390/scsi/zfcp_dbf.c | 1 +
drivers/s390/scsi/zfcp_scsi.c | 1 +
14 files changed, 16 insertions(+)
Paul.
>
> Cc: Frank Blaschka <blaschka@linux.vnet.ibm.com>
> Cc: Jan Glauber <jang@linux.vnet.ibm.com>
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> ---
> drivers/s390/cio/qdio_setup.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
> index d9a46a4..25f4988 100644
> --- a/drivers/s390/cio/qdio_setup.c
> +++ b/drivers/s390/cio/qdio_setup.c
> @@ -7,6 +7,7 @@
> * Author(s): Jan Glauber <jang@linux.vnet.ibm.com>
> */
> #include <linux/kernel.h>
> +#include <linux/export.h>
> #include <linux/slab.h>
> #include <asm/qdio.h>
>
^ permalink raw reply
* Re: linux-next: Tree for Sept 27 (power/qos.c)
From: Randy Dunlap @ 2011-09-27 22:07 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Stephen Rothwell, linux-next, LKML, pm list
In-Reply-To: <201109272205.12021.rjw@sisk.pl>
On 09/27/2011 01:05 PM, Rafael J. Wysocki wrote:
> On Tuesday, September 27, 2011, Randy Dunlap wrote:
>> On 09/27/2011 12:35 AM, Stephen Rothwell wrote:
>>> Hi all,
>>
>>
>> When CONFIG_PM_SLEEP is not enabled:
>>
>> drivers/base/power/qos.c:231:29: error: 'struct dev_pm_info' has no member named 'entry'
>
> Thanks for the report.
>
> Below is a patch and it should be fixed in linux-next now.
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks.
> Rafael
>
> ---
> From: Rafael J. Wysocki <rjw@sisk.pl>
> Subject: PM / QoS: Fix build issue for CONFIG_PM_SLEEP unset
>
> Commit d41a041b58684710638cbc0d5342a661b50db124 "PM / QoS: Add
> function dev_pm_qos_read_value() (v2)" introduced a build problem
> for CONFIG_PM_SLEEP, because it overlooked this case entirely.
>
> To fix this issue, use the power.power_state in struct device to
> indicate whether or not PM QoS constraints can be applied to the
> device object in question instead of checking the device's
> power.entry field that is valid only for CONFIG_PM_SLEEP set.
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---
> drivers/base/power/main.c | 2 +-
> drivers/base/power/power.h | 10 +++++++++-
> drivers/base/power/qos.c | 11 ++++-------
> include/linux/pm.h | 2 ++
> include/linux/pm_qos.h | 9 +++++++--
> 5 files changed, 23 insertions(+), 11 deletions(-)
>
> Index: linux/drivers/base/power/main.c
> ===================================================================
> --- linux.orig/drivers/base/power/main.c
> +++ linux/drivers/base/power/main.c
> @@ -22,7 +22,6 @@
> #include <linux/mutex.h>
> #include <linux/pm.h>
> #include <linux/pm_runtime.h>
> -#include <linux/pm_qos.h>
> #include <linux/resume-trace.h>
> #include <linux/interrupt.h>
> #include <linux/sched.h>
> @@ -67,6 +66,7 @@ void device_pm_init(struct device *dev)
> spin_lock_init(&dev->power.lock);
> pm_runtime_init(dev);
> INIT_LIST_HEAD(&dev->power.entry);
> + dev->power.power_state = PMSG_INVALID;
> }
>
> /**
> Index: linux/include/linux/pm.h
> ===================================================================
> --- linux.orig/include/linux/pm.h
> +++ linux/include/linux/pm.h
> @@ -326,6 +326,7 @@ extern struct dev_pm_ops generic_subsys_
> * requested by a driver.
> */
>
> +#define PM_EVENT_INVALID (-1)
> #define PM_EVENT_ON 0x0000
> #define PM_EVENT_FREEZE 0x0001
> #define PM_EVENT_SUSPEND 0x0002
> @@ -346,6 +347,7 @@ extern struct dev_pm_ops generic_subsys_
> #define PM_EVENT_AUTO_SUSPEND (PM_EVENT_AUTO | PM_EVENT_SUSPEND)
> #define PM_EVENT_AUTO_RESUME (PM_EVENT_AUTO | PM_EVENT_RESUME)
>
> +#define PMSG_INVALID ((struct pm_message){ .event = PM_EVENT_INVALID, })
> #define PMSG_ON ((struct pm_message){ .event = PM_EVENT_ON, })
> #define PMSG_FREEZE ((struct pm_message){ .event = PM_EVENT_FREEZE, })
> #define PMSG_QUIESCE ((struct pm_message){ .event = PM_EVENT_QUIESCE, })
> Index: linux/drivers/base/power/power.h
> ===================================================================
> --- linux.orig/drivers/base/power/power.h
> +++ linux/drivers/base/power/power.h
> @@ -1,3 +1,5 @@
> +#include <linux/pm_qos.h>
> +
> #ifdef CONFIG_PM_RUNTIME
>
> extern void pm_runtime_init(struct device *dev);
> @@ -35,15 +37,21 @@ extern void device_pm_move_last(struct d
> static inline void device_pm_init(struct device *dev)
> {
> spin_lock_init(&dev->power.lock);
> + dev->power.power_state = PMSG_INVALID;
> pm_runtime_init(dev);
> }
>
> +static inline void device_pm_add(struct device *dev)
> +{
> + dev_pm_qos_constraints_init(dev);
> +}
> +
> static inline void device_pm_remove(struct device *dev)
> {
> + dev_pm_qos_constraints_destroy(dev);
> pm_runtime_remove(dev);
> }
>
> -static inline void device_pm_add(struct device *dev) {}
> static inline void device_pm_move_before(struct device *deva,
> struct device *devb) {}
> static inline void device_pm_move_after(struct device *deva,
> Index: linux/include/linux/pm_qos.h
> ===================================================================
> --- linux.orig/include/linux/pm_qos.h
> +++ linux/include/linux/pm_qos.h
> @@ -7,6 +7,7 @@
> #include <linux/plist.h>
> #include <linux/notifier.h>
> #include <linux/miscdevice.h>
> +#include <linux/device.h>
>
> #define PM_QOS_RESERVED 0
> #define PM_QOS_CPU_DMA_LATENCY 1
> @@ -142,9 +143,13 @@ static inline int dev_pm_qos_remove_glob
> struct notifier_block *notifier)
> { return 0; }
> static inline void dev_pm_qos_constraints_init(struct device *dev)
> - { return; }
> +{
> + dev->power.power_state = PMSG_ON;
> +}
> static inline void dev_pm_qos_constraints_destroy(struct device *dev)
> - { return; }
> +{
> + dev->power.power_state = PMSG_INVALID;
> +}
> #endif
>
> #endif
> Index: linux/drivers/base/power/qos.c
> ===================================================================
> --- linux.orig/drivers/base/power/qos.c
> +++ linux/drivers/base/power/qos.c
> @@ -149,6 +149,7 @@ void dev_pm_qos_constraints_init(struct
> {
> mutex_lock(&dev_pm_qos_mtx);
> dev->power.constraints = NULL;
> + dev->power.power_state = PMSG_ON;
> mutex_unlock(&dev_pm_qos_mtx);
> }
>
> @@ -165,6 +166,7 @@ void dev_pm_qos_constraints_destroy(stru
>
> mutex_lock(&dev_pm_qos_mtx);
>
> + dev->power.power_state = PMSG_INVALID;
> c = dev->power.constraints;
> if (!c)
> goto out;
> @@ -222,20 +224,15 @@ int dev_pm_qos_add_request(struct device
>
> req->dev = dev;
>
> - device_pm_lock();
> mutex_lock(&dev_pm_qos_mtx);
>
> - if (dev->power.constraints) {
> - device_pm_unlock();
> - } else {
> - if (list_empty(&dev->power.entry)) {
> + if (!dev->power.constraints) {
> + if (dev->power.power_state.event == PM_EVENT_INVALID) {
> /* The device has been removed from the system. */
> - device_pm_unlock();
> req->dev = NULL;
> ret = -ENODEV;
> goto out;
> } else {
> - device_pm_unlock();
> /*
> * Allocate the constraints data on the first call to
> * add_request, i.e. only if the data is not already
> --
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Russell King @ 2011-09-27 21:23 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Stephen Rothwell, linux-next, linux-kernel, Catalin Marinas,
Jon Medhurst
In-Reply-To: <201109271724.46371.arnd@arndb.de>
On Tue, Sep 27, 2011 at 05:24:46PM +0200, Arnd Bergmann wrote:
> Do you generally send one pull request for each branch you have
> in the for-next branch, or do you send a single request for something
> that roughly resembles the for-next branch at the time of the merge
> window?
It depends how much is queued and how I feel towards the stuff which
is queued. I've tended to send initially a big pull request of 'ARM
updates' which contains mostly everything, though I've also sent
pull requests for individual topic branches when it makes more sense.
At the moment, the diffstat summary says:
423 files changed, 3054 insertions(+), 2855 deletions(-)
but there's quite a spread outside arch/arm this time around due to
the GPIO stuff I'm carrying (mostly the change of mach/gpio.h to
asm/gpio.h).
So, at least the GPIO stuff will be a completely separate pull request
from the rest of the ARM stuff. The 'amba' (primecell) changes will
probably also be a separate pull request because it touches stuff
outside of the arch/arm sub-tree (even though its ARM related.)
What I term 'devel-stable' (iow, stuff I've pulled in from other people
and a few bits of my own stuff which others are using) won't be split
up (that'd negate the point of devel-stable being... stable as it'd
mean there's commits in there which can't be relied upon.)
That leaves 'the rest' which I'll make a decision nearer the time,
along with deciding whether devel-stable ends up being part of
'the rest' or not.
What I will try to do is get the bulk of it in fairly early in the
merge cycle as normal.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the v4l-dvb tree
From: Paul Gortmaker @ 2011-09-27 20:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Igor M. Liplianin,
Mauro Carvalho Chehab
In-Reply-To: <20110927161055.05bbb0586fffbfbb2307f30b@canb.auug.org.au>
On 11-09-27 02:10 AM, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/misc/altera-stapl/altera.c between commit cff4fa8415a3 ("[media]
> altera-stapl: it is time to move out from staging") from the v4l-dvb tree
> and commit 99c978529a40 ("staging: Add module.h to drivers/staging
> users") from the staging tree.
Hey Greg/Stephen,
So that I could revalidate the module.h stuff with randconfig builds,
I've taken the above staging commit and re-applied it to the module.h
tree -- I'm pretty sure git will see it as the same commit and just
move on with no complaints, but just a heads up for Stephen in case.
This won't happen until Stephen takes the module.h from one of our
internal servers as a temporary measure while kernel.org is down.
I'll be sending that information to linux-next and Stephen later
today.
Paul.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
>
> Mauro, you could, of course, apply Paul's patch to the file in its new
> location.
^ permalink raw reply
* Re: linux-next: Tree for Sept 27 (power/qos.c)
From: Rafael J. Wysocki @ 2011-09-27 20:05 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, pm list
In-Reply-To: <4E81FA1E.3060702@xenotime.net>
On Tuesday, September 27, 2011, Randy Dunlap wrote:
> On 09/27/2011 12:35 AM, Stephen Rothwell wrote:
> > Hi all,
>
>
> When CONFIG_PM_SLEEP is not enabled:
>
> drivers/base/power/qos.c:231:29: error: 'struct dev_pm_info' has no member named 'entry'
Thanks for the report.
Below is a patch and it should be fixed in linux-next now.
Rafael
---
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: PM / QoS: Fix build issue for CONFIG_PM_SLEEP unset
Commit d41a041b58684710638cbc0d5342a661b50db124 "PM / QoS: Add
function dev_pm_qos_read_value() (v2)" introduced a build problem
for CONFIG_PM_SLEEP, because it overlooked this case entirely.
To fix this issue, use the power.power_state in struct device to
indicate whether or not PM QoS constraints can be applied to the
device object in question instead of checking the device's
power.entry field that is valid only for CONFIG_PM_SLEEP set.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/base/power/main.c | 2 +-
drivers/base/power/power.h | 10 +++++++++-
drivers/base/power/qos.c | 11 ++++-------
include/linux/pm.h | 2 ++
include/linux/pm_qos.h | 9 +++++++--
5 files changed, 23 insertions(+), 11 deletions(-)
Index: linux/drivers/base/power/main.c
===================================================================
--- linux.orig/drivers/base/power/main.c
+++ linux/drivers/base/power/main.c
@@ -22,7 +22,6 @@
#include <linux/mutex.h>
#include <linux/pm.h>
#include <linux/pm_runtime.h>
-#include <linux/pm_qos.h>
#include <linux/resume-trace.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
@@ -67,6 +66,7 @@ void device_pm_init(struct device *dev)
spin_lock_init(&dev->power.lock);
pm_runtime_init(dev);
INIT_LIST_HEAD(&dev->power.entry);
+ dev->power.power_state = PMSG_INVALID;
}
/**
Index: linux/include/linux/pm.h
===================================================================
--- linux.orig/include/linux/pm.h
+++ linux/include/linux/pm.h
@@ -326,6 +326,7 @@ extern struct dev_pm_ops generic_subsys_
* requested by a driver.
*/
+#define PM_EVENT_INVALID (-1)
#define PM_EVENT_ON 0x0000
#define PM_EVENT_FREEZE 0x0001
#define PM_EVENT_SUSPEND 0x0002
@@ -346,6 +347,7 @@ extern struct dev_pm_ops generic_subsys_
#define PM_EVENT_AUTO_SUSPEND (PM_EVENT_AUTO | PM_EVENT_SUSPEND)
#define PM_EVENT_AUTO_RESUME (PM_EVENT_AUTO | PM_EVENT_RESUME)
+#define PMSG_INVALID ((struct pm_message){ .event = PM_EVENT_INVALID, })
#define PMSG_ON ((struct pm_message){ .event = PM_EVENT_ON, })
#define PMSG_FREEZE ((struct pm_message){ .event = PM_EVENT_FREEZE, })
#define PMSG_QUIESCE ((struct pm_message){ .event = PM_EVENT_QUIESCE, })
Index: linux/drivers/base/power/power.h
===================================================================
--- linux.orig/drivers/base/power/power.h
+++ linux/drivers/base/power/power.h
@@ -1,3 +1,5 @@
+#include <linux/pm_qos.h>
+
#ifdef CONFIG_PM_RUNTIME
extern void pm_runtime_init(struct device *dev);
@@ -35,15 +37,21 @@ extern void device_pm_move_last(struct d
static inline void device_pm_init(struct device *dev)
{
spin_lock_init(&dev->power.lock);
+ dev->power.power_state = PMSG_INVALID;
pm_runtime_init(dev);
}
+static inline void device_pm_add(struct device *dev)
+{
+ dev_pm_qos_constraints_init(dev);
+}
+
static inline void device_pm_remove(struct device *dev)
{
+ dev_pm_qos_constraints_destroy(dev);
pm_runtime_remove(dev);
}
-static inline void device_pm_add(struct device *dev) {}
static inline void device_pm_move_before(struct device *deva,
struct device *devb) {}
static inline void device_pm_move_after(struct device *deva,
Index: linux/include/linux/pm_qos.h
===================================================================
--- linux.orig/include/linux/pm_qos.h
+++ linux/include/linux/pm_qos.h
@@ -7,6 +7,7 @@
#include <linux/plist.h>
#include <linux/notifier.h>
#include <linux/miscdevice.h>
+#include <linux/device.h>
#define PM_QOS_RESERVED 0
#define PM_QOS_CPU_DMA_LATENCY 1
@@ -142,9 +143,13 @@ static inline int dev_pm_qos_remove_glob
struct notifier_block *notifier)
{ return 0; }
static inline void dev_pm_qos_constraints_init(struct device *dev)
- { return; }
+{
+ dev->power.power_state = PMSG_ON;
+}
static inline void dev_pm_qos_constraints_destroy(struct device *dev)
- { return; }
+{
+ dev->power.power_state = PMSG_INVALID;
+}
#endif
#endif
Index: linux/drivers/base/power/qos.c
===================================================================
--- linux.orig/drivers/base/power/qos.c
+++ linux/drivers/base/power/qos.c
@@ -149,6 +149,7 @@ void dev_pm_qos_constraints_init(struct
{
mutex_lock(&dev_pm_qos_mtx);
dev->power.constraints = NULL;
+ dev->power.power_state = PMSG_ON;
mutex_unlock(&dev_pm_qos_mtx);
}
@@ -165,6 +166,7 @@ void dev_pm_qos_constraints_destroy(stru
mutex_lock(&dev_pm_qos_mtx);
+ dev->power.power_state = PMSG_INVALID;
c = dev->power.constraints;
if (!c)
goto out;
@@ -222,20 +224,15 @@ int dev_pm_qos_add_request(struct device
req->dev = dev;
- device_pm_lock();
mutex_lock(&dev_pm_qos_mtx);
- if (dev->power.constraints) {
- device_pm_unlock();
- } else {
- if (list_empty(&dev->power.entry)) {
+ if (!dev->power.constraints) {
+ if (dev->power.power_state.event == PM_EVENT_INVALID) {
/* The device has been removed from the system. */
- device_pm_unlock();
req->dev = NULL;
ret = -ENODEV;
goto out;
} else {
- device_pm_unlock();
/*
* Allocate the constraints data on the first call to
* add_request, i.e. only if the data is not already
^ permalink raw reply
* [PATCH -next] dmar: fix build warnings when ACPI is not enabled
From: Randy Dunlap @ 2011-09-27 17:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Vinod Koul, Dan Williams, Andrew Morton
In-Reply-To: <20110926172348.be01ff9a1c16267ffd000d2a@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix build warnings when CONFIG_ACPI is not enabled:
include/linux/dmar.h:248:46: warning: 'struct acpi_dmar_header' declared inside parameter list
include/linux/dmar.h:248:46: warning: its scope is only this definition or declaration, which is probably not what you want
include/linux/dmar.h:252:46: warning: 'struct acpi_dmar_header' declared inside parameter list
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
include/linux/dmar.h | 2 ++
1 file changed, 2 insertions(+)
--- next-2011-0927.orig/include/linux/dmar.h
+++ next-2011-0927/include/linux/dmar.h
@@ -244,6 +244,8 @@ extern int dmar_parse_dev_scope(void *st
struct pci_dev ***devices, u16 segment);
extern int intel_iommu_init(void);
#else /* !CONFIG_INTEL_IOMMU: */
+struct acpi_dmar_header;
+
static inline int intel_iommu_init(void) { return -ENODEV; }
static inline int dmar_parse_one_rmrr(struct acpi_dmar_header *header)
{
^ permalink raw reply
* [PATCH -next] x86: perf_event_amd.c needs <asm/apicdef.h>
From: Randy Dunlap @ 2011-09-27 17:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Robert Richter, Ingo Molnar, Andre Przywara,
Andrew Morton
In-Reply-To: <20110926172348.be01ff9a1c16267ffd000d2a@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix build error by adding <asm/apicdef.h> header file:
arch/x86/kernel/cpu/perf_event_amd.c:350:2: error: 'BAD_APICID' undeclared (first use in this function)
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
Found in linux-next and patch only applies cleanly to linux-next,
but looks like mainline could use a similar patch (with more
header files).
arch/x86/kernel/cpu/perf_event_amd.c | 1 +
1 file changed, 1 insertion(+)
--- next-2011-0927.orig/arch/x86/kernel/cpu/perf_event_amd.c
+++ next-2011-0927/arch/x86/kernel/cpu/perf_event_amd.c
@@ -2,6 +2,7 @@
#include <linux/types.h>
#include <linux/init.h>
#include <linux/slab.h>
+#include <asm/apicdef.h>
#include "perf_event.h"
^ permalink raw reply
* Re: linux-next: manual merge of the akpm tree with the tree
From: Vaibhav Nagarnaik @ 2011-09-27 16:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Frederic Weisbecker,
Paul E. McKenney
In-Reply-To: <20110927165920.14b00e8595d10135d2a4397a@canb.auug.org.au>
On Mon, Sep 26, 2011 at 11:59 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the scsi-post-merge tree got conflicts in
> arch/x86/kernel/apic/apic.c, arch/x86/kernel/cpu/mcheck/therm_throt.c,
> arch/x86/kernel/cpu/mcheck/threshold.c and arch/x86/kernel/irq.c between
> commit ef14aea88fee ("x86: Call idle notifier after irq_enter()") from
> the rcu tree and commit 6a541324a31f ("The current interrupt traces from
> irq_handler_entry and irq_handler_exit") from the akpm tree.
>
> Just context changes. I fixed them up (see below) and can carry the fixes
> as necessary.
Looks good to me. Do I need to provide Acked-by?
Vaibhav Nagarnaik
^ permalink raw reply
* Re: linux-next: Tree for Sept 27 (power/qos.c)
From: Randy Dunlap @ 2011-09-27 16:30 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Rafael J. Wysocki, pm list
In-Reply-To: <20110927173530.ceae2e49537a81da65287bf3@canb.auug.org.au>
On 09/27/2011 12:35 AM, Stephen Rothwell wrote:
> Hi all,
When CONFIG_PM_SLEEP is not enabled:
drivers/base/power/qos.c:231:29: error: 'struct dev_pm_info' has no member named 'entry'
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* [BUG?] anyone aware of pagecache issues with 2.6.27?
From: Chris Friesen @ 2011-09-27 15:46 UTC (permalink / raw)
To: linux-next
I realize this is a long shot, but I figure it's worth a try.
What we're seeing is that "cached" gets large (several gigs) and "free"
gets small, and when we get into this state our system responsiveness
starts dropping. If I do "echo 3 > /proc/sys/vm/drop_caches", then it
immediately frees up a couple gig of memory and things work as expected.
Based on the fact that memory is immediately reclaimable from the cache
it appears that the bulk of the cache is clean pages. This shouldn't
have a major impact on memory allocation, but at least on this setup it
does. It seems like there is something not quite right about the
mechanism that reclaims clean pages from the cache. Is anyone aware of
issues in this area for 2.6.27-vintage kernels?
Is there a way to limit how much memory gets used for the page cache?
drop_caches seems to help, but it's a really big hammer.
System details:
2.6.27 kernel, x86-64, 8GB RAM, no swap. Root is on a tmpfs filesystem,
local disks are used for miscellaneous stuff including /var/log, we have
some sizeable network-mounted filesystems.
/proc/sys/vm/overcommit_memory is set to 2, with overcommit_ratio set to
100.
Thanks,
Chris
--
Chris Friesen
Software Developer
GENBAND
chris.friesen@genband.com
www.genband.com
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Arnd Bergmann @ 2011-09-27 15:24 UTC (permalink / raw)
To: Russell King
Cc: Stephen Rothwell, linux-next, linux-kernel, Catalin Marinas,
Jon Medhurst
In-Reply-To: <20110927072517.GB11359@flint.arm.linux.org.uk>
On Tuesday 27 September 2011, Russell King wrote:
> On Tue, Sep 27, 2011 at 11:25:24AM +1000, Stephen Rothwell wrote:
> > Hi Arnd,
> >
> > [I have a feeling that I may have reported this previously]
> >
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > arch/arm/mm/dma-mapping.c between commit e73fc88e19d7 ("ARM: 7059/1:
> > LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_*") from the arm tree
> > and commit 99d1717dd7fe ("ARM: Add init_consistent_dma_size()") from the
> > arm-soc tree.
> >
> > I fixed it up (I think - see below) and can carry the fix as necessary.
Ok, looks good.
> This has happened because I've dropped a large chunk of my tree from the
> for-next branch due to some horrible conflicts and some bad workflow
> practice in a git tree I recently merged (so this merge which I'd
> normally do has been exposed.)
Since we have a few conflicts already, I think I'll wait for your
tree to go in first and then send my pull requests with the proper
fixups. I could already pull in some branches that I know I will
have to wait for.
Do you generally send one pull request for each branch you have
in the for-next branch, or do you send a single request for something
that roughly resembles the for-next branch at the time of the merge
window?
Arnd
^ permalink raw reply
* Re: linux-next: manual merge of the moduleh tree with the mfd tree
From: Paul Gortmaker @ 2011-09-27 14:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Linus Walleij, Samuel Ortiz
In-Reply-To: <20110927162919.1bf769d918a16a35d91ac1da@canb.auug.org.au>
On Tue, Sep 27, 2011 at 2:29 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/mfd/ab3550-core.c between commit e085f9a2e27d ("mfd: Delete
> ab3550 driver") from the mfd tree and commit afb68c4877b2 ("mfd: Add
> module.h to the implicit drivers/mfd users") from the moduleh tree.
>
> The former removes this file, so I did that.
Thanks -- I'll simply drop the changes to that file. I'll have an alternate
pull site for linux-next to you by your tomorrow morning as well.
P.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
^ permalink raw reply
* Re: linux-next: manual merge of the net tree with the wireless-current tree
From: wwguy @ 2011-09-27 14:41 UTC (permalink / raw)
To: John W. Linville
Cc: Stephen Rothwell, David Miller, netdev@vger.kernel.org,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Berg, Johannes, Grumbach, Emmanuel
In-Reply-To: <20110927130926.GA2824@tuxdriver.com>
On Tue, 2011-09-27 at 06:09 -0700, John W. Linville wrote:
> On Tue, Sep 27, 2011 at 12:51:32PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the net tree got a conflict in
> > drivers/net/wireless/iwlwifi/iwl-scan.c between commit 6c80c39d9a69
> > ("iwlagn: fix dangling scan request") from the wireless-current tree and
> > commits 63013ae30159 ("iwlagn: priv->status moves to iwl_shared") and
> > 6ac2f839b0b2 ("iwlagn: priv->mutex moves to iwl_shared") from the net
> > tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
>
> Looks good, thanks!
>
Thanks a lot for fixing it.
Wey
^ permalink raw reply
* Re: linux-next: Tree for Aug 24 (dynamic_debug)
From: Jason Baron @ 2011-09-27 13:27 UTC (permalink / raw)
To: David Brown, akpm
Cc: Randy Dunlap, Greg KH, Stephen Rothwell, Bart Van Assche,
linux-next, LKML
In-Reply-To: <20110926231702.GA16827@huya.qualcomm.com>
On Mon, Sep 26, 2011 at 04:17:02PM -0700, David Brown wrote:
> On Wed, Aug 24, 2011 at 02:09:02PM -0700, Greg KH wrote:
> > On Wed, Aug 24, 2011 at 12:42:48PM -0700, Randy Dunlap wrote:
> > > On Wed, 24 Aug 2011 15:32:45 -0400 Jason Baron wrote:
> > >
> > > > On Wed, Aug 24, 2011 at 10:25:51AM -0700, Randy Dunlap wrote:
> > > > > On Wed, 24 Aug 2011 16:04:04 +1000 Stephen Rothwell wrote:
> > > > >
> > > > > > Hi all,
> > > > >
> > > > > When CONFIG_NET is not enabled (I see this on i386 builds):
> > > > >
> > > > > lib/built-in.o: In function `__dynamic_netdev_dbg':
> > > > > (.text+0x9fda): undefined reference to `__netdev_printk'
> > > > >
> > > > > ---
> > > > > ~Randy
> > > > > *** Remember to use Documentation/SubmitChecklist when testing your code ***
> > > >
> > > > Ok, we probably want something, like below, although something keeps
> > > > selecting CONFIG_NET, when I try to unset it, in my .config...so not yet
> > > > tested, but should work.
> > >
> > > Yes, that works. Thanks.
> > >
> > > Acked-by: Randy Dunlap <rdunlap@xenotime.net>
> >
> > Nice.
> >
> > Jason, care to resend this, with a proper signed-off-by, so that I can
> > apply it to fix this build error?
>
> Any status on this, Jason? This seems to still be broken in
> linux-next.
>
> Thanks,
> David
>
Yes, this needs to be resolved asap. I'm sending this to Andrew Morton
b/c these patches have been merged in the -mm tree. I'm guessing
that b/c of the kernel.org outage they aren't showing up in -next? Since
this has dragged on and on, perhaps, those patches can be moved
somewhere else so they can be pulled into -next. Andrew?
Thanks,
-Jason
^ permalink raw reply
* Re: linux-next: manual merge of the rcu tree with Linus' tree
From: Borislav Petkov @ 2011-09-27 13:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Paul E. McKenney, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Hidetoshi Seto, Frederic Weisbecker
In-Reply-To: <20110927151454.9892b23391f20bea20741c21@canb.auug.org.au>
On Tue, Sep 27, 2011 at 01:14:54AM -0400, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in
> arch/x86/kernel/cpu/mcheck/mce.c between commit b77e70bf3535 ("x86, mce:
> Replace MCE_SELF_VECTOR by irq_work") from Linus' tree and commit
> ef14aea88fee ("x86: Call idle notifier after irq_enter()") from the rcu
> tree.
>
> The commit in Linus' tree seem to superced the need for the rcu tree
> patch ... so I effectively dropped the rcu tree change to this file.
Yes, this is correct.
@Frederic, Paul: you guys could probably redo the patch without the
<arch/x86/kernel/cpu/mcheck/mce.c> hunk or leave it like this and let
Linus know about the conflict when sending the pull request during the
merge window...
Thanks.
--
Regards/Gruss,
Boris.
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551
^ permalink raw reply
* Re: linux-next: manual merge of the net tree with the wireless-current tree
From: John W. Linville @ 2011-09-27 13:09 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev, linux-next, linux-kernel, Johannes Berg,
Wey-Yi Guy, Emmanuel Grumbach
In-Reply-To: <20110927125132.002db8176a66f85286dcd027@canb.auug.org.au>
On Tue, Sep 27, 2011 at 12:51:32PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-scan.c between commit 6c80c39d9a69
> ("iwlagn: fix dangling scan request") from the wireless-current tree and
> commits 63013ae30159 ("iwlagn: priv->status moves to iwl_shared") and
> 6ac2f839b0b2 ("iwlagn: priv->mutex moves to iwl_shared") from the net
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good, thanks!
--
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: manual merge of the akpm tree with the tree
From: Frederic Weisbecker @ 2011-09-27 12:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Vaibhav Nagarnaik,
Paul E. McKenney
In-Reply-To: <20110927165920.14b00e8595d10135d2a4397a@canb.auug.org.au>
On Tue, Sep 27, 2011 at 04:59:20PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the scsi-post-merge tree got conflicts in
> arch/x86/kernel/apic/apic.c, arch/x86/kernel/cpu/mcheck/therm_throt.c,
> arch/x86/kernel/cpu/mcheck/threshold.c and arch/x86/kernel/irq.c between
> commit ef14aea88fee ("x86: Call idle notifier after irq_enter()") from
> the rcu tree and commit 6a541324a31f ("The current interrupt traces from
> irq_handler_entry and irq_handler_exit") from the akpm tree.
>
> Just context changes. I fixed them up (see below) and can carry the fixes
> as necessary.
Looks good as well.
Thanks!
^ permalink raw reply
* Re: linux-next: manual merge of the rcu tree with Linus' tree
From: Frederic Weisbecker @ 2011-09-27 12:20 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Paul E. McKenney, linux-next, linux-kernel, Len Brown
In-Reply-To: <20110927160411.7bcec0906847959fb6e88a81@canb.auug.org.au>
On Tue, Sep 27, 2011 at 04:04:11PM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in
> arch/x86/kernel/process_64.c between commit a0bfa1373859 ("cpuidle: stop
> depending on pm_idle") from Linus' tree and commit 18349ca4b42e ("x86:
> Enter rcu extended qs after idle notifier call") from the rcu tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/x86/kernel/process_64.c
> index f693e44,dee2e6c..0000000
> --- a/arch/x86/kernel/process_64.c
> +++ b/arch/x86/kernel/process_64.c
> @@@ -137,8 -136,12 +137,14 @@@ void cpu_idle(void
> enter_idle();
> /* Don't trace irqs off for idle */
> stop_critical_timings();
> - if (cpuidle_idle_call())
> +
> - /* enter_idle() needs rcu for notifiers */
> - rcu_enter_nohz();
> - pm_idle();
> - rcu_exit_nohz();
> ++ if (cpuidle_idle_call()) {
> ++ /* enter_idle() needs rcu for notifiers */
> ++ rcu_enter_nohz();
> + pm_idle();
> ++ rcu_exit_nohz();
> ++ }
> +
> start_critical_timings();
>
> /* In many cases the interrupt that ended idle
Looks good, thanks!
^ permalink raw reply
* linux-next: Tree for Sept 27
From: Stephen Rothwell @ 2011-09-27 7:35 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 25284 bytes --]
Hi all,
The linux-next tree is now available from
git://github.com/sfrothwell/linux-next.git as a temporary measure while
the kernel.org servers are unavailable.
The powerpc allyesconfig build still fails today.
Changes since 20110926:
The arm-soc tree gained a conflict against the arm tree.
The v4l-dvb tree lost its build failure.
The net tree gained a conflict against the wireless-current tree.
The mfd tree gained a conflict against the arm tree.
The trivial tree gained a conflicta against the v4l-dvb tree.
The tip tree gained a conflict against the iommu tree.
The rcu tree gained a conflicts against Linus' tree.
The staging tree gained a conflict against the v4l-dvb tree.
The moduleh tree gained conflicts against the v4l-dvb and mfd trees.
The akpm tree gained conflicts against the rcu and tip trees and I
dropped a couple of patches that have turned up elsewhere.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 199 trees (counting Linus' and 27 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/fixes
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-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 driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
Merging arm-soc/for-next
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x30.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
CONFLICT (delete/modify): arch/arm/mach-nuc93x/Makefile.boot deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-imx/Makefile
Merging linux-spec/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
Merging tegra/for-next
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging quilt/hexagon
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/acpi
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
Merging async_tx/next
Merging net/master
CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-scan.c
CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-pci.c
CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/main.c
Merging bluetooth/master
Merging mtd/master
Merging l2-mtd/master
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
CONFLICT (content): Merge conflict in sound/mips/Kconfig
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
CONFLICT (content): Merge conflict in drivers/mmc/core/sd.c
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/irqs.h
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/fbdev-next
CONFLICT (content): Merge conflict in drivers/video/Kconfig
Merging viafb/viafb-next
Merging omap_dss2/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
CONFLICT (delete/modify): drivers/video/omap/lcd_apollon.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_apollon.c left in tree.
CONFLICT (delete/modify): drivers/video/omap/lcd_ldp.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_ldp.c left in tree.
CONFLICT (delete/modify): drivers/video/omap/lcd_overo.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_overo.c left in tree.
$ git rm -f drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
Merging voltage/for-next
Merging security/next
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging iommu/next
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
CONFLICT (delete/modify): arch/arm/mach-nuc93x/time.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-nuc93x/time.c left in tree.
CONFLICT (content): Merge conflict in drivers/media/video/s5p-fimc/fimc-capture.c
CONFLICT (content): Merge conflict in drivers/net/Kconfig
$ git rm -f arch/arm/mach-nuc93x/time.c
Merging audit/for-next
Merging pm/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging edac-amd/for-next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/iommu/Makefile
Merging rcu/rcu/next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c
Merging kvm/linux-next
CONFLICT (content): Merge conflict in include/linux/kvm.h
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-pvhvm/linux-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
Merging driver-core/driver-core-next
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
Merging tty/tty-next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h
CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c
CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c
CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
$ git rm -f drivers/staging/rtl8192e/r8192E_core.c
Merging bkl-config/config
Merging tmem/tmem
CONFLICT (content): Merge conflict in mm/cleancache.c
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging hwspinlock/linux-next
Merging moduleh/module.h-split
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
CONFLICT (content): Merge conflict in arch/powerpc/mm/tlb_nohash.c
CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
CONFLICT (delete/modify): drivers/mfd/ab3550-core.c deleted in HEAD and modified in moduleh/module.h-split. Version moduleh/module.h-split of drivers/mfd/ab3550-core.c left in tree.
CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-pci.c
CONFLICT (content): Merge conflict in drivers/s390/char/vmur.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
$ git rm -f drivers/mfd/ab3550-core.c
Applying: dm: use export.h instead of module.h where possible
Applying: block: bsg-lib.c needs export.h not module.h
Applying: PM: EXPORT_SYMBOL needs export.h
Applying: bcma: driver_chipcommon_pmu.c needs linux/export.h
Merging kvmtool/master
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master
$ git checkout akpm
Applying: Fix kconfig unmet dependency warning. BACKLIGHT_CLASS_DEVICE depends on
Applying: The parameter's origin type is long. On an i386 architecture, it can
Applying: Since the commit below which added O_PATH support to the *at() calls, the
Applying: Add support for Aspire 1410 BIOS v1.3314. Fixes the following error:
Applying: This makes the iris driver use the platform API, so it is properly exposed
Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
Applying: The x86 timer interrupt handler is the only handler not traced in the
Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
CONFLICT (content): Merge conflict in arch/x86/kernel/apic/apic.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/therm_throt.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/threshold.c
CONFLICT (content): Merge conflict in arch/x86/kernel/irq.c
Applying: Don't allow everybody to use a modem.
Applying: The address limit is already set in flush_old_exec() so this
Applying: A call to va_copy() should always be followed by a call to va_end() in the
Applying: Don't dereference em if it's NULL or an error pointer.
Applying: Some messing with error codes to return 0 on out id's and match
Applying: kbuf is a buffer that is local to this function, so all of the error paths
Applying: fb_set_suspend() must be called with the console semaphore held, which
Applying: hwmon was using an idr with a NULL pointer, so convert to an
Applying: A straightforward looking use of idr for a device id.
Applying: The address limit is already set in flush_old_exec() so this
Applying: The address limit is already set in flush_old_exec() so this
Applying: Add new check (assert_init) to make sure objects are initialized and
Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
Applying: The address limit is already set in flush_old_exec() so those calls to
Applying: The current implementation of dmi_name_in_vendors() is an invitation to
Applying: For headers that get exported to userland and make use of u32 style
Applying: Fix sparse warnings of right shift bigger than source value size:
Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
Applying: Some mangling of errors was necessary to maintain current interface.
Applying: This does involve additional use of the spin lock in idr.c. Is this an
Applying: Instead of open coding this function use kstrtoul_from_user() directly.
Applying: The address limit is already set in flush_old_exec() so this assignment of
Applying: Unbreak the alpha build.
Applying: Unbreak alpha build.
Applying: Unbreak alpha build.
Applying: When we get corruption reports, it's useful to see if the kernel was
Applying: When we get corruption reports, it's useful to see if the kernel was
Applying: The basic idea behind cross memory attach is to allow MPI programs doing
Applying: - Add x86_64 specific wire up
Applying: > You might get some speed benefit by optimising for the small copies
Applying: acct_isolated of compaction uses page_lru_base_type which returns only
Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type. Normally,
Applying: In async mode, compaction doesn't migrate dirty or writeback pages. So,
Applying: In __zone_reclaim case, we don't want to shrink mapped page. Nonetheless,
Applying: unmap_and_move() is one a big messy function. Clean it up.
Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
Applying: per-task block plug can reduce block queue lock contention and increase
Applying: The tracing ring-buffer used this function briefly, but not anymore.
Applying: After selecting a task to kill, the oom killer iterates all processes and
Applying: Add the leading word "tmpfs" to the Kconfig string to make it blindingly
Applying: When we get a bad_page bug report, it's useful to see what modules the
Applying: The nr_force_scan[] tuple holds the effective scan numbers for anon and
Applying: Some kernel components pin user space memory (infiniband and perf) (by
Applying: Add comments to explain the page statistics field in the mm_struct.
Applying: add missing ;
Applying: Testing from the XFS folk revealed that there is still too much I/O from
Applying: Lumpy reclaim worked with two passes - the first which queued pages for IO
Applying: Direct reclaim should never writeback pages. For now, handle the
Applying: Direct reclaim should never writeback pages. Warn if an attempt is made.
Applying: It is preferable that no dirty pages are dispatched for cleaning from the
Applying: Workloads that are allocating frequently and writing files place a large
Applying: When direct reclaim encounters a dirty page, it gets recycled around the
Applying: It's possible a zone watermark is ok when entering the balance_pgdat()
Applying: printk_ratelimit() should not be used, because it shares ratelimiting
Applying: memchr_inv() is mainly used to check whether the whole buffer is filled
Applying: Use newly introduced memchr_inv() for page verification.
Applying: A shrinker function can return -1, means that it cannot do anything
Applying: Use atomic-long operations instead of looping around cmpxchg().
Applying: massage atomic.h inclusions
Applying: The /proc/vmallocinfo shows information about vmalloc allocations in
Applying: Commit 645747462435 ("vmscan: detect mapped file pages used only once")
Applying: Logic added in commit 8cab4754d24a0 ("vmscan: make mapped executable pages
Applying: SPARC32 require access to the start address. Add a new helper
Applying: With the NO_BOOTMEM symbol added architectures may now use the following
Applying: Using "- 1" relies on the old_end to be page aligned and PAGE_SIZE > 1,
Applying: This replaces ptep_clear_flush() with ptep_get_and_clear() and a single
Applying: This adds THP support to mremap (decreases the number of split_huge_page()
Applying: coding-style nitpicking
Applying: Cc: Andrea Arcangeli <aarcange@redhat.com>
Applying: Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applying: vmstat_text is only available when PROC_FS or SYSFS is enabled. This
Applying: reduce ifdeffery
Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applying: Make the security_inode_init_security() initxattrs arg const, to match the
Applying: The current implementation of the /dev/hpet driver couples opening the
Applying: smp_call_function() only lets all other CPUs execute a specific function,
Applying: auto_demotion_disable is called only for online CPUs. For hotplugged
Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
Applying: Strict user copy checks are only really supported on x86_32 even though
Applying: The help text for this config is duplicated across the x86, parisc, and
Applying: s/lib-/obj-/ for usercopy.o
Applying: After an "unexpected" reboot, I found this Oops in my logs:
Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
Applying: Add axis correction for HP EliteBook 2730p.
Applying: Add axis correction for HP EliteBook 8540w.
Applying: Add axis correction for HP ProBook 6555b.
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Change exported functions to use the device given as parameter
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: We are enabling some power features on medfield. To test suspend-2-RAM
Applying: We are enabling some power features on medfield. To test suspend-2-RAM
Applying: We are enabling some power features on medfield. To test suspend-2-RAM
Applying: Cc: Al Viro <viro@zeniv.linux.org.uk>
Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
Applying: include linux/module.h
Applying: The memory for struct led_trigger should be kfreed in the
Applying: Currently termination logic (\0 or \n\0) is hardcoded in _kstrtoull(),
Applying: Add support for slice by 8 to existing crc32 algorithm. Also modify
Applying: don't include asm/msr.h
Applying: epoll can acquire recursively acquire ep->mtx on multiple "struct
Applying: Currently in oprofilefs, files that use ulong_fops mis-handle writes of
Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
Applying: One can get this information from minix/inode.c, but adding the
Applying: The memcg code sometimes uses "struct mem_cgroup *mem" and sometimes uses
Applying: Before calling schedule_timeout(), task state should be changed.
Applying: While back-porting Johannes Weiner's patch "mm: memcg-aware global
Applying: If somebody is touching data too early, it might be easier to diagnose a
Applying: Both mem_cgroup_charge_statistics() and mem_cgroup_move_account() were
Applying: On reading sysctl dirs we should return -EISDIR instead of -EINVAL.
Applying: Force this on for -next/mm testing purposes.
Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
Applying: After merging the akpm tree, today's linux-next build (lost of them)
Applying: The discovered bit in PGCCSR register indicates if the device has been
Applying: Add RapidIO mport driver for IDT TSI721 PCI Express-to-SRIO bridge device.
Applying: When I tried to send a patch to remove it, Andi told me we still need to
Applying: A default echo function has been provided so it is no longer an error when
Applying: This client driver allows you to use a GPIO pin as a source for PPS
Applying: remove unneeded cast of void*
Applying: Straightforward. As an aside, the ida_init calls are not needed as far as
Applying: Simply creates one point to call the w1 interface.
Applying: Adds a nolock function to the w1 interface to avoid locking the
Applying: Fixes the deadlock when inserting and removing the ds2780.
Merging akpm
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Russell King @ 2011-09-27 7:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, linux-next, linux-kernel, Catalin Marinas,
Jon Medhurst
In-Reply-To: <20110927112524.fd0b8f1fe69bc63855ead2d7@canb.auug.org.au>
On Tue, Sep 27, 2011 at 11:25:24AM +1000, Stephen Rothwell wrote:
> Hi Arnd,
>
> [I have a feeling that I may have reported this previously]
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mm/dma-mapping.c between commit e73fc88e19d7 ("ARM: 7059/1:
> LPAE: Use PMD_(SHIFT|SIZE|MASK) instead of PGDIR_*") from the arm tree
> and commit 99d1717dd7fe ("ARM: Add init_consistent_dma_size()") from the
> arm-soc tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
This has happened because I've dropped a large chunk of my tree from the
for-next branch due to some horrible conflicts and some bad workflow
practice in a git tree I recently merged (so this merge which I'd
normally do has been exposed.)
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply
* linux-next: manual merge of the akpm tree with the tip tree
From: Stephen Rothwell @ 2011-09-27 7:13 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Yinghai Lu, Suresh Siddha,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got conflicts in
drivers/iommu/dmar.c and include/linux/dmar.h between commit 318fe7df9d84
("iommu: Move IOMMU specific code to intel-iommu.c") from the tip tree
and commit 432fb2751763 ("When do pci remove/rescan on system that have
more iommus, got") from the akpm tree.
The former moved that code the the latter cares about to another files.
I have dropped this patch from the akpm tree for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the akpm tree with the tree
From: Stephen Rothwell @ 2011-09-27 6:59 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Vaibhav Nagarnaik, Frederic Weisbecker,
Paul E. McKenney
Hi Andrew,
Today's linux-next merge of the scsi-post-merge tree got conflicts in
arch/x86/kernel/apic/apic.c, arch/x86/kernel/cpu/mcheck/therm_throt.c,
arch/x86/kernel/cpu/mcheck/threshold.c and arch/x86/kernel/irq.c between
commit ef14aea88fee ("x86: Call idle notifier after irq_enter()") from
the rcu tree and commit 6a541324a31f ("The current interrupt traces from
irq_handler_entry and irq_handler_exit") from the akpm tree.
Just context changes. I fixed them up (see below) and can carry the fixes
as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/kernel/apic/apic.c
index 4af04d4,0fe559f..0000000
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@@ -857,9 -858,11 +858,11 @@@ void __irq_entry smp_apic_timer_interru
* Besides, if we don't timer interrupts ignore the global
* interrupt lock, which is the WrongThing (tm) to do.
*/
- exit_idle();
irq_enter();
+ exit_idle();
+ trace_irq_vector_entry(LOCAL_TIMER_VECTOR);
local_apic_timer_interrupt();
+ trace_irq_vector_exit(LOCAL_TIMER_VECTOR);
irq_exit();
set_irq_regs(old_regs);
@@@ -1790,8 -1794,9 +1793,9 @@@ void smp_spurious_interrupt(struct pt_r
{
u32 v;
- exit_idle();
irq_enter();
+ exit_idle();
+ trace_irq_vector_entry(SPURIOUS_APIC_VECTOR);
/*
* Check if this really is a spurious interrupt and ACK it
* if it is a vectored one. Just in case...
@@@ -1827,8 -1833,9 +1832,9 @@@ void smp_error_interrupt(struct pt_reg
"Illegal register address", /* APIC Error Bit 7 */
};
- exit_idle();
irq_enter();
+ exit_idle();
+ trace_irq_vector_entry(ERROR_APIC_VECTOR);
/* First tickle the hardware, only then report what went on. -- REW */
v0 = apic_read(APIC_ESR);
apic_write(APIC_ESR, 0);
diff --cc arch/x86/kernel/cpu/mcheck/therm_throt.c
index ce21561,6b7edb5..0000000
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@@ -397,10 -398,12 +398,12 @@@ static void (*smp_thermal_vector)(void
asmlinkage void smp_thermal_interrupt(struct pt_regs *regs)
{
- exit_idle();
irq_enter();
+ exit_idle();
+ trace_irq_vector_entry(THERMAL_APIC_VECTOR);
inc_irq_stat(irq_thermal_count);
smp_thermal_vector();
+ trace_irq_vector_exit(THERMAL_APIC_VECTOR);
irq_exit();
/* Ack only at the end to avoid potential reentry */
ack_APIC_irq();
diff --cc arch/x86/kernel/cpu/mcheck/threshold.c
index aa578ca,ffde17b..0000000
--- a/arch/x86/kernel/cpu/mcheck/threshold.c
+++ b/arch/x86/kernel/cpu/mcheck/threshold.c
@@@ -19,10 -20,12 +20,12 @@@ void (*mce_threshold_vector)(void) = de
asmlinkage void smp_threshold_interrupt(void)
{
- exit_idle();
irq_enter();
+ exit_idle();
+ trace_irq_vector_entry(THRESHOLD_APIC_VECTOR);
inc_irq_stat(irq_threshold_count);
mce_threshold_vector();
+ trace_irq_vector_exit(THRESHOLD_APIC_VECTOR);
irq_exit();
/* Ack only at the end to avoid potential reentry */
ack_APIC_irq();
diff --cc arch/x86/kernel/irq.c
index 5d31e5b,64aad37..0000000
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@@ -209,10 -212,10 +212,9 @@@ void smp_x86_platform_ipi(struct pt_reg
ack_APIC_irq();
- exit_idle();
-
irq_enter();
-
+ exit_idle();
-
+ trace_irq_vector_entry(X86_PLATFORM_IPI_VECTOR);
inc_irq_stat(x86_platform_ipis);
if (x86_platform_ipi_callback)
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the mfd tree
From: Stephen Rothwell @ 2011-09-27 6:29 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Linus Walleij, Samuel Ortiz
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/mfd/ab3550-core.c between commit e085f9a2e27d ("mfd: Delete
ab3550 driver") from the mfd tree and commit afb68c4877b2 ("mfd: Add
module.h to the implicit drivers/mfd users") from the moduleh tree.
The former removes this file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: manual merge of the moduleh tree with the v4l-dvb tree
From: Stephen Rothwell @ 2011-09-27 6:26 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Patrick Boettcher,
Mauro Carvalho Chehab
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/media/dvb/frontends/dibx000_common.c between commit 79fcce3230b1
("[media] DiBcom: protect the I2C bufer access") from the v4l-dvb tree
and commit 32ee0bf69471 ("drivers/media: Add module.h to all files using
it implicitly") from the moduleh tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/media/dvb/frontends/dibx000_common.c
index 774d507,977211f..0000000
--- a/drivers/media/dvb/frontends/dibx000_common.c
+++ b/drivers/media/dvb/frontends/dibx000_common.c
@@@ -1,5 -1,5 +1,6 @@@
#include <linux/i2c.h>
+#include <linux/mutex.h>
+ #include <linux/module.h>
#include "dibx000_common.h"
^ permalink raw reply
* Re: linux-next: manual merge of the mfd tree with the arm tree
From: Stephen Rothwell @ 2011-09-27 6:22 UTC (permalink / raw)
To: Linus Walleij; +Cc: Samuel Ortiz, linux-next, linux-kernel
In-Reply-To: <CAKnu2MoTz5cv9m+x84NeEbO-6YaK0QwwSaHpFwfBWiBG+GrdLw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 423 bytes --]
Hi Linus,
On Tue, 27 Sep 2011 07:52:28 +0200 Linus Walleij <linus.ml.walleij@gmail.com> wrote:
>
> Nothing mentioning the AB3559 should be left after the merge, so the
> IRQ_AB3550_END should be gone.
>
> delete IRQ_AB3550_END and
> #define NR_IRQS IRQ_U300_GPIO_END
OK, I will fix this up tomorrow.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 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