* [PATCH] debugfs: bugfix: include <linux/io.h> in file.c
From: Alessandro Rubini @ 2011-11-21 9:01 UTC (permalink / raw)
To: sfr; +Cc: greg, linux-next, linux-kernel
In-Reply-To: <20111121125703.fbb955c4fc468ba176086168@canb.auug.org.au>
The regs32 machinery uses readl. I forgot the mandatory include
and the code was not compiling on all archs.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
> After merging the driver-core tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> fs/debugfs/file.c: In function 'debugfs_print_regs32':
> fs/debugfs/file.c:560:7: error: implicit declaration of function 'readl' [-
> Werror=implicit-function-declaration]
I'm learning the lesson. I'll be more careful next time.
Sorry for your patience.
/alessandro
fs/debugfs/file.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index fc98ec9..e0a3a59 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -19,6 +19,7 @@
#include <linux/pagemap.h>
#include <linux/namei.h>
#include <linux/debugfs.h>
+#include <linux/io.h>
static ssize_t default_read_file(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
--
1.6.0.2
^ permalink raw reply related
* Re: [PATCH -next] digsig: fix build errors
From: Kasatkin, Dmitry @ 2011-11-21 10:32 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Linux Crypto Mailing List
In-Reply-To: <4EC9EBD2.3040708@xenotime.net>
On Mon, Nov 21, 2011 at 8:12 AM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix build errors by adding kconfig dependency on KEYS:
>
> lib/digsig.c:106:16: error: dereferencing pointer to incomplete type
> lib/digsig.c:107:11: error: dereferencing pointer to incomplete type
> lib/digsig.c:184:14: error: dereferencing pointer to incomplete type
> lib/digsig.c:223:3: error: 'key_ref_t' undeclared (first use in this function)
> lib/digsig.c:223:13: error: expected ';' before 'kref'
> lib/digsig.c:224:3: error: 'kref' undeclared (first use in this function)
> lib/digsig.c:224:3: error: implicit declaration of function 'keyring_search'
> lib/digsig.c:231:3: error: implicit declaration of function 'request_key'
>
> and after changing lib/Kconfig:
> warning: (INTEGRITY_DIGSIG) selects DIGSIG which has unmet direct dependencies (CRYPTO && KEYS)
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> Cc: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
> ---
> lib/Kconfig | 4 ++--
> security/integrity/Kconfig | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> --- next-2011-1121.orig/lib/Kconfig
> +++ next-2011-1121/lib/Kconfig
> @@ -294,10 +294,10 @@ config MPILIB_EXTRA
>
> config DIGSIG
> tristate "In-kernel signature checker"
> - depends on CRYPTO
> + depends on CRYPTO && KEYS
this patch was in /crypto dir before, now it is in /lib...
I think CRYPTO is not needed at all at the moment..
> select MPILIB
> help
> Digital signature verification. Currently only RSA is supported.
> - Implementation is done using GnuPG MPI library
> + Implementation is done using GnuPG MPI library.
>
> endmenu
> --- next-2011-1121.orig/security/integrity/Kconfig
> +++ next-2011-1121/security/integrity/Kconfig
> @@ -5,7 +5,7 @@ config INTEGRITY
>
> config INTEGRITY_DIGSIG
> boolean "Digital signature verification using multiple keyrings"
> - depends on INTEGRITY
> + depends on INTEGRITY && CRYPTO && KEYS
Is it really needed, because 2 lines bellow is "select DIGSIG", which
will depend on KEYS??
> default n
> select DIGSIG
> help
>
Thanks!
^ permalink raw reply
* Re: [PATCH -next] digsig: fix build errors
From: Randy Dunlap @ 2011-11-21 15:52 UTC (permalink / raw)
To: Kasatkin, Dmitry
Cc: Stephen Rothwell, linux-next, LKML, Linux Crypto Mailing List
In-Reply-To: <CALLzPKYmmah9EcXgN2ruRLoFSjV-ozn1pBMans=n2_ouB8Tqsg@mail.gmail.com>
On 11/21/2011 02:32 AM, Kasatkin, Dmitry wrote:
> On Mon, Nov 21, 2011 at 8:12 AM, Randy Dunlap <rdunlap@xenotime.net> wrote:
>> From: Randy Dunlap <rdunlap@xenotime.net>
>>
>> Fix build errors by adding kconfig dependency on KEYS:
>>
>> lib/digsig.c:106:16: error: dereferencing pointer to incomplete type
>> lib/digsig.c:107:11: error: dereferencing pointer to incomplete type
>> lib/digsig.c:184:14: error: dereferencing pointer to incomplete type
>> lib/digsig.c:223:3: error: 'key_ref_t' undeclared (first use in this function)
>> lib/digsig.c:223:13: error: expected ';' before 'kref'
>> lib/digsig.c:224:3: error: 'kref' undeclared (first use in this function)
>> lib/digsig.c:224:3: error: implicit declaration of function 'keyring_search'
>> lib/digsig.c:231:3: error: implicit declaration of function 'request_key'
>>
>> and after changing lib/Kconfig:
>> warning: (INTEGRITY_DIGSIG) selects DIGSIG which has unmet direct dependencies (CRYPTO && KEYS)
>>
>> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
>> Cc: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
>> ---
>> lib/Kconfig | 4 ++--
>> security/integrity/Kconfig | 2 +-
>> 2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> --- next-2011-1121.orig/lib/Kconfig
>> +++ next-2011-1121/lib/Kconfig
>> @@ -294,10 +294,10 @@ config MPILIB_EXTRA
>>
>> config DIGSIG
>> tristate "In-kernel signature checker"
>> - depends on CRYPTO
>> + depends on CRYPTO && KEYS
>
> this patch was in /crypto dir before, now it is in /lib...
> I think CRYPTO is not needed at all at the moment..
>
>
>> select MPILIB
>> help
>> Digital signature verification. Currently only RSA is supported.
>> - Implementation is done using GnuPG MPI library
>> + Implementation is done using GnuPG MPI library.
>>
>> endmenu
>> --- next-2011-1121.orig/security/integrity/Kconfig
>> +++ next-2011-1121/security/integrity/Kconfig
>> @@ -5,7 +5,7 @@ config INTEGRITY
>>
>> config INTEGRITY_DIGSIG
>> boolean "Digital signature verification using multiple keyrings"
>> - depends on INTEGRITY
>> + depends on INTEGRITY && CRYPTO && KEYS
>
> Is it really needed, because 2 lines bellow is "select DIGSIG", which
> will depend on KEYS??
Feel free to fix the build errors any way that you want to do it,
but please get them fixed. Don't leave it as is.
>
>> default n
>> select DIGSIG
>> help
>>
>
> Thanks!
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* eCryptfs tree back on git.kernel.org
From: Tyler Hicks @ 2011-11-21 16:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, ecryptfs
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
Hi Stephen - The eCryptfs devel tree is back on kernel.org. Please track
this branch:
git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
Thanks!
Tyler
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH] dmatest: don't use set_freezable_with_signal()
From: Tejun Heo @ 2011-11-21 18:43 UTC (permalink / raw)
To: Guennadi Liakhovetski, Dan Williams
Cc: Stephen Rothwell, rjw, linux-next, linux-kernel, Vinod Koul,
Nicolas Ferre
Commit 981ed70d8e (dmatest: make dmatest threads freezable) made
dmatest kthread use set_freezable_with_signal(); however, the
interface is scheduled to be removed in the next merge window.
The problem is that unlike userland tasks there's no default place
which handles signal pending state and it isn't clear who owns and/or
is responsible for clearing TIF_SIGPENDING. For example, in the
current code, try_to_freeze() clears TIF_SIGPENDING but it isn't sure
whether it actually owns the TIF_SIGPENDING nor is it race-free -
ie. the task may continue to run with TIF_SIGPENDING set after the
freezable section.
Unfortunately, we don't have wait_for_completion_freezable_timeout().
This patch open codes it and uses wait_event_freezable_timeout()
instead and removes timeout reloading - wait_event_freezable_timeout()
won't return across freezing events (currently racy but fix scheduled)
and timer doesn't decrement while the task is in freezer. Although
this does lose timer-reset-over-freezing, given that timeout is
supposed to be long enough and failure to finish inside is considered
irrecoverable, I don't think this is worth the complexity.
While at it, move completion to outer scope and explain that we're
ignoring dangling pointer problem after timeout. This should give
slightly better chance at avoiding oops after timeout.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Guennadi, Dan, how does this look? If it's okay, do you guys mind
routing this through pm tree? I have some patches stacked on top
removal of freezable_with_signal and it would be much easier to route
these together.
Thank you.
drivers/dma/dmatest.c | 44 ++++++++++++++++++++++++++------------------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index eb1d864..baa6b8d 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -214,9 +214,18 @@ static unsigned int dmatest_verify(u8 **bufs, unsigned int start,
return error_count;
}
-static void dmatest_callback(void *completion)
+/* poor man's completion - we want to use wait_event_freezable() on it */
+struct dmatest_done {
+ bool done;
+ wait_queue_head_t *wait;
+};
+
+static void dmatest_callback(void *arg)
{
- complete(completion);
+ struct dmatest_done *done = arg;
+
+ done->done = true;
+ wake_up_all(done->wait);
}
/*
@@ -235,7 +244,9 @@ static void dmatest_callback(void *completion)
*/
static int dmatest_func(void *data)
{
+ DECLARE_WAIT_QUEUE_HEAD_ONSTACK(done_wait);
struct dmatest_thread *thread = data;
+ struct dmatest_done done = { .wait = &done_wait };
struct dma_chan *chan;
const char *thread_name;
unsigned int src_off, dst_off, len;
@@ -306,9 +317,6 @@ static int dmatest_func(void *data)
struct dma_async_tx_descriptor *tx = NULL;
dma_addr_t dma_srcs[src_cnt];
dma_addr_t dma_dsts[dst_cnt];
- struct completion cmp;
- unsigned long start, tmo, end = 0 /* compiler... */;
- bool reload = true;
u8 align = 0;
total_tests++;
@@ -391,9 +399,9 @@ static int dmatest_func(void *data)
continue;
}
- init_completion(&cmp);
+ done.done = false;
tx->callback = dmatest_callback;
- tx->callback_param = &cmp;
+ tx->callback_param = &done;
cookie = tx->tx_submit(tx);
if (dma_submit_error(cookie)) {
@@ -407,20 +415,20 @@ static int dmatest_func(void *data)
}
dma_async_issue_pending(chan);
- do {
- start = jiffies;
- if (reload)
- end = start + msecs_to_jiffies(timeout);
- else if (end <= start)
- end = start + 1;
- tmo = wait_for_completion_interruptible_timeout(&cmp,
- end - start);
- reload = try_to_freeze();
- } while (tmo == -ERESTARTSYS);
+ wait_event_freezable_timeout(done_wait, done.done,
+ msecs_to_jiffies(timeout));
status = dma_async_is_tx_complete(chan, cookie, NULL, NULL);
- if (tmo == 0) {
+ if (!done.done) {
+ /*
+ * We're leaving the timed out dma operation with
+ * dangling pointer to done_wait. To make this
+ * correct, we'll need to allocate wait_done for
+ * each test iteration and perform "who's gonna
+ * free it this time?" dancing. For now, just
+ * leave it dangling.
+ */
pr_warning("%s: #%u: test timed out\n",
thread_name, total_tests - 1);
failed_tests++;
^ permalink raw reply related
* Re: [PATCH] dmatest: don't use set_freezable_with_signal()
From: Tejun Heo @ 2011-11-21 18:49 UTC (permalink / raw)
To: Guennadi Liakhovetski, Dan Williams
Cc: Stephen Rothwell, rjw, linux-next, linux-kernel, Vinod Koul,
Nicolas Ferre
In-Reply-To: <20111121184316.GH15314@google.com>
On Mon, Nov 21, 2011 at 10:43:16AM -0800, Tejun Heo wrote:
> Commit 981ed70d8e (dmatest: make dmatest threads freezable) made
> dmatest kthread use set_freezable_with_signal(); however, the
> interface is scheduled to be removed in the next merge window.
>
> The problem is that unlike userland tasks there's no default place
> which handles signal pending state and it isn't clear who owns and/or
> is responsible for clearing TIF_SIGPENDING. For example, in the
> current code, try_to_freeze() clears TIF_SIGPENDING but it isn't sure
> whether it actually owns the TIF_SIGPENDING nor is it race-free -
> ie. the task may continue to run with TIF_SIGPENDING set after the
> freezable section.
>
> Unfortunately, we don't have wait_for_completion_freezable_timeout().
> This patch open codes it and uses wait_event_freezable_timeout()
> instead and removes timeout reloading - wait_event_freezable_timeout()
> won't return across freezing events (currently racy but fix scheduled)
> and timer doesn't decrement while the task is in freezer. Although
> this does lose timer-reset-over-freezing, given that timeout is
> supposed to be long enough and failure to finish inside is considered
> irrecoverable, I don't think this is worth the complexity.
>
> While at it, move completion to outer scope and explain that we're
> ignoring dangling pointer problem after timeout. This should give
> slightly better chance at avoiding oops after timeout.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> Guennadi, Dan, how does this look? If it's okay, do you guys mind
> routing this through pm tree? I have some patches stacked on top
> removal of freezable_with_signal and it would be much easier to route
> these together.
Ooh, forgot to mention that it's only compile tested.
Thanks.
--
tejun
^ permalink raw reply
* [PATCH UPDATED] dmatest: don't use set_freezable_with_signal()
From: Tejun Heo @ 2011-11-21 19:20 UTC (permalink / raw)
To: Guennadi Liakhovetski, Dan Williams
Cc: Stephen Rothwell, rjw, linux-next, linux-kernel, Vinod Koul,
Nicolas Ferre
In-Reply-To: <20111121184316.GH15314@google.com>
Commit 981ed70d8e (dmatest: make dmatest threads freezable) made
dmatest kthread use set_freezable_with_signal(); however, the
interface is scheduled to be removed in the next merge window.
The problem is that unlike userland tasks there's no default place
which handles signal pending state and it isn't clear who owns and/or
is responsible for clearing TIF_SIGPENDING. For example, in the
current code, try_to_freeze() clears TIF_SIGPENDING but it isn't sure
whether it actually owns the TIF_SIGPENDING nor is it race-free -
ie. the task may continue to run with TIF_SIGPENDING set after the
freezable section.
Unfortunately, we don't have wait_for_completion_freezable_timeout().
This patch open codes it and uses wait_event_freezable_timeout()
instead and removes timeout reloading - wait_event_freezable_timeout()
won't return across freezing events (currently racy but fix scheduled)
and timer doesn't decrement while the task is in freezer. Although
this does lose timer-reset-over-freezing, given that timeout is
supposed to be long enough and failure to finish inside is considered
irrecoverable, I don't think this is worth the complexity.
While at it, move completion to outer scope and explain that we're
ignoring dangling pointer problem after timeout. This should give
slightly better chance at avoiding oops after timeout.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Oops, forgot to replace set_freezable_with_signal() with
set_freezable(). Updated.
Thank you.
drivers/dma/dmatest.c | 46 +++++++++++++++++++++++++++-------------------
1 file changed, 27 insertions(+), 19 deletions(-)
Index: work/drivers/dma/dmatest.c
===================================================================
--- work.orig/drivers/dma/dmatest.c
+++ work/drivers/dma/dmatest.c
@@ -214,9 +214,18 @@ static unsigned int dmatest_verify(u8 **
return error_count;
}
-static void dmatest_callback(void *completion)
+/* poor man's completion - we want to use wait_event_freezable() on it */
+struct dmatest_done {
+ bool done;
+ wait_queue_head_t *wait;
+};
+
+static void dmatest_callback(void *arg)
{
- complete(completion);
+ struct dmatest_done *done = arg;
+
+ done->done = true;
+ wake_up_all(done->wait);
}
/*
@@ -235,7 +244,9 @@ static void dmatest_callback(void *compl
*/
static int dmatest_func(void *data)
{
+ DECLARE_WAIT_QUEUE_HEAD_ONSTACK(done_wait);
struct dmatest_thread *thread = data;
+ struct dmatest_done done = { .wait = &done_wait };
struct dma_chan *chan;
const char *thread_name;
unsigned int src_off, dst_off, len;
@@ -252,7 +263,7 @@ static int dmatest_func(void *data)
int i;
thread_name = current->comm;
- set_freezable_with_signal();
+ set_freezable();
ret = -ENOMEM;
@@ -306,9 +317,6 @@ static int dmatest_func(void *data)
struct dma_async_tx_descriptor *tx = NULL;
dma_addr_t dma_srcs[src_cnt];
dma_addr_t dma_dsts[dst_cnt];
- struct completion cmp;
- unsigned long start, tmo, end = 0 /* compiler... */;
- bool reload = true;
u8 align = 0;
total_tests++;
@@ -391,9 +399,9 @@ static int dmatest_func(void *data)
continue;
}
- init_completion(&cmp);
+ done.done = false;
tx->callback = dmatest_callback;
- tx->callback_param = &cmp;
+ tx->callback_param = &done;
cookie = tx->tx_submit(tx);
if (dma_submit_error(cookie)) {
@@ -407,20 +415,20 @@ static int dmatest_func(void *data)
}
dma_async_issue_pending(chan);
- do {
- start = jiffies;
- if (reload)
- end = start + msecs_to_jiffies(timeout);
- else if (end <= start)
- end = start + 1;
- tmo = wait_for_completion_interruptible_timeout(&cmp,
- end - start);
- reload = try_to_freeze();
- } while (tmo == -ERESTARTSYS);
+ wait_event_freezable_timeout(done_wait, done.done,
+ msecs_to_jiffies(timeout));
status = dma_async_is_tx_complete(chan, cookie, NULL, NULL);
- if (tmo == 0) {
+ if (!done.done) {
+ /*
+ * We're leaving the timed out dma operation with
+ * dangling pointer to done_wait. To make this
+ * correct, we'll need to allocate wait_done for
+ * each test iteration and perform "who's gonna
+ * free it this time?" dancing. For now, just
+ * leave it dangling.
+ */
pr_warning("%s: #%u: test timed out\n",
thread_name, total_tests - 1);
failed_tests++;
^ permalink raw reply
* Re: eCryptfs tree back on git.kernel.org
From: Stephen Rothwell @ 2011-11-21 21:22 UTC (permalink / raw)
To: Tyler Hicks; +Cc: linux-next, ecryptfs
In-Reply-To: <20111121161607.GC2830@boyd>
[-- Attachment #1: Type: text/plain, Size: 448 bytes --]
Hi Tyler,
On Mon, 21 Nov 2011 10:16:08 -0600 Tyler Hicks <tyhicks@canonical.com> wrote:
>
> Hi Stephen - The eCryptfs devel tree is back on kernel.org. Please track
> this branch:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
OK, I have switched to that, now. I also changed your contact address.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: failure to fetch the cpufreq tree
From: Stephen Rothwell @ 2011-11-21 23:57 UTC (permalink / raw)
To: Dave Jones; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
Hi Dave,
Fetching the cpufreq tree produces this error:
fatal: Couldn't find remote ref refs/heads/next
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: failure to fetch the cpufreq tree
From: Dave Jones @ 2011-11-22 0:23 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20111122105756.08df5d9306102fc31e33dec7@canb.auug.org.au>
On Tue, Nov 22, 2011 at 10:57:56AM +1100, Stephen Rothwell wrote:
> Hi Dave,
>
> Fetching the cpufreq tree produces this error:
>
> fatal: Couldn't find remote ref refs/heads/next
Yeah, I've got nothing queued up for 3.3 yet.
I can push out an empty branch for you if that appeases your scripts ?
Dave
^ permalink raw reply
* linux-next: manual merge of the arm-lpae tree with the arm tree
From: Stephen Rothwell @ 2011-11-22 1:03 UTC (permalink / raw)
To: Catalin Marinas; +Cc: linux-next, linux-kernel, Nicolas Pitre, Russell King
[-- Attachment #1: Type: text/plain, Size: 2968 bytes --]
Hi Catalin,
Today's linux-next merge of the arm-lpae tree got a conflict in
arch/arm/mm/ioremap.c between commit 3afb51f744b6 ("ARM: add generic
ioremap optimization by reusing static mappings") from the arm tree and
commit ec93d80c4b07 ("ARM: LPAE: Page table maintenance for the 3-level
format") from the arm-lpae tree.
I guessed (probably incorrectly) about the fix up (see below). Please
supply a better fix if necessary.
More generally, is the LPAE stuff going to be merged soon? The above
arm-lpae commit dates from February (though it was recommitted on Nov
15) ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mm/ioremap.c
index 12c7ad2,d1f78ba..0000000
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@@ -194,7 -208,14 +202,8 @@@ void __iomem * __arm_ioremap_pfn_caller
*/
if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))
return NULL;
+ #endif
- /*
- * Don't allow RAM to be mapped - this causes problems with ARMv6+
- */
- if (WARN_ON(pfn_valid(pfn)))
- return NULL;
-
type = get_mem_type(mtype);
if (!type)
return NULL;
@@@ -329,34 -322,28 +338,34 @@@ __arm_ioremap_exec(unsigned long phys_a
void __iounmap(volatile void __iomem *io_addr)
{
void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr);
-#if !defined(CONFIG_SMP) && !defined(CONFIG_ARM_LPAE)
- struct vm_struct **p, *tmp;
+ struct vm_struct *vm;
- /*
- * If this is a section based mapping we need to handle it
- * specially as the VM subsystem does not know how to handle
- * such a beast. We need the lock here b/c we need to clear
- * all the mappings before the area can be reclaimed
- * by someone else.
- */
- write_lock(&vmlist_lock);
- for (p = &vmlist ; (tmp = *p) ; p = &tmp->next) {
- if ((tmp->flags & VM_IOREMAP) && (tmp->addr == addr)) {
- if (tmp->flags & VM_ARM_SECTION_MAPPING) {
- unmap_area_sections((unsigned long)tmp->addr,
- tmp->size);
- }
+ read_lock(&vmlist_lock);
+ for (vm = vmlist; vm; vm = vm->next) {
+ if (vm->addr > addr)
+ break;
+ if (!(vm->flags & VM_IOREMAP))
+ continue;
+ /* If this is a static mapping we must leave it alone */
+ if ((vm->flags & VM_ARM_STATIC_MAPPING) &&
+ (vm->addr <= addr) && (vm->addr + vm->size > addr)) {
+ read_unlock(&vmlist_lock);
+ return;
+ }
- #ifndef CONFIG_SMP
++#if !defined(CONFIG_SMP) && !defined(CONFIG_ARM_LPAE)
+ /*
+ * If this is a section based mapping we need to handle it
+ * specially as the VM subsystem does not know how to handle
+ * such a beast.
+ */
+ if ((vm->addr == addr) &&
+ (vm->flags & VM_ARM_SECTION_MAPPING)) {
+ unmap_area_sections((unsigned long)vm->addr, vm->size);
break;
}
- }
- write_unlock(&vmlist_lock);
#endif
+ }
+ read_unlock(&vmlist_lock);
vunmap(addr);
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the at91 tree with the arm tree
From: Stephen Rothwell @ 2011-11-22 1:19 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD, Nicolas Ferre
Cc: linux-next, linux-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 5435 bytes --]
Hi all,
Today's linux-next merge of the at91 tree got conflicts in
arch/arm/mach-at91/at91cap9.c, arch/arm/mach-at91/at91sam9260.c,
arch/arm/mach-at91/at91sam9261.c, arch/arm/mach-at91/at91sam9263.c,
arch/arm/mach-at91/at91sam9g45.c and arch/arm/mach-at91/at91sam9rl.c
between commit b91dfe91bb61 ("ARM: restart: at91: use new restart hook")
from the arm tree and commit 92996c285e17 ("ARM: at91: make shutdown
controler soc independent") from the at91 tree.
Just context changes. I fixed it up (see below) and can carry the fixes
as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-at91/at91cap9.c
index 2937339,81a9f38..0000000
--- a/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@@ -333,10 -326,16 +326,16 @@@ static void __init at91cap9_map_io(void
at91_init_sram(0, AT91CAP9_SRAM_BASE, AT91CAP9_SRAM_SIZE);
}
+ static void __init at91cap9_ioremap_registers(void)
+ {
+ at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC);
+ at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT);
+ at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC);
+ }
+
static void __init at91cap9_initialize(void)
{
- at91_arch_reset = at91cap9_reset;
+ arm_pm_restart = at91cap9_restart;
- pm_power_off = at91cap9_poweroff;
at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
/* Register GPIO subsystem */
diff --cc arch/arm/mach-at91/at91sam9260.c
index ec9e23d,5e25cef..0000000
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@@ -325,10 -318,16 +318,16 @@@ static void __init at91sam9260_map_io(v
}
}
+ static void __init at91sam9260_ioremap_registers(void)
+ {
+ at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC);
+ at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);
+ at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);
+ }
+
static void __init at91sam9260_initialize(void)
{
- at91_arch_reset = at91sam9_alt_reset;
+ arm_pm_restart = at91sam9_alt_restart;
- pm_power_off = at91sam9260_poweroff;
at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
| (1 << AT91SAM9260_ID_IRQ2);
diff --cc arch/arm/mach-at91/at91sam9261.c
index 19ac7c0,a0538c5..0000000
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@@ -285,10 -278,16 +278,16 @@@ static void __init at91sam9261_map_io(v
at91_init_sram(0, AT91SAM9261_SRAM_BASE, AT91SAM9261_SRAM_SIZE);
}
+ static void __init at91sam9261_ioremap_registers(void)
+ {
+ at91_ioremap_shdwc(AT91SAM9261_BASE_SHDWC);
+ at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);
+ at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);
+ }
+
static void __init at91sam9261_initialize(void)
{
- at91_arch_reset = at91sam9_alt_reset;
+ arm_pm_restart = at91sam9_alt_restart;
- pm_power_off = at91sam9261_poweroff;
at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)
| (1 << AT91SAM9261_ID_IRQ2);
diff --cc arch/arm/mach-at91/at91sam9263.c
index 50d0163,0d90b6a..0000000
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@@ -303,10 -296,17 +296,17 @@@ static void __init at91sam9263_map_io(v
at91_init_sram(1, AT91SAM9263_SRAM1_BASE, AT91SAM9263_SRAM1_SIZE);
}
+ static void __init at91sam9263_ioremap_registers(void)
+ {
+ at91_ioremap_shdwc(AT91SAM9263_BASE_SHDWC);
+ at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT);
+ at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0);
+ at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);
+ }
+
static void __init at91sam9263_initialize(void)
{
- at91_arch_reset = at91sam9_alt_reset;
+ arm_pm_restart = at91sam9_alt_restart;
- pm_power_off = at91sam9263_poweroff;
at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1);
/* Register GPIO subsystem */
diff --cc arch/arm/mach-at91/at91sam9g45.c
index ff21f7a,72c3cce..0000000
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@@ -338,10 -331,16 +331,16 @@@ static void __init at91sam9g45_map_io(v
init_consistent_dma_size(SZ_4M);
}
+ static void __init at91sam9g45_ioremap_registers(void)
+ {
+ at91_ioremap_shdwc(AT91SAM9G45_BASE_SHDWC);
+ at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT);
+ at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC);
+ }
+
static void __init at91sam9g45_initialize(void)
{
- at91_arch_reset = at91sam9g45_reset;
+ arm_pm_restart = at91sam9g45_restart;
- pm_power_off = at91sam9g45_poweroff;
at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0);
/* Register GPIO subsystem */
diff --cc arch/arm/mach-at91/at91sam9rl.c
index 61cbb46,96247f6..0000000
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@@ -290,10 -283,16 +283,16 @@@ static void __init at91sam9rl_map_io(vo
at91_init_sram(0, AT91SAM9RL_SRAM_BASE, sram_size);
}
+ static void __init at91sam9rl_ioremap_registers(void)
+ {
+ at91_ioremap_shdwc(AT91SAM9RL_BASE_SHDWC);
+ at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT);
+ at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC);
+ }
+
static void __init at91sam9rl_initialize(void)
{
- at91_arch_reset = at91sam9_alt_reset;
+ arm_pm_restart = at91sam9_alt_restart;
- pm_power_off = at91sam9rl_poweroff;
at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0);
/* Register GPIO subsystem */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the at91 tree with the arm tree
From: Stephen Rothwell @ 2011-11-22 1:22 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD, Nicolas Ferre
Cc: linux-next, linux-kernel, Nicolas Pitre, Russell King
[-- Attachment #1: Type: text/plain, Size: 1387 bytes --]
Hi all,
Today's linux-next merge of the at91 tree got a conflict in
arch/arm/mach-at91/setup.c between commit cf48c02e3bf0 ("ARM: mach-at91:
remove arch specific special handling for ioremap") from the arm tree and
commit 6a5f01336ed8 ("ARM: at91: make DBGU soc independent") from the
at91 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 arch/arm/mach-at91/setup.c
index cf98a8f,3c309dc..0000000
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@@ -73,9 -75,24 +75,6 @@@ static struct map_desc at91_io_desc __i
.type = MT_DEVICE,
};
- #define AT91_DBGU0 0xfffff200
- #define AT91_DBGU1 0xffffee00
-
-void __iomem *at91_ioremap(unsigned long p, size_t size, unsigned int type)
-{
- if (p >= AT91_BASE_SYS && p <= (AT91_BASE_SYS + SZ_16K - 1))
- return (void __iomem *)AT91_IO_P2V(p);
-
- return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));
-}
-EXPORT_SYMBOL(at91_ioremap);
-
-void at91_iounmap(volatile void __iomem *addr)
-{
- unsigned long virt = (unsigned long)addr;
-
- if (virt >= VMALLOC_START && virt < VMALLOC_END)
- __iounmap(addr);
-}
-EXPORT_SYMBOL(at91_iounmap);
-
static void __init soc_detect(u32 dbgu_base)
{
u32 cidr, socid;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the s5p tree with the arm tree
From: Stephen Rothwell @ 2011-11-22 2:01 UTC (permalink / raw)
To: Kukjin Kim
Cc: linux-next, linux-kernel, Marc Zyngier, Russell King,
Thomas Abraham
[-- Attachment #1: Type: text/plain, Size: 2008 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-exynos/cpu.c between commit db0d4db22a78 ("ARM: gic: allow
GIC to support non-banked setups") from the tree and commit fae3f1696b33
("ARM: EXYNOS: Enable conversion of GIC dt irq specifier to linux virq")
from the s5p 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/arm/mach-exynos/cpu.c
index 6e34485,8e09f34..0000000
--- a/arch/arm/mach-exynos/cpu.c
+++ b/arch/arm/mach-exynos/cpu.c
@@@ -206,6 -231,24 +230,13 @@@ void __init exynos4_init_clocks(int xta
exynos4_setup_clocks();
}
-static void exynos4_gic_irq_fix_base(struct irq_data *d)
-{
- struct gic_chip_data *gic_data = irq_data_get_irq_chip_data(d);
-
- gic_data->cpu_base = S5P_VA_GIC_CPU +
- (gic_bank_offset * smp_processor_id());
-
- gic_data->dist_base = S5P_VA_GIC_DIST +
- (gic_bank_offset * smp_processor_id());
-}
-
+ #ifdef CONFIG_OF
+ static const struct of_device_id exynos4_dt_irq_match[] = {
+ { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
+ {},
+ };
+ #endif
+
void __init exynos4_init_irq(void)
{
int irq;
@@@ -213,8 -255,17 +244,13 @@@
gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;
- gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset);
+ if (!of_have_populated_dt())
- gic_init(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);
++ gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset);
+ #ifdef CONFIG_OF
+ else
+ of_irq_init(exynos4_dt_irq_match);
+ #endif
- gic_arch_extn.irq_eoi = exynos4_gic_irq_fix_base;
- gic_arch_extn.irq_unmask = exynos4_gic_irq_fix_base;
- gic_arch_extn.irq_mask = exynos4_gic_irq_fix_base;
-
for (irq = 0; irq < MAX_COMBINER_NR; irq++) {
combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the s5p tree with the arm tree
From: Stephen Rothwell @ 2011-11-22 2:05 UTC (permalink / raw)
To: Kukjin Kim
Cc: linux-next, linux-kernel, Marc Zyngier, Russell King,
Thomas Abraham
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-exynos/include/mach/entry-macro.S between commit
4e44d2cb95bd ("ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER") from
the arm tree and commit 3a7c87154294 ("ARM: SAMSUNG: Move timer irq numbers
to end of linux irq space") from the s5p tree.
The former removed the code modified by the latter, 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: 836 bytes --]
^ permalink raw reply
* Re: linux-next: failure to fetch the cpufreq tree
From: Stephen Rothwell @ 2011-11-22 2:10 UTC (permalink / raw)
To: Dave Jones; +Cc: linux-next, linux-kernel
In-Reply-To: <20111122002322.GA5740@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 418 bytes --]
Hi Dave,
On Mon, 21 Nov 2011 19:23:22 -0500 Dave Jones <davej@redhat.com> wrote:
>
> Yeah, I've got nothing queued up for 3.3 yet.
> I can push out an empty branch for you if that appeases your scripts ?
Thanks, that would mean one less error message for me to waste (limited) brain
power on. :-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the wireless-next tree with Linus' tree
From: Stephen Rothwell @ 2011-11-22 3:20 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Paul Gortmaker, Stanislaw Gruszka
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlegacy/iwl-tx.c
drivers/net/wireless/iwlegacy/iwl-scan.c
drivers/net/wireless/iwlegacy/iwl-rx.c
drivers/net/wireless/iwlegacy/iwl-debugfs.c between commit ee40fa0656a7
("drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE")
from Linus' tree and various commits from the wireless-next tree that
renamed/merged these files.
I just removed these files. Though someone should check to see if the
new files need export.h or module.h.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build warning after merge of the wireless-next tree
From: Stephen Rothwell @ 2011-11-22 3:25 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Paul Gortmaker, Stanislaw Gruszka
[-- Attachment #1: Type: text/plain, Size: 1063 bytes --]
Hi John,
After merging the wireless-next tree, today's linux-next build
(x86_64_allmodconfig) produced this warning:
drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/iwlegacy/debug.c:1410:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/iwlegacy/debug.c:1410:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/iwlegacy/debug.c:1410:1: warning: parameter names (without types) in function declaration [enabled by default]
This indicates that this file needs to include export.h.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the wireless-next tree
From: Stephen Rothwell @ 2011-11-22 3:35 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Stanislaw Gruszka
[-- Attachment #1: Type: text/plain, Size: 683 bytes --]
Hi John,
After merging the wireless-next tree, today's linux-next build
(x86_64_allmodconfig) failed like this:
ERROR: "il_dbgfs_unregister" [drivers/net/wireless/iwlegacy/iwl4965.ko] undefined!
ERROR: "il_dbgfs_register" [drivers/net/wireless/iwlegacy/iwl4965.ko] undefined!
ERROR: "il_dbgfs_unregister" [drivers/net/wireless/iwlegacy/iwl3945.ko] undefined!
ERROR: "il_dbgfs_register" [drivers/net/wireless/iwlegacy/iwl3945.ko] undefined!
Presumably caused by the large cleanup of iwlegacy.
I have used the wireless-next tree from next-20111121 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the akpm tree with the arm tree
From: Stephen Rothwell @ 2011-11-22 6:17 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Nicolas Pitre, Russell King
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in mm/vmalloc.c
between commit be9b7335e706 ("mm: add vm_area_add_early()") from the arm
tree and commit "mm: add vm_area_add_early()" from the akpm tree.
These are clearly meant to be the same patch, so I dropped the version
from the akpm tree. (The arm version has a "BUG_ON(vmap_initialized);"
at the start of vm_area_add_early()).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: Tree for Nov 22
From: Stephen Rothwell @ 2011-11-22 7:23 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 30428 bytes --]
Hi all,
Changes since 20111121:
The arm-lpae tree gained a conflict against the arm tree.
The at91 tree gained conflicts against the arm tree.
The s5p tree gained conflicts against the arm tree.
The drm tree still had its build failure so I used the version from
next-20111115.
The net-next tree lost its conflicts.
The wireless-next tree gained a conflicts against Linus' tree and a build
failure so I used the version from next-20111121.
The driver-core tree still has its build failure so I used the version from
next-20111118.
I removed a patch from the akpm tree that turned up in the arm 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/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 195 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 (f8f5ed7 Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging fixes/master (3155521 Revert "hvc_console: display printk messages on console.")
Merging kbuild-current/rc-fixes (44656fa kbuild: Fix missing system calls check on mips.)
Merging arm-current/fixes (53cbcbc ARM: 7166/1: Use PMD_SHIFT instead of PGDIR_SHIFT in dma-consistent.c)
Merging m68k-current/for-linus (2690e21 m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
Merging powerpc-merge/merge (a313f4c powerpc/signal32: Fix sigset_t conversion when copying to user)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (0b64120 sparc64: Patch sun4v code sequences properly on module load.)
Merging scsi-rc-fixes/master (e5a44df [SCSI] hpsa: Disable ASPM)
Merging net/master (f23aa62 caif: fix endian conversion in cffrml_transmit())
Merging sound-current/for-linus (27533df ALSA: cs5535 - Fix an endianness conversion)
Merging pci-current/for-linus (4cac2eb PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs)
Merging wireless/master (40f9cd2 prism54: potential memory corruption in prism54_get_essid())
Merging driver-core.current/driver-core-linus (91a13c2 drivers/base/node.c: fix compilation error with older versions of gcc)
Merging tty.current/tty-linus (0c73c08 TTY: ldisc, wait for ldisc infinitely in hangup)
Merging usb.current/usb-linus (b1ffb4c USB: Fix Corruption issue in USB ftdi driver ftdi_sio.c)
Merging staging.current/staging-linus (c9fb041 staging: fix more ET131X build errors)
Merging char-misc.current/char-misc-linus (6ac2afb misc: ad525x_dpot: Fix AD8400 spi transfer size.)
Merging cpufreq-current/fixes (eb0b38a [CPUFREQ] db8500: fix build error due to undeclared i variable)
Merging input-current/for-linus (77f6ca5 Input: ams_delta_serio - include linux/module.h)
Merging md-current/for-linus (257a4b4 md/raid5: STRIPE_ACTIVE has lock semantics, add barriers)
Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
Merging crypto-current/master (2742528 crypto: mv_cesa - fix hashing of chunks > 1920 bytes)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c)
Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support)
Merging devicetree-current/devicetree/merge (50e07f8 dt: add empty of_machine_is_compatible)
Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging arm/for-next (756fc4f Merge branch 'restart' into for-next)
Merging arm-lpae/for-next (bba902c ARM: LPAE: Add the Kconfig entries)
CONFLICT (content): Merge conflict in arch/arm/mm/ioremap.c
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
Merging arm-soc/for-next (3155521 Revert "hvc_console: display printk messages on console.")
Merging at91/at91-next (de21d1d ARM: at91: pm_slowclock rename register to named define)
CONFLICT (content): Merge conflict in arch/arm/mach-at91/setup.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9rl.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9261.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master)
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/devices-imx53.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/clock-mx51-mx53.c
Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux)
Merging omap/for-next (322a8b0 Linux 3.1-rc1)
Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (a188e1e Merge branch 'next-samsung-devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/include/mach/entry-macro.S
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpu.c
Merging tegra/for-next (b48c54e Merge branch 'for-3.3/boards' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (9059054 blackfin: Fixup export.h includes)
Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (cfcfc9e Linux 3.2-rc2)
Merging ia64/next (2174f6d pstore: gracefully handle NULL pstore_info functions)
Merging m68k/for-next (9e9ceea m68k: Don't comment out syscalls used by glibc)
Merging m68knommu/for-next (27f8c15 m68knommu: fix ColdFire slice timer to handle clock counter wrapping)
CONFLICT (content): Merge conflict in arch/m68k/Kconfig.debug
Merging microblaze/next (7f80850 Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh)
Merging mips/mips-for-linux-next (4954840 Merge branches 'ar7-for-next', 'ath79-for-next', 'bcm63xx-for-next', 'bmips', 'cavium-for-next', 'kprobes-for-next' and 'raza-for-next' into mips-for-linux-next)
Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
Merging powerpc/next (96cc017 powerpc/p3060qds: Add support for P3060QDS board)
Merging 4xx/next (9fcd768 powerpc/40x: Remove obsolete HCU4 board)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (4022ded powerpc/85xx: Update SRIO device tree nodes)
Merging s390/features (100683e [S390] topology: cleanup z10 topology handling)
Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest)
Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest)
Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net)
Merging tile/master (1583171 Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile)
Merging unicore32/unicore32 (ed96dfb unicore32, exec: remove redundant set_fs(USER_DS))
Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
Merging ceph/for-next (3395734 libceph: fix double-free of page vector)
Merging cifs/master (9c32c63 cifs: Fix sparse warning when calling cifs_strtoUCS)
Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy)
Merging ecryptfs/next (aaef29d eCryptfs: Flush file in vma close)
Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling)
Merging ext4/dev (6e58ad6 ext4: fix up a undefined error in ext4_free_blocks in debugging code)
Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
Merging fuse/for-next (cfcfc9e Linux 3.2-rc2)
Merging gfs2/master (b3e47ca GFS2: split function rgblk_search)
Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors)
Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes)
Merging logfs/master (011a85a logfs: Prevent memory corruption)
CONFLICT (content): Merge conflict in fs/logfs/file.c
Merging nfs/linux-next (62e4a76 NFS: Revert pnfs ugliness from the generic NFS read code path)
Merging nfsd/nfsd-next (353de31 nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error)
Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
Merging ocfs2/linux-next (249ec93 ocfs2: Use filemap_write_and_wait() instead of write_inode_now())
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K)
Merging v9fs/for-next (14211d0 9p: fix 9p.txt to advertise msize instead of maxdata)
Merging ubifs/linux-next (7606f85 UBIFS: fix the dark space calculation)
Merging xfs/master (c889132 MAINTAINERS: update XFS maintainer entry)
Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check)
Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again)
Merging pci/linux-next (cfbf1bd PCI: msi: Disable msi interrupts when we initialize a pci device)
Merging hid/for-next (f357a38 Merge branch 'upstream' into for-next)
Merging quilt/i2c (7ed4742 i2c: Delete ANY_I2C_BUS)
Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge)
CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
Merging quilt/jdelvare-hwmon (dda4fa1 hwmon: (lm63) Add support for LM96163)
Merging hwmon-staging/hwmon-next (3627902 hwmon: (exynos4_tmu) Fix Kconfig dependency)
Merging quilt/kernel-doc (c3b92c8 Linux 3.1)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
Merging v4l-dvb/master (eeff030 Merge branch 'poll-pwc' of /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in drivers/staging/media/as102/as102_drv.h
Merging kbuild/for-next (ddb550d Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (3fab0c1 ahci: start engine only during soft/hard resets)
Merging infiniband/for-next (042f36e IB/qib: Don't use schedule_work())
Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next)
Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand")
Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization)
Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2)
Merging dlm/next (9beb3bf dlm: convert rsb list to rb_tree)
Merging scsi/master (f7c9c6b [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev)
Merging target-updates/for-next (5bda90c target: use ->exectute_task for all CDB emulation)
Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1)
Merging slave-dma/next (ca21a14 dmaengine: add CSR SiRFprimaII DMAC driver)
CONFLICT (content): Merge conflict in drivers/dma/pl330.c
Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
Merging net-next/master (a2d7ec5 netfilter: use jump_label for nf_hooks)
Merging wireless-next/master (30be52e mac80211: fix RCU warnings in mesh)
CONFLICT (modify/delete): drivers/net/wireless/iwlegacy/iwl-tx.c deleted in wireless-next/master and modified in HEAD. Version HEAD of drivers/net/wireless/iwlegacy/iwl-tx.c left in tree.
CONFLICT (modify/delete): drivers/net/wireless/iwlegacy/iwl-scan.c deleted in wireless-next/master and modified in HEAD. Version HEAD of drivers/net/wireless/iwlegacy/iwl-scan.c left in tree.
CONFLICT (modify/delete): drivers/net/wireless/iwlegacy/iwl-rx.c deleted in wireless-next/master and modified in HEAD. Version HEAD of drivers/net/wireless/iwlegacy/iwl-rx.c left in tree.
CONFLICT (modify/delete): drivers/net/wireless/iwlegacy/iwl-debugfs.c deleted in wireless-next/master and modified in HEAD. Version HEAD of drivers/net/wireless/iwlegacy/iwl-debugfs.c left in tree.
$ git rm -f drivers/net/wireless/iwlegacy/iwl-tx.c drivers/net/wireless/iwlegacy/iwl-scan.c drivers/net/wireless/iwlegacy/iwl-rx.c drivers/net/wireless/iwlegacy/iwl-debugfs.c
$ git reset --hard HEAD^
Merging refs/next/20111121/wireless-next
Merging bluetooth/master (c6feeb2 Bluetooth: Use queue in the device list)
Merging mtd/master (e0d6511 Merge git://git.infradead.org/mtd-2.6)
Merging l2-mtd/master (bd1669f mtd: nand: Making MTD_NAND_OMAP2 depend on ARCH_OMAP2PLUS)
Merging crypto/master (8b4d43a crypto: caam - add support for MD5 algorithm variants)
Merging sound/for-next (53151e7 Merge branch 'fix/misc' into for-next)
Merging sound-asoc/for-next (f733547 ASoC: Remove WM5100 DSP memory windows from register default data)
Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders)
Merging quilt/rr (7c9d1cc lguest: switch segment-voodoo-numbers to readable symbols)
Merging input/next (3d95fd6 Input: elantech - add resolution query support for v4 hardware)
CONFLICT (content): Merge conflict in drivers/input/keyboard/samsung-keypad.c
Merging input-mt/next (02f8c6a Linux 3.0)
Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.)
Merging block/for-next (747af4c Merge branch 'for-linus' into for-next)
Merging quilt/device-mapper (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning)
Merging battery/master (85b5fbf power_supply: Fix sysfs format warning)
Merging mmc/mmc-next (ce8fda6 mmc: core: Fix typo at mmc_card_sleep)
Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
Merging slab/for-next (3bd3e0c Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (c7eefaf md/raid1: Mark device replaceable when we see a write error.)
Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates)
Merging hdlc/hdlc-next (4a6908a Linux 2.6.28)
Merging drm/drm-next (08aa3fe Merge branch 'drm-plane-jbarnes' into drm-core-next)
$ git reset --hard HEAD^
Merging refs/next/20111115/drm
Merging fbdev/fbdev-next (4420dd2 video: s3c-fb: fix transparency length for pixel blending)
Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include <linux/module.h>)
Merging regulator/for-next (a92460d regulator: Don't create voltage sysfs entries if we can't read voltage)
Merging security/next (de35353 digsig: build dependency fix)
Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/linux-next (20403e8 watchdog: fix initialisation printout in s3c2410_wdt)
Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (a7e892e Merge branches 'iommu/fixes', 'iommu/page-sizes' and 'iommu/group-id' into next)
Merging cputime/cputime (c5927fe [S390] cputime: add sparse checking and cleanup)
Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging nommu/master (0ce790e Linux 2.6.39-rc1)
Merging trivial/for-next (67c50a7 qnx4fs: Use kmemdup rather than duplicating its implementation)
Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
Merging pm/linux-next (17bc452 PM / Sleep: Simplify device_suspend_noirq())
Merging apm/for-next (73692d9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
Merging irda/for-next (94d57c4 enic: Update MAINTAINERS)
Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
Merging edac-amd/for-next (1f6189e amd64_edac: Cleanup return type of amd64_determine_edac_cap())
Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice)
Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h)
Merging tip/auto-latest (e79d72b Merge branch 'sched/core' into auto-latest)
Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp())
Merging kmemleak/kmemleak (99781ba kmemleak: Add support for memory hotplug)
Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest)
Merging oprofile/for-next (de346b6 Merge branch 'perf/core' into oprofile/master)
Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-two/linux-next (701b049 Merge branch 'stable/for-linus-3.3' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (bc499f9 percpu: rename pcpu_mem_alloc to pcpu_mem_zalloc)
Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue())
Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap())
Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs)
Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (c2f5631 sysctl: remove impossible condition check)
Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.)
Merging regmap/for-next (bad2ab4 regmap: Provide debugfs dump of the rbtree cache data)
Merging driver-core/driver-core-next (42b4d11 usb: dwc3: fix a warning)
$ git reset --hard HEAD^
Merging refs/next/20111118/driver-core
Merging tty/tty-next (161e773 UART: add CSR SiRFprimaII SoC on-chip uart drivers)
CONFLICT (content): Merge conflict in drivers/tty/tty_ldisc.c
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig
Merging usb/usb-next (3af5154 usb: Netlogic: Use CPU_XLR in place of NLM_XLR)
Merging staging/staging-next (cfcfc9e Linux 3.2-rc2)
Merging char-misc/char-misc-next (7f3379d misc: ad525x_dpot: Add support for SPI module device table matching)
Merging bkl-config/config (4ba8216 BKL: That's all, folks)
Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.)
CONFLICT (content): Merge conflict in mm/swapfile.c
Merging writeback/writeback-for-next (c37a78e fs: Make write(2) interruptible by SIGKILL)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (acd42ca pinctrl: GPIO direction support for muxing)
Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
Merging kvmtool/master (e1b4024 kvm tools: Add event idx support to virtio-blk)
CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: vmscan: fix initial shrinker size handling
Applying: vmscan: use atomic-long for shrinker batching
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86: fix mmap random address range
Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
Applying: mrst: battery fixes
Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
Applying: x86: tlb flush avoid superflous leave_mm()
Applying: x86: reduce clock calibration time during slave cpu startup
Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
Applying: drm: avoid switching to text console if there is no panic timeout
Applying: hrtimers: Special-case zero length sleeps
Applying: ia64, exec: remove redundant set_fs(USER_DS)
Applying: ipc/mqueue: cleanup definition names and locations
Applying: ipc/mqueue: switch back to using non-max values on create
Applying: ipc/mqueue: enforce hard limits
Applying: ipc/mqueue: update maximums for the mqueue subsystem
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
Applying: debugobjects: be smarter about static objects
Applying: debugobjects: extend to assert that an object is initialized
Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
Applying: ext4: use proper little-endian bitops
Applying: ocfs2: avoid unaligned access to dqc_bitmap
Applying: parisc, exec: remove redundant set_fs(USER_DS)
Applying: scsi: fix a header to include linux/types.h
Applying: drivers/scsi/megaraid.c: fix sparse warnings
Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
Applying: MAINTAINERS: Staging: cx25821: Add L: linux-media
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
Applying: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm-add-free_hot_cold_page_list-helper-v2
Applying: mm-add-free_hot_cold_page_list-helper-v3
Applying: mm: remove unused pagevec_free
Applying: mm-tracepoint: rename page-free events
Applying: mm-tracepoint: fix documentation and examples
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: mm: migrate: one less atomic operation
Applying: mm: do not stall in synchronous compaction for THP allocations
Applying: mm-do-not-stall-in-synchronous-compaction-for-thp-allocations-v3
Applying: mm: avoid livelock on !__GFP_FS allocations
Applying: mm-avoid-livelock-on-__gfp_fs-allocations-fix
Applying: mm: reduce the amount of work done when updating min_free_kbytes
Applying: mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes-checkpatch-fixes
Applying: thp: reduce khugepaged freezing latency
Applying: hpet: factor timer allocate from open
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: kernel.h: neaten panic prototype
Applying: include/linux/linkage.h: remove unused NORET_AND macro
Applying: treewide: remove useless NORET_TYPE macro and uses
Applying: treewide: convert uses of ATTRIB_NORETURN to __noreturn
Applying: treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes
Applying: include/linux/linkage.h: remove unused ATTRIB_NORET macro
Applying: mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL
Applying: mm,x86,um: move CMPXCHG_LOCAL config option
Applying: mm,x86,um: move CMPXCHG_DOUBLE config option
Applying: audit: always follow va_copy() with va_end()
Applying: brlocks/lglocks: clean up code
Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
Applying: get_maintainers.pl: follow renames when looking up commit signers
Applying: checkpatch: update signature "might be better as" warning
Applying: checkpatch: prefer __printf over __attribute__((format(printf,...)))
Applying: crc32: optimize inner loop
Applying: epoll: limit paths
Applying: cgroups: add res_counter_write_u64() API
Applying: cgroups: new resource counter inheritance API
Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
Applying: cgroups: new cancel_attach_task() subsystem callback
Applying: cgroups: ability to stop res charge propagation on bounded ancestor
Applying: cgroups: add res counter common ancestor searching
Applying: res_counter: allow charge failure pointer to be null
Applying: cgroups: pull up res counter charge failure interpretation to caller
Applying: cgroups: allow subsystems to cancel a fork
Applying: cgroups: add a task counter subsystem
Applying: cgroups: ERR_PTR needs err.h
Applying: cgroup: Fix task counter common ancestor logic
Applying: cgroup-fix-task-counter-common-ancestor-logic-checkpatch-fixes
Applying: mm: memcg: consolidate hierarchy iteration primitives
Applying: mm: vmscan: distinguish global reclaim from global LRU scanning
Applying: mm: vmscan: distinguish between memcg triggering reclaim and memcg being scanned
Applying: mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes
Applying: mm: memcg: per-priority per-zone hierarchy scan generations
Applying: mm: move memcg hierarchy reclaim to generic reclaim code
Applying: mm: memcg: remove optimization of keeping the root_mem_cgroup LRU lists empty
Applying: mm: vmscan: convert global reclaim to per-memcg LRU lists
Applying: mm: collect LRU list heads into struct lruvec
Applying: mm: make per-memcg LRU lists exclusive
Applying: mm: memcg: remove unused node/section info from pc->flags
Applying: mm: memcg: remove unused node/section info from pc->flags fix
Applying: procfs: make proc_get_link to use dentry instead of inode
Applying: procfs: introduce the /proc/<pid>/map_files/ directory
Applying: procfs-introduce-the-proc-pid-map_files-directory-checkpatch-fixes
Applying: workqueue: make alloc_workqueue() take printf fmt and args for name
Applying: workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name-fix
Applying: cpumask: update setup_node_to_cpumask_map() comments
Applying: kdump: add missing RAM resource in crash_shrink_memory()
Applying: kdump: fix crash_kexec()/smp_send_stop() race in panic
Applying: kdump: Add udev events for memory online/offline
Applying: ipc/mqueue: simplify reading msgqueue limit
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: fs/direct-io.c: calculate fs_count correctly in get_more_blocks()
Applying: vfs: cache request_queue in struct block_device
Applying: dio: optimize cache misses in the submission path
Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
Applying: dio: using prefetch requires including prefetch.h
Applying: ramoops: update parameters only after successful init
Merging akpm (a908e58 ramoops: update parameters only after successful init)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build warning after merge of the wireless-next tree
From: Stanislaw Gruszka @ 2011-11-22 7:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: John W. Linville, linux-next, linux-kernel, Paul Gortmaker
In-Reply-To: <20111122142502.ca68d0a1640b2a8480d51ad2@canb.auug.org.au>
On Tue, Nov 22, 2011 at 02:25:02PM +1100, Stephen Rothwell wrote:
> After merging the wireless-next tree, today's linux-next build
> (x86_64_allmodconfig) produced this warning:
>
> drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: data definition has no type or storage class [enabled by default]
> drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
> drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: parameter names (without types) in function declaration [enabled by default]
> drivers/net/wireless/iwlegacy/debug.c:1410:1: warning: data definition has no type or storage class [enabled by default]
> drivers/net/wireless/iwlegacy/debug.c:1410:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
> drivers/net/wireless/iwlegacy/debug.c:1410:1: warning: parameter names (without types) in function declaration [enabled by default]
>
> This indicates that this file needs to include export.h.
I think adding export.h to debug.c should be part of current
wireless-next manual merge (debug.c include old iwl-debugfs.c,
which was modified with export.h). If not, I'm posting patch
with fix in the following email.
Thanks
Stanislaw
^ permalink raw reply
* [PATCH linux-next] iwlegacy: debug.c needs export.h
From: Stanislaw Gruszka @ 2011-11-22 7:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: John W. Linville, linux-next, linux-kernel, Paul Gortmaker
In-Reply-To: <20111122075640.GB2199@redhat.com>
Fix:
drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: parameter names (without types) in function declaration [enabled by default]
drivers/net/wireless/iwlegacy/debug.c:1410:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/iwlegacy/debug.c:1410:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
drivers/net/wireless/iwlegacy/debug.c:1410:1: warning: parameter names (without types) in function declaration [enabled by default]
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
This is linux-next patch only, in wireless-next we do not have
include/linux/export.h file.
drivers/net/wireless/iwlegacy/debug.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
index 928bdbb..b1b8926 100644
--- a/drivers/net/wireless/iwlegacy/debug.c
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -26,6 +26,7 @@
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
*****************************************************************************/
#include <linux/ieee80211.h>
+#include <linux/export.h>
#include <net/mac80211.h>
#include "common.h"
--
1.7.1
^ permalink raw reply related
* Re: linux-next: build failure after merge of the wireless-next tree
From: Stanislaw Gruszka @ 2011-11-22 8:03 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: John W. Linville, linux-next, linux-kernel
In-Reply-To: <20111122143523.ee83308efc48baf19f691441@canb.auug.org.au>
On Tue, Nov 22, 2011 at 02:35:23PM +1100, Stephen Rothwell wrote:
> After merging the wireless-next tree, today's linux-next build
> (x86_64_allmodconfig) failed like this:
>
> ERROR: "il_dbgfs_unregister" [drivers/net/wireless/iwlegacy/iwl4965.ko] undefined!
> ERROR: "il_dbgfs_register" [drivers/net/wireless/iwlegacy/iwl4965.ko] undefined!
> ERROR: "il_dbgfs_unregister" [drivers/net/wireless/iwlegacy/iwl3945.ko] undefined!
> ERROR: "il_dbgfs_register" [drivers/net/wireless/iwlegacy/iwl3945.ko] undefined!
That is consequence of lack export.h in drivers/net/wireless/iwegacy/debug.c
and previous warnings:
drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: data definition has no type or storage class [enabled by default]
drivers/net/wireless/iwlegacy/debug.c:1395:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
Patch posted to fix warnings, should fix that build failure too.
Stanislaw
^ permalink raw reply
* Re: linux-next: manual merge of the arm-lpae tree with the arm tree
From: Russell King @ 2011-11-22 8:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Catalin Marinas, linux-next, linux-kernel, Nicolas Pitre
In-Reply-To: <20111122120358.aa2cefdcdace9a98acafd4b9@canb.auug.org.au>
On Tue, Nov 22, 2011 at 12:03:58PM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm/mm/ioremap.c
> index 12c7ad2,d1f78ba..0000000
> --- a/arch/arm/mm/ioremap.c
> +++ b/arch/arm/mm/ioremap.c
> @@@ -194,7 -208,14 +202,8 @@@ void __iomem * __arm_ioremap_pfn_caller
> */
> if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))
> return NULL;
> + #endif
>
> - /*
> - * Don't allow RAM to be mapped - this causes problems with ARMv6+
> - */
> - if (WARN_ON(pfn_valid(pfn)))
> - return NULL;
> -
This certainly is not correct - if Catalin's lpae tree is removing this
then that needs to be fixed.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ 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