* Re: [PATCH] x86: export 'pcibios_enabled'
From: Alan Cox @ 2012-03-14 11:21 UTC (permalink / raw)
To: Florian Tobias Schandinat
Cc: H. Peter Anvin, Randy Dunlap, Stephen Rothwell, linux-next, LKML,
Michal Januszewski, linux-fbdev, x86, Andrew Morton, Wang YanQing
In-Reply-To: <4F607A18.8080004@gmx.de>
> > uvesafb could look for any PCI vga class device - which I suspect is
> > what it *should* be doing ?
>
> Would this really change depending on whether the page is NX-protected
> or not?
> Your suggestion sounds like it is about detecting whether there is any
> graphic chip present or not while the patch is about fixing an oops
> caused by NX-protection of the BIOS.
Right yes.. I misunderstood what you are trying to do. I'd assumed you
wanted to find the ROM and thus set it to the right mapping mode.
You can use set_memory_x() to mark memory executable (and _nx to set it back).
If you really need to know if NX is being used then the check
if (__supported_pte_mask & PTE_NX)
will do the trick and the variable is exported.
I'd suggest however you wrap that in a cpu_has_nx() type macro somewhere
in the arch headers.
If you go poking around pcibios values you are going to get burned if
someone is ever bored enough to make NX and PCIBIOS work together
differently.
Alan
^ permalink raw reply
* Re: [PATCH] x86: export 'pcibios_enabled'
From: Florian Tobias Schandinat @ 2012-03-14 10:59 UTC (permalink / raw)
To: Alan Cox
Cc: H. Peter Anvin, Randy Dunlap, Stephen Rothwell, linux-next, LKML,
Michal Januszewski, linux-fbdev, x86, Andrew Morton, Wang YanQing
In-Reply-To: <20120314092955.2250a782@pyramind.ukuu.org.uk>
[CC'ing Wang YanQing, the author of the patch requiring it]
On 03/14/2012 09:29 AM, Alan Cox wrote:
>>>
>>> int pcibios_enabled;
>>> +EXPORT_SYMBOL(pcibios_enabled);
>>>
>>> /* According to the BIOS specification at:
>>> * http://members.datafast.net.au/dft0802/specs/bios21.pdf, we could
>>
>> I would think this should be EXPORT_SYMBOL_GPL()... this seems like a
>> symbol with a very high likelihood to be abused in strange ways.
>
> We don't need to expose it anyway
>
> uvesafb could look for any PCI vga class device - which I suspect is
> what it *should* be doing ?
Would this really change depending on whether the page is NX-protected
or not?
Your suggestion sounds like it is about detecting whether there is any
graphic chip present or not while the patch is about fixing an oops
caused by NX-protection of the BIOS.
Best regards,
Florian Tobias Schandinat
^ permalink raw reply
* [PATCH] EEH: remove eeh device from OF node
From: Gavin Shan @ 2012-03-14 10:31 UTC (permalink / raw)
To: sfr, grant.likely, benh
Cc: linux-kernel, linux-next, paulus, linuxppc-dev, Gavin Shan
Originally, the PCI sensitive OF node is tracing the eeh device
through struct device_node::edev. However, it was regarded as
bad idea.
The patch removes struct device_node::edev. In addition, the
global list of eeh devices is introduced, and do retrival of
eeh device according to the given OF node through the global
list.
Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/eeh.h | 7 +++++++
arch/powerpc/platforms/pseries/eeh_dev.c | 29 ++++++++++++++++++++++++++++-
include/linux/of.h | 10 ----------
3 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index d60f998..591e0a1 100644
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -56,6 +56,7 @@ struct eeh_dev {
struct pci_controller *phb; /* Associated PHB */
struct device_node *dn; /* Associated device node */
struct pci_dev *pdev; /* Associated PCI device */
+ struct list_head list; /* Form the global link list */
};
static inline struct device_node *eeh_dev_to_of_node(struct eeh_dev *edev)
@@ -115,6 +116,7 @@ extern int eeh_subsystem_enabled;
*/
#define EEH_MAX_ALLOWED_FREEZES 5
+struct eeh_dev *eeh_dev_from_of_node(struct device_node *dn);
void * __devinit eeh_dev_init(struct device_node *dn, void *data);
void __devinit eeh_dev_phb_init_dynamic(struct pci_controller *phb);
void __init eeh_dev_phb_init(void);
@@ -132,6 +134,11 @@ void eeh_add_device_tree_early(struct device_node *);
void eeh_add_device_tree_late(struct pci_bus *);
void eeh_remove_bus_device(struct pci_dev *);
+static inline struct eeh_dev *of_node_to_eeh_dev(struct device_node *dn)
+{
+ return eeh_dev_from_of_node(dn);
+}
+
/**
* EEH_POSSIBLE_ERROR() -- test for possible MMIO failure.
*
diff --git a/arch/powerpc/platforms/pseries/eeh_dev.c b/arch/powerpc/platforms/pseries/eeh_dev.c
index f3aed7d..925d3a3 100644
--- a/arch/powerpc/platforms/pseries/eeh_dev.c
+++ b/arch/powerpc/platforms/pseries/eeh_dev.c
@@ -34,6 +34,7 @@
#include <linux/export.h>
#include <linux/gfp.h>
#include <linux/init.h>
+#include <linux/list.h>
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/string.h>
@@ -41,6 +42,30 @@
#include <asm/pci-bridge.h>
#include <asm/ppc-pci.h>
+/* eeh device list */
+static LIST_HEAD(eeh_dev_list);
+
+/**
+ * eeh_dev_from_of_node - Retrieve EEH device according to OF node
+ * @dn: OF node
+ *
+ * All existing eeh devices have been put into the global list.
+ * In addition, the eeh device is tracing the corresponding
+ * OF node. The function is used to retrieve the corresponding
+ * eeh device according to the given OF node.
+ */
+struct eeh_dev *eeh_dev_from_of_node(struct device_node *dn)
+{
+ struct eeh_dev *edev = NULL;
+
+ list_for_each_entry(edev, &eeh_dev_list, list) {
+ if (edev->dn && edev->dn == dn)
+ return edev;
+ }
+
+ return NULL;
+}
+
/**
* eeh_dev_init - Create EEH device according to OF node
* @dn: device node
@@ -62,10 +87,12 @@ void * __devinit eeh_dev_init(struct device_node *dn, void *data)
}
/* Associate EEH device with OF node */
- dn->edev = edev;
edev->dn = dn;
edev->phb = phb;
+ /* Add to global list */
+ list_add_tail(&edev->list, &eeh_dev_list);
+
return NULL;
}
diff --git a/include/linux/of.h b/include/linux/of.h
index 3e710d8..a75a831 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -58,9 +58,6 @@ struct device_node {
struct kref kref;
unsigned long _flags;
void *data;
-#if defined(CONFIG_EEH)
- struct eeh_dev *edev;
-#endif
#if defined(CONFIG_SPARC)
char *path_component_name;
unsigned int unique_id;
@@ -75,13 +72,6 @@ struct of_phandle_args {
uint32_t args[MAX_PHANDLE_ARGS];
};
-#if defined(CONFIG_EEH)
-static inline struct eeh_dev *of_node_to_eeh_dev(struct device_node *dn)
-{
- return dn->edev;
-}
-#endif
-
#if defined(CONFIG_SPARC) || !defined(CONFIG_OF)
/* Dummy ref counting routines - to be implemented later */
static inline struct device_node *of_node_get(struct device_node *node)
--
1.7.5.4
^ permalink raw reply related
* Re: [PATCH] x86: export 'pcibios_enabled'
From: Alan Cox @ 2012-03-14 9:29 UTC (permalink / raw)
To: H. Peter Anvin
Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML,
Michal Januszewski, Florian Tobias Schandinat, linux-fbdev, x86,
Andrew Morton
In-Reply-To: <4F5FE9AD.7000204@zytor.com>
> >
> > int pcibios_enabled;
> > +EXPORT_SYMBOL(pcibios_enabled);
> >
> > /* According to the BIOS specification at:
> > * http://members.datafast.net.au/dft0802/specs/bios21.pdf, we could
>
> I would think this should be EXPORT_SYMBOL_GPL()... this seems like a
> symbol with a very high likelihood to be abused in strange ways.
We don't need to expose it anyway
uvesafb could look for any PCI vga class device - which I suspect is
what it *should* be doing ?
Alan
^ permalink raw reply
* Re: linux-next: manual merge of the devicetree tree with the powerpc tree
From: Gavin Shan @ 2012-03-14 9:02 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Grant Likely, linux-kernel, linux-next, Paul Mackerras,
linuxppc-dev, Stephen Rothwell
In-Reply-To: <1331713762.3105.121.camel@pasglop>
>> > +#if defined(CONFIG_EEH)
>> > > +static inline struct eeh_dev *of_node_to_eeh_dev(struct device_node *dn)
>> > > +{
>> > > + return dn->edev;
>> > > +}
>> > > +#endif
>> >
>> > Ben, What is this? I don't want the eeh_dev pointer in struct device_node. Up to
>> > now we've avoided putting any reverse references into device_nodes. For everything
>> > else we use a reverse lookup, particularly for devices, to avoid growing the
>> > device_node for each new type of lookup.
>> >
>>
>> It's used to trace the EEH device. When EEH (Enhanced Error Hanlding) is enabled,
>> EEH device will be created against PCI sensitive OF node to trace the EEH state
>> accordingly. Since you don't want see this in struct device_node, we have to change
>> struct eeh_dev for a little bit to so that all struct eeh_dev instances will form
>> a global list and we can search eeh_dev according to the given device_node through
>> the global list.
>>
>> I don't know the policy or rule here for much. I think we can have 2 options.
>>
>> 1. Keep the code as being, and fix it later.
>> 2. Fix it now.
>
>My bad, it's a mis-review, I thought it was still in pci_dn, I din't
>catch Gavin moving it to device-node.
>
>Yes, Gavin, we need to do something else, a chained list we walk or
>something like that. For the "fast path" which is when we have a pci_dev
>around, we can either add it to dev_archdata or hijack the pci-dev
>platform_data (I don't think anything uses it, Grant, do you know of
>anything ?)
>
Yes, Ben. I'll come up another patch on top of -next. It's supposed
to introduce global list for newly created eeh_dev and retrieve
the corresponding eeh_dev according to the given device_node through
it.
>The patches are already in -next and I won't rebase, so we need to fix
>it on top of the existing patches. Gavin, can you make a patch that puts
>it back into pci_dn to begin with, then we can contemplate what better
>long term solution we have ?
>
I've had something more in my private git tree regarding this. I'll
talk with you for your comments ;-)
Thanks,
Gavin
^ permalink raw reply
* Re: [PATCH] ARM: pxa: fix regulator related build fail in magician_defconfig
From: Haojian Zhuang @ 2012-03-14 8:38 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: broonie, lost.distance, linux-arm-kernel, linux-next
In-Reply-To: <1331242494-3157-1-git-send-email-paul.gortmaker@windriver.com>
On Fri, Mar 9, 2012 at 5:34 AM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> commit 737f360d5bef5e01c6cfa755dca0b449a154c1e0 (linux-next)
>
> "regulator: Remove support for supplies specified by struct device"
>
> deletes the field from the struct, but this platform was still trying
> to set those fields. Convert them to use the REGULATOR_SUPPLY macro.
>
> arch/arm/mach-pxa/magician.c:581: error: unknown field 'dev' specified in initializer
> arch/arm/mach-pxa/magician.c:581: warning: initialization from incompatible pointer type
> arch/arm/mach-pxa/magician.c:585: error: unknown field 'dev' specified in initializer
> arch/arm/mach-pxa/magician.c:585: warning: initialization from incompatible pointer type
>
> arch/arm/mach-pxa/hx4700.c:683: error: unknown field 'dev' specified in initializer
> arch/arm/mach-pxa/hx4700.c:683: warning: initialization from incompatible pointer type
> arch/arm/mach-pxa/hx4700.c:687: error: unknown field 'dev' specified in initializer
> arch/arm/mach-pxa/hx4700.c:687: warning: initialization from incompatible pointer type
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>
> [v3: fix arg2 in REGULATOR_SUPPLY to have correct names ]
>
> diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
> index f2c23ea..b6a338b 100644
> --- a/arch/arm/mach-pxa/hx4700.c
> +++ b/arch/arm/mach-pxa/hx4700.c
> @@ -679,14 +679,8 @@ static struct platform_device power_supply = {
> */
>
> static struct regulator_consumer_supply bq24022_consumers[] = {
> - {
> - .dev = &gpio_vbus.dev,
> - .supply = "vbus_draw",
> - },
> - {
> - .dev = &power_supply.dev,
> - .supply = "ac_draw",
> - },
> + REGULATOR_SUPPLY("vbus_draw", "gpio-vbus"),
> + REGULATOR_SUPPLY("ac_draw", "pda-power"),
How do you think about Mark's comments? Use dev_name() at here.
> };
>
> static struct regulator_init_data bq24022_init_data = {
> diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
> index 3d6baf9..1a18e63 100644
> --- a/arch/arm/mach-pxa/magician.c
> +++ b/arch/arm/mach-pxa/magician.c
> @@ -577,14 +577,8 @@ static struct platform_device power_supply = {
> */
>
> static struct regulator_consumer_supply bq24022_consumers[] = {
> - {
> - .dev = &gpio_vbus.dev,
> - .supply = "vbus_draw",
> - },
> - {
> - .dev = &power_supply.dev,
> - .supply = "ac_draw",
> - },
> + REGULATOR_SUPPLY("vbus_draw", "gpio-vbus"),
> + REGULATOR_SUPPLY("ac_draw", "pda-power"),
> };
>
> static struct regulator_init_data bq24022_init_data = {
> --
> 1.7.9.1
>
^ permalink raw reply
* Re: linux-next: manual merge of the devicetree tree with the powerpc tree
From: Benjamin Herrenschmidt @ 2012-03-14 8:29 UTC (permalink / raw)
To: Gavin Shan
Cc: Grant Likely, linux-kernel, linux-next, Paul Mackerras,
linuxppc-dev, Stephen Rothwell
In-Reply-To: <20120314015356.GA4028@shangw>
On Wed, 2012-03-14 at 09:53 +0800, Gavin Shan wrote:
> > +#if defined(CONFIG_EEH)
> > > +static inline struct eeh_dev *of_node_to_eeh_dev(struct device_node *dn)
> > > +{
> > > + return dn->edev;
> > > +}
> > > +#endif
> >
> > Ben, What is this? I don't want the eeh_dev pointer in struct device_node. Up to
> > now we've avoided putting any reverse references into device_nodes. For everything
> > else we use a reverse lookup, particularly for devices, to avoid growing the
> > device_node for each new type of lookup.
> >
>
> It's used to trace the EEH device. When EEH (Enhanced Error Hanlding) is enabled,
> EEH device will be created against PCI sensitive OF node to trace the EEH state
> accordingly. Since you don't want see this in struct device_node, we have to change
> struct eeh_dev for a little bit to so that all struct eeh_dev instances will form
> a global list and we can search eeh_dev according to the given device_node through
> the global list.
>
> I don't know the policy or rule here for much. I think we can have 2 options.
>
> 1. Keep the code as being, and fix it later.
> 2. Fix it now.
My bad, it's a mis-review, I thought it was still in pci_dn, I din't
catch Gavin moving it to device-node.
Yes, Gavin, we need to do something else, a chained list we walk or
something like that. For the "fast path" which is when we have a pci_dev
around, we can either add it to dev_archdata or hijack the pci-dev
platform_data (I don't think anything uses it, Grant, do you know of
anything ?)
The patches are already in -next and I won't rebase, so we need to fix
it on top of the existing patches. Gavin, can you make a patch that puts
it back into pci_dn to begin with, then we can contemplate what better
long term solution we have ?
Cheers,
Ben.
^ permalink raw reply
* Re: linux-next: manual merge of the isci tree with the scsi tree
From: Stephen Rothwell @ 2012-03-14 7:38 UTC (permalink / raw)
To: Williams, Dan J; +Cc: linux-next, linux-kernel, James Bottomley
In-Reply-To: <CABE8wwsET4BaS39r-+5_cshQ_WJDQMHWCcUsQjmcsqGU6a+R-A@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 643 bytes --]
hi Dan,
On Wed, 14 Mar 2012 00:13:06 -0700 "Williams, Dan J" <dan.j.williams@intel.com> wrote:
>
> On Mon, Mar 12, 2012 at 8:41 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Dan,
> >
> > On Mon, 12 Mar 2012 19:50:33 -0700 "Williams, Dan J" <dan.j.williams@intel.com> wrote:
> >>
> >> I was wondering why it had not happened prior to this point... in any
> >
> > It had, I just put up with it the first time :-)
>
> Ok, all fixed up now, and I'll be quicker to respin when scsi-misc
> picks up the next round of patches.
Great, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (sound tree related)
From: Takashi Iwai @ 2012-03-14 7:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20120314180508.e0fd932c329317ab078c140f@canb.auug.org.au>
At Wed, 14 Mar 2012 18:05:08 +1100,
Stephen Rothwell wrote:
>
> Hi all,
>
> After merging the final tree, today's linux-next build (i386 defconfig)
> failed like this:
>
> sound/pci/hda/patch_sigmatel.c: In function 'stac92xx_update_led_status':
> sound/pci/hda/patch_sigmatel.c:5075:3: error: implicit declaration of function 'stac_vrefout_set' [-Werror=implicit-function-declaration]
>
> Caused by commit 2faa3bf15ba6 ("ALSA: hda - Rewrite the mute-LED hook
> with vmaster hook in patch_sigmatel.c"). CONFIG_SND_HDA_POWER_SAVE is
> not set for this build.
>
> I reverted that commit for today (and commits d2f344b5e0a9 "ALSA: hda -
> Add "Mute-LED Mode" enum control" and f29735cbef4e "ALSA: hda - Add
> expose_enum_ctl flag to snd_hda_add_vmaster_hook()" which conflict with
> the revert).
Oops, fixed now.
thanks,
Takashi
^ permalink raw reply
* linux-next: Tree for Mar 14
From: Stephen Rothwell @ 2012-03-14 7:19 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 53292 bytes --]
Hi all,
News: the build system (see below) has had its toolchains for most
architectures updated to gcc 4.6.3. People might like to check the build
results and consider if this change has caused any problems.
Changes since 20120313:
Dropped tree: uprobes (build and conflict problems)
There are quite a few conflicts caused by the same patches (as opposed to
commits) appearing in more than one tree.
The arm tree lost its conflict.
The tile tree gained a conflict against Linus' tree.
The pci tree still has its build failure, for which I applied a patch.
The sound tree gained a build failure for which I reverted 3 commits.
The tip tree gained conflicts against the s390 and tile trees.
The uprobes tree gained conflicts against the tip tree, lost its build
failure but gained another. Using the version from next-20120309 produced
even more conflicts, so I just dropped the tree for today.
The arm-soc tree gained a conflict against the sound-asoc tree.
The akpm tree lost a patch that turned up elsewhere.
I cherry-picked a Sparc build fix patch from Linus' tree for today.
----------------------------------------------------------------------------
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 188 trees (counting Linus' and 26 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 (2f1c2b8 Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86)
Merging fixes/master (88ebdda Merge tag 'for-3.3' of git://openrisc.net/jonas/linux)
Merging kbuild-current/rc-fixes (42f1c01 coccicheck: change handling of C={1,2} when M= is set)
Merging arm-current/fixes (a0feb6d ARM: 7358/1: perf: add PMU hotplug notifier)
Merging m68k-current/for-linus (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation)
Merging powerpc-merge/merge (c2ea377 Merge remote-tracking branch 'origin/master' into merge)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (e51e07e sparc32: forced setting of mode of sun4m per-cpu timers)
Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576)
Merging net/master (750084b Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem)
Merging sound-current/for-linus (25dc16f ALSA: hda - fix printing of high HDMI sample rates)
Merging pci-current/for-linus (4949be1 PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled)
Merging wireless/master (3780d03 rt2x00: fix random stalls)
Merging driver-core.current/driver-core-linus (fde7d90 Linux 3.3-rc7)
Merging tty.current/tty-linus (fde7d90 Linux 3.3-rc7)
Merging usb.current/usb-linus (fde7d90 Linux 3.3-rc7)
Merging staging.current/staging-linus (fde7d90 Linux 3.3-rc7)
Merging char-misc.current/char-misc-linus (fde7d90 Linux 3.3-rc7)
Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes)
Merging input-current/for-linus (24e3e5a Input: wacom - fix physical size calculation for 3rd-gen Bamboo)
Merging md-current/for-linus (7a90484 md/raid10: fix assembling of arrays with replacement devices.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (f8f54e1 crypto: mv_cesa - fix final callback not ignoring input data)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging devicetree-current/devicetree/merge (29f141f Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge)
Merging spi-current/spi/merge (a5ab629 Fix section mismatch in spi-pl022.c)
Merging gpio-current/gpio/merge (7e3a70f gpio: Add missing spin_lock_init in gpio-ml-ioh driver)
Merging arm/for-next (50351fa Merge branch 'acorn' into for-next)
Merging arm-perf/for-next/perf (cdd2a5b Merge branches 'perf/updates' and 'perf/fixes' into for-next/perf)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (44ad5b5 Merge branch 'next/soc-exynos5250-arch' into for-next)
Merging tegra/for-next (1233655 Merge branch 'for-3.4/cleanup-and-fixes' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Makefile
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (e651fe5 Blackfin: wire up new process_vm syscalls)
Merging c6x/for-linux-next (fde7d90 Linux 3.3-rc7)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging ia64/next (15839b4 [IA64] Fix a couple of warnings for EXPORT_SYMBOL)
Merging m68k/for-next (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation)
Merging m68knommu/for-next (ae909ea m68knommu: factor more common ColdFire cpu reset code)
Merging microblaze/next (8597559 Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6)
Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next)
Merging openrisc/for-upstream (fa8d9d7 OpenRISC: Remove memory_start/end prototypes)
Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
Merging powerpc/next (aba0eb8 Merge branch 'eeh' into next)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging 4xx/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c)
Merging s390/features (c6da39f [S390] kernel: Pass correct stack for smp_call_ipl_cpu())
Merging sparc-next/master (e9b57cc sparc: Use vsprintf extention %pf with builtin_return_address)
Merging tile/master (ca3a3d3 ipc: provide generic compat versions of IPC syscalls)
CONFLICT (content): Merge conflict in arch/Kconfig
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (83eb26a ceph: ensure prealloc_blob is in place when removing xattr)
Merging cifs/master (d575146 CIFS: Do not kmalloc under the flocks spinlock)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (e703c20 ext3: fix start and len arguments handling in ext3_trim_fs())
Merging ext4/dev (24a1c12 ext4: check for zero length extent)
Merging fuse/for-next (4273b79 fuse: O_DIRECT support for files)
Merging gfs2/master (58a7d5f GFS2: call gfs2_write_alloc_required for each chunk)
Merging logfs/master (fde7d90 Linux 3.3-rc7)
Merging nfs/linux-next (e138ead NFS: null dereference in dev_remove())
Merging nfsd/nfsd-next (8546ee5 nfsd4: make sure set CB_PATH_DOWN sequence flag set)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (5bdad93 9p: statfs should not override server f_type)
Merging ubifs/linux-next (5a1f36c UBIFS: improve error messages)
Merging xfs/for-next (4b217ed quota: make Q_XQUOTASYNC a noop)
CONFLICT (content): Merge conflict in fs/xfs/xfs_trans_dquot.c
Merging vfs/for-next (9161999 fs: initial qnx6fs addition)
Merging pci/linux-next (63ab387 x86/PCI: add spinlock held check to 'pcibios_fwaddrmap_lookup()')
CONFLICT (modify/delete): arch/powerpc/platforms/iseries/pci.c deleted in HEAD and modified in pci/linux-next. Version pci/linux-next of arch/powerpc/platforms/iseries/pci.c left in tree.
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/ppc-pci.h
CONFLICT (content): Merge conflict in arch/mips/pci/pci.c
$ git rm -f arch/powerpc/platforms/iseries/pci.c
Applying: powerpc/PCI: fix up for mismatch between resource_size_t and pointer size
Merging hid/for-next (b6560ea Merge branch 'multitouch' into for-next)
Merging quilt/i2c (49d4384 i2c: Update the FSF address)
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging i2c-embedded/i2c-embedded/for-next (bbceeee i2c-eg20t: Remove write-only variables)
Merging quilt/jdelvare-hwmon (23bbf12 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (745b155 hwmon: (jc42) Remove unnecessary device IDs)
Merging quilt/kernel-doc (7e7b32a Update quilt tree location for Documentation/ patches.)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
Merging v4l-dvb/master (704f8b9 Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (17c0999 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 (b8cec3c pata_cmd64x: implement sff_irq_check() method)
Merging infiniband/for-next (5ad19b0 Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next)
Merging acpi/next (71ad90e ACPICA: Fix regression in FADT revision checks)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (6f6f92d Merge branch 'master' into for-next)
Merging ubi/linux-next (898e567 UBI: fix eraseblock picking criteria)
Merging dlm/next (7210cb7 dlm: fix slow rsb search in dir recovery)
Merging scsi/master (cd8df93 [SCSI] qla4xxx: Update driver version to 5.02.00-k15)
Merging target-updates/for-next (9765b1f target: Bump core version to v4.1.0-rc2-ml + fabric versions)
Merging target-merge/for-next-merge (b3fd3cc tcm_qla2xxx: Add >= 24xx series fabric module for target-core)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (4af617a Merge branch 'devel' into all)
CONFLICT (content): Merge conflict in include/scsi/sas_ata.h
CONFLICT (content): Merge conflict in include/scsi/libsas.h
CONFLICT (content): Merge conflict in include/linux/libata.h
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_internal.h
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_init.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_expander.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_event.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_discover.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c
CONFLICT (content): Merge conflict in drivers/scsi/isci/request.h
CONFLICT (content): Merge conflict in drivers/scsi/isci/registers.h
CONFLICT (content): Merge conflict in drivers/scsi/isci/port.h
CONFLICT (content): Merge conflict in drivers/scsi/isci/port.c
CONFLICT (content): Merge conflict in drivers/scsi/isci/phy.c
CONFLICT (content): Merge conflict in drivers/scsi/isci/init.c
CONFLICT (content): Merge conflict in drivers/scsi/isci/host.c
CONFLICT (content): Merge conflict in drivers/ata/libata-scsi.c
Merging slave-dma/next (5170c05 Revert "drivers/dma: linux/module.h included twice")
CONFLICT (content): Merge conflict in drivers/mmc/host/atmel-mci.c
CONFLICT (modify/delete): arch/arm/include/asm/hardware/pl330.h deleted in slave-dma/next and modified in HEAD. Version HEAD of arch/arm/include/asm/hardware/pl330.h left in tree.
CONFLICT (modify/delete): arch/arm/common/pl330.c deleted in slave-dma/next and modified in HEAD. Version HEAD of arch/arm/common/pl330.c left in tree.
$ git rm -f arch/arm/common/pl330.c arch/arm/include/asm/hardware/pl330.h
Applying: DMA: PL330: update for code movement
Merging dmaengine/next (d07a74a dmaengine: fix missing 'cnt' in ?: in dmatest)
Merging net-next/master (3832b26 ixgbe: Simplify logic for ethtool loopback frame creation and testing)
Merging wireless-next/master (3117bbdb mac80211: Don't let regulatory make us deaf)
Merging bluetooth/master (44e612b Bluetooth: Check FINDING state in interleaved discovery)
Merging mtd/master (3c3e51d Merge ../linux-2.6 to bring in 3.3-rc fixes already merged)
Merging l2-mtd/master (11c2f85 mtd: gpmi: fix the wrong DMA command.)
CONFLICT (content): Merge conflict in fs/jffs2/fs.c
CONFLICT (content): Merge conflict in drivers/mtd/chips/cfi_cmdset_0002.c
Merging crypto/master (8940426 crypto: twofish-x86_64/i586 - set alignmask to zero)
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/fuse.c
Merging sound/for-next (d39d46e Merge branch 'topic/hda' into for-next)
CONFLICT (content): Merge conflict in sound/soc/mxs/mxs-pcm.h
CONFLICT (content): Merge conflict in sound/soc/imx/imx-pcm-dma-mx2.c
Merging sound-asoc/for-next (f65eab9 Merge branch 'for-3.4' into asoc-next)
Merging cpufreq/next (fd0ef7a [CPUFREQ] CPUfreq ondemand: update sampling rate without waiting for next sampling)
CONFLICT (content): Merge conflict in drivers/cpufreq/Kconfig.arm
Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.)
CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
Merging input/next (b51425b Input: hp680_ts_input - ensure arguments to request_irq and free_irq are compatible)
Merging input-mt/for-next (7491f3d bcm5974: Add pointer and buttonpad properties)
Merging block/for-next (7622d14 Merge branch 'for-3.4/drivers' into for-next)
Merging quilt/device-mapper (b8c84fe This patch introduces a new function dm_bufio_prefetch. It prefetches the specified range of blocks into dm-bufio cache without waiting for i/o completion.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
CONFLICT (content): Merge conflict in drivers/pcmcia/soc_common.c
Merging battery/master (651bfc3 max17042_battery: Make it possible to instantiate driver from DT)
Merging mmc/mmc-next (07c3275 mmc: sdhci-pci: add SDHCI_QUIRK2_HOST_OFF_CARD_ON for Medfield SDIO)
CONFLICT (content): Merge conflict in include/linux/mmc/host.h
CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-s3c.c
CONFLICT (content): Merge conflict in drivers/mmc/host/atmel-mci.c
CONFLICT (content): Merge conflict in drivers/mmc/core/host.h
CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
Merging kgdb/kgdb-next (0e997a4 KDB: Fix usability issues relating to the 'enter' key.)
Merging slab/for-next (b80b6c0 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 (d02d93d md/raid1,raid10: avoid deadlock during resync/recovery.)
Merging mfd/for-next (2f5f89b mfd: Fix pm8606 build failure)
CONFLICT (content): Merge conflict in drivers/mfd/ab8500-core.c
Merging drm/drm-next (abd3200 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-core-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
Merging fbdev/fbdev-next (c2bc0a7 video:uvesafb: notice user when we failed to save hardware state)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (001b7f3 ARM: OMAP2+: Fix compile error when FB_OMAP2 is not set)
Merging regulator/for-next (a52401b Merge branch 'regulator-drivers' into regulator-next)
Merging security/next (f67dabb KEYS: testing wrong bit for KEY_FLAG_REVOKED)
Merging selinux/master (a9ab18a selinux: include flow.h where used rather than get it indirectly)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/linux-next (ea70e19 watchdog: ep93xx_wdt.c: fix platform probe)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (8bb9ad1 Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next)
Merging osd/linux-next (0aa436b exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (cd635af usb: gadget: Kconfig: fix typo for 'different')
CONFLICT (content): Merge conflict in fs/jffs2/compr.c
CONFLICT (content): Merge conflict in drivers/watchdog/pnx4008_wdt.c
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (ffb8811 PM / shmobile: Make MTU2 driver use pm_genpd_dev_always_on())
Merging apm/for-next (b4a133d 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 edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
CONFLICT (content): Merge conflict in include/linux/of.h
CONFLICT (modify/delete): arch/powerpc/platforms/iseries/Kconfig deleted in HEAD and modified in devicetree/devicetree/next. Version devicetree/devicetree/next of arch/powerpc/platforms/iseries/Kconfig left in tree.
$ git rm -f arch/powerpc/platforms/iseries/Kconfig
Merging spi/spi/next (9af4acc spi: release lock on error path in spi_pump_messages())
Merging tip/auto-latest (90900f1 Merge branch 'sched/arch' into auto-latest)
CONFLICT (content): Merge conflict in include/net/sock.h
CONFLICT (content): Merge conflict in arch/x86/platform/mrst/mrst.c
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/s390/kernel/smp.c
CONFLICT (modify/delete): arch/powerpc/platforms/iseries/setup.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/powerpc/platforms/iseries/setup.c left in tree.
CONFLICT (modify/delete): arch/m68k/kernel/process_no.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/m68k/kernel/process_no.c left in tree.
CONFLICT (modify/delete): arch/m68k/kernel/process_mm.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/m68k/kernel/process_mm.c left in tree.
$ git rm -f arch/m68k/kernel/process_no.c arch/m68k/kernel/process_mm.c arch/powerpc/platforms/iseries/setup.c
Applying: sched/rt: Use schedule_preempt_disabled() in m68k
Applying: staging: disable the sep driver due to breakage
Merging rcu/rcu/next (1cc8596 rcu: Stop spurious warnings from synchronize_sched_expedited)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (1fe509b uprobes/core: Handle breakpoint and singlestep exception.)
CONFLICT (add/add): Merge conflict in kernel/events/uprobes.c
CONFLICT (content): Merge conflict in kernel/events/Makefile
CONFLICT (add/add): Merge conflict in include/linux/uprobes.h
CONFLICT (add/add): Merge conflict in arch/x86/kernel/uprobes.c
CONFLICT (add/add): Merge conflict in arch/x86/include/asm/uprobes.h
$ git reset --hard HEAD^
Merging refs/next/20120309/uprobes
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (add/add): Merge conflict in kernel/events/uprobes.c
CONFLICT (content): Merge conflict in kernel/events/Makefile
CONFLICT (add/add): Merge conflict in include/linux/uprobes.h
CONFLICT (content): Merge conflict in fs/signalfd.c
CONFLICT (content): Merge conflict in fs/eventpoll.c
CONFLICT (add/add): Merge conflict in arch/x86/kernel/uprobes.c
CONFLICT (add/add): Merge conflict in arch/x86/include/asm/uprobes.h
$ git reset --hard
Merging cgroup/for-next (3ce3230 cgroup: Walk task list under tasklist_lock in cgroup_enable_task_cg_list)
CONFLICT (content): Merge conflict in block/blk-cgroup.c
Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3)
Merging kvm/linux-next (5c53b75 KVM: nVMX: Fix erroneous exception bitmap check)
Merging oprofile/for-next (b9e7f8e Merge branches 'oprofile/urgent' and 'oprofile/core' into oprofile/master)
CONFLICT (content): Merge conflict in tools/perf/util/header.h
CONFLICT (content): Merge conflict in tools/perf/util/header.c
Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
Merging xen-two/linux-next (de34b60 Merge branch 'stable/for-linus-3.4' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_return() definition)
Merging workqueues/for-next (e06ffa1 workqueue: use percpu allocator for cwq on UP)
Merging drivers-x86/linux-next (2d23b05 panasonic-laptop: avoid overflow in acpi_pcc_hotkey_add())
CONFLICT (content): Merge conflict in arch/x86/platform/mrst/mrst.c
CONFLICT (content): Merge conflict in arch/x86/platform/geode/Makefile
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e75732 sysctl: Don't call sysctl_follow_link unless we are a link.)
CONFLICT (content): Merge conflict in fs/proc/proc_sysctl.c
Merging regmap/for-next (f5910f3 Merge branch 'regmap-core' into regmap-next)
CONFLICT (content): Merge conflict in sound/soc/imx/phycore-ac97.c
CONFLICT (rename/rename): Rename "arch/arm/plat-mxc/audmux-v2.c"->"sound/soc/imx/imx-audmux.c" in branch "HEAD" rename "arch/arm/plat-mxc/audmux-v2.c"->"arch/arm/plat-mxc/audmux.c" in "regmap/for-next"
CONFLICT (content): Merge conflict in sound/soc/imx/eukrea-tlv320.c
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/Makefile
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-imx/Kconfig
$ git rm -f arch/arm/plat-mxc/audmux.c arch/arm/plat-mxc/audmux-v2.c
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (e485ceac Drivers: hv: Add new message types to enhance KVP)
CONFLICT (content): Merge conflict in include/linux/pci.h
CONFLICT (content): Merge conflict in drivers/base/driver.c
Merging tty/tty-next (60f4b00 serial: bfin-uart: Don't access tty circular buffer in TX DMA interrupt after it is reset.)
CONFLICT (content): Merge conflict in drivers/isdn/gigaset/interface.c
CONFLICT (content): Merge conflict in arch/ia64/hp/sim/simserial.c
Merging usb/usb-next (8d06984 usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH)
CONFLICT (add/add): Merge conflict in drivers/net/usb/qmi_wwan.c
Merging staging/staging-next (5f9092f drivers:staging:mei Fix some typos in staging/mei)
Merging char-misc/char-misc-next (b222258 misc: bmp085: Use unsigned long to store jiffies)
Merging tmem/linux-next (b05b561 Merge branch 'devel/frontswap.v13' into linux-next)
Applying: mm: frontswap: update for security_vm_enough_memory API change
Merging writeback/writeback-for-next (b3f14b0 writeback: Remove outdated comment)
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 (70b3637 pinctrl: fix error path in pinconf_map_to_setting())
Merging moduleh/for-sfr (9e1c4a5 Merge branch 'device-3.4' into for-sfr)
CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500.h
CONFLICT (content): Merge conflict in drivers/usb/dwc3/dwc3-omap.c
Merging vhost/linux-next (1e05b62 sh: use the the PCI channels's io_map_base)
Merging kmap_atomic/kmap_atomic (23a000f feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
CONFLICT (content): Merge conflict in drivers/staging/zcache/zcache-main.c
CONFLICT (content): Merge conflict in drivers/scsi/storvsc_drv.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/e1000e/netdev.c
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/)
CONFLICT (content): Merge conflict in include/linux/virtio_ids.h
Merging irqdomain/irqdomain/next (e7cc3ac dt: fix twl4030 for non-dt compile on x86)
CONFLICT (content): Merge conflict in arch/powerpc/sysdev/mpic.c
CONFLICT (modify/delete): arch/powerpc/platforms/iseries/irq.c deleted in HEAD and modified in irqdomain/irqdomain/next. Version irqdomain/irqdomain/next of arch/powerpc/platforms/iseries/irq.c left in tree.
CONFLICT (content): Merge conflict in arch/c6x/Kconfig
CONFLICT (content): Merge conflict in arch/arm/common/gic.c
$ git rm -f arch/powerpc/platforms/iseries/irq.c
Merging gpio/gpio/next (81b279d gpio/davinci: fix enabling unbanked GPIO IRQs)
CONFLICT (content): Merge conflict in include/linux/mfd/tps65910.h
Merging arm-soc/for-next (cf8c142 Revert "Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2")
CONFLICT (content): Merge conflict in drivers/regulator/Makefile
CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
CONFLICT (modify/delete): arch/arm/plat-versatile/localtimer.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of arch/arm/plat-versatile/localtimer.c left in tree.
CONFLICT (modify/delete): arch/arm/plat-mxc/audmux-v1.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of arch/arm/plat-mxc/audmux-v1.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/ct-ca9x4.c
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/timer.c
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Makefile
CONFLICT (modify/delete): arch/arm/mach-s3c2440/common.h deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of arch/arm/mach-s3c2440/common.h left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap4panda.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap1/board-palmz71.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap1/board-palmtt.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap1/board-osk.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap1/board-nokia770.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap1/board-ams-delta.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx5.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx3.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
$ git rm -f arch/arm/plat-mxc/audmux-v1.c arch/arm/mach-s3c2440/common.h arch/arm/plat-versatile/localtimer.c
Merging kvmtool/master (20082f5 kvm tools: Fix realpath() error checking)
Merging dma-mapping/dma-mapping-next (6cc2bf1 common: DMA-mapping: add NON-CONSISTENT attribute)
Merging dma-buf/for-next (ab006e7 dma-buf: add dma_data_direction to unmap dma_buf_op)
Merging ktest/for-next (be405f9 ktest: Add INGORE_ERRORS to ignore warnings in boot up)
Merging cpuidle-cons/cpuidle_consol_pull (bd7fd2a SH: shmobile: Consolidate time keeping and irq enable)
CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
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: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
Applying: x86, olpc: add debugfs interface for EC commands
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix
Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
Applying: x86-change-percpu_read_stable-to-this_cpu_read_stable-fix
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: drivers/media/video/uvc/uvc_driver.c: use linux/atomic.h
Applying: Hexagon: use set_current_blocked() and block_sigmask()
Applying: drivers/idle/intel_idle.c: fix confusing code identation
Applying: tile: use set_current_blocked() and block_sigmask()
Applying: hrtimers: Special-case zero length sleeps
Applying: hpet: factor timer allocate from open
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: headers_check: recursively search for linux/types.h inclusion
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: MIPS: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: drivers/thermal/thermal_sys.c: fix build warning
Applying: thermal_sys: remove unnecessary line continuations
Applying: thermal_sys: remove obfuscating used-once macros
Applying: thermal_sys: kernel style cleanups
Applying: thermal_sys: convert printks to pr_<level>
Applying: thermal: add support for thermal sensor present on SPEAr13xx machines
Applying: thermal-add-support-for-thermal-sensor-present-on-spear13xx-machines-fix
Applying: thermal-add-support-for-thermal-sensor-present-on-spear13xx-machines-fix-fix
Applying: thermal/spear_thermal: Add compilation dependency on PLAT_SPEAR
Applying: thermal/spear_thermal: replace readl/writel with lighter _relaxed variants
Applying: thermal: spear13xx: checking for NULL instead of IS_ERR()
Applying: unicore32: use block_sigmask()
Applying: net/netfilter/nfnetlink_acct.c: use linux/atomic.h
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: xtensa: don't reimplement force_sigsegv()
Applying: xtensa: no need to reset handler if SA_ONESHOT
Applying: xtensa: don't mask signals if we fail to setup signal stack
Applying: xtensa: use set_current_blocked() and block_sigmask()
Applying: sparc: use block_sigmask()
Applying: mm, oom: avoid looping when chosen thread detaches its mm
Applying: mm, oom: fold oom_kill_task() into oom_kill_process()
Applying: mm, oom: do not emit oom killer warning if chosen thread is already exiting
Applying: mm, oom: introduce independent oom killer ratelimit state
Applying: mm: add rss counters consistency check
Applying: mm/vmscan.c: cleanup with s/reclaim_mode/isolate_mode/
Applying: mm: make get_mm_counter static-inline
Applying: mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()
Applying: mm: make swapin readahead skip over holes
Applying: make-swapin-readahead-skip-over-holes-fix
Applying: vmscan: reclaim at order 0 when compaction is enabled
Applying: vmscan: kswapd carefully call compaction
Applying: vmscan-kswapd-carefully-call-compaction-fix
Applying: vmscan: only defer compaction for failed order and higher
Applying: compact_pgdat: workaround lockdep warning in kswapd
Applying: mm: compaction: make compact_control order signed
Applying: mm-compaction-make-compact_control-order-signed-fix
Applying: hugetlbfs: fix hugetlb_get_unmapped_area()
Applying: hugetlb: remove prev_vma from hugetlb_get_unmapped_area_topdown()
Applying: hugetlb: try to search again if it is really needed
Applying: hugetlb-try-to-search-again-if-it-is-really-needed-fix
Applying: mm: do not reset cached_hole_size when vma is unmapped
Applying: mm: search from free_area_cache for the bigger size
Applying: pagemap: avoid splitting thp when reading /proc/pid/pagemap
Applying: thp: optimize away unnecessary page table locking
Applying: fix mremap bug of failing to split thp
Applying: thp-optimize-away-unnecessary-page-table-locking-fix-checkpatch-fixes
Applying: pagemap: export KPF_THP
Applying: pagemap: document KPF_THP and make page-types aware of it
Applying: pagemap: introduce data structure for pagemap entry
Applying: mm: replace PAGE_MIGRATION with IS_ENABLED(CONFIG_MIGRATION)
Applying: mm: vmscan: forcibly scan highmem if there are too many buffer_heads pinning highmem
Applying: mm: move buffer_heads_over_limit check up
Applying: mm-vmscan-forcibly-scan-highmem-if-there-are-too-many-buffer_heads-pinning-highmem-fix-fix
Applying: mm: hugetlb: defer freeing pages when gathering surplus pages
Applying: rmap: anon_vma_prepare: Reduce code duplication by calling anon_vma_chain_link
Applying: vmscan: handle isolated pages with lru lock released
Applying: thp: documentation: 'transparent_hugepage=' can also be specified on cmdline
Applying: mm: hugetlb: bail out unmapping after serving reference page
Applying: mm: hugetlb: cleanup duplicated code in unmapping vm range
Applying: procfs: mark thread stack correctly in proc/<pid>/maps
Applying: mm, oom: force oom kill on sysrq+f
Applying: tmpfs: security xattr setting on inode creation
Applying: thp: allow a hwpoisoned head page to be put back to LRU
Applying: mm: fix move/migrate_pages() race on task struct
Applying: mm-fix-move-migrate_pages-race-on-task-struct-checkpatch-fixes
Applying: mm: drain percpu lru add/rotate page-vectors on cpu hot-unplug
Applying: bootmem/sparsemem: remove limit constraint in alloc_bootmem_section
Applying: bootmem-sparsemem-remove-limit-constraint-in-alloc_bootmem_section-fix
Applying: ksm: clean up page_trans_compound_anon_split()
Applying: ksm: cleanup: introduce ksm_check_mm()
Applying: ksm-cleanup-introduce-ksm_check_mm-fix
Applying: hugetlbfs: avoid taking i_mutex from hugetlbfs_read()
Applying: mm: don't set __GFP_WRITE on ramfs/sysfs writes
Applying: mm: use global_dirty_limit in throttle_vm_writeout()
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: memcg: replace MEM_CONT by MEM_RES_CTLR
Applying: memcg: replace mem and mem_cont stragglers
Applying: memcg: lru_size instead of MEM_CGROUP_ZSTAT
Applying: memcg: enum lru_list lru
Applying: memcg: remove redundant returns
Applying: memcg: remove unnecessary thp check in page stat accounting
Applying: idr: make idr_get_next() good for rcu_read_lock()
Applying: cgroup: revert ss_id_lock to spinlock
Applying: memcg: let css_get_next() rely upon rcu_read_lock()
Applying: memcg: remove PCG_CACHE page_cgroup flag
Applying: memcg-remove-pcg_cache-page_cgroup-flag-checkpatch-fixes
Applying: memcg: remove PCG_CACHE page_cgroup flag fix
Applying: memcg: kill dead prev_priority stubs
Applying: memcg: remove EXPORT_SYMBOL(mem_cgroup_update_page_stat)
Applying: memcg: simplify move_account() check
Applying: memcg-simplify-move_account-check-fix
Applying: memcg: remove PCG_MOVE_LOCK flag from page_cgroup
Applying: memcg: use new logic for page stat accounting
Applying: memcg-use-new-logic-for-page-stat-accounting-fix
Applying: memcg: fix deadlock by avoiding stat lock when anon
Applying: memcg: remove PCG_FILE_MAPPED
Applying: memcg-remove-pcg_file_mapped-fix
Applying: memcg: remove PCG_FILE_MAPPED fix cosmetic fix
Applying: memcg: remove PCG_CACHE page_cgroup flag fix2
Applying: memcg: fix performance of mem_cgroup_begin_update_page_stat()
Applying: memcg-fix-performance-of-mem_cgroup_begin_update_page_stat-fix
Applying: mm/memcontrol.c: s/stealed/stolen/
Applying: mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event()
Applying: mm/memcontrol.c: remove unnecessary 'break' in mem_cgroup_read()
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: sh: no need to reset handler if SA_ONESHOT
Applying: sh: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: alpha: use set_current_blocked() and block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: C6X: use set_current_blocked() and block_sigmask()
Applying: cpuidle: add a sysfs entry to disable specific C state for debug purpose.
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
Applying: um: don't restore current->blocked on error
Applying: um: use set_current_blocked() and block_sigmask()
Applying: magic.h: move some FS magic numbers into magic.h
Applying: nmi watchdog: do not use cpp symbol in Kconfig
Applying: ceph, cifs, nfs, fuse: boolean and / or confusion
Applying: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: percpu: remove percpu_xxx() functions
Applying: percpu-remove-percpu_xxx-functions-fix
Applying: headers: include linux/types.h where appropriate
Applying: consolidate WARN_...ONCE() static variables
Applying: Remove remaining bits of io_remap_page_range()
Applying: prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision
Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix
Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix
Applying: kernel/exit.c: if init dies, log a signal which killed it, if any
Applying: kernel-exitc-if-init-dies-log-a-signal-which-killed-it-if-any-fix
Applying: powerpc/eeh: remove eeh_event_handler()->daemonize()
Applying: vfs: increment iversion when a file is truncated
Applying: brlocks/lglocks: cleanups
Applying: vfs: correctly set the dir i_mutex lockdep class
Applying: seq_file: fix mishandling of consecutive pread() invocations.
Applying: fs: symlink restrictions on sticky directories
Applying: fs-symlink-restrictions-on-sticky-directories-fix-2
Applying: fs: hardlink creation restrictions
Applying: fs-hardlink-creation-restrictions-fix
Applying: fs: hardlink creation restriction cleanup
Applying: get_maintainer: use a default "unknown" S: status/role
Applying: MAINTAINERS: fix REMOTEPROC F: typo
Applying: MAINTAINERS: Update MCA section
Applying: MAINTAINERS: update git urls for 2.6 deletions
Applying: MAINTAINERS: add status to ALPHA architecture
Applying: MAINTAINERS: Add "S: Maintained" to clkdev and clk sections
Applying: backlight: convert backlight i2c drivers to module_i2c_driver
Applying: backlight: convert backlight spi drivers to module_spi_driver
Applying: drivers/video/backlight/wm831x_bl.c: use devm_ functions
Applying: drivers/video/backlight: use devm_ functions
Applying: drivers/video/backlight/adp5520_bl.c: use devm_ functions
Applying: backlight: new backlight driver for LP855x devices
Applying: backlight: lp855x_bl: Add missing mutex_unlock in lp855x_read_byte error path
Applying: backlight/lp855x_bl.c: check platform data in lp855x_probe()
Applying: backlight/lp855x_bl.c: small cleanups
Applying: lp855x-bl: remove unnecessary platform data
Applying: lp855x-bl: remove unnecessary headers
Applying: backlight: add driver for Bachmann's ot200
Applying: backlight-add-driver-for-bachmanns-ot200-fix
Applying: backlight: add support for Pandora backlight
Applying: backlight-add-support-for-pandora-backlight-v2
Applying: backlight: convert platform_lcd to dev_pm_ops
Applying: backlight: fix ot200_bl build
Applying: bitops: rename for_each_set_bit_cont() in favor of analogous list.h function
Applying: bitops: remove for_each_set_bit_cont()
Applying: regmap: cope with bitops API change (for_each_set_bit_cont)
Applying: bitops: introduce for_each_clear_bit()
Applying: mtd: use for_each_clear_bit()
Applying: s390/char: use for_each_clear_bit()
Applying: uwb: use for_each_clear_bit()
Applying: x86: use for_each_clear_bit_from()
Applying: drivers/leds/leds-lp5521.c: fix typo
Applying: drivers/leds/leds-tca6507.c: cleanup error handling in tca6507_probe()
Applying: drivers/leds/leds-tca6507.c: remove obsolete cleanup for clientdata
Applying: drivers/leds/leds-lp5521.c: add 'name' in the lp5521_led_config
Applying: drivers/leds/leds-lp5521.c: add 'update_config' in the lp5521_platform_data
Applying: drivers/leds/leds-lp5521.c: support led pattern data
Applying: leds-lp5521-support-led-pattern-data-checkpatch-fixes
Applying: drivers/leds/leds-lp5521.c: redefinition of register bits
Applying: drivers/leds/leds-lp5521.c: ret may be uninitialized
Applying: drivers/leds/leds-lp5523.c: constify some data
Applying: drivers/leds: add driver for PCA9633 I2C chip
Applying: drivers-leds-add-driver-for-pca9663-i2c-chip-fix
Applying: drivers-leds-add-driver-for-pca9663-i2c-chip-fix-2
Applying: drivers/leds/leds-pca9633.c: fix kcalloc parameters swapped
Applying: drivers/leds/leds-gpio.c: use linux/gpio.h rather than asm/gpio.h
Applying: leds-lm3530: set the max_brightness to 127
Applying: leds-lm3530: replace i2c_client with led_classdev
Applying: leds-lm3530-replace-i2c_client-with-led_classdev-fix
Applying: leds-lm3530: support pwm input mode
Applying: leds-lm3530: remove LM3530_ALS_ZONE_REG code
Applying: leds-lm3530: replace pltfm with pdata
Applying: drivers/leds/leds-pca9633.c: remove unused 'adapter' variable
Applying: drivers/leds/leds-lm3530.c: move the code setting gen_config to one place
Applying: drivers-leds-leds-lm3530c-move-the-code-setting-gen_config-to-one-place-fix
Applying: string: memchr_inv speed improvements
Applying: prio_tree: remove unnecessary code in prio_tree_replace
Applying: prio_tree: cleanup prio_tree_left()/prio_tree_right()
Applying: prio_tree: simplify prio_tree_expand()
Applying: prio_tree: introduce prio_set_parent()
Applying: include/ and checkpatch: prefer __scanf to __attribute__((format(scanf,...)
Applying: checkpatch: add some --strict coding style checks
Applying: checkpatch-add-some-strict-coding-style-checks-v3
Applying: checkpatch.pl: be silent when -q and --ignore is given
Applying: checkpatch: catch [ ... ] usage when not at the beginning of definition
Applying: checkpatch: allow simple character constants in #defines
Applying: checkpatch: handle string concatenation in simple #defines
Applying: checkpatch: high precedence operators do not require additional parentheses in #defines
Applying: checkpatch: add [] to type extensions
Applying: checkpatch: add --strict tests for braces, comments and casts
Applying: checkpatch: add --strict test for strings split across multiple lines
Applying: crc32: remove two instances of trailing whitespaces
Applying: crc32: move long comment about crc32 fundamentals to Documentation/
Applying: crc32-move-long-comment-about-crc32-fundamentals-to-documentation-fix
Applying: crc32: simplify unit test code
Applying: crc32: miscellaneous cleanups
Applying: crc32: fix mixing of endian-specific types
Applying: crc32: make CRC_*_BITS definition correspond to actual bit counts
Applying: crc32: add slice-by-8 algorithm to existing code
Applying: crc32: optimize loop counter for x86
Applying: crc32: add note about this patchset to crc32.c
Applying: crc32: bolt on crc32c
Applying: crc32: Don't reference unnecessary crc32 tables in single-bit mode
Applying: crypto: crc32c should use library implementation
Applying: crc32: add self-test code for crc32c
Applying: crc32: select an algorithm via Kconfig
Applying: epoll: comment the funky #ifdef
Applying: epoll: remove unneeded variable in reverse_path_check()
Applying: init/do_mounts.c: create /root if it does not exist
Applying: rtc-spear: fix for balancing the enable_irq_wake in Power Mgmt
Applying: rtc/spear: fix for RTC_AIE_ON and RTC_AIE_OFF ioctl errors
Applying: rtc/rtc-spear: call platform_set_drvdata() before registering rtc device
Applying: rtc: convert rtc spi drivers to module_spi_driver
Applying: rtc: convert rtc i2c drivers to module_i2c_driver
Applying: MIPS: add RTC support for loongson1B
Applying: drivers/rtc/rtc-twl.c: optimize IRQ bit access
Applying: drivers/rtc/rtc-twl.c: enable RTC irrespective of its prior state
Applying: drivers/rtc/rtc-twl.c: simplify RTC interrupt clearing
Applying: drivers/rtc/rtc-twl.c: return correct RTC event from ISR
Applying: drivers/rtc: remove IRQF_DISABLED
Applying: drivers/rtc/rtc-pm8xxx.c: make pm8xxx_rtc_pm_ops static
Applying: drivers/rtc/rtc-max8925.c: fix max8925_rtc_read_alarm() return value error
Applying: drivers/rtc/rtc-max8925.c: fix alarm->enabled mistake in max8925_rtc_read_alarm/max8925_rtc_set_alarm
Applying: rtc: driver for DA9052/53 PMIC v1
Applying: rtc-rtc-driver-for-da9052-53-pmic-v1-fix
Applying: rtc: ds1307: refactor chip_desc table
Applying: rtc: ds1307: simplify irq setup code
Applying: rtc: ds1307: comment and format cleanup
Applying: rtc: ds1307: generalise ram size and offset
Applying: rtc: fix rtc-ds1307 printk format warning
Applying: ptrace: the killed tracee should not enter the syscall
Applying: ptrace: don't send SIGTRAP on exec if SEIZED
Applying: ptrace: don't modify flags on PTRACE_SETOPTIONS failure
Applying: ptrace: simplify PTRACE_foo constants and PTRACE_SETOPTIONS code
Applying: ptrace: make PTRACE_SEIZE set ptrace options specified in 'data' parameter
Applying: ptrace: renumber PTRACE_EVENT_STOP so that future new options and events can match
Applying: ptrace: remove PTRACE_SEIZE_DEVEL bit
Applying: signal: give SEND_SIG_FORCED more power to beat SIGNAL_UNKILLABLE
Applying: signal: cosmetic, s/from_ancestor_ns/force/ in prepare_signal() paths
Applying: signal: oom_kill_task: use SEND_SIG_FORCED instead of force_sig()
Applying: signal: zap_pid_ns_processes: s/SEND_SIG_NOINFO/SEND_SIG_FORCED/
Applying: usermodehelper: use UMH_WAIT_PROC consistently
Applying: usermodehelper: introduce umh_complete(sub_info)
Applying: usermodehelper: implement UMH_KILLABLE
Applying: usermodehelper: kill umh_wait, renumber UMH_* constants
Applying: usermodehelper: ____call_usermodehelper() doesn't need do_exit()
Applying: kmod: introduce call_modprobe() helper
Applying: kmod: make __request_module() killable
Applying: kmod: avoid deadlock from recursive kmod call
Applying: kmod-avoid-deadlock-by-recursive-kmod-call-fix
Applying: fs/proc/kcore.c: make get_sparsemem_vmemmap_info() static
Applying: proc: speedup /proc/stat handling
Applying: procfs: add num_to_str() to speed up /proc/stat
Applying: procfs-add-num_to_str-to-speed-up-proc-stat-fix
Applying: procfs: avoid breaking the ABI in /proc/stat
Applying: procfs: speed up /proc/pid/stat, statm
Applying: procfs-speed-up-proc-pid-stat-statm-checkpatch-fixes
Applying: proc: clean up /proc/<pid>/environ handling
Applying: seq_file: add seq_set_overflow(), seq_overflow()
Applying: seq_file-add-seq_set_overflow-seq_overflow-fix
Applying: smp: introduce a generic on_each_cpu_mask() function
Applying: arm: move arm over to generic on_each_cpu_mask
Applying: tile: move tile to use generic on_each_cpu_mask
Applying: smp: add func to IPI cpus based on parameter func
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-fix
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-update-fix
Applying: smp: add func to IPI cpus based on parameter func
Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-v9-fix
Applying: slub: only IPI CPUs that have per cpu obj to flush
Applying: fs: only send IPI to invalidate LRU BH when needed
Applying: mm: only IPI CPUs to drain local pages if they exist
Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-update
Applying: mm-only-ipi-cpus-to-drain-local-pages-if-they-exist-v9
Applying: lib/cpumask.c: remove __any_online_cpu()
Applying: arch/ia64: remove references to cpu_*_map
Applying: kexec: crash: don't save swapper_pg_dir for !CONFIG_MMU configurations
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipmi: decrease the IPMI message transaction time in interrupt mode
Applying: ipmi: increase KCS timeouts
Applying: ipmi: use a tasklet for handling received messages
Applying: ipmi: fix message handling during panics
Applying: ipmi: simplify locking
Applying: ipmi: use locks on watchdog timeout set on reboot
Applying: sysctl: use bitmap library functions
Applying: pidns: add reboot_pid_ns() to handle the reboot syscall
Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-fix
Applying: pidns-add-reboot_pid_ns-to-handle-the-reboot-syscall-checkpatch-fixes
Applying: fs/proc/namespaces.c: prevent crash when ns_entries[] is empty
Applying: selftests: launch individual selftests from the main Makefile
Applying: selftests/Makefile: make `run_tests' depend on `all'
Applying: mm: move page-types.c from Documentation to tools/vm
Applying: mm: move slabinfo.c to tools/vm
Applying: mm: move hugepage test examples to tools/testing/selftests/vm
Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix
Applying: move-hugepage-test-examples-to-tools-testing-selftests-vm-fix-fix
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix-2
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: notify_change(): check that i_mutex is held
Merging akpm (4863c37 notify_change(): check that i_mutex is held)
[master e27fdd7] Revert "ALSA: hda - Add expose_enum_ctl flag to snd_hda_add_vmaster_hook()"
[master aeb2b76] Revert "ALSA: hda - Add "Mute-LED Mode" enum control"
[master c965acf] Revert "ALSA: hda - Rewrite the mute-LED hook with vmaster hook in patch_sigmatel.c"
$ git cherry-pick e0adb9902fb3
[master c002629] sparc32: Add -Av8 to assembler command line.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the isci tree with the scsi tree
From: Williams, Dan J @ 2012-03-14 7:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, James Bottomley
In-Reply-To: <20120313144152.5bd633a5ea6e496c059a9465@canb.auug.org.au>
On Mon, Mar 12, 2012 at 8:41 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dan,
>
> On Mon, 12 Mar 2012 19:50:33 -0700 "Williams, Dan J" <dan.j.williams@intel.com> wrote:
>>
>> I was wondering why it had not happened prior to this point... in any
>
> It had, I just put up with it the first time :-)
Ok, all fixed up now, and I'll be quicker to respin when scsi-misc
picks up the next round of patches.
Thanks for carrying this.
--
Dan
^ permalink raw reply
* linux-next: build failure after merge of the final tree (sound tree related)
From: Stephen Rothwell @ 2012-03-14 7:05 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 794 bytes --]
Hi all,
After merging the final tree, today's linux-next build (i386 defconfig)
failed like this:
sound/pci/hda/patch_sigmatel.c: In function 'stac92xx_update_led_status':
sound/pci/hda/patch_sigmatel.c:5075:3: error: implicit declaration of function 'stac_vrefout_set' [-Werror=implicit-function-declaration]
Caused by commit 2faa3bf15ba6 ("ALSA: hda - Rewrite the mute-LED hook
with vmaster hook in patch_sigmatel.c"). CONFIG_SND_HDA_POWER_SAVE is
not set for this build.
I reverted that commit for today (and commits d2f344b5e0a9 "ALSA: hda -
Add "Mute-LED Mode" enum control" and f29735cbef4e "ALSA: hda - Add
expose_enum_ctl flag to snd_hda_add_vmaster_hook()" which conflict with
the revert).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the sound-asoc tree
From: Stephen Rothwell @ 2012-03-14 6:06 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Fabio Estevam, Mark Brown,
Liam Girdwood, Javier Martin, Sascha Hauer
[-- Attachment #1: Type: text/plain, Size: 1218 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-imx/mach-imx27_visstrim_m10.c between commit 5ec65ee589fd
("ASoC: mx27vis-aic32x4: Convert it to platform driver") from the
sound-asoc tree and commit f52f5a5503b5 ("i.MX27: visstrim_m10: Add video
support") from the arm-soc 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-imx/mach-imx27_visstrim_m10.c
index 428459f,0a1643c..0000000
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@@ -263,7 -393,10 +393,11 @@@ static void __init visstrim_m10_board_i
imx27_add_fec(NULL);
imx_add_gpio_keys(&visstrim_gpio_keys_platform_data);
platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+ platform_device_register_resndata(NULL, "soc-camera-pdrv", 0, NULL, 0,
+ &iclink_tvp5150, sizeof(iclink_tvp5150));
+ gpio_led_register_device(0, &visstrim_m10_led_data);
+ visstrim_camera_init();
+ imx_add_platform_device("mx27vis", 0, NULL, 0, NULL, 0);
}
static void __init visstrim_m10_timer_init(void)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: New build failures in sparc.
From: Stephen Rothwell @ 2012-03-14 5:02 UTC (permalink / raw)
To: David Miller; +Cc: tony, paul.gortmaker, sparclinux, linux-next
In-Reply-To: <20120313.214609.1139946570476396180.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 398 bytes --]
Hi Dave,
On Tue, 13 Mar 2012 21:46:09 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> See the patch I sent to Linus which landed in his tree an hour or so
> ago:
>
> --------------------
> [PATCH] sparc32: Add -Av8 to assembler command line.
I will cherry-pick that onto the end of linux-next today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the uprobes tree with the tip tree
From: Srikar Dronamraju @ 2012-03-14 4:55 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra
In-Reply-To: <20120314151444.a34eef495739e13506ac5b1a@canb.auug.org.au>
> The linux-next merge of the uprobes tree gets several conflicts against
> the tip tree because the same patches appear in both threes and there are
> further changes to some files in the uprobes tree.
>
> Merging uprobes/for-next (1fe509b uprobes/core: Handle breakpoint and singlestep exception.)
> CONFLICT (add/add): Merge conflict in kernel/events/uprobes.c
> CONFLICT (content): Merge conflict in kernel/events/Makefile
> CONFLICT (add/add): Merge conflict in include/linux/uprobes.h
> CONFLICT (add/add): Merge conflict in arch/x86/kernel/uprobes.c
> CONFLICT (add/add): Merge conflict in arch/x86/include/asm/uprobes.h
>
> The easiest way to remove these conflicts would be for you to rebase the
> uprobes tree onto the perl/uprobes branch of the tip tree (I assume that
> all the uprobes code will eventually be merged to Linus via the tip tree)
> or a subset of that branch that is the common set of patches.
Okay, I will go with this suggestion. Infact this is actually easier for
me.
--
Thanks and Regards
Srikar
^ permalink raw reply
* Re: New build failures in sparc.
From: David Miller @ 2012-03-14 4:46 UTC (permalink / raw)
To: tony; +Cc: sfr, paul.gortmaker, sparclinux, linux-next
In-Reply-To: <20120314040102.GA26084@thor.bakeyournoodle.com>
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Wed, 14 Mar 2012 15:01:02 +1100
> On Tue, Mar 13, 2012 at 05:37:41PM -0700, David Miller wrote:
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Wed, 14 Mar 2012 10:28:30 +1100
>>
>> > Yeah, we updated our sparc64 toolchain yesterday ... Tony says he
>> > will try applying the patch(es) from the bugzilla.
>>
>> Meanwhile I'll add a workaround to the sparc makefiles, and
>> push that to Linus. This way it will work no matter what
>> combination of tools someone has.
>
> Thanks Dave, we may be hitting a related but different issue as gcc
> 4.6.3 seems to have that patch already.
See the patch I sent to Linus which landed in his tree an hour or so
ago:
--------------------
[PATCH] sparc32: Add -Av8 to assembler command line.
Newer version of binutils are more strict about specifying the
correct options to enable certain classes of instructions.
The sparc32 build is done for v7 in order to support sun4c systems
which lack hardware integer multiply and divide instructions.
So we have to pass -Av8 when building the assembler routines that
use these instructions and get patched into the kernel when we find
out that we have a v8 capable cpu.
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
arch/sparc/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index ad1fb5d..eddcfb3 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -31,7 +31,7 @@ UTS_MACHINE := sparc
#KBUILD_CFLAGS += -g -pipe -fcall-used-g5 -fcall-used-g7
KBUILD_CFLAGS += -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7
-KBUILD_AFLAGS += -m32
+KBUILD_AFLAGS += -m32 -Wa,-Av8
#LDFLAGS_vmlinux = -N -Ttext 0xf0004000
# Since 2.5.40, the first stage is left not btfix-ed.
--
1.7.6.5
^ permalink raw reply related
* linux-next: build failure after merge of the uprobes tree
From: Stephen Rothwell @ 2012-03-14 4:31 UTC (permalink / raw)
To: Srikar Dronamraju
Cc: linux-next, linux-kernel, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]
Hi Srikar,
After merging the uprobes tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from include/linux/compat.h:18:0,
from arch/x86/include/asm/ia32.h:7,
from arch/x86/include/asm/sigframe.h:17,
from arch/x86/kernel/asm-offsets.c:16:
arch/x86/include/asm/compat.h:238:20: error: redefinition of 'is_ia32_task'
arch/x86/include/asm/thread_info.h:272:20: note: previous definition of 'is_ia32_task' was here
Caused by commit 081c056eccf3 ("x86: Move is_ia32_task to
asm/thread_info.h from asm/compat.h") which added the function to
asm/thread_info.h but did not remove it from asm/compat.h. The version
of this patch that is in the tip tree is correct (but that is not in
tip's auto-latest branch (and hence linux-next) today).
I would have used the uprobes tree from next-20130309, but trying that
produced a large number of conflicts, so I just dropped the uprobes tree
for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: arm build failures (Was: linux-next: triage for March 13, 2012)
From: Tony Breeds @ 2012-03-14 4:29 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Paul Gortmaker, linux-next, linux-kernel, Russell King
In-Reply-To: <20120314114115.24e59318bdac705fec61bd89@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1477 bytes --]
On Wed, Mar 14, 2012 at 11:41:15AM +1100, Stephen Rothwell wrote:
> On Tue, 13 Mar 2012 19:47:07 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> >
> > ARM:netx_defconfig,pnx4008_defconfig
> > when: Mar 14, 02:43
> > why: net/core/pktgen.c: can't find a register in class 'GENERAL_REGS'
> > status:
> > fix:
> > ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5869486/
>
> This is this:
>
> net/core/pktgen.c:682:2775: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
> net/core/pktgen.c:682:3153: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
> net/core/pktgen.c:682:2775: error: 'asm' operand has impossible constraints
> net/core/pktgen.c:682:3153: error: 'asm' operand has impossible constraints
>
> Which is a do_div() call. The relevant code does not appear to have
> changed, so this may well be a result of our toolchain changing from
> "arm-linux-gcc (GCC) 4.4.0, GNU ld (GNU Binutils) 2.19.1" to
> "arm-unknown-linux-gnueabi-gcc (GCC) 4.6.3, GNU ld (GNU Binutils) 2.22".
Just for reference I build that code with:
arm-unknown-linux-gnueabi-gcc (GCC) 4.5.2, GNU ld (GNU Binutils) 2.21
and it was fine so I don't think it's to do with the switch from
arm-linux-gcc to arm-unknown-linux-gnueabi-gcc[1]
Yours Tony
[1] This switchwas done as a result off the discussion at: http://lists.infradead.org/pipermail/linux-arm-kernel/2010-November/030627.html
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the uprobes tree with the tip tree
From: Stephen Rothwell @ 2012-03-14 4:14 UTC (permalink / raw)
To: Srikar Dronamraju
Cc: linux-next, linux-kernel, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra
[-- Attachment #1: Type: text/plain, Size: 993 bytes --]
Hi Srikar,
The linux-next merge of the uprobes tree gets several conflicts against
the tip tree because the same patches appear in both threes and there are
further changes to some files in the uprobes tree.
Merging uprobes/for-next (1fe509b uprobes/core: Handle breakpoint and singlestep exception.)
CONFLICT (add/add): Merge conflict in kernel/events/uprobes.c
CONFLICT (content): Merge conflict in kernel/events/Makefile
CONFLICT (add/add): Merge conflict in include/linux/uprobes.h
CONFLICT (add/add): Merge conflict in arch/x86/kernel/uprobes.c
CONFLICT (add/add): Merge conflict in arch/x86/include/asm/uprobes.h
The easiest way to remove these conflicts would be for you to rebase the
uprobes tree onto the perl/uprobes branch of the tip tree (I assume that
all the uprobes code will eventually be merged to Linus via the tip tree)
or a subset of that branch that is the common set of patches.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: New build failures in sparc.
From: Tony Breeds @ 2012-03-14 4:01 UTC (permalink / raw)
To: David Miller; +Cc: sfr, paul.gortmaker, sparclinux, linux-next
In-Reply-To: <20120313.173741.18086192847996966.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 575 bytes --]
On Tue, Mar 13, 2012 at 05:37:41PM -0700, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 14 Mar 2012 10:28:30 +1100
>
> > Yeah, we updated our sparc64 toolchain yesterday ... Tony says he
> > will try applying the patch(es) from the bugzilla.
>
> Meanwhile I'll add a workaround to the sparc makefiles, and
> push that to Linus. This way it will work no matter what
> combination of tools someone has.
Thanks Dave, we may be hitting a related but different issue as gcc
4.6.3 seems to have that patch already.
Yours Tony
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] -mm/linux-next: procfs: Mark thread stack correctly in proc/<pid>/maps
From: Siddhesh Poyarekar @ 2012-03-14 3:58 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-kernel, linux-next, Alexander Viro, Alexey Dobriyan,
Jamie Lokier, KOSAKI Motohiro, Matt Mackall, Mike Frysinger,
Oleg Nesterov, Paul Gortmaker, Mark Salter
In-Reply-To: <20120313131616.f66dbdad.akpm@linux-foundation.org>
On Wed, Mar 14, 2012 at 1:46 AM, Andrew Morton
<akpm@linux-foundation.org> wrote:
> Boy, that's a lot of changes (below). What does it all do?
>
> Why did the sched.h inclusions get taken out again?
>
Most of it is code shuffling in addition to the feature change I
mentioned earlier. I've elaborated on the changes inline.
> diff -puN Documentation/filesystems/proc.txt~procfs-mark-thread-stack-correctly-in-proc-pid-maps-v3 Documentation/filesystems/proc.txt
> --- a/Documentation/filesystems/proc.txt~procfs-mark-thread-stack-correctly-in-proc-pid-maps-v3
> +++ a/Documentation/filesystems/proc.txt
<snip>
>
> The /proc/PID/task/TID/maps is a view of the virtual memory from the viewpoint
> of the individual tasks of a process. In this file you will see a mapping marked
> -as [stack:TID] only if that task sees it as a stack. This is a key difference
> -from the content of /proc/PID/maps, where you will see all mappings that are
> -being used as stack by all of those tasks.
> +as [stack] if that task sees it as a stack. This is a key difference from the
> +content of /proc/PID/maps, where you will see all mappings that are being used
> +as stack by all of those tasks. Hence, for the example above, the task-level
> +map, i.e. /proc/PID/task/TID/maps for thread 1001 will look like this:
> +
> +08048000-08049000 r-xp 00000000 03:00 8312 /opt/test
> +08049000-0804a000 rw-p 00001000 03:00 8312 /opt/test
> +0804a000-0806b000 rw-p 00000000 00:00 0 [heap]
> +a7cb1000-a7cb2000 ---p 00000000 00:00 0
> +a7cb2000-a7eb2000 rw-p 00000000 00:00 0
> +a7eb2000-a7eb3000 ---p 00000000 00:00 0
> +a7eb3000-a7ed5000 rw-p 00000000 00:00 0 [stack]
> +a7ed5000-a8008000 r-xp 00000000 03:00 4222 /lib/libc.so.6
> +a8008000-a800a000 r--p 00133000 03:00 4222 /lib/libc.so.6
> +a800a000-a800b000 rw-p 00135000 03:00 4222 /lib/libc.so.6
> +a800b000-a800e000 rw-p 00000000 00:00 0
> +a800e000-a8022000 r-xp 00000000 03:00 14462 /lib/libpthread.so.0
> +a8022000-a8023000 r--p 00013000 03:00 14462 /lib/libpthread.so.0
> +a8023000-a8024000 rw-p 00014000 03:00 14462 /lib/libpthread.so.0
> +a8024000-a8027000 rw-p 00000000 00:00 0
> +a8027000-a8043000 r-xp 00000000 03:00 8317 /lib/ld-linux.so.2
> +a8043000-a8044000 r--p 0001b000 03:00 8317 /lib/ld-linux.so.2
> +a8044000-a8045000 rw-p 0001c000 03:00 8317 /lib/ld-linux.so.2
> +aff35000-aff4a000 rw-p 00000000 00:00 0
> +ffffe000-fffff000 r-xp 00000000 00:00 0 [vdso]
I extended the documentation a bit to give an example of how
/proc/PID/task/TID/maps would look like. This reflects the feature
change that KOSAKI-san requested (keeping process stack as [stack] in
/proc/PID/maps).
> --- a/fs/proc/task_mmu.c~procfs-mark-thread-stack-correctly-in-proc-pid-maps-v3
> +++ a/fs/proc/task_mmu.c
> @@ -222,7 +222,7 @@ show_map_vma(struct seq_file *m, struct
> unsigned long start, end;
> dev_t dev = 0;
> int len;
> - const char *name;
> + const char *name = NULL;
>
> if (file) {
> struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
> @@ -256,33 +256,47 @@ show_map_vma(struct seq_file *m, struct
> if (file) {
> pad_len_spaces(m, len);
> seq_path(m, &file->f_path, "\n");
> - goto out;
> + goto done;
> }
>
> name = arch_vma_name(vma);
> if (!name) {
> - if (mm) {
> - if (vma->vm_start <= mm->brk &&
> - vma->vm_end >= mm->start_brk) {
> - name = "[heap]";
> - } else {
> - pid_t tid;
> + pid_t tid;
>
> - tid = vm_is_stack(task, vma, is_pid);
> - if (tid != 0) {
> - pad_len_spaces(m, len);
> - seq_printf(m, "[stack:%d]", tid);
> - }
> - }
> - } else {
> + if (!mm) {
> name = "[vdso]";
> + goto done;
> + }
> +
> + if (vma->vm_start <= mm->brk &&
> + vma->vm_end >= mm->start_brk) {
> + name = "[heap]";
> + goto done;
> + }
> +
> + tid = vm_is_stack(task, vma, is_pid);
> +
> + if (tid !=0) {
> + /*
> + * Thread stack in /proc/PID/task/TID/maps or
> + * the main process stack.
> + */
> + if (!is_pid || (vma->vm_start <= mm->start_stack &&
> + vma->vm_end >= mm->start_stack)) {
> + name = "[stack]";
> + } else {
> + /* Thread stack in /proc/PID/maps */
> + pad_len_spaces(m, len);
> + seq_printf(m, "[stack:%d]", tid);
> + }
> }
> }
> +
> +done:
> if (name) {
> pad_len_spaces(m, len);
> seq_puts(m, name);
> }
> -out:
> seq_putc(m, '\n');
> }
>
> @@ -1134,8 +1148,17 @@ static int show_numa_map(struct seq_file
> seq_printf(m, " heap");
> } else {
> pid_t tid = vm_is_stack(proc_priv->task, vma, is_pid);
> - if (tid != 0)
> - seq_printf(m, " stack:%d", tid);
> + if (tid !=0) {
> + /*
> + * Thread stack in /proc/PID/task/TID/maps or
> + * the main process stack.
> + */
> + if (!is_pid || (vma->vm_start <= mm->start_stack &&
> + vma->vm_end >= mm->start_stack))
> + seq_printf(m, " stack");
> + else
> + seq_printf(m, " stack:%d", tid);
> + }
> }
The request to keep process stack marked as [stack] meant an
additional nested condition, so I cleaned up the code like you had
suggested earlier.
> diff -puN mm/util.c~procfs-mark-thread-stack-correctly-in-proc-pid-maps-v3 mm/util.c
> --- a/mm/util.c~procfs-mark-thread-stack-correctly-in-proc-pid-maps-v3
> +++ a/mm/util.c
> @@ -239,6 +239,47 @@ void __vma_link_list(struct mm_struct *m
> next->vm_prev = vma;
> }
>
> +/* Check if the vma is being used as a stack by this task */
> +static int vm_is_stack_for_task(struct task_struct *t,
> + struct vm_area_struct *vma)
> +{
> + return (vma->vm_start <= KSTK_ESP(t) && vma->vm_end >= KSTK_ESP(t));
> +}
> +
> +/*
> + * Check if the vma is being used as a stack.
> + * If is_group is non-zero, check in the entire thread group or else
> + * just check in the current task. Returns the pid of the task that
> + * the vma is stack for.
> + */
> +pid_t vm_is_stack(struct task_struct *task,
> + struct vm_area_struct *vma, int in_group)
> +{
> + pid_t ret = 0;
> +
> + if (vm_is_stack_for_task(task, vma))
> + return task->pid;
> +
> + if (in_group) {
> + struct task_struct *t;
> + rcu_read_lock();
> + if (!pid_alive(task))
> + goto done;
> +
> + t = task;
> + do {
> + if (vm_is_stack_for_task(t, vma)) {
> + ret = t->pid;
> + goto done;
> + }
> + } while_each_thread(task, t);
> +done:
> + rcu_read_unlock();
> + }
> +
> + return ret;
> +}
> +
> #if defined(CONFIG_MMU) && !defined(HAVE_ARCH_PICK_MMAP_LAYOUT)
> void arch_pick_mmap_layout(struct mm_struct *mm)
> {
> _
>
I had duplicated the vm_is_stack functions for mmu and nommu in
memory.c and nommu.c, which I unified and moved to util.c (above),
which is built in both mmu and nommu and also seemed like a good
enough place for it since it is a utility function. util.c already
includes sched.h, which is why the sched.h inclusions are not needed
anymore.
I forgot to mention how I have tested this:
* Build and functionality test on x86_64
* Build test for i386
* Build test for nommu with a bit of a hack; removing mmu code in x86
and building it as if it were nommu.
--
Siddhesh Poyarekar
http://siddhesh.in
^ permalink raw reply
* linux-next: manual merge of the tip tree with the tile tree
From: Stephen Rothwell @ 2012-03-14 3:52 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Chris Metcalf, H. J. Lu
[-- Attachment #1: Type: text/plain, Size: 1494 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/Kconfig between commit ca3a3d347e23 ("ipc: provide generic
compat versions of IPC syscalls") from the tile tree and commits
5fd92e65a68b ("x32: Allow x32 to be configured") and 0bf6276392e9 ("x32:
Warn and disable rather than error if binutils too old") from the tip
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/x86/Kconfig
index 0ca57e0,21ec4bf..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2174,10 -2195,22 +2194,23 @@@ config IA32_AOU
---help---
Support old a.out binaries in the 32bit emulation.
+ config X86_X32
+ bool "x32 ABI for 64-bit mode (EXPERIMENTAL)"
+ depends on X86_64 && IA32_EMULATION && EXPERIMENTAL
+ ---help---
+ Include code to run binaries for the x32 native 32-bit ABI
+ for 64-bit processors. An x32 process gets access to the
+ full 64-bit register file and wide data path while leaving
+ pointers at 32 bits for smaller memory footprint.
+
+ You will need a recent binutils (2.22 or later) with
+ elf32_x86_64 support enabled to compile a kernel with this
+ option set.
+
config COMPAT
def_bool y
- depends on IA32_EMULATION
+ depends on IA32_EMULATION || X86_X32
+ select ARCH_WANT_OLD_COMPAT_IPC
config COMPAT_FOR_U64_ALIGNMENT
def_bool COMPAT
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the tip tree with the s390 tree
From: Stephen Rothwell @ 2012-03-14 3:46 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Martin Schwidefsky, Heiko Carstens
[-- Attachment #1: Type: text/plain, Size: 1312 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/s390/kernel/smp.c between commit 8b646bd75908 ("[S390] rework smp
code") from the s390 tree and commit 5fbd036b552f ("sched: Cleanup
cpu_active madness") from the tip 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/s390/kernel/smp.c
index 64ebbcb,b0e28c4..0000000
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@@ -714,12 -544,12 +714,6 @@@ static void __cpuinit smp_start_seconda
ipi_call_lock();
set_cpu_online(smp_processor_id(), true);
ipi_call_unlock();
- /*
- * Wait until the cpu which brought this one up marked it
- * active before enabling interrupts.
- */
- while (!cpumask_test_cpu(smp_processor_id(), cpu_active_mask))
- cpu_relax();
- __ctl_clear_bit(0, 28); /* Disable lowcore protection */
- S390_lowcore.restart_psw.mask =
- PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA | PSW_MASK_BA;
- S390_lowcore.restart_psw.addr =
- PSW_ADDR_AMODE | (unsigned long) psw_restart_int_handler;
- __ctl_set_bit(0, 28); /* Enable lowcore protection */
local_irq_enable();
/* cpu_idle will call schedule for us */
cpu_idle();
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the devicetree tree with the powerpc tree
From: Gavin Shan @ 2012-03-14 1:53 UTC (permalink / raw)
To: Grant Likely, benh
Cc: linux-kernel, linux-next, Paul Mackerras, linuxppc-dev,
Stephen Rothwell
In-Reply-To: <20120313182612.0546D3E053B@localhost>
Hi Grant,
> >
> > Today's linux-next merge of the devicetree tree got a conflict in
> > include/linux/of.h between commit eb740b5f3e65 ("powerpc/eeh: Introduce
> > EEH device") from the powerpc tree and commit 0f22dd395fc4 ("of: Only
> > compile OF_DYNAMIC on PowerPC pseries and iseries") from the devicetree
> > 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 include/linux/of.h
> > index bdb1c07,533603e..0000000
> > --- a/include/linux/of.h
> > +++ b/include/linux/of.h
> > @@@ -75,14 -72,10 +75,17 @@@ struct of_phandle_args
> > uint32_t args[MAX_PHANDLE_ARGS];
> > };
> >
> > +#if defined(CONFIG_EEH)
> > +static inline struct eeh_dev *of_node_to_eeh_dev(struct device_node *dn)
> > +{
> > + return dn->edev;
> > +}
> > +#endif
>
> Ben, What is this? I don't want the eeh_dev pointer in struct device_node. Up to
> now we've avoided putting any reverse references into device_nodes. For everything
> else we use a reverse lookup, particularly for devices, to avoid growing the
> device_node for each new type of lookup.
>
It's used to trace the EEH device. When EEH (Enhanced Error Hanlding) is enabled,
EEH device will be created against PCI sensitive OF node to trace the EEH state
accordingly. Since you don't want see this in struct device_node, we have to change
struct eeh_dev for a little bit to so that all struct eeh_dev instances will form
a global list and we can search eeh_dev according to the given device_node through
the global list.
I don't know the policy or rule here for much. I think we can have 2 options.
1. Keep the code as being, and fix it later.
2. Fix it now.
Thanks,
Gavin
^ permalink raw reply
* Re: New build failures in sparc.
From: Stephen Rothwell @ 2012-03-14 0:58 UTC (permalink / raw)
To: David Miller; +Cc: paul.gortmaker, sparclinux, linux-next, tony
In-Reply-To: <20120313.173741.18086192847996966.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
Hi Dave,
On Tue, 13 Mar 2012 17:37:41 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 14 Mar 2012 10:28:30 +1100
>
> > Yeah, we updated our sparc64 toolchain yesterday ... Tony says he
> > will try applying the patch(es) from the bugzilla.
>
> Meanwhile I'll add a workaround to the sparc makefiles, and
> push that to Linus. This way it will work no matter what
> combination of tools someone has.
Excellent, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 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